September 2011 - Wine-Commits

Alexandre Julliard : advapi32: Include system headers before Windows headers.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: d37c85d6a78a4ebde4311cc8db2a0b750eba0875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37c85d6a78a4ebde4311cc8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 5 17:22:10 2011 +0200 advapi32: Include system headers before Windows headers. --- dlls/advapi32/cred.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 0c8c129..c7af18b 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -21,18 +21,18 @@ #include <stdarg.h> #include <time.h> -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "wincred.h" -#include "winternl.h" - #ifdef __APPLE__ # include <Security/SecKeychain.h> # include <Security/SecKeychainItem.h> # include <Security/SecKeychainSearch.h> #endif +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "wincred.h" +#include "winternl.h" + #include "crypt.h" #include "wine/unicode.h"

1 0

Alexandre Julliard : gphoto2.ds: Include system headers before Windows headers.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: 08272af642f88429a90a1c5b3f74d0aa38aae48b URL: http://source.winehq.org/git/wine.git/?a=commit;h=08272af642f88429a90a1c5b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 5 17:22:33 2011 +0200 gphoto2.ds: Include system headers before Windows headers. --- dlls/gphoto2.ds/capability.c | 3 --- dlls/gphoto2.ds/ds_image.c | 7 ++----- dlls/gphoto2.ds/gphoto2_i.h | 1 + dlls/gphoto2.ds/gphoto2_main.c | 3 --- dlls/gphoto2.ds/ui.c | 5 +---- 5 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dlls/gphoto2.ds/capability.c b/dlls/gphoto2.ds/capability.c index 378ef2a..34d081e 100644 --- a/dlls/gphoto2.ds/capability.c +++ b/dlls/gphoto2.ds/capability.c @@ -24,9 +24,6 @@ #include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "twain.h" #include "gphoto2_i.h" #include "wine/debug.h" diff --git a/dlls/gphoto2.ds/ds_image.c b/dlls/gphoto2.ds/ds_image.c index f26b3dd..c870ec4 100644 --- a/dlls/gphoto2.ds/ds_image.c +++ b/dlls/gphoto2.ds/ds_image.c @@ -20,17 +20,14 @@ #include "config.h" #include "wine/port.h" -#include "wine/library.h" #include <stdarg.h> #include <stdio.h> -#include "windef.h" -#include "winbase.h" +#include "gphoto2_i.h" #include "wingdi.h" #include "winuser.h" -#include "twain.h" -#include "gphoto2_i.h" +#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(twain); diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h index 373c6fc..edc4d91 100644 --- a/dlls/gphoto2.ds/gphoto2_i.h +++ b/dlls/gphoto2.ds/gphoto2_i.h @@ -48,6 +48,7 @@ # include <jpeglib.h> # undef HAVE_STDLIB_H # define HAVE_STDLIB_H 1 +# undef UINT8 # undef UINT16 #endif diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c index 5d80d4c..8c14632 100644 --- a/dlls/gphoto2.ds/gphoto2_main.c +++ b/dlls/gphoto2.ds/gphoto2_main.c @@ -28,9 +28,6 @@ #endif #include <stdlib.h> -#include "windef.h" -#include "winbase.h" -#include "twain.h" #include "gphoto2_i.h" #include "wine/debug.h" diff --git a/dlls/gphoto2.ds/ui.c b/dlls/gphoto2.ds/ui.c index b769a6e..df79875 100644 --- a/dlls/gphoto2.ds/ui.c +++ b/dlls/gphoto2.ds/ui.c @@ -26,16 +26,13 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" +#include "gphoto2_i.h" #include "winuser.h" #include "winnls.h" #include "wingdi.h" #include "winreg.h" #include "commctrl.h" #include "prsht.h" -#include "twain.h" -#include "gphoto2_i.h" #include "wine/debug.h" #include "resource.h"

1 0

