wine-commits March 2012

wine-commits@winehq.org

3 participants
710 discussions

André Hentschel : windowscodecs: Add stub for DllCanUnloadNow.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: 10cd34db38d7b982294e123d0bcdfa67ab1af193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10cd34db38d7b982294e123d0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 10 20:17:42 2012 +0100 windowscodecs: Add stub for DllCanUnloadNow. --- dlls/windowscodecs/main.c | 5 +++++ dlls/windowscodecs/windowscodecs.spec | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index a6588fd..8dd847e 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -49,6 +49,11 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return WIC_DllMain(hinstDLL, fdwReason, lpvReserved); } +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, UINT srcwidth, UINT srcheight, INT srcstride, const WICRect *rc, UINT dststride, UINT dstbuffersize, BYTE *dstbuffer) diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index d0b6a7e..71022cb 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -1,3 +1,4 @@ +@ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer()

1 0

Alistair Leslie-Hughes : ole32/tests: Assign a default value (clang).
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: d764b5188edb5187f736a3708679222f3b496dea URL: http://source.winehq.org/git/wine.git/?a=commit;h=d764b5188edb5187f736a3708… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 31 20:00:39 2012 +1100 ole32/tests: Assign a default value (clang). --- dlls/ole32/tests/ole2.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 6641683..7b4f36a 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -914,6 +914,7 @@ static void test_OleCreate(IStorage *pStorage) IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); trace("end\n"); + g_expected_fetc = NULL; } static void test_OleLoad(IStorage *pStorage)

1 0

