September 2011 - Wine-commits

Jacek Caban : vbscript: Added more IDispatchEx tests.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 888ce005316642e3253e724d3c676200322f3ca9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=888ce005316642e3253e724d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 16 13:29:09 2011 +0200 vbscript: Added more IDispatchEx tests. --- dlls/vbscript/tests/lang.vbs | 5 +++ dlls/vbscript/tests/run.c | 59 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index cb0c7eb..08f4736 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -442,6 +442,11 @@ Class TestClass Private Sub privateSub End Sub + + Public Sub Class_Initialize + publicProp2 = 2 + privateProp = true + End Sub End Class Call testDisp(new testClass) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index f524b81..3fee711 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -160,7 +160,7 @@ static BOOL is_lang_english(void) static void test_disp(IDispatch *disp) { - DISPID id, public_prop_id, public_prop2_id, public_func_id, public_sub_id; + DISPID id, public_prop_id, public_prop2_id, public_func_id, public_sub_id, defvalget_id; DISPID named_args[5] = {DISPID_PROPERTYPUT}; VARIANT v, args[5]; DISPPARAMS dp = {args, named_args}; @@ -188,6 +188,23 @@ static void test_disp(IDispatch *disp) SysFreeString(str); ok(hres == S_OK, "GetDispID(publicProp2) failed: %08x\n", hres); + str = a2bstr("defValGet"); + hres = IDispatchEx_GetDispID(dispex, str, fdexNameCaseInsensitive, &defvalget_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID(defValGet) failed: %08x\n", hres); + ok(defvalget_id == DISPID_VALUE, "id = %d\n", defvalget_id); + + str = a2bstr("privateProp"); + hres = IDispatchEx_GetDispID(dispex, str, fdexNameCaseInsensitive, &id); + SysFreeString(str); + ok(hres == DISP_E_UNKNOWNNAME, "GetDispID(privateProp) failed: %08x, expected DISP_E_UNKNOWNNAME\n", hres); + ok(id == -1, "id = %d\n", id); + + str = a2bstr("class_initialize"); + hres = IDispatchEx_GetDispID(dispex, str, fdexNameCaseInsensitive, &id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID(publicProp2) failed: %08x\n", hres); + hres = IDispatchEx_InvokeEx(dispex, public_prop_id, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dp, &v, &ei, NULL); ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); ok(V_VT(&v) == VT_EMPTY, "V_VT(v) = %d\n", V_VT(&v)); @@ -202,7 +219,7 @@ static void test_disp(IDispatch *disp) dp.cArgs = dp.cNamedArgs = 0; hres = IDispatchEx_InvokeEx(dispex, public_prop_id, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dp, &v, &ei, NULL); - ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); ok(V_BOOL(&v), "V_BOOL(v) = %x\n", V_BOOL(&v)); @@ -237,6 +254,44 @@ static void test_disp(IDispatch *disp) ok(V_I2(&v) == 4, "V_I2(v) = %d\n", V_I2(&v)); dp.cArgs = dp.cNamedArgs = 0; + hres = IDispatchEx_InvokeEx(dispex, public_func_id, 0, DISPATCH_PROPERTYGET, &dp, &v, &ei, NULL); + ok(hres == DISP_E_MEMBERNOTFOUND, "InvokeEx failed: %08x, expected DISP_E_MEMBERNOTFOUND\n", hres); + ok(V_VT(&v) == VT_EMPTY, "V_VT(v) = %d\n", V_VT(&v)); + + dp.cArgs = dp.cNamedArgs = 0; + hres = IDispatchEx_InvokeEx(dispex, public_func_id, 0, DISPATCH_METHOD, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I2, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I2(&v) == 4, "V_I2(v) = %d\n", V_I2(&v)); + + dp.cArgs = dp.cNamedArgs = 0; + hres = IDispatchEx_InvokeEx(dispex, public_sub_id, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_EMPTY, "V_VT(v) = %d\n", V_VT(&v)); + + dp.cArgs = dp.cNamedArgs = 0; + hres = IDispatchEx_InvokeEx(dispex, public_sub_id, 0, DISPATCH_PROPERTYGET, &dp, &v, &ei, NULL); + ok(hres == DISP_E_MEMBERNOTFOUND, "InvokeEx failed: %08x, expected DISP_E_MEMBERNOTFOUND\n", hres); + ok(V_VT(&v) == VT_EMPTY, "V_VT(v) = %d\n", V_VT(&v)); + + dp.cArgs = dp.cNamedArgs = 0; + hres = IDispatchEx_InvokeEx(dispex, public_sub_id, 0, DISPATCH_METHOD, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_EMPTY, "V_VT(v) = %d\n", V_VT(&v)); + + V_VT(args) = VT_BOOL; + V_BOOL(args) = VARIANT_TRUE; + dp.cArgs = dp.cNamedArgs = 1; + hres = IDispatchEx_InvokeEx(dispex, public_sub_id, 0, DISPATCH_PROPERTYPUT, &dp, NULL, &ei, NULL); + ok(FAILED(hres), "InvokeEx succeeded: %08x\n", hres); + + dp.cArgs = dp.cNamedArgs = 0; + hres = IDispatchEx_InvokeEx(dispex, public_func_id, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I2, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I2(&v) == 4, "V_I2(v) = %d\n", V_I2(&v)); + + dp.cArgs = dp.cNamedArgs = 0; hres = IDispatchEx_InvokeEx(dispex, public_func_id, 0, DISPATCH_METHOD, &dp, &v, &ei, NULL); ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); ok(V_VT(&v) == VT_I2, "V_VT(v) = %d\n", V_VT(&v));

