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

Nikolay Sivov : wshom.ocx: Added missing IWshShell3 methods.
by Alexandre Julliard 09 Mar '15

09 Mar '15

Module: wine Branch: master Commit: 99afcdff2d453a4788d1e897bfc0226cb7fb3d32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99afcdff2d453a4788d1e897b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 7 15:35:42 2015 +0300 wshom.ocx: Added missing IWshShell3 methods. --- dlls/wshom.ocx/shell.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 198531e..422f89b 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -1321,6 +1321,24 @@ static HRESULT WINAPI WshShell3_SendKeys(IWshShell3 *iface, BSTR Keys, VARIANT * return E_NOTIMPL; } +static HRESULT WINAPI WshShell3_Exec(IWshShell3 *iface, BSTR command, IWshExec **ret) +{ + FIXME("(%s %p): stub\n", debugstr_w(command), ret); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_get_CurrentDirectory(IWshShell3 *iface, BSTR *dir) +{ + FIXME("(%p): stub\n", dir); + return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_put_CurrentDirectory(IWshShell3 *iface, BSTR dir) +{ + FIXME("(%s): stub\n", debugstr_w(dir)); + return E_NOTIMPL; +} + static const IWshShell3Vtbl WshShell3Vtbl = { WshShell3_QueryInterface, WshShell3_AddRef, @@ -1340,7 +1358,10 @@ static const IWshShell3Vtbl WshShell3Vtbl = { WshShell3_RegDelete, WshShell3_LogEvent, WshShell3_AppActivate, - WshShell3_SendKeys + WshShell3_SendKeys, + WshShell3_Exec, + WshShell3_get_CurrentDirectory, + WshShell3_put_CurrentDirectory }; static IWshShell3 WshShell3 = { &WshShell3Vtbl };

1 0

Nikolay Sivov : wshom.ocx: Implement CurrentDirectory() property.
by Alexandre Julliard 09 Mar '15

09 Mar '15

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

Nikolay Sivov : oleaut32/tests: Hide details about VARIANT wire header in header testing helper.
by Alexandre Julliard 09 Mar '15

09 Mar '15

Module: wine Branch: master Commit: 52d30cc301b1c4a7c40532ef5971abbb65a2eb84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52d30cc301b1c4a7c40532ef5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 7 23:40:35 2015 +0300 oleaut32/tests: Hide details about VARIANT wire header in header testing helper. --- dlls/oleaut32/tests/usrmarshal.c | 103 +++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52d30cc301b1c4a7c4053…

1 0

Nikolay Sivov : oleaut32: Use WdtpInterfacePointer_* functions in VARIANT marshalling.
by Alexandre Julliard 09 Mar '15

09 Mar '15

Module: wine Branch: master Commit: 44360823b985918db874bf8b94c09dc2293813fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=44360823b985918db874bf8b9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 8 11:04:29 2015 +0300 oleaut32: Use WdtpInterfacePointer_* functions in VARIANT marshalling. --- dlls/ole32/tests/usrmarshal.c | 29 +++++++-- dlls/oleaut32/tests/usrmarshal.c | 20 +++--- dlls/oleaut32/usrmarshal.c | 127 +++++++++------------------------------ 3 files changed, 62 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44360823b985918db874b…

1 0

Nikolay Sivov : vbscript: Use CP_ACP instead of its numeric value.
by Alexandre Julliard 09 Mar '15

09 Mar '15

Module: wine Branch: master Commit: 4b15e6fd094a496e7f4bae549253931562e62e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b15e6fd094a496e7f4bae549… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 8 13:51:37 2015 +0300 vbscript: Use CP_ACP instead of its numeric value. --- dlls/vbscript/global.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 448b886..74acff7 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1303,7 +1303,7 @@ static HRESULT Global_Chr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA buf[len++] = c>>8; if(!len || IsDBCSLeadByteEx(cp, buf[0])) buf[len++] = c; - if(!MultiByteToWideChar(0, 0, buf, len, &ch, 1)) { + if(!MultiByteToWideChar(CP_ACP, 0, buf, len, &ch, 1)) { WARN("invalid arg %d, cp %d\n", c, cp); return E_FAIL; }

1 0

Francois Gouget : wrc: Remove an unused lexer definition.
by Alexandre Julliard 09 Mar '15

09 Mar '15

Module: wine Branch: master Commit: 9cb557913077891d569cdbacc31c1b014f407643 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb557913077891d569cdbacc… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 9 09:30:18 2015 +0100 wrc: Remove an unused lexer definition. --- tools/wrc/parser.l | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index 16a487f..80072b2 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -90,7 +90,6 @@ /* Some shortcut definitions */ ws [ \f\t\r] -cident [a-zA-Z_][0-9a-zA-Z_]* %{

1 0

Francois Gouget : activeds: Remove an unneeded NONAMELESSUNION directive.
by Alexandre Julliard 09 Mar '15

09 Mar '15

Module: wine Branch: master Commit: 988a6d099f7fc8ea7959358a0ca6bab1ebe514e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=988a6d099f7fc8ea7959358a0… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 9 09:31:12 2015 +0100 activeds: Remove an unneeded NONAMELESSUNION directive. --- dlls/activeds/activeds_main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index c249cf1..15a329e 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -24,7 +24,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h"

1 0

Francois Gouget : actxprxy: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 09 Mar '15

09 Mar '15

Module: wine Branch: master Commit: f847b42994fa045ee810f766c051b967694f258a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f847b42994fa045ee810f766c… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 9 09:31:20 2015 +0100 actxprxy: Remove unneeded NONAMELESSXXX directives. --- dlls/actxprxy/usrmarshal.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/actxprxy/usrmarshal.c b/dlls/actxprxy/usrmarshal.c index 1683f2c..54d885a 100644 --- a/dlls/actxprxy/usrmarshal.c +++ b/dlls/actxprxy/usrmarshal.c @@ -22,8 +22,6 @@ #include <string.h> #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 09 Mar '15

09 Mar '15

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

Francois Gouget : comctl32: Remove unneeded NONAMELESSSTRUCT directives.
by Alexandre Julliard 09 Mar '15

09 Mar '15

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