Alexandre Julliard : crypt32: Include system headers before Windows headers .
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: f9a9a18e1d5bd43ef9232713d4070b370fe18176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9a9a18e1d5bd43ef9232713d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 5 17:22:17 2011 +0200 crypt32: Include system headers before Windows headers. --- dlls/crypt32/rootstore.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 44c3d81..386bc9b 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -31,6 +31,9 @@ #endif #include <errno.h> #include <limits.h> +#ifdef HAVE_SECURITY_SECURITY_H +#include <Security/Security.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -40,9 +43,6 @@ #include "winternl.h" #include "wine/debug.h" #include "crypt32_private.h" -#ifdef HAVE_SECURITY_SECURITY_H -#include <Security/Security.h> -#endif WINE_DEFAULT_DEBUG_CHANNEL(crypt);

1 0

Alexandre Julliard : secur32: Avoid size_t and fix some printf formats.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: 52fa3bf42d193d17e24dc41ab66d84b4bed07391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52fa3bf42d193d17e24dc41ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 5 19:32:06 2011 +0200 secur32: Avoid size_t and fix some printf formats. --- dlls/secur32/schannel.c | 30 +++++++++++++++--------------- dlls/secur32/schannel_gnutls.c | 4 ++-- dlls/secur32/schannel_macosx.c | 32 +++++++++++++++----------------- dlls/secur32/secur32_priv.h | 4 ++-- 4 files changed, 34 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52fa3bf42d193d17e24dc…

1 0

Thomas Mullaly : urlmon: Use CoTaskMemFree instead of HeapFree for memory allocated with CoTaskMemAlloc .
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: 9848872207cd577fa8cb2128dd273d724fe9e2bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9848872207cd577fa8cb2128d… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Aug 31 18:44:28 2011 -0400 urlmon: Use CoTaskMemFree instead of HeapFree for memory allocated with CoTaskMemAlloc. --- dlls/urlmon/sec_mgr.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index ffbeaa3..7cdc4dd 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -514,7 +514,7 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) if(hres != S_OK) { size = strlenW(url)*sizeof(WCHAR); - secur_url = heap_alloc(size); + secur_url = CoTaskMemAlloc(size); if(!secur_url) return E_OUTOFMEMORY; @@ -523,7 +523,7 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) hres = CoInternetParseUrl(secur_url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(WCHAR), &size, 0); if(FAILED(hres) || !*schema) { - heap_free(secur_url); + CoTaskMemFree(secur_url); return E_INVALIDARG; } @@ -571,7 +571,7 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) } if(FAILED(hres) || !ret_url) - heap_free(secur_url); + CoTaskMemFree(secur_url); else *ret_url = secur_url; @@ -849,7 +849,7 @@ static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManagerEx2 * static const BYTE secidFile[] = {'f','i','l','e',':'}; - heap_free(url); + CoTaskMemFree(url); if(*pcbSecurityId < sizeof(secidFile)+sizeof(zone)) return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); @@ -875,12 +875,12 @@ static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManagerEx2 * len = WideCharToMultiByte(CP_ACP, 0, url, -1, NULL, 0, NULL, NULL)-1; if(len+sizeof(DWORD) > *pcbSecurityId) { - heap_free(url); + CoTaskMemFree(url); return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); } WideCharToMultiByte(CP_ACP, 0, url, -1, (LPSTR)pbSecurityId, len, NULL, NULL); - heap_free(url); + CoTaskMemFree(url); *(DWORD*)(pbSecurityId+len) = zone;

1 0

