com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/com_dot net/com_com.c ext/com_dotnet/com_dotnet.c
| From: | Anatol Belski | Date: | Mon, 12 Dec 2016 00:56:44 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/com_dot net/com_com.c ext/com_dotnet/com_dotnet.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96300@lists.php.net to get a copy of this message | ||
Commit: d9fc5ea6ecbd44fda21e2db2981a0b3cdfd55510
Author: Anatol Belski <ab@php.net> Mon, 12 Dec 2016 01:56:44 +0100
Parents: 8199e5a7e933493e991f402923213b40d01896a9 7a8774ade4383cd1c98d46e7e64f73f869a110e2
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d9fc5ea6ecbd44fda21e2db2981a0b3cdfd55510
Log:
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
better way to get ACP
Changed paths:
MM ext/com_dotnet/com_com.c
MM ext/com_dotnet/com_dotnet.c
Diff:
diff --cc ext/com_dotnet/com_com.c
index 68252da,fd6d983..77f988c
--- a/ext/com_dotnet/com_com.c
+++ b/ext/com_dotnet/com_com.c
@@@ -52,8 -52,7 +52,8 @@@ 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();
obj = CDNO_FETCH(object);
diff --cc ext/com_dotnet/com_dotnet.c
index 58002bb,195ba63..72e4ffc
--- a/ext/com_dotnet/com_dotnet.c
+++ b/ext/com_dotnet/com_dotnet.c
@@@ -196,8 -196,7 +196,8 @@@ 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();
stuff = (struct dotnet_runtime_stuff*)COMG(dotnet_runtime_stuff);