1 0

Francois Gouget : po: Remove English strings from the Finnish translation.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: dc1de1780bbfb312edde2f9b27612b4173f1312b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc1de1780bbfb312edde2f9b2… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 16 01:42:30 2011 +0200 po: Remove English strings from the Finnish translation. --- po/fi.po | 168 +++++++++++++++++++++---------------------------------------- 1 files changed, 58 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc1de1780bbfb312edde2…

1 0

Francois Gouget : po: Remove English strings from the Turkish translation.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: bfbde4368ef04e8bce290863c0ef506aeac6a72f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfbde4368ef04e8bce290863c… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 16 01:49:26 2011 +0200 po: Remove English strings from the Turkish translation. --- po/tr.po | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/po/tr.po b/po/tr.po index 995accd..b69b3c8 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6622,7 +6622,7 @@ msgstr "Silinme tarihi" #: shell32.rc:156 msgid "Control Panel" -msgstr "Control Panel" +msgstr "" #: shell32.rc:163 msgid "Select" @@ -6926,7 +6926,7 @@ msgstr "" #: shell32.rc:250 msgid "Wine Control Panel" -msgstr "Wine Control Panel" +msgstr "" #: shell32.rc:192 msgid "Unable to display Run File dialog box (internal error)" @@ -7960,13 +7960,10 @@ msgid "" "Not Yet Implemented\n" "\n" msgstr "" -"Not Yet Implemented\n" -"\n" #: attrib.rc:28 cmd.rc:301 -#, fuzzy msgid "%s: File Not Found\n" -msgstr "%s : File Not Found\n" +msgstr "" #: attrib.rc:47 msgid "" @@ -11148,6 +11145,7 @@ msgid "Error while selecting new font." msgstr "Yeni yazı tipi seçerken hata." #: winefile.rc:99 +#, fuzzy msgid "Wine File Manager" msgstr "Winefile"

1 0

