--- embedaddon/php/ext/com_dotnet/com_olechar.c 2012/02/21 23:47:53 1.1.1.1 +++ embedaddon/php/ext/com_dotnet/com_olechar.c 2013/07/22 01:31:38 1.1.1.3 @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2012 The PHP Group | + | Copyright (c) 1997-2013 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: com_olechar.c,v 1.1.1.1 2012/02/21 23:47:53 misho Exp $ */ +/* $Id: com_olechar.c,v 1.1.1.3 2013/07/22 01:31:38 misho Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -30,7 +30,7 @@ #include "php_com_dotnet_internal.h" -PHPAPI OLECHAR *php_com_string_to_olestring(char *string, uint string_len, int codepage TSRMLS_DC) +PHP_COM_DOTNET_API OLECHAR *php_com_string_to_olestring(char *string, uint string_len, int codepage TSRMLS_DC) { OLECHAR *olestring = NULL; DWORD flags = codepage == CP_UTF8 ? 0 : MB_PRECOMPOSED | MB_ERR_INVALID_CHARS; @@ -54,7 +54,7 @@ PHPAPI OLECHAR *php_com_string_to_olestring(char *stri } if (!ok) { - char *msg = php_win_err(GetLastError()); + char *msg = php_win32_error_to_msg(GetLastError()); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not convert string to unicode: `%s'", msg); @@ -65,7 +65,7 @@ PHPAPI OLECHAR *php_com_string_to_olestring(char *stri return olestring; } -PHPAPI char *php_com_olestring_to_string(OLECHAR *olestring, uint *string_len, int codepage TSRMLS_DC) +PHP_COM_DOTNET_API char *php_com_olestring_to_string(OLECHAR *olestring, uint *string_len, int codepage TSRMLS_DC) { char *string; uint length = 0; @@ -85,7 +85,7 @@ PHPAPI char *php_com_olestring_to_string(OLECHAR *oles } if (!ok) { - char *msg = php_win_err(GetLastError()); + char *msg = php_win32_error_to_msg(GetLastError()); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not convert string from unicode: `%s'", msg);