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

Bruno Jesus : ws2_32: Handle NULL proto in WSAAsyncGetServByName.
by Alexandre Julliard 26 Mar '12

26 Mar '12

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

Lauri Kenttä : mscoree: Print the correct values in a TRACE.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 118b53a7bd193b7307b7c0e7a6299d4957b9cfea URL: http://source.winehq.org/git/wine.git/?a=commit;h=118b53a7bd193b7307b7c0e7a… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Mar 23 22:41:25 2012 +0200 mscoree: Print the correct values in a TRACE. --- dlls/mscoree/mscoree_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 1aa120f..0ebc813 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -359,7 +359,7 @@ HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWST HRESULT WINAPI GetRequestedRuntimeVersion(LPWSTR pExe, LPWSTR pVersion, DWORD cchBuffer, DWORD *dwlength) { - TRACE("(%s, %p, %d, %p)\n", debugstr_w(pExe), debugstr_w(pExe), cchBuffer, dwlength); + TRACE("(%s, %p, %d, %p)\n", debugstr_w(pExe), pVersion, cchBuffer, dwlength); if(!dwlength) return E_POINTER;

1 0

Cheer Xiao : po: Update simplified Chinese translation.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 57f5ca9a6faa343ecb9d1b6dd6a19a5c1d337695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57f5ca9a6faa343ecb9d1b6dd… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Sat Mar 17 23:05:47 2012 +0800 po: Update simplified Chinese translation. --- po/zh_CN.po | 217 ++++++++++++++++++++--------------------------------------- 1 files changed, 73 insertions(+), 144 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=57f5ca9a6faa343ecb9d1…

1 0

Michael Stefaniuc : dxdiagn: Print the debug string and not the pointer to it.
by Alexandre Julliard 26 Mar '12

26 Mar '12

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

Michael Stefaniuc : quartz: Print the debug string and not the pointer to it.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 810b619e2b1eb9a5c950ba1c3afb9807d95a7d14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=810b619e2b1eb9a5c950ba1c3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:39:16 2012 +0100 quartz: Print the debug string and not the pointer to it. --- dlls/quartz/nullrenderer.c | 2 +- dlls/quartz/videorenderer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index dc1bd0f..9fc1b44 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -372,7 +372,7 @@ static HRESULT WINAPI NullRenderer_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin { NullRendererImpl *This = (NullRendererImpl *)iface; - TRACE("(%p/%p)->(%p,%p)\n", This, iface, debugstr_w(Id), ppPin); + TRACE("(%p/%p)->(%s,%p)\n", This, iface, debugstr_w(Id), ppPin); if (!Id || !ppPin) return E_POINTER; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 92a0c99..3e1004e 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -883,7 +883,7 @@ static HRESULT WINAPI VideoRenderer_FindPin(IBaseFilter * iface, LPCWSTR Id, IPi { VideoRendererImpl *This = (VideoRendererImpl *)iface; - FIXME("(%p/%p)->(%p,%p): stub !!!\n", This, iface, debugstr_w(Id), ppPin); + FIXME("(%p/%p)->(%s,%p): stub !!!\n", This, iface, debugstr_w(Id), ppPin); /* FIXME: critical section */

1 0

Michael Stefaniuc : shell32: Print the debug string and not the pointer to it.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 798beb2cb8d07cd76494cd878ecef711ca969d92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=798beb2cb8d07cd76494cd878… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:39:51 2012 +0100 shell32: Print the debug string and not the pointer to it. --- dlls/shell32/folders.c | 4 ++-- dlls/shell32/shellpath.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index d077925..4848644 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -355,8 +355,8 @@ static HRESULT WINAPI IExtractIconW_fnExtract(IExtractIconW * iface, LPCWSTR psz IExtractIconWImpl *This = impl_from_IExtractIconW(iface); int index; - FIXME("(%p) (file=%p index=%d %p %p size=%08x) semi-stub\n", This, debugstr_w(pszFile), (signed)nIconIndex, - phiconLarge, phiconSmall, nIconSize); + FIXME("(%p) (file=%s index=%d %p %p size=%08x) semi-stub\n", This, debugstr_w(pszFile), + (signed)nIconIndex, phiconLarge, phiconSmall, nIconSize); index = SIC_GetIconIndex(pszFile, nIconIndex, 0); diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 16ca6a3..c883e64 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3578,7 +3578,7 @@ static HRESULT WINAPI knownfolder_SetPath( struct knownfolder *knownfolder = impl_from_IKnownFolder( iface ); HRESULT hr = S_OK; - TRACE("(%p, 0x%08x, %p)\n", knownfolder, dwFlags, debugstr_w(pszPath)); + TRACE("(%p, 0x%08x, %s)\n", knownfolder, dwFlags, debugstr_w(pszPath)); /* check if the known folder is registered */ if(!knownfolder->registryPath)

1 0

Michael Stefaniuc : urlmon: Print the debug string and not the pointer to it.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: cbcf08a7dfe65cd573a2738c6bddc9cfc4c6e1ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbcf08a7dfe65cd573a2738c6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:40:35 2012 +0100 urlmon: Print the debug string and not the pointer to it. --- dlls/urlmon/urlmon_main.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 3fea58c..0cb72dd 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -998,9 +998,8 @@ HRESULT WINAPI GetClassFileOrMime(LPBC pBC, LPCWSTR pszFilename, LPVOID pBuffer, DWORD cbBuffer, LPCWSTR pszMimeType, DWORD dwReserved, CLSID *pclsid) { - FIXME("(%p, %s, %p, %d, %p, 0x%08x, %p): stub\n", pBC, - debugstr_w(pszFilename), pBuffer, cbBuffer, debugstr_w(pszMimeType), - dwReserved, pclsid); + FIXME("(%p, %s, %p, %d, %s, 0x%08x, %p): stub\n", pBC, debugstr_w(pszFilename), pBuffer, + cbBuffer, debugstr_w(pszMimeType), dwReserved, pclsid); return E_NOTIMPL; }

1 0

Michael Stefaniuc : dbghelp: Print the debug string and not the pointer to it.
by Alexandre Julliard 26 Mar '12

26 Mar '12

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 : netapi32: Print the debug string and not the pointer to it.
by Alexandre Julliard 26 Mar '12

26 Mar '12

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 : shlwapi: Print the debug string and not the pointer to it.
by Alexandre Julliard 26 Mar '12

26 Mar '12

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