Francois Gouget : po: Remove English strings from the Dutch translation.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: e4a45fc6e9f98b5cfefba3c274cb76631622a967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a45fc6e9f98b5cfefba3c27… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 16 01:50:46 2011 +0200 po: Remove English strings from the Dutch translation. --- po/nl.po | 29 +++++++++-------------------- 1 files changed, 9 insertions(+), 20 deletions(-) diff --git a/po/nl.po b/po/nl.po index 637ac43..4b64de6 100644 --- a/po/nl.po +++ b/po/nl.po @@ -2223,7 +2223,7 @@ msgstr "&Toevoegen aan favorieten..." #: progman.rc:52 regedit.rc:76 taskmgr.rc:87 winefile.rc:85 winemine.rc:48 #: winhlp32.rc:53 wordpad.rc:91 msgid "&Help" -msgstr "&Help" +msgstr "" #: ieframe.rc:57 #, fuzzy @@ -2719,7 +2719,7 @@ msgstr "Openen mislukt\n" #: winerror.mc:431 msgid "Buffer overflow\n" -msgstr "Buffer overflow\n" +msgstr "" #: winerror.mc:441 msgid "No more search handles\n" @@ -3149,7 +3149,7 @@ msgstr "Ongeldig adres\n" #: winerror.mc:976 msgid "Arithmetic overflow\n" -msgstr "Arithmetic overflow\n" +msgstr "" #: winerror.mc:981 msgid "Pipe connected\n" @@ -5035,11 +5035,11 @@ msgstr "Floating-point delen-door-nul\n" #: winerror.mc:3266 msgid "Floating-point underflow\n" -msgstr "Floating-point underflow\n" +msgstr "" #: winerror.mc:3271 msgid "Floating-point overflow\n" -msgstr "Floating-point overlow\n" +msgstr "" #: winerror.mc:3276 msgid "No more entries\n" @@ -5055,7 +5055,7 @@ msgstr "Karaktervertalingstabelbestand te klein\n" #: winerror.mc:3291 msgid "Null context handle\n" -msgstr "Null context handle\n" +msgstr "" #: winerror.mc:3296 msgid "Context handle damaged\n" @@ -5063,7 +5063,7 @@ msgstr "Context handle beschadigd\n" #: winerror.mc:3301 msgid "Binding handle mismatch\n" -msgstr "Binding handle mismatch\n" +msgstr "" #: winerror.mc:3306 msgid "Cannot get call handle\n" @@ -6833,19 +6833,6 @@ msgid "" "along with Wine; if not, write to the Free Software Foundation, Inc., 51 " "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." msgstr "" -"Wine is free software; you can redistribute it and/or modify it under the " -"terms of the GNU Lesser General Public License as published by the Free " -"Software Foundation; either version 2.1 of the License, or (at your option) " -"any later version.\n" -"\n" -"Wine is distributed in the hope that it will be useful, but WITHOUT ANY " -"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " -"FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for " -"more details.\n" -"\n" -"You should have received a copy of the GNU Lesser General Public License " -"along with this library; if not, write to the Free Software Foundation, " -"Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." #: shell32.rc:266 msgid "Wine License" @@ -9792,6 +9779,7 @@ msgstr "" "onder bepaalde voorwaarden; draai 'start /L' voor details.\n" #: start.rc:64 +#, fuzzy msgid "" "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" "This program is free software; you can redistribute it and/or\n" @@ -11038,6 +11026,7 @@ msgid "Error while selecting new font." msgstr "Probleem tijdens het selecteren van het nieuwe lettertype." #: winefile.rc:99 +#, fuzzy msgid "Wine File Manager" msgstr "Winefile"

1 0