Alistair Leslie-Hughes : advapi32: Assign a default value (clang).
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: 77b9d585562154b6b810b8e1ac0738f84bb826f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77b9d585562154b6b810b8e1a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 31 20:14:42 2012 +1100 advapi32: Assign a default value (clang). --- dlls/advapi32/service.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index bdebc91..025d6c9 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -755,7 +755,7 @@ SC_HANDLE WINAPI OpenSCManagerA( LPCSTR lpMachineName, LPCSTR lpDatabaseName, SC_HANDLE WINAPI OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName, DWORD dwDesiredAccess ) { - SC_HANDLE handle; + SC_HANDLE handle = 0; LONG r; TRACE("(%s,%s,0x%08x)\n", debugstr_w(lpMachineName), @@ -899,7 +899,7 @@ SC_HANDLE WINAPI OpenServiceA( SC_HANDLE hSCManager, LPCSTR lpServiceName, SC_HANDLE WINAPI OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, DWORD dwDesiredAccess) { - SC_HANDLE handle; + SC_HANDLE handle = 0; DWORD err; TRACE("%p %s %d\n", hSCManager, debugstr_w(lpServiceName), dwDesiredAccess); @@ -942,7 +942,7 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, LPCWSTR lpDependencies, LPCWSTR lpServiceStartName, LPCWSTR lpPassword ) { - SC_HANDLE handle; + SC_HANDLE handle = 0; DWORD err; SIZE_T passwdlen;

1 0

Austin English : wevtapi: Add stub dll.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: 9381e9334e7b61e023315a2df74766deb762d94e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9381e9334e7b61e023315a2df… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Mar 4 16:08:21 2012 -0800 wevtapi: Add stub dll. --- configure | 1 + configure.ac | 1 + dlls/wevtapi/Makefile.in | 6 +++++ dlls/wevtapi/main.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wevtapi/wevtapi.spec | 46 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 99 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 3a62558..3c4c966 100755 --- a/configure +++ b/configure @@ -15362,6 +15362,7 @@ wine_fn_config_dll w32sys.dll16 enable_win16 wine_fn_config_dll wbemprox enable_wbemprox wine_fn_config_dll wer enable_wer implib wine_fn_config_test dlls/wer/tests wer_test +wine_fn_config_dll wevtapi enable_wevtapi wine_fn_config_dll wiaservc enable_wiaservc wine_fn_config_dll win32s16.dll16 enable_win16 wine_fn_config_dll win87em.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 472ef12..023e46e 100644 --- a/configure.ac +++ b/configure.ac @@ -2871,6 +2871,7 @@ WINE_CONFIG_DLL(w32sys.dll16,enable_win16) WINE_CONFIG_DLL(wbemprox) WINE_CONFIG_DLL(wer,,[implib]) WINE_CONFIG_TEST(dlls/wer/tests) +WINE_CONFIG_DLL(wevtapi) WINE_CONFIG_DLL(wiaservc) WINE_CONFIG_DLL(win32s16.dll16,enable_win16) WINE_CONFIG_DLL(win87em.dll16,enable_win16) diff --git a/dlls/wevtapi/Makefile.in b/dlls/wevtapi/Makefile.in new file mode 100644 index 0000000..cf63838 --- /dev/null +++ b/dlls/wevtapi/Makefile.in @@ -0,0 +1,6 @@ +MODULE = wevtapi.dll + +C_SRCS = \ + main.c + +@MAKE_DLL_RULES@ diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c new file mode 100644 index 0000000..583ddba --- /dev/null +++ b/dlls/wevtapi/main.c @@ -0,0 +1,45 @@ +/* + * Copyright 2012 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wevtapi); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec new file mode 100644 index 0000000..f6a5786 --- /dev/null +++ b/dlls/wevtapi/wevtapi.spec @@ -0,0 +1,46 @@ +@ stub EvtArchiveExportedLog +@ stub EvtCancel +@ stub EvtClearLog +@ stub EvtClose +@ stub EvtCreateBookmark +@ stub EvtCreateRenderContext +@ stub EvtExportLog +@ stub EvtFormatMessage +@ stub EvtGetChannelConfigProperty +@ stub EvtGetEventInfo +@ stub EvtGetEventMetadataProperty +@ stub EvtGetExtendedStatus +@ stub EvtGetLogInfo +@ stub EvtGetObjectArrayProperty +@ stub EvtGetObjectArraySize +@ stub EvtGetPublisherMetadataProperty +@ stub EvtGetQueryInfo +@ stub EvtIntAssertConfig +@ stub EvtIntCreateBinXMLFromCustomXML +@ stub EvtIntCreateLocalLogfile +@ stub EvtIntGetClassicLogDisplayName +@ stub EvtIntRenderResourceEventTemplate +@ stub EvtIntReportAuthzEventAndSourceAsync +@ stub EvtIntReportEventAndSourceAsync +@ stub EvtIntRetractConfig +@ stub EvtIntSysprepCleanup +@ stub EvtIntWriteXmlEventToLocalLogfile +@ stub EvtNext +@ stub EvtNextChannelPath +@ stub EvtNextEventMetadata +@ stub EvtNextPublisherId +@ stub EvtOpenChannelConfig +@ stub EvtOpenChannelEnum +@ stub EvtOpenEventMetadataEnum +@ stub EvtOpenLog +@ stub EvtOpenPublisherEnum +@ stub EvtOpenPublisherMetadata +@ stub EvtOpenSession +@ stub EvtQuery +@ stub EvtRender +@ stub EvtSaveChannelConfig +@ stub EvtSeek +@ stub EvtSetChannelConfigProperty +@ stub EvtSetObjectArrayProperty +@ stub EvtSubscribe +@ stub EvtUpdateBookmark

1 0

Alessandro Pignotti : oleaut32: Avoid converting variants if it is not needed.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: 25d6e9aee86c7fce2970889ba850df156e727b14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d6e9aee86c7fce2970889ba… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Thu Feb 2 19:02:17 2012 +0100 oleaut32: Avoid converting variants if it is not needed. --- dlls/oleaut32/typelib.c | 129 +++++++++++++++++++++++++---------------------- 1 files changed, 68 insertions(+), 61 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 95cdc36..302edbf 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6427,83 +6427,90 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( { dump_Variant(src_arg); - if (rgvt[i] == VT_VARIANT) - hres = VariantCopy(&rgvarg[i], src_arg); - else if (rgvt[i] == (VT_VARIANT | VT_BYREF)) + if(rgvt[i]!=V_VT(src_arg)) { - if (rgvt[i] == V_VT(src_arg)) - V_VARIANTREF(&rgvarg[i]) = V_VARIANTREF(src_arg); - else + if (rgvt[i] == VT_VARIANT) + hres = VariantCopy(&rgvarg[i], src_arg); + else if (rgvt[i] == (VT_VARIANT | VT_BYREF)) + { + if (rgvt[i] == V_VT(src_arg)) + V_VARIANTREF(&rgvarg[i]) = V_VARIANTREF(src_arg); + else + { + VARIANTARG *missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams); + if (wParamFlags & PARAMFLAG_FIN) + hres = VariantCopy(&missing_arg[i], src_arg); + V_VARIANTREF(&rgvarg[i]) = &missing_arg[i]; + } + V_VT(&rgvarg[i]) = rgvt[i]; + } + else if (rgvt[i] == (VT_VARIANT | VT_ARRAY) && func_desc->cParamsOpt < 0 && i == func_desc->cParams-1) + { + SAFEARRAY *a; + SAFEARRAYBOUND bound; + VARIANT *v; + LONG j; + bound.lLbound = 0; + bound.cElements = pDispParams->cArgs-i; + if (!(a = SafeArrayCreate(VT_VARIANT, 1, &bound))) + { + ERR("SafeArrayCreate failed\n"); + break; + } + hres = SafeArrayAccessData(a, (LPVOID)&v); + if (hres != S_OK) + { + ERR("SafeArrayAccessData failed with %x\n", hres); + break; + } + for (j = 0; j < bound.cElements; j++) + VariantCopy(&v[j], &pDispParams->rgvarg[pDispParams->cArgs - 1 - i - j]); + hres = SafeArrayUnaccessData(a); + if (hres != S_OK) + { + ERR("SafeArrayUnaccessData failed with %x\n", hres); + break; + } + V_ARRAY(&rgvarg[i]) = a; + V_VT(&rgvarg[i]) = rgvt[i]; + } + else if ((rgvt[i] & VT_BYREF) && !V_ISBYREF(src_arg)) { VARIANTARG *missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams); if (wParamFlags & PARAMFLAG_FIN) - hres = VariantCopy(&missing_arg[i], src_arg); - V_VARIANTREF(&rgvarg[i]) = &missing_arg[i]; + hres = VariantChangeType(&missing_arg[i], src_arg, 0, rgvt[i] & ~VT_BYREF); + else + V_VT(&missing_arg[i]) = rgvt[i] & ~VT_BYREF; + V_BYREF(&rgvarg[i]) = &V_NONE(&missing_arg[i]); + V_VT(&rgvarg[i]) = rgvt[i]; } - V_VT(&rgvarg[i]) = rgvt[i]; - } - else if (rgvt[i] == (VT_VARIANT | VT_ARRAY) && func_desc->cParamsOpt < 0 && i == func_desc->cParams-1) - { - SAFEARRAY *a; - SAFEARRAYBOUND bound; - VARIANT *v; - LONG j; - bound.lLbound = 0; - bound.cElements = pDispParams->cArgs-i; - if (!(a = SafeArrayCreate(VT_VARIANT, 1, &bound))) + else if ((rgvt[i] & VT_BYREF) && (rgvt[i] == V_VT(src_arg))) { - ERR("SafeArrayCreate failed\n"); - break; + V_BYREF(&rgvarg[i]) = V_BYREF(src_arg); + V_VT(&rgvarg[i]) = rgvt[i]; } - hres = SafeArrayAccessData(a, (LPVOID)&v); - if (hres != S_OK) + else { - ERR("SafeArrayAccessData failed with %x\n", hres); - break; + /* FIXME: this doesn't work for VT_BYREF arguments if + * they are not the same type as in the paramdesc */ + V_VT(&rgvarg[i]) = V_VT(src_arg); + hres = VariantChangeType(&rgvarg[i], src_arg, 0, rgvt[i]); + V_VT(&rgvarg[i]) = rgvt[i]; } - for (j = 0; j < bound.cElements; j++) - VariantCopy(&v[j], &pDispParams->rgvarg[pDispParams->cArgs - 1 - i - j]); - hres = SafeArrayUnaccessData(a); - if (hres != S_OK) + + if (FAILED(hres)) { - ERR("SafeArrayUnaccessData failed with %x\n", hres); + ERR("failed to convert param %d to %s%s from %s%s\n", i, + debugstr_vt(rgvt[i]), debugstr_vf(rgvt[i]), + debugstr_VT(src_arg), debugstr_VF(src_arg)); break; } - V_ARRAY(&rgvarg[i]) = a; - V_VT(&rgvarg[i]) = rgvt[i]; - } - else if ((rgvt[i] & VT_BYREF) && !V_ISBYREF(src_arg)) - { - VARIANTARG *missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams); - if (wParamFlags & PARAMFLAG_FIN) - hres = VariantChangeType(&missing_arg[i], src_arg, 0, rgvt[i] & ~VT_BYREF); - else - V_VT(&missing_arg[i]) = rgvt[i] & ~VT_BYREF; - V_BYREF(&rgvarg[i]) = &V_NONE(&missing_arg[i]); - V_VT(&rgvarg[i]) = rgvt[i]; - } - else if ((rgvt[i] & VT_BYREF) && (rgvt[i] == V_VT(src_arg))) - { - V_BYREF(&rgvarg[i]) = V_BYREF(src_arg); - V_VT(&rgvarg[i]) = rgvt[i]; + prgpvarg[i] = &rgvarg[i]; } else { - /* FIXME: this doesn't work for VT_BYREF arguments if - * they are not the same type as in the paramdesc */ - V_VT(&rgvarg[i]) = V_VT(src_arg); - hres = VariantChangeType(&rgvarg[i], src_arg, 0, rgvt[i]); - V_VT(&rgvarg[i]) = rgvt[i]; - } - - if (FAILED(hres)) - { - ERR("failed to convert param %d to %s%s from %s%s\n", i, - debugstr_vt(rgvt[i]), debugstr_vf(rgvt[i]), - debugstr_VT(src_arg), debugstr_VF(src_arg)); - break; + prgpvarg[i] = src_arg; } - prgpvarg[i] = &rgvarg[i]; } else if (wParamFlags & PARAMFLAG_FOPT) {

1 0

Carlo Bramini : shlwapi: Implemented StrToInt64ExA/W.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: a1af8395165a85c086745dd224f105c07c983fdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1af8395165a85c086745dd22… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Thu Mar 8 14:35:56 2012 +0100 shlwapi: Implemented StrToInt64ExA/W. --- dlls/shlwapi/shlwapi.spec | 2 + dlls/shlwapi/string.c | 42 ++++++++++++++++-- dlls/shlwapi/tests/string.c | 99 ++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 133 insertions(+), 10 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index deb8a48..40e2ee9 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -804,6 +804,8 @@ @ stdcall StrStrNW(wstr wstr long) @ stdcall StrStrNIW(wstr wstr long) @ stdcall StrStrW(wstr wstr) +@ stdcall StrToInt64ExA(str long ptr) +@ stdcall StrToInt64ExW(wstr long ptr) @ stdcall StrToIntA(str) @ stdcall StrToIntExA(str long ptr) @ stdcall StrToIntExW(wstr long ptr) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 903c981..c65d576 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -91,7 +91,7 @@ static void FillNumberFmt(NUMBERFMTW *fmt, LPWSTR decimal_buffer, int decimal_bu * Format an integer according to the current locale * * RETURNS - * The number of bytes written on success or 0 on failure + * The number of characters written on success or 0 on failure */ static int FormatInt(LONGLONG qdwValue, LPWSTR pszBuf, int cchBuf) { @@ -124,7 +124,7 @@ static int FormatInt(LONGLONG qdwValue, LPWSTR pszBuf, int cchBuf) * after the decimal point * * RETURNS - * The number of bytes written on success or 0 on failure + * The number of characters written on success or 0 on failure */ static int FormatDouble(double value, int decimals, LPWSTR pszBuf, int cchBuf) { @@ -855,8 +855,25 @@ int WINAPI StrToIntW(LPCWSTR lpszStr) */ BOOL WINAPI StrToIntExA(LPCSTR lpszStr, DWORD dwFlags, LPINT lpiRet) { + LONGLONG li; + BOOL bRes; + + TRACE("(%s,%08X,%p)\n", debugstr_a(lpszStr), dwFlags, lpiRet); + + bRes = StrToInt64ExA(lpszStr, dwFlags, &li); + if (bRes) *lpiRet = li; + return bRes; +} + +/************************************************************************* + * StrToInt64ExA [SHLWAPI.@] + * + * See StrToIntExA. + */ +BOOL WINAPI StrToInt64ExA(LPCSTR lpszStr, DWORD dwFlags, LONGLONG *lpiRet) +{ BOOL bNegative = FALSE; - int iRet = 0; + LONGLONG iRet = 0; TRACE("(%s,%08X,%p)\n", debugstr_a(lpszStr), dwFlags, lpiRet); @@ -922,8 +939,25 @@ BOOL WINAPI StrToIntExA(LPCSTR lpszStr, DWORD dwFlags, LPINT lpiRet) */ BOOL WINAPI StrToIntExW(LPCWSTR lpszStr, DWORD dwFlags, LPINT lpiRet) { + LONGLONG li; + BOOL bRes; + + TRACE("(%s,%08X,%p)\n", debugstr_w(lpszStr), dwFlags, lpiRet); + + bRes = StrToInt64ExW(lpszStr, dwFlags, &li); + if (bRes) *lpiRet = li; + return bRes; +} + +/************************************************************************* + * StrToInt64ExW [SHLWAPI.@] + * + * See StrToIntExA. + */ +BOOL WINAPI StrToInt64ExW(LPCWSTR lpszStr, DWORD dwFlags, LONGLONG *lpiRet) +{ BOOL bNegative = FALSE; - int iRet = 0; + LONGLONG iRet = 0; TRACE("(%s,%08X,%p)\n", debugstr_w(lpszStr), dwFlags, lpiRet); diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 5522137..c918bcc 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -65,6 +65,8 @@ static LPWSTR (WINAPI *pStrStrNIW)(LPCWSTR,LPCWSTR,UINT); static INT (WINAPIV *pwnsprintfA)(LPSTR,INT,LPCSTR, ...); static INT (WINAPIV *pwnsprintfW)(LPWSTR,INT,LPCWSTR, ...); static LPWSTR (WINAPI *pStrChrNW)(LPWSTR,WCHAR,UINT); +static BOOL (WINAPI *pStrToInt64ExA)(LPCSTR,DWORD,LONGLONG*); +static BOOL (WINAPI *pStrToInt64ExW)(LPCWSTR,DWORD,LONGLONG*); static int strcmpW(const WCHAR *str1, const WCHAR *str2) { @@ -77,17 +79,19 @@ typedef struct tagStrToIntResult { const char* string; int str_to_int; - int str_to_int_ex; - int str_to_int_hex; + LONGLONG str_to_int64_ex; + LONGLONG str_to_int64_hex; } StrToIntResult; static const StrToIntResult StrToInt_results[] = { { "1099", 1099, 1099, 1099 }, + { "4294967319", 23, ((LONGLONG)1 << 32) | 23, ((LONGLONG)1 << 32) | 23 }, { "+88987", 0, 88987, 88987 }, { "012", 12, 12, 12 }, { "-55", -55, -55, -55 }, { "-0", 0, 0, 0 }, { "0x44ff", 0, 0, 0x44ff }, + { "0x2bdc546291f4b1", 0, 0, ((LONGLONG)0x2bdc54 << 32) | 0x6291f4b1 }, { "+0x44f4", 0, 0, 0x44f4 }, { "-0x44fd", 0, 0, 0x44fd }, { "+ 88987", 0, 0, 0 }, @@ -480,7 +484,7 @@ static void test_StrToIntExA(void) ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); if (bRet) - ok(return_val == result->str_to_int_ex, "converted '%s' wrong (%d)\n", + ok(return_val == (int)result->str_to_int64_ex, "converted '%s' wrong (%d)\n", result->string, return_val); result++; } @@ -493,7 +497,7 @@ static void test_StrToIntExA(void) ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); if (bRet) - ok(return_val == result->str_to_int_hex, "converted '%s' wrong (%d)\n", + ok(return_val == (int)result->str_to_int64_hex, "converted '%s' wrong (%d)\n", result->string, return_val); result++; } @@ -514,7 +518,7 @@ static void test_StrToIntExW(void) ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); if (bRet) - ok(return_val == result->str_to_int_ex, "converted '%s' wrong (%d)\n", + ok(return_val == (int)result->str_to_int64_ex, "converted '%s' wrong (%d)\n", result->string, return_val); result++; } @@ -528,12 +532,91 @@ static void test_StrToIntExW(void) ok(!bRet || return_val != -1, "No result returned from '%s'\n", result->string); if (bRet) - ok(return_val == result->str_to_int_hex, "converted '%s' wrong (%d)\n", + ok(return_val == (int)result->str_to_int64_hex, "converted '%s' wrong (%d)\n", result->string, return_val); result++; } } +static void test_StrToInt64ExA(void) +{ + const StrToIntResult *result = StrToInt_results; + LONGLONG return_val; + BOOL bRet; + + if (!pStrToInt64ExA) + { + win_skip("StrToInt64ExA() is not available\n"); + return; + } + + while (result->string) + { + return_val = -1; + bRet = pStrToInt64ExA(result->string,0,&return_val); + ok(!bRet || return_val != -1, "No result returned from '%s'\n", + result->string); + if (bRet) + ok(return_val == result->str_to_int64_ex, "converted '%s' wrong (%08x%08x)\n", + result->string, (DWORD)(return_val >> 32), (DWORD)return_val); + result++; + } + + result = StrToInt_results; + while (result->string) + { + return_val = -1; + bRet = pStrToInt64ExA(result->string,STIF_SUPPORT_HEX,&return_val); + ok(!bRet || return_val != -1, "No result returned from '%s'\n", + result->string); + if (bRet) + ok(return_val == result->str_to_int64_hex, "converted '%s' wrong (%08x%08x)\n", + result->string, (DWORD)(return_val >> 32), (DWORD)return_val); + result++; + } +} + +static void test_StrToInt64ExW(void) +{ + WCHAR szBuff[256]; + const StrToIntResult *result = StrToInt_results; + LONGLONG return_val; + BOOL bRet; + + if (!pStrToInt64ExW) + { + win_skip("StrToInt64ExW() is not available\n"); + return; + } + + while (result->string) + { + return_val = -1; + MultiByteToWideChar(0,0,result->string,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR)); + bRet = pStrToInt64ExW(szBuff, 0, &return_val); + ok(!bRet || return_val != -1, "No result returned from '%s'\n", + result->string); + if (bRet) + ok(return_val == result->str_to_int64_ex, "converted '%s' wrong (%08x%08x)\n", + result->string, (DWORD)(return_val >> 32), (DWORD)return_val); + result++; + } + + result = StrToInt_results; + while (result->string) + { + return_val = -1; + MultiByteToWideChar(0,0,result->string,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR)); + bRet = pStrToInt64ExW(szBuff, STIF_SUPPORT_HEX, &return_val); + ok(!bRet || return_val != -1, "No result returned from '%s'\n", + result->string); + if (bRet) + ok(return_val == result->str_to_int64_hex, "converted '%s' wrong (%08x%08x)\n", + result->string, (DWORD)(return_val >> 32), (DWORD)return_val); + result++; + } +} + static void test_StrDupA(void) { LPSTR lpszStr; @@ -1422,6 +1505,8 @@ START_TEST(string) pStrStrNIW = (void *)GetProcAddress(hShlwapi, "StrStrNIW"); pwnsprintfA = (void *)GetProcAddress(hShlwapi, "wnsprintfA"); pwnsprintfW = (void *)GetProcAddress(hShlwapi, "wnsprintfW"); + pStrToInt64ExA = (void *)GetProcAddress(hShlwapi, "StrToInt64ExA"); + pStrToInt64ExW = (void *)GetProcAddress(hShlwapi, "StrToInt64ExW"); test_StrChrA(); test_StrChrW(); @@ -1435,6 +1520,8 @@ START_TEST(string) test_StrToIntW(); test_StrToIntExA(); test_StrToIntExW(); + test_StrToInt64ExA(); + test_StrToInt64ExW(); test_StrDupA(); /* language-dependent test */

1 0

Erich Hoover : ntdll: Fix mapping sections for applications that map over the section headers.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: 3dd58d8bfbf266430130f49dd223e284e628b4bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dd58d8bfbf266430130f49dd… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Mar 7 15:22:07 2012 -0700 ntdll: Fix mapping sections for applications that map over the section headers. --- dlls/ntdll/virtual.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 717917d..5271d18 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1122,7 +1122,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz { IMAGE_DOS_HEADER *dos; IMAGE_NT_HEADERS *nt; - IMAGE_SECTION_HEADER *sec; + IMAGE_SECTION_HEADER *sec = NULL; IMAGE_DATA_DIRECTORY *imports; NTSTATUS status = STATUS_CONFLICTING_ADDRESSES; int i; @@ -1130,7 +1130,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz sigset_t sigset; struct stat st; struct file_view *view = NULL; - char *ptr, *header_end; + char *ptr, *header_end, *header_start; INT_PTR delta = 0; /* zero-map the whole range */ @@ -1167,8 +1167,17 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz header_end = ptr + ROUND_SIZE( 0, header_size ); memset( ptr + header_size, 0, header_end - (ptr + header_size) ); if ((char *)(nt + 1) > header_end) goto error; - sec = (IMAGE_SECTION_HEADER*)((char*)&nt->OptionalHeader+nt->FileHeader.SizeOfOptionalHeader); - if ((char *)(sec + nt->FileHeader.NumberOfSections) > header_end) goto error; + header_start = (char*)&nt->OptionalHeader+nt->FileHeader.SizeOfOptionalHeader; + if (header_start + sizeof(*sec) * nt->FileHeader.NumberOfSections > header_end) goto error; + /* Some applications (e.g. the Steam version of Borderlands) map over the top of the section headers, + * copying the headers into local memory is necessary to properly load such applications. */ + sec = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*sec) * nt->FileHeader.NumberOfSections); + if (!sec) + { + status = STATUS_NO_MEMORY; + goto error; + } + memcpy(sec, header_start, sizeof(*sec) * nt->FileHeader.NumberOfSections); imports = nt->OptionalHeader.DataDirectory + IMAGE_DIRECTORY_ENTRY_IMPORT; if (!imports->Size || !imports->VirtualAddress) imports = NULL; @@ -1364,6 +1373,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz } done: + RtlFreeHeap( GetProcessHeap(), 0, sec ); view->mapping = dup_mapping; view->map_protect = map_vprot; server_leave_uninterrupted_section( &csVirtual, &sigset ); @@ -1376,6 +1386,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz return STATUS_SUCCESS; error: + RtlFreeHeap( GetProcessHeap(), 0, sec ); if (view) delete_view( view ); server_leave_uninterrupted_section( &csVirtual, &sigset ); if (dup_mapping) NtClose( dup_mapping );

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: fbe6723391ed34664ac6f422190c2e2ccb438586 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe6723391ed34664ac6f4221… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Mar 15 22:54:46 2012 +0900 po: Update Korean translation. --- po/ko.po | 27 +++++++-------------------- 1 files changed, 7 insertions(+), 20 deletions(-) diff --git a/po/ko.po b/po/ko.po index 8195586..e3f1ed2 100644 --- a/po/ko.po +++ b/po/ko.po @@ -2182,16 +2182,12 @@ msgstr "" "목록을 가지고 있을 수 있음:" #: cryptui.rc:296 -#, fuzzy -#| msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)" msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" -msgstr "암호화 메세지 문법 표준/PKCS #7 메시지 (.p7b)" +msgstr "암호화 메세지 문법 표준/PKCS #7 메시지 (*.p7b)" #: cryptui.rc:298 -#, fuzzy -#| msgid "Personal Information Exchange/PKCS #12 (.pfx, .p12)" msgid "Personal Information Exchange/PKCS #12 (*.pfx; *.p12)" -msgstr "개인 정보 교환/PKCS #12 (.pfx, .p12)" +msgstr "개인 정보 교환/PKCS #12 (*.pfx;*.p12)" #: cryptui.rc:300 cryptui.rc:78 cryptui.rc:159 msgid "Microsoft Serialized Certificate Store (*.sst)" @@ -2332,32 +2328,24 @@ msgid "Select the format you want to use:" msgstr "사용할 파일 형식 선택:" #: cryptui.rc:405 -#, fuzzy -#| msgid "&DER-encoded X.509 (.cer)" msgid "&DER-encoded X.509 (*.cer)" -msgstr "&DER-암호화된 X.509 (.cer)" +msgstr "&DER-암호화된 X.509 (*.cer)" #: cryptui.rc:407 -#, fuzzy -#| msgid "Ba&se64-encoded X.509 (.cer):" msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "Ba&se64-암호화된 X.509 (.cer):" +msgstr "Ba&se64-암호화된 X.509 (*.cer):" #: cryptui.rc:409 -#, fuzzy -#| msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)" msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" -msgstr "암호 메시지 문법 표준/PKCS #7 메시지(&C) (.p7b)" +msgstr "암호 메시지 문법 표준/PKCS #7 메시지(&C) (*.p7b)" #: cryptui.rc:411 msgid "&Include all certificates in the certification path if possible" msgstr "가능한 인증서 경로에 있는 모든 인증서 포함(&I)" #: cryptui.rc:413 -#, fuzzy -#| msgid "&Personal Information Exchange/PKCS #12 (.pfx)" msgid "&Personal Information Exchange/PKCS #12 (*.pfx)" -msgstr "개인 정보 교환(&P)/PKCS #12 (.pfx)" +msgstr "개인 정보 교환(&P)/PKCS #12 (*.pfx)" #: cryptui.rc:415 msgid "Incl&ude all certificates in the certification path if possible" @@ -12648,9 +12636,8 @@ msgid "Select an executable file" msgstr "실행 파일 선택" #: winecfg.rc:66 -#, fuzzy msgid "Autodetect" -msgstr "자동찾기(&D)" +msgstr "자동으로 찾기" #: winecfg.rc:67 msgid "Local hard disk"

1 0

Francois Gouget : mssign32: Add a trailing '\n' to a few FIXME() messages.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: a364a2f06799ac02aac25a769e30795fbfda619c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a364a2f06799ac02aac25a769… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 16 10:16:05 2012 +0100 mssign32: Add a trailing '\n' to a few FIXME() messages. --- dlls/mssign32/mssign32_main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mssign32/mssign32_main.c b/dlls/mssign32/mssign32_main.c index c58c1f0..ef1065f 100644 --- a/dlls/mssign32/mssign32_main.c +++ b/dlls/mssign32/mssign32_main.c @@ -50,7 +50,7 @@ HRESULT WINAPI PvkGetCryptProv(HWND hwnd, LPCWSTR pwszCaption, LPCWSTR pwszCapiP DWORD dwProviderType, LPCWSTR pwszPvkFile, LPCWSTR pwszKeyContainerName, DWORD *pdwKeySpec, LPWSTR *ppwszTmpContainer, HCRYPTPROV *phCryptProv) { - FIXME("%p %s %s %d %s %s %p %p %p stub", hwnd, debugstr_w(pwszCaption), debugstr_w(pwszCapiProvider), + FIXME("%p %s %s %d %s %s %p %p %p stub\n", hwnd, debugstr_w(pwszCaption), debugstr_w(pwszCapiProvider), dwProviderType, debugstr_w(pwszPvkFile), debugstr_w(pwszKeyContainerName), pdwKeySpec, ppwszTmpContainer, phCryptProv); @@ -61,7 +61,7 @@ BOOL WINAPI PvkPrivateKeyAcquireContextFromMemory(LPCWSTR pwszProvName, DWORD dw BYTE *pbData, DWORD cbData, HWND hwndOwner, LPCWSTR pwszKeyName, DWORD *pdwKeySpec, HCRYPTPROV *phCryptProv, LPWSTR *ppwszTmpContainer) { - FIXME("%s %d %p %d %p %s %p %p %p stub", debugstr_w(pwszProvName), dwProvType, + FIXME("%s %d %p %d %p %s %p %p %p stub\n", debugstr_w(pwszProvName), dwProvType, pbData, cbData, hwndOwner, debugstr_w(pwszKeyName), pdwKeySpec, phCryptProv, ppwszTmpContainer); @@ -71,6 +71,6 @@ BOOL WINAPI PvkPrivateKeyAcquireContextFromMemory(LPCWSTR pwszProvName, DWORD dw void WINAPI PvkFreeCryptProv(HCRYPTPROV hProv, LPCWSTR pwszCapiProvider, DWORD dwProviderType, LPWSTR pwszTmpContainer) { - FIXME("%08lx %s %d %s stub", hProv, debugstr_w(pwszCapiProvider), dwProviderType, + FIXME("%08lx %s %d %s stub\n", hProv, debugstr_w(pwszCapiProvider), dwProviderType, debugstr_w(pwszTmpContainer)); }

1 0

Akihiro Sagawa : msvcrt: Implement _mbcjmstojis.
by Alexandre Julliard 16 Mar '12

16 Mar '12

Module: wine Branch: master Commit: c9f1489cab159c882b7110fa8475d86a5b849124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9f1489cab159c882b7110fa8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 15 23:41:33 2012 +0900 msvcrt: Implement _mbcjmstojis. --- dlls/msvcrt/mbcs.c | 18 +++++++++++++++++- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/tests/string.c | 8 ++------ 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index cde1e06..6d3e3fb 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -474,7 +474,23 @@ unsigned int CDECL _mbcjmstojis(unsigned int c) In all other cases, c is returned unchanged */ if(get_mbcinfo()->mbcodepage == 932) { - FIXME("(%x): stub\n", c); + if(_ismbclegal(c) && HIBYTE(c) < 0xf0) + { + if(HIBYTE(c) >= 0xe0) + c -= 0x4000; + + c = (((HIBYTE(c) - 0x81)*2 + 0x21) << 8) | LOBYTE(c); + + if(LOBYTE(c) > 0x7f) + c -= 0x1; + + if(LOBYTE(c) > 0x9d) + c += 0x83; + else + c -= 0x1f; + } + else + return 0; /* Codepage is 932, but c can't be converted */ } return c; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 76f558c..6103c1e 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -913,6 +913,7 @@ int _setmbcp_l(int, LCID, MSVCRT_pthreadmbcinfo) DECLSPEC_HIDDEN; int __cdecl MSVCRT__write(int,const void*,unsigned int); int __cdecl _getch(void); int __cdecl _ismbblead(unsigned int); +int __cdecl _ismbclegal(unsigned int c); int __cdecl _ismbstrail(const unsigned char* start, const unsigned char* str); MSVCRT_size_t __cdecl MSVCRT_mbstowcs(MSVCRT_wchar_t*,const char*,MSVCRT_size_t); MSVCRT_intptr_t __cdecl MSVCRT__spawnve(int,const char*,const char* const *,const char* const *); diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 659afc2..c40451c 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -901,12 +901,8 @@ static void test_mbcjmsjis(void) unsigned int ret, exp; ret = _mbcjmstojis(jmsjis[j][0]); exp = (cp[i] == 932) ? jmsjis[j][1] : jmsjis[j][0]; - if (cp[i] == 932) - todo_wine ok(ret == exp, "Expected 0x%x, got 0x%x (0x%x, codepage=%d)\n", - exp, ret, jmsjis[j][0], cp[i]); - else - ok(ret == exp, "Expected 0x%x, got 0x%x (0x%x, codepage=%d)\n", - exp, ret, jmsjis[j][0], cp[i]); + ok(ret == exp, "Expected 0x%x, got 0x%x (0x%x, codepage=%d)\n", + exp, ret, jmsjis[j][0], cp[i]); } } _setmbcp(prev_cp);

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2012