September 2009 - Wine-commits

Jacek Caban : mshtml: Added ScriptHost IServiceProvider stub implementation .
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: c14c3a6e91a7ba41c73496a619619ef5ab11afc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c14c3a6e91a7ba41c73496a61… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 29 00:11:06 2009 +0200 mshtml: Added ScriptHost IServiceProvider stub implementation. --- dlls/mshtml/script.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/script.c | 2 +- 2 files changed, 43 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index e66ba90..c242242 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -47,6 +47,7 @@ struct ScriptHost { const IActiveScriptSiteInterruptPollVtbl *lpIActiveScriptSiteInterruptPollVtbl; const IActiveScriptSiteWindowVtbl *lpIActiveScriptSiteWindowVtbl; const IActiveScriptSiteDebug32Vtbl *lpIActiveScriptSiteDebug32Vtbl; + const IServiceProviderVtbl *lpServiceProviderVtbl; LONG ref; @@ -239,6 +240,9 @@ static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, }else if(IsEqualGUID(&IID_IActiveScriptSiteDebug32, riid)) { TRACE("(%p)->(IID_IActiveScriptSiteDebug32 %p)\n", This, ppv); *ppv = ACTSCPDBG32(This); + }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { + TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); + *ppv = SERVPROV(This); }else if(IsEqualGUID(&IID_ICanHandleException, riid)) { TRACE("(%p)->(IID_ICanHandleException not supported %p)\n", This, ppv); return E_NOINTERFACE; @@ -529,6 +533,43 @@ static const IActiveScriptSiteDebug32Vtbl ActiveScriptSiteDebug32Vtbl = { ActiveScriptSiteDebug32_OnScriptErrorDebug }; +#define SERVPROV_THIS(iface) DEFINE_THIS(ScriptHost, ServiceProvider, iface) + +static HRESULT WINAPI ASServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) +{ + ScriptHost *This = SERVPROV_THIS(iface); + return IActiveScriptSite_QueryInterface(ACTSCPSITE(This), riid, ppv); +} + +static ULONG WINAPI ASServiceProvider_AddRef(IServiceProvider *iface) +{ + ScriptHost *This = SERVPROV_THIS(iface); + return IActiveScriptSite_AddRef(ACTSCPSITE(This)); +} + +static ULONG WINAPI ASServiceProvider_Release(IServiceProvider *iface) +{ + ScriptHost *This = SERVPROV_THIS(iface); + return IActiveScriptSite_Release(ACTSCPSITE(This)); +} + +static HRESULT WINAPI ASServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, + REFIID riid, void **ppv) +{ + ScriptHost *This = SERVPROV_THIS(iface); + FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +#undef SERVPROV_THIS + +static const IServiceProviderVtbl ASServiceProviderVtbl = { + ASServiceProvider_QueryInterface, + ASServiceProvider_AddRef, + ASServiceProvider_Release, + ASServiceProvider_QueryService +}; + static ScriptHost *create_script_host(HTMLWindow *window, const GUID *guid) { ScriptHost *ret; @@ -539,6 +580,7 @@ static ScriptHost *create_script_host(HTMLWindow *window, const GUID *guid) ret->lpIActiveScriptSiteInterruptPollVtbl = &ActiveScriptSiteInterruptPollVtbl; ret->lpIActiveScriptSiteWindowVtbl = &ActiveScriptSiteWindowVtbl; ret->lpIActiveScriptSiteDebug32Vtbl = &ActiveScriptSiteDebug32Vtbl; + ret->lpServiceProviderVtbl = &ASServiceProviderVtbl; ret->ref = 1; ret->window = window; ret->script_state = SCRIPTSTATE_UNINITIALIZED; diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index a4ef3d0..6c6504b 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -1053,7 +1053,7 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc ok(hres == E_NOINTERFACE, "Could not get IID_ICanHandleException interface: %08x\n", hres); hres = IActiveScriptSite_QueryInterface(pass, &IID_IServiceProvider, (void**)&service); - todo_wine ok(hres == S_OK, "Could not get IServiceProvider interface: %08x\n", hres); + ok(hres == S_OK, "Could not get IServiceProvider interface: %08x\n", hres); if(SUCCEEDED(hres)) IServiceProvider_Release(service);

1 0

Jacek Caban : mshtml: Added IInternetHostSecurityManager stub implementation.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 404c183d80b9bbfba5e84ef2658692fbb294ca67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=404c183d80b9bbfba5e84ef26… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 29 00:11:28 2009 +0200 mshtml: Added IInternetHostSecurityManager stub implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmldoc.c | 12 +++++- dlls/mshtml/mshtml_private.h | 6 +++ dlls/mshtml/secmgr.c | 95 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 1 + 5 files changed, 114 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 7f44bb1..b100359 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -60,6 +60,7 @@ C_SRCS = \ persist.c \ protocol.c \ script.c \ + secmgr.c \ selection.c \ service.c \ task.c \ diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index f7c7190..bfde79d 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -28,6 +28,7 @@ #include "winuser.h" #include "ole2.h" #include "perhist.h" +#include "mshtmdid.h" #include "wine/debug.h" @@ -1756,7 +1757,15 @@ static HRESULT HTMLDocumentNode_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) if(htmldoc_qi(&This->basedoc, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; - return HTMLDOMNode_QI(&This->node, riid, ppv); + if(IsEqualGUID(&IID_IInternetHostSecurityManager, riid)) { + TRACE("(%p)->(IID_IInternetHostSecurityManager %p)\n", This, ppv); + *ppv = HOSTSECMGR(This); + }else { + return HTMLDOMNode_QI(&This->node, riid, ppv); + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } void HTMLDocumentNode_destructor(HTMLDOMNode *iface) @@ -1806,6 +1815,7 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob init_dispex(&doc->node.dispex, (IUnknown*)HTMLDOMNODE(&doc->node), &HTMLDocumentNode_dispex); init_doc(&doc->basedoc, (IUnknown*)HTMLDOMNODE(&doc->node), DISPATCHEX(&doc->node.dispex)); + HTMLDocumentNode_SecMgr_Init(doc); doc->ref = 1; nsIDOMHTMLDocument_AddRef(nsdoc); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 73daf01..17fa971 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -465,6 +465,8 @@ struct HTMLDocumentNode { HTMLDOMNode node; HTMLDocument basedoc; + const IInternetHostSecurityManagerVtbl *lpIInternetHostSecurityManagerVtbl; + LONG ref; HTMLDOMNode *nodes; @@ -540,6 +542,8 @@ struct HTMLDocumentNode { #define SUPPERRINFO(x) ((ISupportErrorInfo*) &(x)->lpSupportErrorInfoVtbl) +#define HOSTSECMGR(x) ((IInternetHostSecurityManager*) &(x)->lpIInternetHostSecurityManagerVtbl) + #define DEFINE_THIS2(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,ifc))) #define DEFINE_THIS(cls,ifc,iface) DEFINE_THIS2(cls,lp ## ifc ## Vtbl,iface) @@ -564,6 +568,8 @@ void HTMLDocument_Window_Init(HTMLDocument*); void HTMLDocument_Service_Init(HTMLDocument*); void HTMLDocument_Hlink_Init(HTMLDocument*); +void HTMLDocumentNode_SecMgr_Init(HTMLDocumentNode*); + HRESULT HTMLCurrentStyle_Create(HTMLElement*,IHTMLCurrentStyle**); void ConnectionPoint_Init(ConnectionPoint*,ConnectionPointContainer*,REFIID); diff --git a/dlls/mshtml/secmgr.c b/dlls/mshtml/secmgr.c new file mode 100644 index 0000000..617cb23 --- /dev/null +++ b/dlls/mshtml/secmgr.c @@ -0,0 +1,95 @@ +/* + * Copyright 2009 Jacek Caban for CodeWeavers + * + * This library 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. + * + * This library 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. + * + * 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 + */ + +#include "config.h" + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" + +#include "wine/debug.h" + +#include "mshtml_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mshtml); + +#define HOSTSECMGR_THIS(iface) DEFINE_THIS(HTMLDocumentNode, IInternetHostSecurityManager, iface) + +static HRESULT WINAPI InternetHostSecurityManager_QueryInterface(IInternetHostSecurityManager *iface, REFIID riid, void **ppv) +{ + HTMLDocumentNode *This = HOSTSECMGR_THIS(iface); + return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(&This->node), riid, ppv); +} + +static ULONG WINAPI InternetHostSecurityManager_AddRef(IInternetHostSecurityManager *iface) +{ + HTMLDocumentNode *This = HOSTSECMGR_THIS(iface); + return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->node)); +} + +static ULONG WINAPI InternetHostSecurityManager_Release(IInternetHostSecurityManager *iface) +{ + HTMLDocumentNode *This = HOSTSECMGR_THIS(iface); + return IHTMLDOMNode_Release(HTMLDOMNODE(&This->node)); +} + +static HRESULT WINAPI InternetHostSecurityManager_GetSecurityId(IInternetHostSecurityManager *iface, BYTE *pbSecurityId, + DWORD *pcbSecurityId, DWORD_PTR dwReserved) +{ + HTMLDocumentNode *This = HOSTSECMGR_THIS(iface); + FIXME("(%p)->(%p %p %lx)\n", This, pbSecurityId, pcbSecurityId, dwReserved); + return E_NOTIMPL; +} + +static HRESULT WINAPI InternetHostSecurityManager_ProcessUrlAction(IInternetHostSecurityManager *iface, DWORD dwAction, + BYTE *pPolicy, DWORD cbPolicy, BYTE *pContext, DWORD cbContext, DWORD dwFlags, DWORD dwReserved) +{ + HTMLDocumentNode *This = HOSTSECMGR_THIS(iface); + FIXME("%p)->(%d %p %d %p %d %x %x)\n", This, dwAction, pPolicy, cbPolicy, pContext, cbContext, dwFlags, dwReserved); + return E_NOTIMPL; +} + +static HRESULT WINAPI InternetHostSecurityManager_QueryCustomPolicy(IInternetHostSecurityManager *iface, REFGUID guidKey, + BYTE **ppPolicy, DWORD *pcbPolicy, BYTE *pContext, DWORD cbContext, DWORD dwReserved) +{ + HTMLDocumentNode *This = HOSTSECMGR_THIS(iface); + FIXME("(%p)->(%s %p %p %p %d %x)\n", This, debugstr_guid(guidKey), ppPolicy, pcbPolicy, pContext, cbContext, dwReserved); + return E_NOTIMPL; +} + +#undef HOSTSECMGR_THIS + +static const IInternetHostSecurityManagerVtbl InternetHostSecurityManagerVtbl = { + InternetHostSecurityManager_QueryInterface, + InternetHostSecurityManager_AddRef, + InternetHostSecurityManager_Release, + InternetHostSecurityManager_GetSecurityId, + InternetHostSecurityManager_ProcessUrlAction, + InternetHostSecurityManager_QueryCustomPolicy +}; + +void HTMLDocumentNode_SecMgr_Init(HTMLDocumentNode *This) +{ + This->lpIInternetHostSecurityManagerVtbl = &InternetHostSecurityManagerVtbl; +} diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index fd7cc44..626445e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -105,6 +105,7 @@ static const IID * const doc_node_iids[] = { &IID_IHTMLDocument5, &IID_IDispatchEx, &IID_IConnectionPointContainer, + &IID_IInternetHostSecurityManager, NULL };

1 0

Paul Vriens : jscript: Add some Dutch translations.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: da9de037611e5cd044c9fd37a38ae505441adee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da9de037611e5cd044c9fd37a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Sep 29 09:53:19 2009 +0200 jscript: Add some Dutch translations. --- dlls/jscript/jscript_Nl.rc | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Nl.rc b/dlls/jscript/jscript_Nl.rc index 1006bed..c4f761a 100644 --- a/dlls/jscript/jscript_Nl.rc +++ b/dlls/jscript/jscript_Nl.rc @@ -38,5 +38,8 @@ STRINGTABLE DISCARDABLE IDS_ILLEGAL_ASSIGN "Ongeldige toekenning" IDS_UNDEFINED "'|' is ongedefinieerd" IDS_NOT_BOOL "Boolean object verwacht" + IDS_JSCRIPT_EXPECTED "JScript object verwacht" + IDS_REGEXP_SYNTAX_ERROR "Syntax fout in reguliere expressie" IDS_INVALID_LENGTH "Array lengte moet een eindig, positief geheel getal zijn" + IDS_ARRAY_EXPECTED "Array object verwacht" }