Francois Gouget : po: Remove English strings from the Korean translation.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: ce6a608a32c295e6bb696dd4deeea1b39f1fd706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce6a608a32c295e6bb696dd4d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 16 01:52:06 2011 +0200 po: Remove English strings from the Korean translation. --- po/ko.po | 35 ++++------------------------------- 1 files changed, 4 insertions(+), 31 deletions(-) diff --git a/po/ko.po b/po/ko.po index 8fee6b7..781a291 100644 --- a/po/ko.po +++ b/po/ko.po @@ -2938,7 +2938,7 @@ msgstr "%1의 나쁜 EXE 형식\n" #: winerror.mc:761 msgid "Iterated data exceeds 64k in %1\n" -msgstr "Iterated data exceeds 64k in %1\n" +msgstr "" #: winerror.mc:766 msgid "Invalid MinAllocSize in %1\n" @@ -6689,19 +6689,6 @@ msgid "" "along with Wine; if not, write to the Free Software Foundation, Inc., 51 " "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." msgstr "" -"Wine is free software; you can redistribute it and/or modify it under the " -"terms of the GNU Lesser General Public License as published by the Free " -"Software Foundation; either version 2.1 of the License, or (at your option) " -"any later version.\n" -"\n" -"Wine is distributed in the hope that it will be useful, but WITHOUT ANY " -"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " -"FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for " -"more details.\n" -"\n" -"You should have received a copy of the GNU Lesser General Public License " -"along with Wine; if not, write to the Free Software Foundation, Inc., 51 " -"Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." #: shell32.rc:266 msgid "Wine License" @@ -9055,7 +9042,7 @@ msgstr "타입 라이브러리" #: oleview.rc:135 msgid "ver." -msgstr "ver." +msgstr "" #: oleview.rc:136 msgid "Interfaces" @@ -9559,6 +9546,7 @@ msgid "Exports selected branch of the registry to a text file" msgstr "레지스트리의 선택된 부분을 텍스트 파일로 내보내기" #: start.rc:46 +#, fuzzy msgid "" "Start a program, or open a document in the program normally used for files " "with that suffix.\n" @@ -9621,22 +9609,6 @@ msgid "" "\n" "See the COPYING.LIB file for license information.\n" msgstr "" -"start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" -"This program is free software; you can redistribute it and/or\n" -"modify it under the terms of the GNU Lesser Public License\n" -"as published by the Free Software Foundation; either version 2.1\n" -"of the License, or (at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU Lesser Public License for more details.\n" -"\n" -"You should have received a copy of the GNU Lesser Public License\n" -"along with this program; if not, write to the Free Software\n" -"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.\n" -"\n" -"See the COPYING.LIB file for license information.\n" #: start.rc:66 msgid "" @@ -10821,6 +10793,7 @@ msgid "Error while selecting new font." msgstr "새 글꼴 선택 오류." #: winefile.rc:99 +#, fuzzy msgid "Wine File Manager" msgstr "Winefile"

1 0

Francois Gouget : po: Remove English strings from the Japanese translation.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 3beac360a9e5beeb8313ff4b53cb904b8c0041df URL: http://source.winehq.org/git/wine.git/?a=commit;h=3beac360a9e5beeb8313ff4b5… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 16 01:53:24 2011 +0200 po: Remove English strings from the Japanese translation. --- po/ja.po | 308 ++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 149 insertions(+), 159 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3beac360a9e5beeb8313f…

1 0

