March 2012 - Wine-Commits - list.winehq.org

Akihiro Sagawa : msvcrt: Fix _mbsnbcmp and _mbsnbicmp implementation.
by Alexandre Julliard March 26, 2012

March 26, 2012

Module: wine Branch: master Commit: ece5d712f6e1719c173289d18631159f7badc8cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ece5d712f6e1719c173289d18… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Mar 21 23:02:17 2012 +0900 msvcrt: Fix _mbsnbcmp and _mbsnbicmp implementation. --- dlls/msvcrt/mbcs.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 37b72a3..0f15cb1 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -896,7 +896,7 @@ int CDECL _mbsnbcmp(const unsigned char* str, const unsigned char* cmp, MSVCRT_s if (_ismbblead(*cmp)) cmpc=(len>=2)?_mbsnextc(cmp):0; else - cmpc=*str; + cmpc=*cmp; if(strc != cmpc) return strc < cmpc ? -1 : 1; len -= clen; @@ -967,7 +967,7 @@ int CDECL _mbsnbicmp(const unsigned char* str, const unsigned char* cmp, MSVCRT_ if (_ismbblead(*cmp)) cmpc=(len>=2)?_mbsnextc(cmp):0; else - cmpc=*str; + cmpc=*cmp; strc = _mbctolower(strc); cmpc = _mbctolower(cmpc); if(strc != cmpc)

1 0

Bruno Jesus : ws2_32: Handle NULL proto in WSAAsyncGetServByName.
by Alexandre Julliard March 26, 2012

March 26, 2012

Module: wine Branch: master Commit: 70be64b2ba9704f806ff4b4aab632aea827a2313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70be64b2ba9704f806ff4b4aa… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Mar 23 00:23:48 2012 -0300 ws2_32: Handle NULL proto in WSAAsyncGetServByName. --- dlls/ws2_32/async.c | 14 +++++++++++--- dlls/ws2_32/tests/sock.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/async.c b/dlls/ws2_32/async.c index cc330bb..573349f 100644 --- a/dlls/ws2_32/async.c +++ b/dlls/ws2_32/async.c @@ -384,7 +384,7 @@ HANDLE WINAPI WSAAsyncGetServByName(HWND hWnd, UINT uMsg, LPCSTR name, { struct async_query_getservbyname *aq; unsigned int len1 = strlen(name) + 1; - unsigned int len2 = strlen(proto) + 1; + unsigned int len2 = proto ? strlen(proto) + 1 : 0; TRACE("hwnd %p, msg %04x, name %s, proto %s\n", hWnd, uMsg, debugstr_a(name), debugstr_a(proto)); @@ -393,10 +393,18 @@ HANDLE WINAPI WSAAsyncGetServByName(HWND hWnd, UINT uMsg, LPCSTR name, SetLastError( WSAEWOULDBLOCK ); return 0; } + aq->serv_name = (char *)(aq + 1); - aq->serv_proto = aq->serv_name + len1; strcpy( aq->serv_name, name ); - strcpy( aq->serv_proto, proto ); + + if (proto) + { + aq->serv_proto = aq->serv_name + len1; + strcpy( aq->serv_proto, proto ); + } + else + aq->serv_proto = NULL; + return run_query( hWnd, uMsg, async_getservbyname, &aq->query, sbuf, buflen ); } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2de23c9..f4cc909 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5203,6 +5203,33 @@ static void test_WSAAsyncGetServByPort(void) DestroyWindow(hwnd); } +static void test_WSAAsyncGetServByName(void) +{ + HWND hwnd = create_async_message_window(); + HANDLE ret; + char buffer[MAXGETHOSTSTRUCT]; + + if (!hwnd) + return; + + /* FIXME: The asynchronous window messages should be tested. */ + + /* Parameters are not checked when initiating the asynchronous operation. */ + ret = WSAAsyncGetServByName(hwnd, WM_ASYNCCOMPLETE, "", NULL, NULL, 0); + ok(ret != NULL, "WSAAsyncGetServByName returned NULL\n"); + + ret = WSAAsyncGetServByName(hwnd, WM_ASYNCCOMPLETE, "", "", buffer, MAXGETHOSTSTRUCT); + ok(ret != NULL, "WSAAsyncGetServByName returned NULL\n"); + + ret = WSAAsyncGetServByName(hwnd, WM_ASYNCCOMPLETE, "http", NULL, NULL, 0); + ok(ret != NULL, "WSAAsyncGetServByName returned NULL\n"); + + ret = WSAAsyncGetServByName(hwnd, WM_ASYNCCOMPLETE, "http", "tcp", buffer, MAXGETHOSTSTRUCT); + ok(ret != NULL, "WSAAsyncGetServByName returned NULL\n"); + + DestroyWindow(hwnd); +} + static void test_completion_port(void) { HANDLE previous_port, io_port; @@ -5770,6 +5797,7 @@ START_TEST( sock ) test_sioRoutingInterfaceQuery(); test_WSAAsyncGetServByPort(); + test_WSAAsyncGetServByName(); test_completion_port();

1 0

Akihiro Sagawa : msvcrt: Fix _mbcjistojms off by one error.
by Alexandre Julliard March 26, 2012

March 26, 2012

Module: wine Branch: master Commit: 7535b367dd4f5ae1b22fcb068eaaf4e2b428b98f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7535b367dd4f5ae1b22fcb068… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Mar 21 23:02:16 2012 +0900 msvcrt: Fix _mbcjistojms off by one error. --- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/tests/string.c | 5 ----- 2 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index c61311b..37b72a3 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -461,7 +461,7 @@ unsigned int CDECL _mbcjistojms(unsigned int c) else c += 0x7d; - if(LOBYTE(c) > 0x7F) + if(LOBYTE(c) >= 0x7F) c += 0x1; c = (((HIBYTE(c) - 0x21)/2 + 0x81) << 8) | LOBYTE(c); diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 6f9ce0f..9f0d8be 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -877,11 +877,6 @@ static void test_mbcjisjms(void) unsigned int ret, exp; ret = _mbcjistojms(jisjms[j][0]); exp = (cp[i] == 932) ? jisjms[j][1] : jisjms[j][0]; - if (LOBYTE(exp) == 0x80 && cp[i] == 932) { - todo_wine ok(ret == exp, "Expected 0x%x, got 0x%x (0x%x, codepage=%d)\n", - exp, ret, jisjms[j][0], cp[i]); - continue; - } ok(ret == exp, "Expected 0x%x, got 0x%x (0x%x, codepage=%d)\n", exp, ret, jisjms[j][0], cp[i]); }

1 0

Michael Stefaniuc : setupapi: Print the debug string and not the pointer to it.
by Alexandre Julliard March 26, 2012

March 26, 2012

Module: wine Branch: master Commit: 8f6801fdc02ff8307d81368be5d231505c78a35a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6801fdc02ff8307d81368be… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:39:39 2012 +0100 setupapi: Print the debug string and not the pointer to it. --- dlls/setupapi/stubs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index ba437b7..f4e6959 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -441,7 +441,7 @@ BOOL WINAPI SetupLogFileW( PCWSTR OtherInfo, DWORD Flags ) { - FIXME("(%p, %p, '%s', '%s', %d, %p, %p, %p, %d): stub\n", FileLogHandle, + FIXME("(%p, %s, '%s', '%s', %d, %s, %s, %s, %d): stub\n", FileLogHandle, debugstr_w(LogSectionName), debugstr_w(SourceFileName), debugstr_w(TargetFileName), Checksum, debugstr_w(DiskTagfile), debugstr_w(DiskDescription), debugstr_w(OtherInfo), Flags);

1 0

Michael Stefaniuc : shlwapi: Print the debug string and not the pointer to it.
by Alexandre Julliard March 26, 2012

March 26, 2012

Module: wine Branch: master Commit: 05561929940a9bb75e49427e90895a7903fbab6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=05561929940a9bb75e49427e9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:40:08 2012 +0100 shlwapi: Print the debug string and not the pointer to it. --- dlls/shlwapi/ordinal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 01adaa9..78cd02d 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -1435,7 +1435,7 @@ HRESULT WINAPI IUnknown_GetClassID(IUnknown *lpUnknown, CLSID* lpClassId) IPersist* lpPersist; HRESULT hRet = E_FAIL; - TRACE("(%p,%p)\n", lpUnknown, debugstr_guid(lpClassId)); + TRACE("(%p,%s)\n", lpUnknown, debugstr_guid(lpClassId)); if (lpUnknown) {

1 0

Michael Stefaniuc : netapi32: Print the debug string and not the pointer to it.
by Alexandre Julliard March 26, 2012

March 26, 2012

Module: wine Branch: master Commit: 04121b3e020dc40193db1b6e89efc9e2233adb33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04121b3e020dc40193db1b6e8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:37:54 2012 +0100 netapi32: Print the debug string and not the pointer to it. --- dlls/netapi32/netapi32.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 58cd014..470adf0 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -88,10 +88,10 @@ NET_API_STATUS WINAPI NetServerEnumEx( LMCSTR domain, LMCSTR FirstNameToReturn) { - FIXME("Stub (%s %d %p %d %p %p %d %s %p)\n", debugstr_w(ServerName), - Level, Bufptr, PrefMaxlen, EntriesRead, totalentries, servertype, - debugstr_w(domain), debugstr_w(FirstNameToReturn)); - + FIXME("Stub (%s %d %p %d %p %p %d %s %s)\n", + debugstr_w(ServerName), Level, Bufptr, PrefMaxlen, EntriesRead, totalentries, + servertype, debugstr_w(domain), debugstr_w(FirstNameToReturn)); + return ERROR_NO_BROWSER_SERVERS_FOUND; }

1 0

Michael Stefaniuc : dbghelp: Print the debug string and not the pointer to it.
by Alexandre Julliard March 26, 2012

March 26, 2012

Module: wine Branch: master Commit: 4cf695e16444ff296c72499a7e557bddb1f5338b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cf695e16444ff296c72499a7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:34:22 2012 +0100 dbghelp: Print the debug string and not the pointer to it. --- dlls/dbghelp/path.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 1b494da..f16eb00 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -78,8 +78,8 @@ HANDLE WINAPI FindDebugInfoFileEx(PCSTR FileName, PCSTR SymbolPath, PFIND_DEBUG_FILE_CALLBACK Callback, PVOID CallerData) { - FIXME("(%s %s %p %p %p): stub\n", - debugstr_a(FileName), debugstr_a(SymbolPath), debugstr_a(DebugFilePath), Callback, CallerData); + FIXME("(%s %s %s %p %p): stub\n", debugstr_a(FileName), debugstr_a(SymbolPath), + debugstr_a(DebugFilePath), Callback, CallerData); return NULL; }

1 0

Michael Stefaniuc : dxdiagn: Print the debug string and not the pointer to it.
by Alexandre Julliard March 26, 2012

March 26, 2012

Module: wine Branch: master Commit: cf9b5b0ff8ed4aa15e8f44010ed9bb7e24a71f94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf9b5b0ff8ed4aa15e8f44010… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:35:13 2012 +0100 dxdiagn: Print the debug string and not the pointer to it. --- dlls/dxdiagn/container.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index 7501d98..d167043 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -269,8 +269,8 @@ static const IDxDiagContainerVtbl DxDiagContainer_Vtbl = HRESULT DXDiag_CreateDXDiagContainer(REFIID riid, IDxDiagContainerImpl_Container *cont, IDxDiagProvider *pProv, LPVOID *ppobj) { IDxDiagContainerImpl* container; - TRACE("(%p, %p)\n", debugstr_guid(riid), ppobj); - + TRACE("(%s, %p)\n", debugstr_guid(riid), ppobj); + container = HeapAlloc(GetProcessHeap(), 0, sizeof(IDxDiagContainerImpl)); if (NULL == container) { *ppobj = NULL;

1 0

Akihiro Sagawa : msvcrt: Add test for _mbbtombc.
by Alexandre Julliard March 26, 2012

March 26, 2012

Module: wine Branch: master Commit: d3e9665001aa89c1cbc2ed6f34f5df1565958e73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3e9665001aa89c1cbc2ed6f3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Mar 21 23:02:08 2012 +0900 msvcrt: Add test for _mbbtombc. --- dlls/msvcrt/tests/string.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index c40451c..e65b274 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -908,6 +908,36 @@ static void test_mbcjmsjis(void) _setmbcp(prev_cp); } +static void test_mbbtombc(void) +{ + static const unsigned int mbbmbc[][2] = { + {0x1f, 0x1f}, {0x20, 0x8140}, {0x39, 0x8258}, {0x40, 0x8197}, + {0x41, 0x8260}, {0x5e, 0x814f}, {0x7e, 0x8150}, {0x7f, 0x7f}, + {0x80, 0x80}, {0x81, 0x81}, {0xa0, 0xa0}, {0xa7, 0x8340}, + {0xb0, 0x815b}, {0xd1, 0x8380}, {0xff, 0xff}, {0,0}}; + int cp[] = { 932, 936, 939, 950, 1361, _MB_CP_SBCS }; + int i, j; + int prev_cp = _getmbcp(); + + for (i = 0; i < sizeof(cp)/sizeof(cp[0]); i++) + { + _setmbcp(cp[i]); + for (j = 0; mbbmbc[j][0] != 0; j++) + { + unsigned int exp, ret; + ret = _mbbtombc(mbbmbc[j][0]); + exp = (cp[i] == 932) ? mbbmbc[j][1] : mbbmbc[j][0]; + if (cp[i] == 932 && exp > 255) + todo_wine ok(ret == exp, "Expected 0x%x, got 0x%x (0x%x, codepage %d)\n", + exp, ret, mbbmbc[j][0], cp[i]); + else + ok(ret == exp, "Expected 0x%x, got 0x%x (0x%x, codepage %d)\n", + exp, ret, mbbmbc[j][0], cp[i]); + } + } + _setmbcp(prev_cp); +} + static void test_mbctombb(void) { static const unsigned int mbcmbb_932[][2] = { @@ -2134,6 +2164,7 @@ START_TEST(string) test__mbsnbcpy_s(); test_mbcjisjms(); test_mbcjmsjis(); + test_mbbtombc(); test_mbctombb(); test_ismbclegal(); test_strtok();

1 0

Akihiro Sagawa : msvcrt/tests: Add more tests for _mbcjistojms.
by Alexandre Julliard March 26, 2012

March 26, 2012

Module: wine Branch: master Commit: c1558bb7ef87f2f5898f7cac6d05975e50edc542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1558bb7ef87f2f5898f7cac6… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Mar 21 23:02:14 2012 +0900 msvcrt/tests: Add more tests for _mbcjistojms. --- dlls/msvcrt/tests/string.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 5edd86c..6f9ce0f 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -863,6 +863,7 @@ static void test_mbcjisjms(void) /* List of value-pairs to test. The test assumes the last pair to be {0, ..} */ unsigned int jisjms[][2] = { {0x2020, 0}, {0x2021, 0}, {0x2120, 0}, {0x2121, 0x8140}, {0x7f7f, 0}, {0x7f7e, 0}, {0x7e7f, 0}, {0x7e7e, 0xeffc}, + {0x255f, 0x837e}, {0x2560, 0x8380}, {0x2561, 0x8381}, {0x2121FFFF, 0}, {0x2223, 0x81a1}, {0x237e, 0x829e}, {0, 0}}; int cp[] = { 932, 936, 939, 950, 1361, _MB_CP_SBCS }; unsigned int i, j; @@ -876,6 +877,11 @@ static void test_mbcjisjms(void) unsigned int ret, exp; ret = _mbcjistojms(jisjms[j][0]); exp = (cp[i] == 932) ? jisjms[j][1] : jisjms[j][0]; + if (LOBYTE(exp) == 0x80 && cp[i] == 932) { + todo_wine ok(ret == exp, "Expected 0x%x, got 0x%x (0x%x, codepage=%d)\n", + exp, ret, jisjms[j][0], cp[i]); + continue; + } ok(ret == exp, "Expected 0x%x, got 0x%x (0x%x, codepage=%d)\n", exp, ret, jisjms[j][0], cp[i]); }

1 0