Jacek Caban : vbscript: Added SetScriptState implementation.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: 3d3504a6d72cf13ea16dc44d2ccfe01dee92d555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d3504a6d72cf13ea16dc44d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 5 11:13:54 2011 +0200 vbscript: Added SetScriptState implementation. --- dlls/vbscript/tests/vbscript.c | 13 +++++++++++++ dlls/vbscript/vbscript.c | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index ff167b7..76d90a9 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -326,9 +326,22 @@ static void test_vbscript(void) hres = IActiveScriptParse64_InitNew(parser); ok(hres == E_UNEXPECTED, "InitNew failed: %08x, expected E_UNEXPECTED\n", hres); + SET_EXPECT(OnStateChange_CONNECTED); + hres = IActiveScript_SetScriptState(vbscript, SCRIPTSTATE_CONNECTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_CONNECTED) failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_CONNECTED); + + test_state(vbscript, SCRIPTSTATE_CONNECTED); + + SET_EXPECT(OnStateChange_DISCONNECTED); + SET_EXPECT(OnStateChange_INITIALIZED); SET_EXPECT(OnStateChange_CLOSED); hres = IActiveScript_Close(vbscript); ok(hres == S_OK, "Close failed: %08x\n", hres); + todo_wine + CHECK_CALLED(OnStateChange_DISCONNECTED); + todo_wine + CHECK_CALLED(OnStateChange_INITIALIZED); CHECK_CALLED(OnStateChange_CLOSED); test_state(vbscript, SCRIPTSTATE_CLOSED); diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index b50cbd6..08e715a 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -63,6 +63,11 @@ static void change_state(VBScript *This, SCRIPTSTATE state) IActiveScriptSite_OnStateChange(This->site, state); } +static void exec_queued_code(VBScript *This) +{ + FIXME("\n"); +} + static HRESULT set_ctx_site(VBScript *This) { This->ctx->lcid = This->lcid; @@ -207,7 +212,40 @@ static HRESULT WINAPI VBScript_GetScriptSite(IActiveScript *iface, REFIID riid, static HRESULT WINAPI VBScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE ss) { VBScript *This = impl_from_IActiveScript(iface); - FIXME("(%p)->(%d)\n", This, ss); + + TRACE("(%p)->(%d)\n", This, ss); + + if(This->thread_id && GetCurrentThreadId() != This->thread_id) + return E_UNEXPECTED; + + if(ss == SCRIPTSTATE_UNINITIALIZED) { + if(This->state == SCRIPTSTATE_CLOSED) + return E_UNEXPECTED; + + decrease_state(This, SCRIPTSTATE_UNINITIALIZED); + return S_OK; + } + + if(!This->ctx) + return E_UNEXPECTED; + + switch(ss) { + case SCRIPTSTATE_STARTED: + case SCRIPTSTATE_CONNECTED: /* FIXME */ + if(This->state == SCRIPTSTATE_CLOSED) + return E_UNEXPECTED; + + exec_queued_code(This); + break; + case SCRIPTSTATE_INITIALIZED: + FIXME("unimplemented SCRIPTSTATE_INITIALIZED\n"); + return S_OK; + default: + FIXME("unimplemented state %d\n", ss); + return E_NOTIMPL; + } + + change_state(This, ss); return S_OK; }

1 0

Francois Gouget : shlwapi: Add a message context for 'hr', 'min' and 'sec'.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

1 0

Francois Gouget : po: Mark a couple of broken German translation as fuzzy.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: 4dcb96af56b85f0d01ed30d81e7a6b00d8b94518 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dcb96af56b85f0d01ed30d81… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 5 09:14:38 2011 +0200 po: Mark a couple of broken German translation as fuzzy. --- po/de.po | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/po/de.po b/po/de.po index ff2c2df..184935d 100644 --- a/po/de.po +++ b/po/de.po @@ -3843,6 +3843,7 @@ msgid "Perform operation even when nothing changed\n" msgstr "Operation durchführen, auch wenn sich nichts ändert\n" #: winerror.mc:1896 +#, fuzzy msgid "The user profile is invalid\n" msgstr "Das Benutzerprofil ist ungültig." @@ -4507,6 +4508,7 @@ msgid "Installer service failed.\n" msgstr "Installer Dienst gescheitert.\n" #: winerror.mc:2731 +#, fuzzy msgid "Installation aborted by user\n" msgstr "Setup-Programme"

1 0

Thomas Mullaly : urlmon: Improved GetSecurityId's support for file url's.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: e0dfbd6a94bcb74b04bf73cdd7de99b387837da1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0dfbd6a94bcb74b04bf73cdd… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Aug 31 18:31:35 2011 -0400 urlmon: Improved GetSecurityId's support for file url's. --- dlls/urlmon/sec_mgr.c | 119 ++++++++++++++++++++++++------------------- dlls/urlmon/tests/sec_mgr.c | 6 ++- 2 files changed, 71 insertions(+), 54 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 7cdc4dd..c81f44d 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -652,6 +652,69 @@ static HRESULT get_action_policy(DWORD zone, DWORD action, BYTE *policy, DWORD s return hres; } +static HRESULT get_security_id(LPCWSTR url, BYTE *secid, DWORD *secid_len) +{ + LPWSTR secur_url, ptr, ptr2; + DWORD zone, len; + HRESULT hres; + + static const WCHAR wszFile[] = {'f','i','l','e',':'}; + + hres = map_url_to_zone(url, &zone, &secur_url); + if(FAILED(hres)) + return hres == 0x80041001 ? E_INVALIDARG : hres; + + /* file protocol is a special case */ + if(strlenW(secur_url) >= sizeof(wszFile)/sizeof(WCHAR) + && !memcmp(secur_url, wszFile, sizeof(wszFile))) { + WCHAR path[MAX_PATH]; + len = sizeof(path)/sizeof(WCHAR); + + hres = CoInternetParseUrl(secur_url, PARSE_PATH_FROM_URL, 0, path, len, &len, 0); + if(hres == S_OK && !PathIsNetworkPathW(path)) { + static const BYTE secidFile[] = {'f','i','l','e',':'}; + + CoTaskMemFree(secur_url); + + if(*secid_len < sizeof(secidFile)+sizeof(zone)) + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + + memcpy(secid, secidFile, sizeof(secidFile)); + *(DWORD*)(secid+sizeof(secidFile)) = zone; + + *secid_len = sizeof(secidFile)+sizeof(zone); + return S_OK; + } + } + + ptr = strchrW(secur_url, ':'); + ptr2 = ++ptr; + while(*ptr2 == '/') + ptr2++; + if(ptr2 != ptr) + memmove(ptr, ptr2, (strlenW(ptr2)+1)*sizeof(WCHAR)); + + ptr = strchrW(ptr, '/'); + if(ptr) + *ptr = 0; + + len = WideCharToMultiByte(CP_ACP, 0, secur_url, -1, NULL, 0, NULL, NULL)-1; + + if(len+sizeof(DWORD) > *secid_len) { + CoTaskMemFree(secur_url); + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } + + WideCharToMultiByte(CP_ACP, 0, secur_url, -1, (LPSTR)secid, len, NULL, NULL); + CoTaskMemFree(secur_url); + + *(DWORD*)(secid+len) = zone; + + *secid_len = len+sizeof(DWORD); + + return S_OK; +} + /*********************************************************************** * InternetSecurityManager implementation * @@ -817,16 +880,13 @@ static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManagerEx2 * LPCWSTR pwszUrl, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved) { SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface); - LPWSTR url, ptr, ptr2; - DWORD zone, len; - HRESULT hres; - - static const WCHAR wszFile[] = {'f','i','l','e',':'}; TRACE("(%p)->(%s %p %p %08lx)\n", iface, debugstr_w(pwszUrl), pbSecurityId, pcbSecurityId, dwReserved); if(This->custom_manager) { + HRESULT hres; + hres = IInternetSecurityManager_GetSecurityId(This->custom_manager, pwszUrl, pbSecurityId, pcbSecurityId, dwReserved); if(hres != INET_E_DEFAULT_ACTION) @@ -839,54 +899,7 @@ static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManagerEx2 * if(dwReserved) FIXME("dwReserved is not supported\n"); - hres = map_url_to_zone(pwszUrl, &zone, &url); - if(FAILED(hres)) - return hres == 0x80041001 ? E_INVALIDARG : hres; - - /* file protocol is a special case */ - if(strlenW(url) >= sizeof(wszFile)/sizeof(WCHAR) - && !memcmp(url, wszFile, sizeof(wszFile)) && strchrW(url, '\\')) { - - static const BYTE secidFile[] = {'f','i','l','e',':'}; - - CoTaskMemFree(url); - - if(*pcbSecurityId < sizeof(secidFile)+sizeof(zone)) - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); - - memcpy(pbSecurityId, secidFile, sizeof(secidFile)); - *(DWORD*)(pbSecurityId+sizeof(secidFile)) = zone; - - *pcbSecurityId = sizeof(secidFile)+sizeof(zone); - return S_OK; - } - - ptr = strchrW(url, ':'); - ptr2 = ++ptr; - while(*ptr2 == '/') - ptr2++; - if(ptr2 != ptr) - memmove(ptr, ptr2, (strlenW(ptr2)+1)*sizeof(WCHAR)); - - ptr = strchrW(ptr, '/'); - if(ptr) - *ptr = 0; - - len = WideCharToMultiByte(CP_ACP, 0, url, -1, NULL, 0, NULL, NULL)-1; - - if(len+sizeof(DWORD) > *pcbSecurityId) { - CoTaskMemFree(url); - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); - } - - WideCharToMultiByte(CP_ACP, 0, url, -1, (LPSTR)pbSecurityId, len, NULL, NULL); - CoTaskMemFree(url); - - *(DWORD*)(pbSecurityId+len) = zone; - - *pcbSecurityId = len+sizeof(DWORD); - - return S_OK; + return get_security_id(pwszUrl, pbSecurityId, pcbSecurityId); } diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 3d630b8..a064b17 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -94,6 +94,8 @@ static const WCHAR url9[] = {'h','t','t','p',':','/','/','w','w','w','.','z','o' '.','w','i','n','e','t','e','s','t', '/','s','i','t','e','/','a','b','o','u','t',0}; static const WCHAR url10[] = {'f','i','l','e',':','/','/','s','o','m','e','%','2','0','f','i','l','e', '.','j','p','g',0}; +static const WCHAR url11[] = {'f','i','l','e',':','/','/','c',':','/','I','n','d','e','x','.','h','t','m',0}; +static const WCHAR url12[] = {'f','i','l','e',':','/','/','/','c',':','/','I','n','d','e','x','.','h','t','m',0}; static const WCHAR url4e[] = {'f','i','l','e',':','s','o','m','e',' ','f','i','l','e', '.','j','p','g',0}; @@ -140,7 +142,9 @@ static struct secmgr_test { {url3, 0, S_OK, sizeof(secid1), secid1, S_OK}, {url5, 3, S_OK, sizeof(secid5), secid5, S_OK}, {url6, 3, S_OK, sizeof(secid6), secid6, S_OK}, - {url7, 3, S_OK, sizeof(secid7), secid7, S_OK} + {url7, 3, S_OK, sizeof(secid7), secid7, S_OK}, + {url11,0, S_OK, sizeof(secid1), secid1, S_OK}, + {url12,0, S_OK, sizeof(secid1), secid1, S_OK} }; static int strcmp_w(const WCHAR *str1, const WCHAR *str2)