Francois Gouget : vbscript/tests: Some tests require that the user interface be in English.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: b6da3052ed7c1a6c22b25bcdb5b82f1ba03b6717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6da3052ed7c1a6c22b25bcdb… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 16 13:09:01 2011 +0200 vbscript/tests: Some tests require that the user interface be in English. --- dlls/vbscript/tests/lang.vbs | 2 +- dlls/vbscript/tests/run.c | 35 ++++++++++++++++++++++++++--------- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 3511707..867779d 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -86,7 +86,7 @@ Call ok("ab " & empty = "ab ", """ab"" & empty = " & ("ab " & empty)) Call ok(1 & 100000 = "1100000", "1 & 100000 = " & (1 & 100000)) Call ok("ab" & x = "abxx", """ab"" & x = " & ("ab"&x)) -if(isEnglishLocale) then +if(isEnglishLang) then Call ok("" & true = "True", """"" & true = " & true) Call ok(true & false = "TrueFalse", "true & false = " & (true & false)) end if diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index d98cf38..6b2ec84 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -69,7 +69,7 @@ DEFINE_EXPECT(testobj_propput_i); #define DISPID_GLOBAL_TRACE 1001 #define DISPID_GLOBAL_OK 1002 #define DISPID_GLOBAL_GETVT 1003 -#define DISPID_GLOBAL_ISENGLOC 1004 +#define DISPID_GLOBAL_ISENGLANG 1004 #define DISPID_GLOBAL_VBVAR 1005 #define DISPID_GLOBAL_TESTOBJ 1006 #define DISPID_GLOBAL_ISNULLDISP 1007 @@ -135,10 +135,27 @@ static const char *vt2a(VARIANT *v) } } -static BOOL is_english(void) +/* Returns true if the user interface is in English. Note that this does not + * presume of the formatting of dates, numbers, etc. + */ +static BOOL is_lang_english(void) { - return PRIMARYLANGID(GetSystemDefaultLangID()) == LANG_ENGLISH - && PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; + static HMODULE hkernel32 = NULL; + static LANGID (WINAPI *pGetThreadUILanguage)(void) = NULL; + static LANGID (WINAPI *pGetUserDefaultUILanguage)(void) = NULL; + + if (!hkernel32) + { + hkernel32 = GetModuleHandleA("kernel32.dll"); + pGetThreadUILanguage = (void*)GetProcAddress(hkernel32, "GetThreadUILanguage"); + pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage"); + } + if (pGetThreadUILanguage) + return PRIMARYLANGID(pGetThreadUILanguage()) == LANG_ENGLISH; + if (pGetUserDefaultUILanguage) + return PRIMARYLANGID(pGetUserDefaultUILanguage()) == LANG_ENGLISH; + + return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; } static void test_disp(IDispatch *disp) @@ -405,9 +422,9 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_GETVT; return S_OK; } - if(!strcmp_wa(bstrName, "isEnglishLocale")) { + if(!strcmp_wa(bstrName, "isEnglishLang")) { test_grfdex(grfdex, fdexNameCaseInsensitive); - *pid = DISPID_GLOBAL_ISENGLOC; + *pid = DISPID_GLOBAL_ISENGLANG; return S_OK; } if(!strcmp_wa(bstrName, "testObj")) { @@ -511,7 +528,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_BSTR(pvarRes) = a2bstr(vt2a(pdp->rgvarg)); return S_OK; - case DISPID_GLOBAL_ISENGLOC: + case DISPID_GLOBAL_ISENGLANG: ok(wFlags == (INVOKE_FUNC|INVOKE_PROPERTYGET), "wFlags = %x\n", wFlags); ok(pdp != NULL, "pdp == NULL\n"); ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); @@ -521,10 +538,10 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(pei != NULL, "pei == NULL\n"); V_VT(pvarRes) = VT_BOOL; - if(is_english()) { + if(is_lang_english()) { V_BOOL(pvarRes) = VARIANT_TRUE; }else { - skip("Skipping some test in non-English locale\n"); + skip("Skipping some tests in non-English UIs\n"); V_BOOL(pvarRes) = VARIANT_FALSE; } return S_OK;

1 0

Piotr Caban : propsys: Added InitVariantFromGUIDAsString implementation.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 27ac89acbca16531da3af4e021cba54623f85374 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27ac89acbca16531da3af4e02… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 16 11:20:07 2011 +0200 propsys: Added InitVariantFromGUIDAsString implementation. --- dlls/propsys/Makefile.in | 1 + dlls/propsys/propsys.spec | 4 +- dlls/propsys/propvar.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/propsys/Makefile.in b/dlls/propsys/Makefile.in index ae2d91f..1cbbe7c 100644 --- a/dlls/propsys/Makefile.in +++ b/dlls/propsys/Makefile.in @@ -1,5 +1,6 @@ MODULE = propsys.dll IMPORTLIB = propsys +IMPORTS = ole32 oleaut32 C_SRCS = \ propsys_main.c \ diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 3726fac..e738985 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -33,7 +33,7 @@ @ stub InitPropVariantFromDoubleVector @ stub InitPropVariantFromFileTime @ stub InitPropVariantFromFileTimeVector -@ stub InitPropVariantFromGUIDAsString +@ stdcall InitPropVariantFromGUIDAsString(ptr ptr) @ stub InitPropVariantFromInt16Vector @ stub InitPropVariantFromInt32Vector @ stub InitPropVariantFromInt64Vector @@ -51,7 +51,7 @@ @ stub InitVariantFromDoubleArray @ stub InitVariantFromFileTime @ stub InitVariantFromFileTimeArray -@ stub InitVariantFromGUIDAsString +@ stdcall InitVariantFromGUIDAsString(ptr ptr) @ stub InitVariantFromInt16Array @ stub InitVariantFromInt32Array @ stub InitVariantFromInt64Array diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index cdfb89f..d59173c 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -32,6 +32,7 @@ #include "propvarutil.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(propsys); @@ -86,3 +87,48 @@ HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT p return E_FAIL; } + +static void PROPVAR_GUIDToWSTR(REFGUID guid, WCHAR *str) +{ + static const WCHAR format[] = {'{','%','0','8','X','-','%','0','4','X','-','%','0','4','X', + '-','%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X','%','0','2','X', + '%','0','2','X','%','0','2','X','%','0','2','X','}',0}; + + sprintfW(str, format, guid->Data1, guid->Data2, guid->Data3, + guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], + guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); +} + +HRESULT WINAPI InitPropVariantFromGUIDAsString(REFGUID guid, PROPVARIANT *ppropvar) +{ + TRACE("(%p %p)\n", guid, ppropvar); + + if(!guid) + return E_FAIL; + + ppropvar->vt = VT_LPWSTR; + ppropvar->u.pwszVal = CoTaskMemAlloc(39*sizeof(WCHAR)); + if(!ppropvar->u.pwszVal) + return E_OUTOFMEMORY; + + PROPVAR_GUIDToWSTR(guid, ppropvar->u.pwszVal); + return S_OK; +} + +HRESULT WINAPI InitVariantFromGUIDAsString(REFGUID guid, VARIANT *pvar) +{ + TRACE("(%p %p)\n", guid, pvar); + + if(!guid) { + FIXME("guid == NULL\n"); + return E_FAIL; + } + + V_VT(pvar) = VT_BSTR; + V_BSTR(pvar) = SysAllocStringLen(NULL, 38); + if(!V_BSTR(pvar)) + return E_OUTOFMEMORY; + + PROPVAR_GUIDToWSTR(guid, V_BSTR(pvar)); + return S_OK; +}

1 0

Piotr Caban : propsys/tests: Added InitVariantFromGUIDAsString tests.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 96427780894897c84646ba1a8060309b79ac4e25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96427780894897c84646ba1a8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 16 11:20:18 2011 +0200 propsys/tests: Added InitVariantFromGUIDAsString tests. --- dlls/propsys/tests/Makefile.in | 2 +- dlls/propsys/tests/propsys.c | 59 ++++++++++++++++++++++++++++++++++++++++ include/propvarutil.h | 2 + 3 files changed, 62 insertions(+), 1 deletions(-) diff --git a/dlls/propsys/tests/Makefile.in b/dlls/propsys/tests/Makefile.in index 8db4008..312a3a9 100644 --- a/dlls/propsys/tests/Makefile.in +++ b/dlls/propsys/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = propsys.dll -IMPORTS = propsys ole32 +IMPORTS = propsys ole32 oleaut32 C_SRCS = \ propsys.c diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index e0895f3..1e63348 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -24,10 +24,13 @@ #include <stdarg.h> #include <stdio.h> +#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "objbase.h" #include "propsys.h" +#include "propvarutil.h" #include "initguid.h" #include "wine/test.h" @@ -46,6 +49,13 @@ static char *show_guid(const GUID *guid, char *buf) return buf; } +static int strcmp_wa(LPCWSTR strw, const char *stra) +{ + CHAR buf[512]; + WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); + return lstrcmpA(stra, buf); +} + static void test_PSStringFromPropertyKey(void) { static const WCHAR fillerW[] = {'X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X', @@ -450,9 +460,58 @@ static void test_PSRefreshPropertySchema(void) CoUninitialize(); } +static void test_InitPropVariantFromGUIDAsString(void) +{ + PROPVARIANT propvar; + VARIANT var; + HRESULT hres; + int i; + + const struct { + REFGUID guid; + const char *str; + } testcases[] = { + {&IID_NULL, "{00000000-0000-0000-0000-000000000000}" }, + {&dummy_guid, "{DEADBEEF-DEAD-BEEF-DEAD-BEEFCAFEBABE}" }, + }; + + hres = InitPropVariantFromGUIDAsString(NULL, &propvar); + ok(hres == E_FAIL, "InitPropVariantFromGUIDAsString returned %x\n", hres); + + if(0) { + /* Returns strange data on Win7, crashes on older systems */ + InitVariantFromGUIDAsString(NULL, &var); + + /* Crashes on windows */ + InitPropVariantFromGUIDAsString(&IID_NULL, NULL); + InitVariantFromGUIDAsString(&IID_NULL, NULL); + } + + for(i=0; i<sizeof(testcases)/sizeof(testcases[0]); i++) { + memset(&propvar, 0, sizeof(PROPVARIANT)); + hres = InitPropVariantFromGUIDAsString(testcases[i].guid, &propvar); + ok(hres == S_OK, "%d) InitPropVariantFromGUIDAsString returned %x\n", i, hres); + ok(propvar.vt == VT_LPWSTR, "%d) propvar.vt = %d\n", i, propvar.vt); + ok(!strcmp_wa(propvar.u.pwszVal, testcases[i].str), "%d) propvar.u.pwszVal = %s\n", + i, wine_dbgstr_w(propvar.u.pwszVal)); + CoTaskMemFree(propvar.u.pwszVal); + + memset(&var, 0, sizeof(VARIANT)); + hres = InitVariantFromGUIDAsString(testcases[i].guid, &var); + ok(hres == S_OK, "%d) InitVariantFromGUIDAsString returned %x\n", i, hres); + ok(V_VT(&var) == VT_BSTR, "%d) V_VT(&var) = %d\n", i, V_VT(&var)); + ok(SysStringLen(V_BSTR(&var)) == 38, "SysStringLen returned %d\n", + SysStringLen(V_BSTR(&var))); + ok(!strcmp_wa(V_BSTR(&var), testcases[i].str), "%d) V_BSTR(&var) = %s\n", + i, wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + } +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); test_PSPropertyKeyFromString(); test_PSRefreshPropertySchema(); + test_InitPropVariantFromGUIDAsString(); } diff --git a/include/propvarutil.h b/include/propvarutil.h index e830885..4d2a9b4 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -37,6 +37,8 @@ typedef int PROPVAR_CHANGE_FLAGS; HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT propvarSrc, PROPVAR_CHANGE_FLAGS flags, VARTYPE vt); +HRESULT WINAPI InitPropVariantFromGUIDAsString(REFGUID guid, PROPVARIANT *ppropvar); +HRESULT WINAPI InitVariantFromGUIDAsString(REFGUID guid, VARIANT *pvar); #ifdef __cplusplus

1 0

Piotr Caban : urlmon: Added 362 ordinal export (InitVariantFromGUIDAsString ).
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 97b49079c34753375632a44936590f5cb4df80bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=97b49079c34753375632a4493… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 16 11:20:27 2011 +0200 urlmon: Added 362 ordinal export (InitVariantFromGUIDAsString). --- dlls/urlmon/urlmon.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 3536257..1a409c3 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -94,5 +94,6 @@ @ stub WriteHitLogging @ stub ZonesReInit +362 stdcall @(ptr ptr) propsys.InitVariantFromGUIDAsString 410 stdcall @(long long) URLMON_410 423 stdcall @(long long long long) URLMON_423

1 0