March 2013 - Wine-commits - list.winehq.org

Jacek Caban : secur32: Added SECPKG_ATTR_SUPPORTED_PROTOCOLS implementation .
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: e413b8a5054bc1c4ca1ddb35b6d21e3379b6a79b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e413b8a5054bc1c4ca1ddb35b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 12:22:35 2013 +0100 secur32: Added SECPKG_ATTR_SUPPORTED_PROTOCOLS implementation. --- dlls/secur32/schannel.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 87bb942..9a83a76 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -281,14 +281,14 @@ static SECURITY_STATUS schan_QueryCredentialsAttributes( ret = SEC_E_INTERNAL_ERROR; break; case SECPKG_ATTR_SUPPORTED_PROTOCOLS: - if (pBuffer) - { - /* FIXME: get from OpenSSL? */ - FIXME("SECPKG_ATTR_SUPPORTED_PROTOCOLS: stub\n"); - ret = SEC_E_UNSUPPORTED_FUNCTION; - } - else + if(pBuffer) { + /* Regardless of MSDN documentation, tests show that this attribute takes into account + * what protocols are enabled for given credential. */ + ((SecPkgCred_SupportedProtocols*)pBuffer)->grbitProtocol = cred->enabled_protocols; + ret = SEC_E_OK; + }else { ret = SEC_E_INTERNAL_ERROR; + } break; default: ret = SEC_E_UNSUPPORTED_FUNCTION;

1 0

Jacek Caban : secur32: Added SECPKG_ATTR_SUPPORTED_PROTOCOLS tests.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: 79c5d5cc176727a45505db73734b87ba214a8c76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79c5d5cc176727a45505db737… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 12:22:48 2013 +0100 secur32: Added SECPKG_ATTR_SUPPORTED_PROTOCOLS tests. --- dlls/secur32/tests/schannel.c | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 7d4c532..5076767 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -166,6 +166,31 @@ static void test_strength(PCredHandle handle) trace("strength %d - %d\n", strength.dwMinimumCipherStrength, strength.dwMaximumCipherStrength); } +static void test_supported_protocols(CredHandle *handle, unsigned exprots) +{ + SecPkgCred_SupportedProtocols protocols; + SECURITY_STATUS status; + + status = pQueryCredentialsAttributesA(handle, SECPKG_ATTR_SUPPORTED_PROTOCOLS, &protocols); + ok(status == SEC_E_OK, "QueryCredentialsAttributes failed: %08x\n", status); + + if(exprots) + ok(protocols.grbitProtocol == exprots, "protocols.grbitProtocol = %x, expected %x\n", protocols.grbitProtocol, exprots); + + trace("Supported protocols:\n"); + +#define X(flag, name) do { if(protocols.grbitProtocol & flag) { trace(name "\n"); protocols.grbitProtocol &= ~flag; } }while(0) + X(SP_PROT_SSL2_CLIENT, "SSL 2 client"); + X(SP_PROT_SSL3_CLIENT, "SSL 3 client"); + X(SP_PROT_TLS1_0_CLIENT, "TLS 1.0 client"); + X(SP_PROT_TLS1_1_CLIENT, "TLS 1.1 client"); + X(SP_PROT_TLS1_2_CLIENT, "TLS 1.2 client"); +#undef X + + if(protocols.grbitProtocol) + trace("Unknown flags: %x\n", protocols.grbitProtocol); +} + static void testAcquireSecurityContext(void) { BOOL has_schannel = FALSE; @@ -261,8 +286,13 @@ static void testAcquireSecurityContext(void) st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, NULL, NULL, NULL, &cred, NULL); ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st); - if(st == SEC_E_OK) + if(st == SEC_E_OK) { + st = pQueryCredentialsAttributesA(&cred, SECPKG_ATTR_SUPPORTED_PROTOCOLS, NULL); + ok(st == SEC_E_INTERNAL_ERROR, "QueryCredentialsAttributes failed: %08x, expected SEC_E_INTERNAL_ERROR\n", st); + + test_supported_protocols(&cred, 0); pFreeCredentialsHandle(&cred); + } memset(&cred, 0, sizeof(cred)); st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, NULL, NULL, NULL, &cred, &exp); @@ -650,6 +680,8 @@ static void test_communication(void) ok(status == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", status); if (status != SEC_E_OK) return; + test_supported_protocols(&cred_handle, SP_PROT_SSL3_CLIENT); + /* Initialize the connection */ init_buffers(&buffers[0], 4, buf_size); init_buffers(&buffers[1], 4, buf_size);

1 0

Piotr Caban : msvcrt: Don't forward _wcsicmp to ntdll.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: 0ffc970aa483792ec1b080ad01beea34f688dd55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ffc970aa483792ec1b080ad0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:11:06 2013 +0100 msvcrt: Don't forward _wcsicmp to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 99072aa..b648f88 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1098,7 +1098,7 @@ @ cdecl _wcserror(long) MSVCRT__wcserror @ cdecl _wcserror_s(ptr long long) # stub _wcsftime_l(ptr long wstr ptr ptr) -@ cdecl _wcsicmp(wstr wstr) ntdll._wcsicmp +@ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp # stub _wcsicmp_l(wstr wstr ptr) @ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll # stub _wcsicoll_l(wstr wstr ptr) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index ba53084..fe0b6ac 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -70,6 +70,14 @@ MSVCRT_wchar_t* CDECL MSVCRT__wcsdup( const MSVCRT_wchar_t* str ) } /********************************************************************* + * _wcsicmp (MSVCRT.@) + */ +INT CDECL MSVCRT__wcsicmp( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2 ) +{ + return strcmpiW( str1, str2 ); +} + +/********************************************************************* * _wcsicoll (MSVCRT.@) */ INT CDECL MSVCRT__wcsicoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2 )

1 0

Piotr Caban : msvcrt: Don't forward _wtoi to ntdll.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: 5c03a35f7a78f158e79b86ab0cfb72b594439da7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c03a35f7a78f158e79b86ab0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:11:23 2013 +0100 msvcrt: Don't forward _wtoi to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b648f88..ef5823c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1222,7 +1222,7 @@ # stub _wtmpnam_s(ptr long) @ cdecl _wtof(wstr) MSVCRT__wtof @ cdecl _wtof_l(wstr ptr) MSVCRT__wtof_l -@ cdecl _wtoi(wstr) ntdll._wtoi +@ cdecl _wtoi(wstr) MSVCRT__wtoi @ cdecl -ret64 _wtoi64(wstr) ntdll._wtoi64 # stub -ret64 _wtoi64_l(wstr ptr) @ cdecl _wtoi_l(wstr ptr) MSVCRT__wtoi_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index fe0b6ac..e00cb83 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1449,7 +1449,7 @@ __int64 CDECL MSVCRT__wcstoi64(const MSVCRT_wchar_t *nptr, /********************************************************************* * _wtoi_l (MSVCRT.@) */ -int MSVCRT__wtoi_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) +int __cdecl MSVCRT__wtoi_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) { __int64 ret = MSVCRT__wcstoi64_l(str, NULL, 10, locale); @@ -1464,6 +1464,14 @@ int MSVCRT__wtoi_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) } /********************************************************************* + * _wtoi (MSVCRT.@) + */ +int __cdecl MSVCRT__wtoi(const MSVCRT_wchar_t *str) +{ + return MSVCRT__wtoi_l(str, NULL); +} + +/********************************************************************* * _wcstoui64_l (MSVCRT.@) * * FIXME: locale parameter is ignored

1 0

Piotr Caban : msvcrt: Added _wtol_l implementation.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: 06c677384402d30c2868feca59d0708bdcf635cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=06c677384402d30c2868feca5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:11:32 2013 +0100 msvcrt: Added _wtol_l implementation. --- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/wcs.c | 25 +++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 07e2984..69ad7a7 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -42,6 +42,7 @@ #include "winbase.h" #define MSVCRT_LONG_MAX 0x7fffffffL +#define MSVCRT_LONG_MIN (-MSVCRT_LONG_MAX-1) #define MSVCRT_ULONG_MAX 0xffffffffUL #define MSVCRT_I64_MAX (((__int64)0x7fffffff << 32) | 0xffffffff) #define MSVCRT_I64_MIN (-MSVCRT_I64_MAX-1) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ef5823c..36e1510 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1226,8 +1226,8 @@ @ cdecl -ret64 _wtoi64(wstr) ntdll._wtoi64 # stub -ret64 _wtoi64_l(wstr ptr) @ cdecl _wtoi_l(wstr ptr) MSVCRT__wtoi_l -@ cdecl _wtol(wstr) ntdll._wtol -# stub _wtol_l(wstr ptr) +@ cdecl _wtol(wstr) MSVCRT__wtol +@ cdecl _wtol_l(wstr ptr) MSVCRT__wtol_l @ cdecl _wunlink(wstr) MSVCRT__wunlink @ cdecl _wutime(wstr ptr) @ cdecl _wutime32(wstr ptr) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index e00cb83..b0a52d7 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1472,6 +1472,31 @@ int __cdecl MSVCRT__wtoi(const MSVCRT_wchar_t *str) } /********************************************************************* + * _wtol_l (MSVCRT.@) + */ +MSVCRT_long __cdecl MSVCRT__wtol_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) +{ + __int64 ret = MSVCRT__wcstoi64_l(str, NULL, 10, locale); + + if(ret > MSVCRT_LONG_MAX) { + ret = MSVCRT_LONG_MAX; + *MSVCRT__errno() = MSVCRT_ERANGE; + } else if(ret < MSVCRT_LONG_MIN) { + ret = MSVCRT_LONG_MIN; + *MSVCRT__errno() = MSVCRT_ERANGE; + } + return ret; +} + +/********************************************************************* + * _wtol (MSVCRT.@) + */ +MSVCRT_long __cdecl MSVCRT__wtol(const MSVCRT_wchar_t *str) +{ + return MSVCRT__wtol_l(str, NULL); +} + +/********************************************************************* * _wcstoui64_l (MSVCRT.@) * * FIXME: locale parameter is ignored

1 0

Piotr Caban : msvcrt: Don't forward atoi to ntdll.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: 15b40e7b9c3740d0cb5da2f7d82058ee53adb812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15b40e7b9c3740d0cb5da2f7d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:11:49 2013 +0100 msvcrt: Don't forward atoi to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 36e1510..7b27220 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1249,7 +1249,7 @@ @ cdecl -arch=arm,x86_64 atan2f(float float) MSVCRT_atan2f @ cdecl atexit(ptr) MSVCRT_atexit @ cdecl atof(str) MSVCRT_atof -@ cdecl atoi(str) ntdll.atoi +@ cdecl atoi(str) MSVCRT_atoi @ cdecl atol(str) ntdll.atol @ cdecl bsearch(ptr ptr long long ptr) ntdll.bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 1b2dea8..0002ff0 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -861,7 +861,7 @@ __int64 CDECL MSVCRT_strtoi64(const char *nptr, char **endptr, int base) /********************************************************************* * _atoi_l (MSVCRT.@) */ -int MSVCRT__atoi_l(const char *str, MSVCRT__locale_t locale) +int __cdecl MSVCRT__atoi_l(const char *str, MSVCRT__locale_t locale) { __int64 ret = MSVCRT_strtoi64_l(str, NULL, 10, locale); @@ -876,6 +876,14 @@ int MSVCRT__atoi_l(const char *str, MSVCRT__locale_t locale) } /********************************************************************* + * atoi (MSVCRT.@) + */ +int __cdecl MSVCRT_atoi(const char *str) +{ + return MSVCRT__atoi_l(str, NULL); +} + +/********************************************************************* * _strtoui64_l (MSVCRT.@) * * FIXME: locale parameter is ignored

1 0

Piotr Caban : shell32: Match parameters list with function we' re forwarding to.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: 6a0f7521ed439bada37573996524f2d1a699b8c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a0f7521ed439bada37573996… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 09:51:15 2013 +0100 shell32: Match parameters list with function we're forwarding to. --- dlls/shell32/shell32.spec | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 790cc9f..0f991a4 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -114,7 +114,7 @@ 119 stdcall -ordinal IsLFNDrive(ptr) IsLFNDriveAW 120 stdcall -noname FileMenu_AbortInitMenu() 121 stdcall -noname SHFlushClipboard() - 122 stdcall -private @(long long long str long) shell.dll16.RunDLL_CallEntry16 + 122 stdcall -private @(long long ptr str long) shell.dll16.RunDLL_CallEntry16 123 stdcall -noname SHFreeUnusedLibraries() 124 stdcall -noname FileMenu_AppendFilesForPidl(long ptr long) 125 stdcall -noname FileMenu_AddFilesForPidl(long long long ptr long long ptr) @@ -445,13 +445,13 @@ @ stdcall StrCmpNIW(wstr wstr long) shlwapi.StrCmpNIW @ stdcall StrCmpNW(wstr wstr long) shlwapi.StrCmpNW @ stdcall StrCpyNA (ptr str long) kernel32.lstrcpynA -@ stdcall StrCpyNW(wstr wstr long) shlwapi.StrCpyNW +@ stdcall StrCpyNW(ptr wstr long) shlwapi.StrCpyNW @ stdcall StrNCmpA(str str long) shlwapi.StrCmpNA @ stdcall StrNCmpIA(str str long) shlwapi.StrCmpNIA @ stdcall StrNCmpIW(wstr wstr long) shlwapi.StrCmpNIW @ stdcall StrNCmpW(wstr wstr long) shlwapi.StrCmpNW @ stdcall StrNCpyA (ptr str long) kernel32.lstrcpynA -@ stdcall StrNCpyW(wstr wstr long) shlwapi.StrCpyNW +@ stdcall StrNCpyW(ptr wstr long) shlwapi.StrCpyNW @ stdcall StrRChrA(str str long) shlwapi.StrRChrA @ stdcall StrRChrIA(str str long) shlwapi.StrRChrIA @ stdcall StrRChrIW(wstr wstr long) shlwapi.StrRChrIW

1 0

Piotr Caban : imagehlp: Match parameters list with function we' re forwarding to.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: 60cf24a972bcaecbcc5592305627675d701033bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=60cf24a972bcaecbcc5592305… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 09:51:27 2013 +0100 imagehlp: Match parameters list with function we're forwarding to. --- dlls/imagehlp/imagehlp.spec | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/imagehlp/imagehlp.spec b/dlls/imagehlp/imagehlp.spec index 3ba9efa..744b339 100644 --- a/dlls/imagehlp/imagehlp.spec +++ b/dlls/imagehlp/imagehlp.spec @@ -3,7 +3,7 @@ @ stdcall CheckSumMappedFile(ptr long ptr ptr) @ stdcall EnumerateLoadedModules64(long ptr ptr) dbghelp.EnumerateLoadedModules64 @ stdcall EnumerateLoadedModules(long ptr ptr) dbghelp.EnumerateLoadedModules -@ stdcall FindDebugInfoFile(str str str) dbghelp.FindDebugInfoFile +@ stdcall FindDebugInfoFile(str str ptr) dbghelp.FindDebugInfoFile @ stdcall FindDebugInfoFileEx(str str ptr ptr ptr) dbghelp.FindDebugInfoFileEx @ stdcall FindExecutableImage(str str str) dbghelp.FindExecutableImage @ stdcall FindExecutableImageEx(str str ptr ptr ptr) dbghelp.FindExecutableImageEx @@ -38,16 +38,16 @@ @ stdcall RemovePrivateCvSymbolic(ptr ptr ptr) @ stub RemovePrivateCvSymbolicEx @ stdcall RemoveRelocations(ptr) -@ stdcall SearchTreeForFile(str str str) dbghelp.SearchTreeForFile +@ stdcall SearchTreeForFile(str str ptr) dbghelp.SearchTreeForFile @ stdcall SetImageConfigInformation(ptr ptr) @ stdcall SplitSymbols(str str str long) @ stdcall StackWalk64(long long long ptr ptr ptr ptr ptr ptr) dbghelp.StackWalk64 @ stdcall StackWalk(long long long ptr ptr ptr ptr ptr ptr) dbghelp.StackWalk @ stdcall SymCleanup(long) dbghelp.SymCleanup -@ stdcall SymEnumSourceFiles(long long str ptr ptr) dbghelp.SymEnumSourceFiles +@ stdcall SymEnumSourceFiles(ptr int64 str ptr ptr) dbghelp.SymEnumSourceFiles @ stub SymEnumSym -@ stdcall SymEnumSymbols(long long str ptr ptr) dbghelp.SymEnumSymbols -@ stdcall SymEnumTypes(long long ptr ptr) dbghelp.SymEnumTypes +@ stdcall SymEnumSymbols(ptr int64 str ptr ptr) dbghelp.SymEnumSymbols +@ stdcall SymEnumTypes(ptr int64 ptr ptr) dbghelp.SymEnumTypes @ stdcall SymEnumerateModules64(long ptr ptr) dbghelp.SymEnumerateModules64 @ stdcall SymEnumerateModules(long ptr ptr) dbghelp.SymEnumerateModules @ stdcall SymEnumerateSymbols64(long int64 ptr ptr) dbghelp.SymEnumerateSymbols64 @@ -55,7 +55,7 @@ @ stub SymEnumerateSymbolsW64 @ stub SymEnumerateSymbolsW @ stdcall SymFindFileInPath(long str str ptr long long long ptr ptr ptr) dbghelp.SymFindFileInPath -@ stdcall SymFromAddr(long long ptr ptr) dbghelp.SymFromAddr +@ stdcall SymFromAddr(ptr int64 ptr ptr) dbghelp.SymFromAddr @ stdcall SymFromName(long str ptr) dbghelp.SymFromName @ stdcall SymFunctionTableAccess64(long int64) dbghelp.SymFunctionTableAccess64 @ stdcall SymFunctionTableAccess(long long) dbghelp.SymFunctionTableAccess @@ -74,7 +74,7 @@ @ stdcall SymGetModuleInfoW64(long int64 ptr) dbghelp.SymGetModuleInfoW64 @ stdcall SymGetModuleInfoW(long long ptr) dbghelp.SymGetModuleInfoW @ stdcall SymGetOptions() dbghelp.SymGetOptions -@ stdcall SymGetSearchPath(long str long) dbghelp.SymGetSearchPath +@ stdcall SymGetSearchPath(long ptr long) dbghelp.SymGetSearchPath @ stdcall SymGetSymFromAddr64(long int64 ptr ptr) dbghelp.SymGetSymFromAddr64 @ stdcall SymGetSymFromAddr(long long ptr ptr) dbghelp.SymGetSymFromAddr @ stdcall SymGetSymFromName64(long str ptr) dbghelp.SymGetSymFromName64 @@ -83,8 +83,8 @@ @ stdcall SymGetSymNext(long ptr) dbghelp.SymGetSymNext @ stdcall SymGetSymPrev64(long ptr) dbghelp.SymGetSymPrev64 @ stdcall SymGetSymPrev(long ptr) dbghelp.SymGetSymPrev -@ stdcall SymGetTypeFromName(long long str ptr) dbghelp.SymGetTypeFromName -@ stdcall SymGetTypeInfo(long long long long ptr) dbghelp.SymGetTypeInfo +@ stdcall SymGetTypeFromName(ptr int64 str ptr) dbghelp.SymGetTypeFromName +@ stdcall SymGetTypeInfo(ptr int64 long long ptr) dbghelp.SymGetTypeInfo @ stdcall SymInitialize(long str long) dbghelp.SymInitialize @ stdcall SymLoadModule64(long long str str int64 long) dbghelp.SymLoadModule64 @ stdcall SymLoadModule(long long str str long long) dbghelp.SymLoadModule

1 0

Piotr Caban : wmi: Match parameters list with function we're forwarding to.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: 57fb89200f55460d0f73791d46da7eadd5044e97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57fb89200f55460d0f73791d4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 09:51:38 2013 +0100 wmi: Match parameters list with function we're forwarding to. --- dlls/wmi/wmi.spec | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wmi/wmi.spec b/dlls/wmi/wmi.spec index c6ae3cc..4291d4d 100644 --- a/dlls/wmi/wmi.spec +++ b/dlls/wmi/wmi.spec @@ -1,25 +1,25 @@ -@ stdcall CloseTrace(long) advapi32.CloseTrace -@ stdcall ControlTraceA(long long ptr long) advapi32.ControlTraceA -@ stdcall ControlTraceW(long long ptr long) advapi32.ControlTraceW +@ stdcall CloseTrace(int64) advapi32.CloseTrace +@ stdcall ControlTraceA(int64 str ptr long) advapi32.ControlTraceA +@ stdcall ControlTraceW(int64 wstr ptr long) advapi32.ControlTraceW @ stdcall CreateTraceInstanceId(long ptr) advapi32.CreateTraceInstanceId -@ stdcall EnableTrace(long long long ptr long) advapi32.EnableTrace -@ stdcall GetTraceEnableFlags(long) advapi32.GetTraceEnableFlags -@ stdcall GetTraceEnableLevel(long) advapi32.GetTraceEnableLevel -@ stdcall GetTraceLoggerHandle(ptr) advapi32.GetTraceLoggerHandle -@ stdcall OpenTraceA(ptr) advapi32.OpenTraceA -@ stdcall OpenTraceW(ptr) advapi32.OpenTraceW +@ stdcall EnableTrace(long long long ptr int64) advapi32.EnableTrace +@ stdcall GetTraceEnableFlags(int64) advapi32.GetTraceEnableFlags +@ stdcall GetTraceEnableLevel(int64) advapi32.GetTraceEnableLevel +@ stdcall -ret64 GetTraceLoggerHandle(ptr) advapi32.GetTraceLoggerHandle +@ stdcall -ret64 OpenTraceA(ptr) advapi32.OpenTraceA +@ stdcall -ret64 OpenTraceW(ptr) advapi32.OpenTraceW @ stdcall ProcessTrace(ptr long ptr ptr) advapi32.ProcessTrace @ stdcall QueryAllTracesA(ptr long ptr) advapi32.QueryAllTracesA @ stdcall QueryAllTracesW(ptr long ptr) advapi32.QueryAllTracesW -@ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr ptr ptr ptr) advapi32.RegisterTraceGuidsA -@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr ptr ptr ptr) advapi32.RegisterTraceGuidsW +@ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) advapi32.RegisterTraceGuidsA +@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) advapi32.RegisterTraceGuidsW @ stdcall RemoveTraceCallback(ptr) advapi32.RemoveTraceCallback @ stdcall SetTraceCallback(ptr ptr) advapi32.SetTraceCallback -@ stdcall StartTraceA(ptr ptr ptr) advapi32.StartTraceA -@ stdcall StartTraceW(ptr ptr ptr) advapi32.StartTraceW -@ stdcall TraceEvent(long ptr) advapi32.TraceEvent -@ stdcall TraceEventInstance(long ptr ptr ptr) advapi32.TraceEventInstance -@ stdcall UnregisterTraceGuids(long) advapi32.UnregisterTraceGuids +@ stdcall StartTraceA(ptr str ptr) advapi32.StartTraceA +@ stdcall StartTraceW(ptr wstr ptr) advapi32.StartTraceW +@ stdcall TraceEvent(int64 ptr) advapi32.TraceEvent +@ stdcall TraceEventInstance(int64 ptr ptr ptr) advapi32.TraceEventInstance +@ stdcall UnregisterTraceGuids(int64) advapi32.UnregisterTraceGuids @ stdcall WmiCloseBlock() advapi32.WmiCloseBlock @ stdcall WmiDevInstToInstanceNameA() advapi32.WmiDevInstToInstanceNameA @ stdcall WmiDevInstToInstanceNameW() advapi32.WmiDevInstToInstanceNameW

1 0

Piotr Caban : msvcrt: Added _set_output_format implementation.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: 9c4be83a78c5a105d4e3305d9977c213a4503a84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c4be83a78c5a105d4e3305d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 10:39:30 2013 +0100 msvcrt: Added _set_output_format implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/misc.c | 17 ++++++++++++++++- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/printf.h | 23 +++++++++++++---------- include/msvcrt/stdio.h | 1 + 9 files changed, 36 insertions(+), 16 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 5938d54..93bddbf 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1270,7 +1270,7 @@ @ cdecl _set_fmode(long) msvcrt._set_fmode @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait -@ stub _set_output_format +@ cdecl _set_output_format(long) msvcrt._set_output_format @ cdecl _set_printf_count_output(long) msvcrt._set_printf_count_output @ cdecl _set_purecall_handler(ptr) msvcrt._set_purecall_handler @ cdecl _seterrormode(long) msvcrt._seterrormode diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 81b3fc2..7f6b0d9 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1632,7 +1632,7 @@ @ cdecl _set_fmode(long) msvcrt._set_fmode @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait -@ stub _set_output_format +@ cdecl _set_output_format(long) msvcrt._set_output_format @ cdecl _set_printf_count_output(long) msvcrt._set_printf_count_output @ cdecl _set_purecall_handler(ptr) msvcrt._set_purecall_handler @ cdecl _seterrormode(long) msvcrt._seterrormode diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 6b7a318..a2e2929 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -931,7 +931,7 @@ @ cdecl _set_fmode(long) msvcrt._set_fmode @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait -@ stub _set_output_format +@ cdecl _set_output_format(long) msvcrt._set_output_format @ cdecl _set_printf_count_output(long) msvcrt._set_printf_count_output @ cdecl _set_purecall_handler(ptr) msvcrt._set_purecall_handler @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 81a265d..998349f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -924,7 +924,7 @@ @ cdecl _set_fmode(long) msvcrt._set_fmode @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait -@ stub _set_output_format +@ cdecl _set_output_format(long) msvcrt._set_output_format @ cdecl _set_printf_count_output(long) msvcrt._set_printf_count_output @ cdecl _set_purecall_handler(ptr) msvcrt._set_purecall_handler @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 2da2429..75e75e6 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -29,6 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); +static unsigned int output_format; /********************************************************************* * _beep (MSVCRT.@) @@ -283,7 +284,21 @@ void CDECL MSVCRT_qsort_s(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, */ unsigned int CDECL _get_output_format(void) { - return 0; + return output_format; +} + +/********************************************************************* + * _set_output_format (MSVCRT.@) + */ +unsigned int CDECL _set_output_format(unsigned int new_output_format) +{ + unsigned int ret = output_format; + + if(!MSVCRT_CHECK_PMT(new_output_format==0 || new_output_format==MSVCRT__TWO_DIGIT_EXPONENT)) + return ret; + + output_format = new_output_format; + return ret; } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 3bbbe93..07e2984 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -982,6 +982,7 @@ int __cdecl MSVCRT__toupper_l(int,MSVCRT__locale_t); int __cdecl MSVCRT__tolower_l(int,MSVCRT__locale_t); int __cdecl MSVCRT__strnicoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); int __cdecl MSVCRT_strncoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); +unsigned int __cdecl _get_output_format(void); /* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) * #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b6ae261..99072aa 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -894,7 +894,7 @@ @ cdecl _set_error_mode(long) # stub _set_fileinfo(long) @ cdecl _set_fmode(long) -# stub _set_output_format(long) +@ cdecl _set_output_format(long) @ cdecl _set_sbh_threshold(long) @ cdecl _seterrormode(long) @ cdecl -arch=i386,x86_64,arm -norelay _setjmp(ptr) MSVCRT__setjmp diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index d02115e..3ccb1c4 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -307,22 +307,25 @@ static inline void FUNC_NAME(pf_fixup_exponent)(char *buf) if(tmp[0] && (tmp[1]=='+' || tmp[1]=='-') && isdigit(tmp[2]) && isdigit(tmp[3])) { - char final; + BOOL two_digit_exp = (_get_output_format() == MSVCRT__TWO_DIGIT_EXPONENT); + + tmp += 2; + if(isdigit(tmp[2])) { + if(two_digit_exp && tmp[0]=='0') { + tmp[0] = tmp[1]; + tmp[1] = tmp[2]; + tmp[2] = tmp[3]; + } - if (isdigit(tmp[4])) return; /* Exponent already 3 digits */ + }else if(two_digit_exp) { + return; + } - tmp += 2; - final = tmp[2]; + tmp[3] = tmp[2]; tmp[2] = tmp[1]; tmp[1] = tmp[0]; tmp[0] = '0'; - - if(final == '\0') { - tmp[3] = '\0'; - if(buf[0] == ' ') - memmove(buf, buf + 1, (tmp - buf) + 3); - } } } diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index f6bf3b5..a01859e 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -182,6 +182,7 @@ int __cdecl vprintf_s(const char*,__ms_va_list); int __cdecl vsprintf(char*,const char*,__ms_va_list); int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list); unsigned int __cdecl _get_output_format(void); +unsigned int __cdecl _set_output_format(void); #ifndef _WSTDIO_DEFINED #define _WSTDIO_DEFINED

1 0