1 0

Jacek Caban : vbscript: Added AddNamedItem implementation.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: bbed41fa6a9b1745cdf2a8f82f9fd4f46f6e6597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbed41fa6a9b1745cdf2a8f82… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 5 11:14:55 2011 +0200 vbscript: Added AddNamedItem implementation. --- dlls/vbscript/vbscript.c | 64 +++++++++++++++++++++++++++++++++++++++++++++- dlls/vbscript/vbscript.h | 31 ++++++++++++++++++++++ 2 files changed, 94 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 2ca5584..77ccaee 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -87,6 +87,18 @@ static HRESULT set_ctx_site(VBScript *This) static void destroy_script(script_ctx_t *ctx) { + while(!list_empty(&ctx->named_items)) { + named_item_t *iter = LIST_ENTRY(list_head(&ctx->named_items), named_item_t, entry); + + list_remove(&iter->entry); + if(iter->disp) + IDispatch_Release(iter->disp); + heap_free(iter->name); + heap_free(iter); + } + + if(ctx->host_global) + IDispatch_Release(ctx->host_global); if(ctx->site) IActiveScriptSite_Release(ctx->site); if(ctx->script_obj) @@ -295,7 +307,55 @@ static HRESULT WINAPI VBScript_Close(IActiveScript *iface) static HRESULT WINAPI VBScript_AddNamedItem(IActiveScript *iface, LPCOLESTR pstrName, DWORD dwFlags) { VBScript *This = impl_from_IActiveScript(iface); - FIXME("(%p)->(%s %x)\n", This, debugstr_w(pstrName), dwFlags); + named_item_t *item; + IDispatch *disp = NULL; + HRESULT hres; + + TRACE("(%p)->(%s %x)\n", This, debugstr_w(pstrName), dwFlags); + + if(This->thread_id != GetCurrentThreadId() || !This->ctx || This->state == SCRIPTSTATE_CLOSED) + return E_UNEXPECTED; + + if(dwFlags & SCRIPTITEM_GLOBALMEMBERS) { + IUnknown *unk; + + hres = IActiveScriptSite_GetItemInfo(This->site, pstrName, SCRIPTINFO_IUNKNOWN, &unk, NULL); + if(FAILED(hres)) { + WARN("GetItemInfo failed: %08x\n", hres); + return hres; + } + + hres = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&disp); + IUnknown_Release(unk); + if(FAILED(hres)) { + WARN("object does not implement IDispatch\n"); + return hres; + } + + if(This->ctx->host_global) + IDispatch_Release(This->ctx->host_global); + IDispatch_AddRef(disp); + This->ctx->host_global = disp; + } + + item = heap_alloc(sizeof(*item)); + if(!item) { + if(disp) + IDispatch_Release(disp); + return E_OUTOFMEMORY; + } + + item->disp = disp; + item->flags = dwFlags; + item->name = heap_strdupW(pstrName); + if(!item->name) { + if(disp) + IDispatch_Release(disp); + heap_free(item); + return E_OUTOFMEMORY; + } + + list_add_tail(&This->ctx->named_items, &item->entry); return S_OK; } @@ -421,6 +481,8 @@ static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface) if(!ctx) return E_OUTOFMEMORY; + list_init(&ctx->named_items); + old_ctx = InterlockedCompareExchangePointer((void**)&This->ctx, ctx, NULL); if(old_ctx) { destroy_script(ctx); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 1f6276f..9c1d35c 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -28,6 +28,17 @@ #include "vbscript_classes.h" +#include "wine/list.h" +#include "wine/unicode.h" + +typedef struct named_item_t { + IDispatch *disp; + DWORD flags; + LPWSTR name; + + struct list entry; +} named_item_t; + typedef struct { IDispatchEx IDispatchEx_iface; @@ -38,7 +49,11 @@ typedef struct { IActiveScriptSite *site; LCID lcid; + IDispatch *host_global; + vbdisp_t *script_obj; + + struct list named_items; } script_ctx_t; HRESULT init_global(script_ctx_t*); @@ -59,3 +74,19 @@ static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem); } + +static inline LPWSTR heap_strdupW(LPCWSTR str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD size; + + size = (strlenW(str)+1)*sizeof(WCHAR); + ret = heap_alloc(size); + if(ret) + memcpy(ret, str, size); + } + + return ret; +}

1 0