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

Nikolay Sivov : wshom.ocx: Implement CurrentDirectory() property.
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: b9819b0b8ed6d92421349c9116f07b559ae7bb29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9819b0b8ed6d92421349c911… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 7 16:40:52 2015 +0300 wshom.ocx: Implement CurrentDirectory() property. --- dlls/wshom.ocx/shell.c | 33 +++++++++++++++++++++++++++++---- dlls/wshom.ocx/tests/wshom.c | 25 +++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 422f89b..c164b70 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -1329,14 +1329,39 @@ static HRESULT WINAPI WshShell3_Exec(IWshShell3 *iface, BSTR command, IWshExec * static HRESULT WINAPI WshShell3_get_CurrentDirectory(IWshShell3 *iface, BSTR *dir) { - FIXME("(%p): stub\n", dir); - return E_NOTIMPL; + DWORD ret; + + TRACE("(%p)\n", dir); + + ret = GetCurrentDirectoryW(0, NULL); + if (!ret) + return HRESULT_FROM_WIN32(GetLastError()); + + *dir = SysAllocStringLen(NULL, ret-1); + if (!*dir) + return E_OUTOFMEMORY; + + ret = GetCurrentDirectoryW(ret, *dir); + if (!ret) { + SysFreeString(*dir); + *dir = NULL; + return HRESULT_FROM_WIN32(GetLastError()); + } + + return S_OK; } static HRESULT WINAPI WshShell3_put_CurrentDirectory(IWshShell3 *iface, BSTR dir) { - FIXME("(%s): stub\n", debugstr_w(dir)); - return E_NOTIMPL; + TRACE("(%s)\n", debugstr_w(dir)); + + if (!dir) + return E_INVALIDARG; + + if (!SetCurrentDirectoryW(dir)) + return HRESULT_FROM_WIN32(GetLastError()); + + return S_OK; } static const IWshShell3Vtbl WshShell3Vtbl = { diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 888023f..0a69af3 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -39,6 +39,8 @@ static void test_wshshell(void) static const WCHAR pathW[] = {'%','P','A','T','H','%',0}; static const WCHAR sysW[] = {'S','Y','S','T','E','M',0}; static const WCHAR path2W[] = {'P','A','T','H',0}; + static const WCHAR dummydirW[] = {'d','e','a','d','p','a','r','r','o','t',0}; + static const WCHAR emptyW[] = {'e','m','p','t','y',0}; IWshEnvironment *env; IWshShell3 *sh3; IDispatchEx *dispex; @@ -209,6 +211,29 @@ static void test_wshshell(void) SysFreeString(str); + /* current directory */ +if (0) /* crashes on native */ + hr = IWshShell3_get_CurrentDirectory(sh3, NULL); + + str = NULL; + hr = IWshShell3_get_CurrentDirectory(sh3, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(str && str[0] != 0, "got empty string\n"); + SysFreeString(str); + + hr = IWshShell3_put_CurrentDirectory(sh3, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + str = SysAllocString(emptyW); + hr = IWshShell3_put_CurrentDirectory(sh3, str); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + SysFreeString(str); + + str = SysAllocString(dummydirW); + hr = IWshShell3_put_CurrentDirectory(sh3, str); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + SysFreeString(str); + IWshCollection_Release(coll); IDispatch_Release(disp); IWshShell3_Release(sh3);

1 0

Francois Gouget : comdlg32: Remove unneeded NONAMELESSSTRUCT directives.
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: 99f0f3a7e1876df5d217a3c9ceb0c3150145179d URL: http://source.winehq.org/git/wine.git/?a=commit;h=99f0f3a7e1876df5d217a3c9c… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 9 09:32:39 2015 +0100 comdlg32: Remove unneeded NONAMELESSSTRUCT directives. --- dlls/comdlg32/filedlg.c | 1 - dlls/comdlg32/filedlgbrowser.c | 1 - dlls/comdlg32/itemdlg.c | 1 - 3 files changed, 3 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index e0939ef..2890108 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -56,7 +56,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index eed34f5..ce97ec3 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -25,7 +25,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 3b97111..c37b66e 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -22,7 +22,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h"

1 0

Francois Gouget : appwiz.cpl: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: d53afeca09dc7ef54b273359e118b6ab27c7e527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d53afeca09dc7ef54b273359e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 9 09:31:29 2015 +0100 appwiz.cpl: Remove an unneeded NONAMELESSSTRUCT directive. --- dlls/appwiz.cpl/addons.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index ce128fe..b4fcc25 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -29,7 +29,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h"

1 0

Michael Stefaniuc : gameux: Avoid comparison of a BOOL return with TRUE ( PVS-Studio).
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: cd1e969b2807a2e02aeccd8c9c56e52ec162a28c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd1e969b2807a2e02aeccd8c9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 9 10:29:13 2015 +0100 gameux: Avoid comparison of a BOOL return with TRUE (PVS-Studio). --- dlls/gameux/gamestatistics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 7c95065..ff57b77 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -1127,7 +1127,7 @@ static HRESULT STDMETHODCALLTYPE GameStatisticsMgrImpl_RemoveGameStatistics( hr = GAMEUX_buildStatisticsFilePath(lpApplicationId, sStatsFile); if(SUCCEEDED(hr)) - hr = (DeleteFileW(sStatsFile)==TRUE ? S_OK : HRESULT_FROM_WIN32(GetLastError())); + hr = DeleteFileW(sStatsFile) ? S_OK : HRESULT_FROM_WIN32(GetLastError()); return hr; }

1 0

Francois Gouget : commdlg.dll16: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: 285dc99999f6e0c50db01585004d5ec12099e2e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=285dc99999f6e0c50db015850… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 9 09:32:20 2015 +0100 commdlg.dll16: Remove unneeded NONAMELESSXXX directives. --- dlls/commdlg.dll16/printdlg.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/commdlg.dll16/printdlg.c b/dlls/commdlg.dll16/printdlg.c index 59239dd..ac4741e 100644 --- a/dlls/commdlg.dll16/printdlg.c +++ b/dlls/commdlg.dll16/printdlg.c @@ -27,8 +27,6 @@ #include <stdio.h> #include <string.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "wingdi.h"

1 0

Bruno Jesus : ws2_32/tests: Improve setup_connector_socket to allow non-blocking connect calls.
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: 4ca53984e46a434dcbfc43b3a0f8047dc05473e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ca53984e46a434dcbfc43b3a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Mar 8 01:06:04 2015 -0300 ws2_32/tests: Improve setup_connector_socket to allow non-blocking connect calls. --- dlls/ws2_32/tests/sock.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7acc489..d741ca5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -196,6 +196,9 @@ static int client_id; /**************** General utility functions ***************/ +static SOCKET setup_server_socket(struct sockaddr_in *addr, int *len); +static SOCKET setup_connector_socket(struct sockaddr_in *addr, int len, BOOL nonblock); + static int tcp_socketpair(SOCKET *src, SOCKET *dst) { SOCKET server = INVALID_SOCKET; @@ -3632,7 +3635,7 @@ static SOCKET setup_server_socket(struct sockaddr_in *addr, int *len) return server_socket; } -static SOCKET setup_connector_socket(struct sockaddr_in *addr, int len) +static SOCKET setup_connector_socket(struct sockaddr_in *addr, int len, BOOL nonblock) { int ret; SOCKET connector; @@ -3640,8 +3643,18 @@ static SOCKET setup_connector_socket(struct sockaddr_in *addr, int len) connector = socket(AF_INET, SOCK_STREAM, 0); ok(connector != INVALID_SOCKET, "failed to create connector socket %d\n", WSAGetLastError()); + if (nonblock) + set_blocking(connector, !nonblock); + ret = connect(connector, (struct sockaddr *)addr, len); - ok(!ret, "connecting to accepting socket failed %d\n", WSAGetLastError()); + if (!nonblock) + ok(!ret, "connecting to accepting socket failed %d\n", WSAGetLastError()); + else if (ret == SOCKET_ERROR) + { + DWORD error = WSAGetLastError(); + ok(error == WSAEWOULDBLOCK || error == WSAEINPROGRESS, + "expected 10035 or 10036, got %d\n", error); + } return connector; } @@ -3669,7 +3682,7 @@ static void test_accept(void) return; } - connector = setup_connector_socket(&address, socklen); + connector = setup_connector_socket(&address, socklen, FALSE); if (connector == INVALID_SOCKET) goto done; trace("Blocking accept next\n"); @@ -3717,7 +3730,7 @@ static void test_accept(void) server_socket = setup_server_socket(&address, &socklen); if (server_socket == INVALID_SOCKET) goto done; - connector = setup_connector_socket(&address, socklen); + connector = setup_connector_socket(&address, socklen, FALSE); if (connector == INVALID_SOCKET) goto done; socklen = 0; @@ -3728,7 +3741,7 @@ static void test_accept(void) connector = INVALID_SOCKET; socklen = sizeof(address); - connector = setup_connector_socket(&address, socklen); + connector = setup_connector_socket(&address, socklen, FALSE); if (connector == INVALID_SOCKET) goto done; accepted = WSAAccept(server_socket, NULL, NULL, NULL, 0); @@ -3738,7 +3751,7 @@ static void test_accept(void) accepted = connector = INVALID_SOCKET; socklen = sizeof(address); - connector = setup_connector_socket(&address, socklen); + connector = setup_connector_socket(&address, socklen, FALSE); if (connector == INVALID_SOCKET) goto done; socklen = sizeof(ss); @@ -3752,7 +3765,7 @@ static void test_accept(void) accepted = connector = INVALID_SOCKET; socklen = sizeof(address); - connector = setup_connector_socket(&address, socklen); + connector = setup_connector_socket(&address, socklen, FALSE); if (connector == INVALID_SOCKET) goto done; socklen = 0; @@ -3763,7 +3776,7 @@ static void test_accept(void) accepted = connector = INVALID_SOCKET; socklen = sizeof(address); - connector = setup_connector_socket(&address, socklen); + connector = setup_connector_socket(&address, socklen, FALSE); if (connector == INVALID_SOCKET) goto done; accepted = accept(server_socket, NULL, NULL); @@ -3773,7 +3786,7 @@ static void test_accept(void) accepted = connector = INVALID_SOCKET; socklen = sizeof(address); - connector = setup_connector_socket(&address, socklen); + connector = setup_connector_socket(&address, socklen, FALSE); if (connector == INVALID_SOCKET) goto done; socklen = sizeof(ss);

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: e928f5544e745fcbcfb7e079df8932478139cca3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e928f5544e745fcbcfb7e079d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 7 11:24:43 2015 +0100 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddraw4.c | 18 +++++++++--------- dlls/ddraw/tests/ddraw7.c | 18 +++++++++--------- dlls/ddraw/tests/visual.c | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e928f5544e745fcbcfb7e…

1 0

Michael Stefaniuc : dsound: Avoid comparing BOOL variables with TRUE ( PVS-Studio).
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: 91e59d99f93907b464ae3d8d16547868476557af URL: http://source.winehq.org/git/wine.git/?a=commit;h=91e59d99f93907b464ae3d8d1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 9 10:27:08 2015 +0100 dsound: Avoid comparing BOOL variables with TRUE (PVS-Studio). --- dlls/dsound/dsound_main.c | 2 +- dlls/dsound/mixer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 0e3a313..0130607 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -528,7 +528,7 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, release_mmdevenum(devenum, init_hr); - return (keep_going == TRUE) ? S_OK : S_FALSE; + return keep_going ? S_OK : S_FALSE; } /*************************************************************************** diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index b367086..973a65e 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -841,7 +841,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) } /* if device was stopping, its for sure stopped when all buffers have stopped */ - else if((all_stopped == TRUE) && (device->state == STATE_STOPPING)){ + else if (all_stopped && (device->state == STATE_STOPPING)) { TRACE("All buffers have stopped. Stopping primary buffer\n"); device->state = STATE_STOPPED;

1 0

Francois Gouget : comctl32: Remove unneeded NONAMELESSSTRUCT directives.
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: c04cc70f7de202fcde4d326315d90706705d8184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c04cc70f7de202fcde4d32631… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 9 09:32:08 2015 +0100 comctl32: Remove unneeded NONAMELESSSTRUCT directives. --- dlls/comctl32/comctl32undoc.c | 1 - dlls/comctl32/propsheet.c | 2 +- dlls/comctl32/treeview.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index 97bbf1a..639db05 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c @@ -36,7 +36,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 5de0deb..ce7001c 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -56,7 +56,7 @@ #include <string.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 4067323..f13090f 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -51,7 +51,7 @@ #include <stdlib.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "wingdi.h"

1 0

Nikolay Sivov : rpcrt4: Return buffer size directly to avoid accessing implementation fields.
by Alexandre Julliard March 9, 2015

March 9, 2015

Module: wine Branch: master Commit: 71d663f1deb66caed55a8c11c537c5e8da646eb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d663f1deb66caed55a8c11c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 6 20:28:24 2015 +0300 rpcrt4: Return buffer size directly to avoid accessing implementation fields. --- dlls/rpcrt4/ndr_ole.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index 0ad4860..81d08b3 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -212,21 +212,23 @@ static const IStreamVtbl RpcStream_Vtbl = NULL /* Clone */ }; -static HRESULT RpcStream_Create(PMIDL_STUB_MESSAGE pStubMsg, BOOL init, IStream **stream) +static HRESULT RpcStream_Create(PMIDL_STUB_MESSAGE pStubMsg, BOOL init, ULONG *size, IStream **stream) { RpcStreamImpl *This; *stream = NULL; - This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(RpcStreamImpl)); + This = HeapAlloc(GetProcessHeap(), 0, sizeof(RpcStreamImpl)); if (!This) return E_OUTOFMEMORY; This->IStream_iface.lpVtbl = &RpcStream_Vtbl; This->RefCount = 1; This->pMsg = pStubMsg; This->size = (LPDWORD)pStubMsg->Buffer; - This->data = (unsigned char*)(This->size + 1); + This->data = pStubMsg->Buffer + sizeof(DWORD); This->pos = 0; if (init) *This->size = 0; TRACE("init size=%d\n", *This->size); + + if (size) *size = *This->size; *stream = &This->IStream_iface; return S_OK; } @@ -263,7 +265,7 @@ unsigned char * WINAPI NdrInterfacePointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, pStubMsg->MaxCount = 0; if (!LoadCOM()) return NULL; if (pStubMsg->Buffer + sizeof(DWORD) <= (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) { - hr = RpcStream_Create(pStubMsg, TRUE, &stream); + hr = RpcStream_Create(pStubMsg, TRUE, NULL, &stream); if (hr == S_OK) { if (pMemory) hr = COM_MarshalInterface(stream, riid, (LPUNKNOWN)pMemory, @@ -293,9 +295,11 @@ unsigned char * WINAPI NdrInterfacePointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg if (!LoadCOM()) return NULL; *(LPVOID*)ppMemory = NULL; if (pStubMsg->Buffer + sizeof(DWORD) < (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) { - hr = RpcStream_Create(pStubMsg, FALSE, &stream); + ULONG size; + + hr = RpcStream_Create(pStubMsg, FALSE, &size, &stream); if (hr == S_OK) { - if (*((RpcStreamImpl *)stream)->size != 0) + if (size != 0) hr = COM_UnmarshalInterface(stream, &IID_NULL, (LPVOID*)ppMemory); IStream_Release(stream);

1 0