1 0

Paul Vriens : kernel32/tests: Fix some test failures on WinMe.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: a04e265486d85f6a3acbc62ef5b715e49d4bcd0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a04e265486d85f6a3acbc62ef… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Sep 29 10:14:23 2009 +0200 kernel32/tests: Fix some test failures on WinMe. --- dlls/kernel32/tests/file.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index e2ad49d..5219f79 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1860,10 +1860,11 @@ static void test_FindNextFileA(void) ok ( err == ERROR_NO_MORE_FILES, "GetLastError should return ERROR_NO_MORE_FILES\n"); } -static void test_FindFirstFileExA(void) +static void test_FindFirstFileExA(FINDEX_SEARCH_OPS search_ops) { WIN32_FIND_DATAA search_results; HANDLE handle; + BOOL ret; if (!pFindFirstFileExA) { @@ -1875,9 +1876,8 @@ static void test_FindFirstFileExA(void) _lclose(_lcreat("test-dir\\file1", 0)); _lclose(_lcreat("test-dir\\file2", 0)); CreateDirectoryA("test-dir\\dir1", NULL); - /* FindExLimitToDirectories is ignored */ SetLastError(0xdeadbeef); - handle = pFindFirstFileExA("test-dir\\*", FindExInfoStandard, &search_results, FindExSearchLimitToDirectories, NULL, 0); + handle = pFindFirstFileExA("test-dir\\*", FindExInfoStandard, &search_results, search_ops, NULL, 0); if (handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("FindFirstFileExA is not implemented\n"); @@ -1894,7 +1894,18 @@ static void test_FindFirstFileExA(void) ok(FindNextFile(handle, &search_results), "Fetching third file failed\n"); ok(CHECK_NAME(search_results.cFileName), "Invalid third entry - %s\n", search_results.cFileName); - ok(FindNextFile(handle, &search_results), "Fetching fourth file failed\n"); + SetLastError(0xdeadbeef); + ret = FindNextFile(handle, &search_results); + if (!ret && (GetLastError() == ERROR_NO_MORE_FILES) && (search_ops == FindExSearchLimitToDirectories)) + { + skip("File system supports directory filtering\n"); + /* Results from the previous call are not cleared */ + ok(strcmp(search_results.cFileName, "dir1") == 0, "Third entry should be 'dir1' is %s\n", search_results.cFileName); + FindClose( handle ); + goto cleanup; + } + + ok(ret, "Fetching fourth file failed\n"); ok(CHECK_NAME(search_results.cFileName), "Invalid fourth entry - %s\n", search_results.cFileName); ok(FindNextFile(handle, &search_results), "Fetching fifth file failed\n"); @@ -1902,7 +1913,7 @@ static void test_FindFirstFileExA(void) #undef CHECK_NAME - ok(FindNextFile(handle, &search_results) == FALSE, "Fetching sixth file should failed\n"); + ok(FindNextFile(handle, &search_results) == FALSE, "Fetching sixth file should fail\n"); FindClose( handle ); @@ -2804,7 +2815,9 @@ START_TEST(file) test_MoveFileW(); test_FindFirstFileA(); test_FindNextFileA(); - test_FindFirstFileExA(); + test_FindFirstFileExA(0); + /* FindExLimitToDirectories is ignored if the file system doesn't support directory filtering */ + test_FindFirstFileExA(FindExSearchLimitToDirectories); test_LockFile(); test_file_sharing(); test_offset_in_overlapped_structure();

1 0

Paul Vriens : include: Add an error code.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 558b7a3c4f2ae8a830414385736d0ee7b51a6999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=558b7a3c4f2ae8a8304143857… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Sep 29 11:40:11 2009 +0200 include: Add an error code. --- include/winerror.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winerror.h b/include/winerror.h index c7427d7..a1fa985 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -1558,6 +1558,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_SXS_WRONG_SECTION_TYPE 14009 #define ERROR_SXS_THREAD_QUERIES_DISABLED 14010 #define ERROR_SXS_PROCESS_DEFAULT_ALREADY_SET 14011 +#define ERROR_SXS_CORRUPTION 14083 /* HRESULT values for OLE, SHELL and other Interface stuff */ /* the codes 4000-40ff are reserved for OLE */

1 0

Henri Verbeet : wined3d: Fix a typo.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 6a7b97b61712764bea9215eb088fcbf4dfa29b9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a7b97b61712764bea9215eb0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 29 11:09:03 2009 +0200 wined3d: Fix a typo. --- dlls/wined3d/wined3d_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b431a1b..66d3c1a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2293,7 +2293,7 @@ struct IWineD3DStateBlockImpl /* Light hashmap . Collisions are handled using standard wine double linked lists */ #define LIGHTMAP_SIZE 43 /* Use of a prime number recommended. Set to 1 for a linked list! */ #define LIGHTMAP_HASHFUNC(x) ((x) % LIGHTMAP_SIZE) /* Primitive and simple function */ - struct list lightMap[LIGHTMAP_SIZE]; /* Mashmap containing the lights */ + struct list lightMap[LIGHTMAP_SIZE]; /* Hash map containing the lights */ PLIGHTINFOEL *activeLights[MAX_ACTIVE_LIGHTS]; /* Map of opengl lights to d3d lights */ /* Clipping */

1 0

Alexandre Julliard : winetest: Use the registry path for COM dlls instead of GetModuleFileName.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: c75aa35ba2380829a1f442a5479f9b5ad760a34b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c75aa35ba2380829a1f442a54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 29 13:06:09 2009 +0200 winetest: Use the registry path for COM dlls instead of GetModuleFileName. This allows to load them with LOAD_LIBRARY_AS_DATAFILE. --- programs/winetest/main.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 4287066..f43b7de 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -570,12 +570,13 @@ static BOOL get_main_clsid(const char *name, CLSID *clsid) return FALSE; } -static HMODULE load_com_dll(const char *name) +static HMODULE load_com_dll(const char *name, char **path, char *filename) { HMODULE dll = NULL; HKEY hkey; char keyname[100]; char dllname[MAX_PATH]; + char *p; CLSID clsid; if(!get_main_clsid(name, &clsid)) return NULL; @@ -589,7 +590,15 @@ static HMODULE load_com_dll(const char *name) { LONG size = sizeof(dllname); if(RegQueryValueA(hkey, NULL, dllname, &size) == ERROR_SUCCESS) - dll = LoadLibraryA(dllname); + { + if ((dll = LoadLibraryExA(dllname, NULL, LOAD_LIBRARY_AS_DATAFILE))) + { + strcpy( filename, dllname ); + p = strrchr(dllname, '\\'); + if (p) *p = 0; + *path = heap_strdup( dllname ); + } + } RegCloseKey(hkey); } @@ -628,11 +637,7 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, strcpy(filename, dllname); dll = LoadLibraryExA(dllname, NULL, LOAD_LIBRARY_AS_DATAFILE); - if(!dll) - { - dll = load_com_dll(dllname); - if(dll) get_dll_path(dll, &wine_tests[nr_of_files].maindllpath, filename); - } + if (!dll) dll = load_com_dll(dllname, &wine_tests[nr_of_files].maindllpath, filename); if (!dll && pLoadLibraryShim) {

1 0

Alexandre Julliard : winetest: Don' t run tests on native dlls when running under Wine.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 9cdd9a56e47f16b72fc5da19ec84a9c973524c7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cdd9a56e47f16b72fc5da19e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 29 13:28:15 2009 +0200 winetest: Don't run tests on native dlls when running under Wine. --- programs/winetest/main.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index f43b7de..b16b9cf 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -155,6 +155,20 @@ static int running_on_visible_desktop (void) return IsWindowVisible(desktop); } +/* check for wine fake dll module */ +static BOOL is_fake_dll( HMODULE module ) +{ + static const char fakedll_signature[] = "Wine placeholder DLL"; + const IMAGE_DOS_HEADER *dos; + + if (!((ULONG_PTR)module & 1)) return FALSE; /* not loaded as datafile */ + dos = (const IMAGE_DOS_HEADER *)((const char *)module - 1); + if (dos->e_magic != IMAGE_DOS_SIGNATURE) return FALSE; + if (dos->e_lfanew >= sizeof(*dos) + sizeof(fakedll_signature) && + !memcmp( dos + 1, fakedll_signature, sizeof(fakedll_signature) )) return TRUE; + return FALSE; +} + /* check if Gecko is present, trying to trigger the install if not */ static BOOL gecko_check(void) { @@ -639,6 +653,17 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, if (!dll) dll = load_com_dll(dllname, &wine_tests[nr_of_files].maindllpath, filename); + if (dll && running_under_wine() && ((ULONG_PTR)dll & 1)) + { + /* builtin dlls can't be loaded as datafile, so we must have native or fake dll */ + if (!is_fake_dll(dll)) + { + FreeLibrary(dll); + xprintf (" %s=load error Configured as native\n", dllname); + return TRUE; + } + } + if (!dll && pLoadLibraryShim) { MultiByteToWideChar(CP_ACP, 0, dllname, -1, dllnameW, MAX_PATH);

1 0

Juan Lang : ntdll/tests: Add tests for process and thread affinity.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: d9ce24e6cb5ebea3a3a1e1570391422dbed13afe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ce24e6cb5ebea3a3a1e1570… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 28 08:21:59 2009 -0700 ntdll/tests: Add tests for process and thread affinity. --- dlls/ntdll/tests/info.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index ff61a2b..5c44d6d 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -23,6 +23,9 @@ static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI * pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); +static NTSTATUS (WINAPI * pNtQueryInformationThread)(HANDLE, THREADINFOCLASS, PVOID, ULONG, PULONG); +static NTSTATUS (WINAPI * pNtSetInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG); +static NTSTATUS (WINAPI * pNtSetInformationThread)(HANDLE, THREADINFOCLASS, PVOID, ULONG); static NTSTATUS (WINAPI * pNtReadVirtualMemory)(HANDLE, const void*, void*, SIZE_T, SIZE_T*); /* one_before_last_pid is used to be able to compare values of a still running process @@ -50,6 +53,9 @@ static BOOL InitFunctionPtrs(void) NTDLL_GET_PROC(NtQuerySystemInformation); NTDLL_GET_PROC(NtQueryInformationProcess); + NTDLL_GET_PROC(NtQueryInformationThread); + NTDLL_GET_PROC(NtSetInformationProcess); + NTDLL_GET_PROC(NtSetInformationThread); NTDLL_GET_PROC(NtReadVirtualMemory); return TRUE; @@ -884,6 +890,76 @@ static void test_readvirtualmemory(void) CloseHandle(process); } +static void test_affinity(void) +{ + NTSTATUS status; + PROCESS_BASIC_INFORMATION pbi; + DWORD_PTR proc_affinity, thread_affinity; + THREAD_BASIC_INFORMATION tbi; + + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + proc_affinity = (DWORD_PTR)pbi.Reserved2[0]; + ok( proc_affinity == (1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1, "Unexpected process affinity\n" ); + proc_affinity = 1 << NtCurrentTeb()->Peb->NumberOfProcessors; + status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); + ok( status == STATUS_INVALID_PARAMETER, + "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + + proc_affinity = 0; + status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); + todo_wine + ok( status == STATUS_INVALID_PARAMETER, + "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + + status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( tbi.AffinityMask == (1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1, "Unexpected thread affinity\n" ); + thread_affinity = 1 << NtCurrentTeb()->Peb->NumberOfProcessors; + status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); + ok( status == STATUS_INVALID_PARAMETER, + "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + thread_affinity = 0; + status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); + todo_wine + ok( status == STATUS_INVALID_PARAMETER, + "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + + thread_affinity = 1; + status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); + ok( tbi.AffinityMask == 1, "Unexpected thread affinity\n" ); + + if (NtCurrentTeb()->Peb->NumberOfProcessors <= 1) + { + skip("only one processor, skipping affinity testing\n"); + return; + } + proc_affinity = 2; + status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + proc_affinity = (DWORD_PTR)pbi.Reserved2[0]; + ok( proc_affinity == 2, "Unexpected process affinity\n" ); + /* Setting the process affinity changes the thread affinity to match */ + status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + todo_wine + ok( tbi.AffinityMask == 2, "Unexpected thread affinity\n" ); + + proc_affinity = (1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1; + status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + /* Resetting the process affinity also resets the thread affinity */ + status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + todo_wine + ok( tbi.AffinityMask == (1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1, + "Unexpected thread affinity" ); +} + START_TEST(info) { if(!InitFunctionPtrs()) @@ -968,4 +1044,7 @@ START_TEST(info) /* belongs into it's own file */ trace("Starting test_readvirtualmemory()\n"); test_readvirtualmemory(); + + trace("Starting test_affinity()\n"); + test_affinity(); }

1 0

Juan Lang : ntdll: Don't allow setting a zero process affinity.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: c7b14235211b20fc38650100fce32618ff680daf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7b14235211b20fc38650100f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 28 08:24:02 2009 -0700 ntdll: Don't allow setting a zero process affinity. --- dlls/ntdll/process.c | 2 ++ dlls/ntdll/tests/info.c | 1 - 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 573ee86..d2e8db0 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -404,6 +404,8 @@ NTSTATUS WINAPI NtSetInformationProcess( if (ProcessInformationLength != sizeof(DWORD_PTR)) return STATUS_INVALID_PARAMETER; if (*(PDWORD_PTR)ProcessInformation & ~(((DWORD_PTR)1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1)) return STATUS_INVALID_PARAMETER; + if (!*(PDWORD_PTR)ProcessInformation) + return STATUS_INVALID_PARAMETER; SERVER_START_REQ( set_process_info ) { req->handle = wine_server_obj_handle( ProcessHandle ); diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 5c44d6d..37895ef 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -908,7 +908,6 @@ static void test_affinity(void) proc_affinity = 0; status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); - todo_wine ok( status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status);

1 0