archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.0' into PHP-7.1

Browse source 
* PHP-7.0:
  better way to get ACP
This commit is contained in:
Anatol Belski 2016-12-12 01:56:44 +01:00
commit d9fc5ea6ec
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/com_dotnet/com_com.c
View file

@ -52,7 +52,7 @@ PHP_FUNCTION(com_create_instance)
RPC_C_AUTHN_LEVEL_DEFAULT, RPC_C_IMP_LEVEL_IMPERSONATE, RPC_C_AUTHN_LEVEL_DEFAULT, RPC_C_IMP_LEVEL_IMPERSONATE,
&authid, EOAC_NONE &authid, EOAC_NONE
}; };
zend_long cp = CP_ACP; zend_long cp = GetACP();
const struct php_win32_cp *cp_it; const struct php_win32_cp *cp_it;
php_com_initialize(); php_com_initialize();

2
ext/com_dotnet/com_dotnet.c
View file

@ -196,7 +196,7 @@ PHP_FUNCTION(com_dotnet_create_instance)
int ret = FAILURE; int ret = FAILURE;
char *where = ""; char *where = "";
IUnknown *unk = NULL; IUnknown *unk = NULL;
zend_long cp = CP_ACP; zend_long cp = GetACP();
const struct php_win32_cp *cp_it; const struct php_win32_cp *cp_it;
php_com_initialize(); php_com_initialize();