mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: better way to get ACP
This commit is contained in:
commit
d9fc5ea6ec
@ -52,7 +52,7 @@ PHP_FUNCTION(com_create_instance)
|
||||
RPC_C_AUTHN_LEVEL_DEFAULT, RPC_C_IMP_LEVEL_IMPERSONATE,
|
||||
&authid, EOAC_NONE
|
||||
};
|
||||
zend_long cp = CP_ACP;
|
||||
zend_long cp = GetACP();
|
||||
const struct php_win32_cp *cp_it;
|
||||
|
||||
php_com_initialize();
|
||||
|
@ -196,7 +196,7 @@ PHP_FUNCTION(com_dotnet_create_instance)
|
||||
int ret = FAILURE;
|
||||
char *where = "";
|
||||
IUnknown *unk = NULL;
|
||||
zend_long cp = CP_ACP;
|
||||
zend_long cp = GetACP();
|
||||
const struct php_win32_cp *cp_it;
|
||||
|
||||
php_com_initialize();
|
||||
|
Loading…
Reference in New Issue
Block a user