com php-src: better way to get ACP: ext/com_dotnet/com_com .c ext/com_dotnet/com_dotnet.c
| From: | Anatol Belski | Date: | Mon, 12 Dec 2016 00:54:22 +0000 |
| Subject: | com php-src: better way to get ACP: ext/com_dotnet/com_com .c ext/com_dotnet/com_dotnet.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96299@lists.php.net to get a copy of this message | ||
Commit: 7a8774ade4383cd1c98d46e7e64f73f869a110e2
Author: Anatol Belski <ab@php.net> Mon, 12 Dec 2016 01:54:22 +0100
Parents: 3473b519c0337937a7d667273ec971825db9ea6a
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7a8774ade4383cd1c98d46e7e64f73f869a110e2
Log:
better way to get ACP
Changed paths:
M ext/com_dotnet/com_com.c
M ext/com_dotnet/com_dotnet.c
Diff:
diff --git a/ext/com_dotnet/com_com.c b/ext/com_dotnet/com_com.c
index 86b3bd1..fd6d983 100644
--- a/ext/com_dotnet/com_com..c
+++ b/ext/com_dotnet/com_com.c
@@ -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();
php_com_initialize();
obj = CDNO_FETCH(object);
diff --git a/ext/com_dotnet/com_dotnet.c b/ext/com_dotnet/com_dotnet.c
index a6b75ca..195ba63 100644
--- a/ext/com_dotnet/com_dotnet.c
+++ b/ext/com_dotnet/com_dotnet.c
@@ -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();
php_com_initialize();
stuff = (struct dotnet_runtime_stuff*)COMG(dotnet_runtime_stuff);