wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

David Hedberg : explorerframe: Add some infrastructure to register the NamespaceTreeControl CLSID.
by Alexandre Julliard 02 Aug '10

02 Aug '10

Module: wine Branch: master Commit: d6db3732da14708210e30c03039f0eba51cf4bdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6db3732da14708210e30c030… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sat Jul 31 20:02:50 2010 +0200 explorerframe: Add some infrastructure to register the NamespaceTreeControl CLSID. --- dlls/explorerframe/Makefile.in | 1 + dlls/explorerframe/eframe.rc | 22 ++++++++ dlls/explorerframe/explorerframe.inf | 17 +++++++ dlls/explorerframe/explorerframe.spec | 2 + dlls/explorerframe/explorerframe_main.c | 81 +++++++++++++++++++++++++++++++ tools/wine.inf.in | 1 + 6 files changed, 124 insertions(+), 0 deletions(-) diff --git a/dlls/explorerframe/Makefile.in b/dlls/explorerframe/Makefile.in index dad33b1..3d17fcd 100644 --- a/dlls/explorerframe/Makefile.in +++ b/dlls/explorerframe/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ nstc.c RC_SRCS = \ + eframe.rc \ version.rc @MAKE_DLL_RULES@ diff --git a/dlls/explorerframe/eframe.rc b/dlls/explorerframe/eframe.rc new file mode 100644 index 0000000..25619de --- /dev/null +++ b/dlls/explorerframe/eframe.rc @@ -0,0 +1,22 @@ +/* + * ExplorerFrame main resource file + * + * Copyright 2010 David Hedberg + * + * 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 + */ + +/* @makedep: explorerframe.inf */ +REGINST REGINST explorerframe.inf diff --git a/dlls/explorerframe/explorerframe.inf b/dlls/explorerframe/explorerframe.inf new file mode 100644 index 0000000..7d6ba63 --- /dev/null +++ b/dlls/explorerframe/explorerframe.inf @@ -0,0 +1,17 @@ +[version] +Signature="$CHICAGO$" + +[RegisterDll] +AddReg=Classes.Reg + +[UnregisterDll] +DelReg=Classes.Reg + +[Classes.Reg] +; For some reason called "ListView" in the registry. +HKCR,"CLSID\%CLSID_NamespaceTreeControl%",,,"Shell Name Space ListView" +HKCR,"CLSID\%CLSID_NamespaceTreeControl%\InProcServer32",,,"%MODULE%" +HKCR,"CLSID\%CLSID_NamespaceTreeControl%\InProcServer32","ThreadingModel",,"Apartment" + +[Strings] +MODULE="explorerframe.dll" diff --git a/dlls/explorerframe/explorerframe.spec b/dlls/explorerframe/explorerframe.spec index 9ef2684..0e644a3 100644 --- a/dlls/explorerframe/explorerframe.spec +++ b/dlls/explorerframe/explorerframe.spec @@ -5,3 +5,5 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllGetVersion(ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/explorerframe/explorerframe_main.c b/dlls/explorerframe/explorerframe_main.c index fd958ef..dd3c0cf 100644 --- a/dlls/explorerframe/explorerframe_main.c +++ b/dlls/explorerframe/explorerframe_main.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdio.h> #define COBJMACROS #define NONAMELESSUNION @@ -26,8 +27,11 @@ #include "windef.h" #include "winbase.h" +#include "winuser.h" #include "winreg.h" #include "shlwapi.h" +#include "advpub.h" +#include "shobjidl.h" #include "wine/debug.h" @@ -203,3 +207,80 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) return CLASS_E_CLASSNOTAVAILABLE; } + +/************************************************************************* + * Register/Unregister DLL, based on shdocvw/factory.c + */ +static HRESULT reg_install(LPCSTR section, STRTABLEA *strtable) +{ + HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); + HMODULE hadvpack; + HRESULT hres; + + static const WCHAR advpackW[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; + + hadvpack = LoadLibraryW(advpackW); + pRegInstall = (void *)GetProcAddress(hadvpack, "RegInstall"); + + hres = pRegInstall(explorerframe_hinstance, section, strtable); + + FreeLibrary(hadvpack); + return hres; +} + +#define INF_SET_CLSID(clsid) \ + do \ + { \ + static CHAR name[] = "CLSID_" #clsid; \ + \ + pse[i].pszName = name; \ + clsids[i++] = &CLSID_ ## clsid; \ + } while (0) + +static HRESULT register_server(BOOL doregister) +{ + STRTABLEA strtable; + STRENTRYA pse[1]; + static CLSID const *clsids[1]; + unsigned int i = 0; + HRESULT hres; + + INF_SET_CLSID(NamespaceTreeControl); + + for(i = 0; i < sizeof(pse)/sizeof(pse[0]); i++) + { + pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, 39); + sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + clsids[i]->Data1, clsids[i]->Data2, clsids[i]->Data3, clsids[i]->Data4[0], + clsids[i]->Data4[1], clsids[i]->Data4[2], clsids[i]->Data4[3], clsids[i]->Data4[4], + clsids[i]->Data4[5], clsids[i]->Data4[6], clsids[i]->Data4[7]); + } + + strtable.cEntries = sizeof(pse)/sizeof(pse[0]); + strtable.pse = pse; + + hres = reg_install(doregister ? "RegisterDll" : "UnregisterDll", &strtable); + + for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) + HeapFree(GetProcessHeap(), 0, pse[i].pszValue); + + return hres; +} + +#undef INF_SET_CLSID + +/************************************************************************* + * DllRegisterServer (ExplorerFrame.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + return register_server(TRUE); +} + +/************************************************************************* + * DllUnregisterServer (ExplorerFrame.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return register_server(FALSE); +} diff --git a/tools/wine.inf.in b/tools/wine.inf.in index aa7b4f0..ff5c7b2 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2507,6 +2507,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,dsound.dll,1 11,,dswave.dll,1 11,,dxdiagn.dll,1 +11,,explorerframe.dll,1 11,,gameux.dll,1 11,,hhctrl.ocx,1 11,,hlink.dll,1

1 0

David Hedberg : explorerframe/tests: Add initial NamespaceTreeControl tests .
by Alexandre Julliard 02 Aug '10

02 Aug '10

Module: wine Branch: master Commit: 87212d510582d5889122b05438075e287235a3a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87212d510582d5889122b0543… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sat Jul 31 20:02:49 2010 +0200 explorerframe/tests: Add initial NamespaceTreeControl tests. --- configure | 1 + configure.ac | 1 + dlls/explorerframe/tests/Makefile.in | 11 +++++ dlls/explorerframe/tests/nstc.c | 81 ++++++++++++++++++++++++++++++++++ 4 files changed, 94 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 6dd4a36..3a5b7b6 100755 --- a/configure +++ b/configure @@ -14504,6 +14504,7 @@ wine_fn_config_dll dxgi enable_dxgi dxgi wine_fn_config_test dlls/dxgi/tests dxgi_test wine_fn_config_lib dxguid wine_fn_config_dll explorerframe enable_explorerframe +wine_fn_config_test dlls/explorerframe/tests explorerframe_test wine_fn_config_dll faultrep enable_faultrep wine_fn_config_dll fltlib enable_fltlib wine_fn_config_dll fusion enable_fusion diff --git a/configure.ac b/configure.ac index aac7a82..37b0cf0 100644 --- a/configure.ac +++ b/configure.ac @@ -2360,6 +2360,7 @@ WINE_CONFIG_DLL(dxgi,,[dxgi]) WINE_CONFIG_TEST(dlls/dxgi/tests) WINE_CONFIG_LIB(dxguid) WINE_CONFIG_DLL(explorerframe) +WINE_CONFIG_TEST(dlls/explorerframe/tests) WINE_CONFIG_DLL(faultrep) WINE_CONFIG_DLL(fltlib) WINE_CONFIG_DLL(fusion) diff --git a/dlls/explorerframe/tests/Makefile.in b/dlls/explorerframe/tests/Makefile.in new file mode 100644 index 0000000..880d19a --- /dev/null +++ b/dlls/explorerframe/tests/Makefile.in @@ -0,0 +1,11 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = explorerframe.dll +IMPORTS = uuid user32 ole32 + +C_SRCS = \ + nstc.c + +@MAKE_TEST_RULES@ diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c new file mode 100644 index 0000000..bd0caf1 --- /dev/null +++ b/dlls/explorerframe/tests/nstc.c @@ -0,0 +1,81 @@ +/* + * Unit tests for the NamespaceTree Control + * + * Copyright 2010 David Hedberg + * + * 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 <stdio.h> + +#define COBJMACROS + +#include "shlobj.h" +#include "wine/test.h" + +static HWND hwnd; + +/* "Intended for internal use" */ +#define TVS_EX_NOSINGLECOLLAPSE 0x1 + +/* Returns FALSE if the NamespaceTreeControl failed to be instantiated. */ +static BOOL test_initialization(void) +{ + INameSpaceTreeControl *pnstc; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_NamespaceTreeControl, NULL, CLSCTX_INPROC_SERVER, + &IID_INameSpaceTreeControl, (void**)&pnstc); + ok(hr == S_OK || hr == REGDB_E_CLASSNOTREG, "Got 0x%08x\n", hr); + if(FAILED(hr)) + { + return FALSE; + } + + INameSpaceTreeControl_Release(pnstc); + + return TRUE; +} + +static void setup_window(void) +{ + WNDCLASSA wc; + static const char nstctest_wnd_name[] = "nstctest_wnd"; + + ZeroMemory(&wc, sizeof(WNDCLASSA)); + wc.lpfnWndProc = DefWindowProcA; + wc.lpszClassName = nstctest_wnd_name; + RegisterClassA(&wc); + hwnd = CreateWindowA(nstctest_wnd_name, NULL, WS_TABSTOP, + 0, 0, 200, 200, NULL, 0, 0, NULL); + ok(hwnd != NULL, "Failed to create window for test (lasterror: %d).\n", + GetLastError()); +} + +static void destroy_window(void) +{ + DestroyWindow(hwnd); +} + +START_TEST(nstc) +{ + OleInitialize(NULL); + setup_window(); + + test_initialization(); + + destroy_window(); + OleUninitialize(); +}

1 0

David Hedberg : explorerframe: Add classfactory implementation.
by Alexandre Julliard 02 Aug '10

02 Aug '10

Module: wine Branch: master Commit: 46a3e7c24daf26bce6a4e98cb8114bd47b7f1283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46a3e7c24daf26bce6a4e98cb… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sat Jul 31 20:02:48 2010 +0200 explorerframe: Add classfactory implementation. --- dlls/explorerframe/explorerframe.spec | 2 +- dlls/explorerframe/explorerframe_main.c | 109 +++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 1 deletions(-) diff --git a/dlls/explorerframe/explorerframe.spec b/dlls/explorerframe/explorerframe.spec index 58777b0..9ef2684 100644 --- a/dlls/explorerframe/explorerframe.spec +++ b/dlls/explorerframe/explorerframe.spec @@ -3,5 +3,5 @@ # 134 stub EXPLORERFRAME_134 @ stdcall -private DllCanUnloadNow() -@ stub DllGetClassObject +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllGetVersion(ptr) diff --git a/dlls/explorerframe/explorerframe_main.c b/dlls/explorerframe/explorerframe_main.c index 51f7d39..fd958ef 100644 --- a/dlls/explorerframe/explorerframe_main.c +++ b/dlls/explorerframe/explorerframe_main.c @@ -94,3 +94,112 @@ HRESULT WINAPI DllGetVersion(DLLVERSIONINFO *info) WARN("wrong DLLVERSIONINFO size from app.\n"); return E_INVALIDARG; } + +/************************************************************************* + * Implement the ExplorerFrame class factory + * + * (Taken from shdocvw/factory.c; based on implementation in + * ddraw/main.c) + */ + +#define FACTORY(x) ((IClassFactory*) &(x)->lpClassFactoryVtbl) + +typedef struct +{ + const IClassFactoryVtbl *lpClassFactoryVtbl; + HRESULT (*cf)(IUnknown*, REFIID, void**); + LONG ref; +} IClassFactoryImpl; + +/************************************************************************* + * EFCF_QueryInterface (IUnknown) + */ +static HRESULT WINAPI EFCF_QueryInterface(IClassFactory* iface, + REFIID riid, void **ppobj) +{ + TRACE("%p (%s %p)\n", iface, debugstr_guid(riid), ppobj); + + if(!ppobj) + return E_POINTER; + + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IClassFactory, riid)) + { + *ppobj = iface; + IClassFactory_AddRef(iface); + return S_OK; + } + + WARN("Interface not supported.\n"); + + *ppobj = NULL; + return E_NOINTERFACE; +} + +/************************************************************************* + * EFCF_AddRef (IUnknown) + */ +static ULONG WINAPI EFCF_AddRef(IClassFactory *iface) +{ + EFRAME_LockModule(); + + return 2; /* non-heap based object */ +} + +/************************************************************************* + * EFCF_Release (IUnknown) + */ +static ULONG WINAPI EFCF_Release(IClassFactory *iface) +{ + EFRAME_UnlockModule(); + + return 1; /* non-heap based object */ +} + +/************************************************************************* + * EFCF_CreateInstance (IClassFactory) + */ +static HRESULT WINAPI EFCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, + REFIID riid, void **ppobj) +{ + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + return This->cf(pOuter, riid, ppobj); +} + +/************************************************************************* + * EFCF_LockServer (IClassFactory) + */ +static HRESULT WINAPI EFCF_LockServer(IClassFactory *iface, BOOL dolock) +{ + TRACE("%p (%d)\n", iface, dolock); + + if (dolock) + EFRAME_LockModule(); + else + EFRAME_UnlockModule(); + + return S_OK; +} + +static const IClassFactoryVtbl EFCF_Vtbl = +{ + EFCF_QueryInterface, + EFCF_AddRef, + EFCF_Release, + EFCF_CreateInstance, + EFCF_LockServer +}; + +/************************************************************************* + * DllGetClassObject (ExplorerFrame.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) +{ + static IClassFactoryImpl NSTCClassFactory = {&EFCF_Vtbl, NamespaceTreeControl_Constructor}; + + TRACE("%s, %s, %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + if(IsEqualGUID(&CLSID_NamespaceTreeControl, rclsid)) + return IClassFactory_QueryInterface(FACTORY(&NSTCClassFactory), riid, ppv); + + return CLASS_E_CLASSNOTAVAILABLE; +}

1 0

David Hedberg : explorerframe: Add a stub of NamespaceTreeControl.
by Alexandre Julliard 02 Aug '10

02 Aug '10

Module: wine Branch: master Commit: 49b43e8f7c9643bf8c4ae73d9c3c5f34a61f0b95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49b43e8f7c9643bf8c4ae73d9… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sat Jul 31 20:02:47 2010 +0200 explorerframe: Add a stub of NamespaceTreeControl. --- dlls/explorerframe/Makefile.in | 4 +- dlls/explorerframe/explorerframe_main.h | 4 + dlls/explorerframe/nstc.c | 356 +++++++++++++++++++++++++++++++ 3 files changed, 363 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49b43e8f7c9643bf8c4ae…

1 0

David Hedberg : explorerframe: Implement DllGetVersion.
by Alexandre Julliard 02 Aug '10

02 Aug '10

Module: wine Branch: master Commit: ddfab6bb9d474172526abb9e1b7ff5fd3cc50d14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddfab6bb9d474172526abb9e1… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sat Jul 31 20:02:46 2010 +0200 explorerframe: Implement DllGetVersion. --- dlls/explorerframe/explorerframe.spec | 2 +- dlls/explorerframe/explorerframe_main.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/explorerframe/explorerframe.spec b/dlls/explorerframe/explorerframe.spec index dbd9c41..58777b0 100644 --- a/dlls/explorerframe/explorerframe.spec +++ b/dlls/explorerframe/explorerframe.spec @@ -4,4 +4,4 @@ @ stdcall -private DllCanUnloadNow() @ stub DllGetClassObject -@ stub DllGetVersion +@ stdcall -private DllGetVersion(ptr) diff --git a/dlls/explorerframe/explorerframe_main.c b/dlls/explorerframe/explorerframe_main.c index 4fa5cc6..51f7d39 100644 --- a/dlls/explorerframe/explorerframe_main.c +++ b/dlls/explorerframe/explorerframe_main.c @@ -64,3 +64,33 @@ HRESULT WINAPI DllCanUnloadNow(void) TRACE("refCount is %d\n", EFRAME_refCount); return EFRAME_refCount ? S_FALSE : S_OK; } + +/************************************************************************* + * DllGetVersion (ExplorerFrame.@) + */ +HRESULT WINAPI DllGetVersion(DLLVERSIONINFO *info) +{ + TRACE("%p\n", info); + if(info->cbSize == sizeof(DLLVERSIONINFO) || + info->cbSize == sizeof(DLLVERSIONINFO2)) + { + /* Windows 7 */ + info->dwMajorVersion = 6; + info->dwMinorVersion = 1; + info->dwBuildNumber = 7600; + info->dwPlatformID = DLLVER_PLATFORM_WINDOWS; + if(info->cbSize == sizeof(DLLVERSIONINFO2)) + { + DLLVERSIONINFO2 *info2 = (DLLVERSIONINFO2*)info; + info2->dwFlags = 0; + info2->ullVersion = MAKEDLLVERULL(info->dwMajorVersion, + info->dwMinorVersion, + info->dwBuildNumber, + 16385); /* "hotfix number" */ + } + return S_OK; + } + + WARN("wrong DLLVERSIONINFO size from app.\n"); + return E_INVALIDARG; +}

1 0

David Hedberg : explorerframe: Add dll stub.
by Alexandre Julliard 02 Aug '10

02 Aug '10

Module: wine Branch: master Commit: e2cf9ad33e547c6b8c516cc68b18bc82e303de34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2cf9ad33e547c6b8c516cc68… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sat Jul 31 20:02:45 2010 +0200 explorerframe: Add dll stub. --- configure | 1 + configure.ac | 1 + dlls/explorerframe/Makefile.in | 14 +++++++ dlls/explorerframe/explorerframe.spec | 7 +++ dlls/explorerframe/explorerframe_main.c | 66 +++++++++++++++++++++++++++++++ dlls/explorerframe/explorerframe_main.h | 30 ++++++++++++++ dlls/explorerframe/version.rc | 29 +++++++++++++ 7 files changed, 148 insertions(+), 0 deletions(-) diff --git a/configure b/configure index a5b8dd0..6dd4a36 100755 --- a/configure +++ b/configure @@ -14503,6 +14503,7 @@ wine_fn_config_lib dxerr9 wine_fn_config_dll dxgi enable_dxgi dxgi wine_fn_config_test dlls/dxgi/tests dxgi_test wine_fn_config_lib dxguid +wine_fn_config_dll explorerframe enable_explorerframe wine_fn_config_dll faultrep enable_faultrep wine_fn_config_dll fltlib enable_fltlib wine_fn_config_dll fusion enable_fusion diff --git a/configure.ac b/configure.ac index bacba41..aac7a82 100644 --- a/configure.ac +++ b/configure.ac @@ -2359,6 +2359,7 @@ WINE_CONFIG_LIB(dxerr9) WINE_CONFIG_DLL(dxgi,,[dxgi]) WINE_CONFIG_TEST(dlls/dxgi/tests) WINE_CONFIG_LIB(dxguid) +WINE_CONFIG_DLL(explorerframe) WINE_CONFIG_DLL(faultrep) WINE_CONFIG_DLL(fltlib) WINE_CONFIG_DLL(fusion) diff --git a/dlls/explorerframe/Makefile.in b/dlls/explorerframe/Makefile.in new file mode 100644 index 0000000..3ef7e5b --- /dev/null +++ b/dlls/explorerframe/Makefile.in @@ -0,0 +1,14 @@ +EXTRADEFS = -DCOM_NO_WINDOWS_H +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = explorerframe.dll + +C_SRCS = \ + explorerframe_main.c + +RC_SRCS = \ + version.rc + +@MAKE_DLL_RULES@ diff --git a/dlls/explorerframe/explorerframe.spec b/dlls/explorerframe/explorerframe.spec new file mode 100644 index 0000000..dbd9c41 --- /dev/null +++ b/dlls/explorerframe/explorerframe.spec @@ -0,0 +1,7 @@ +# 110 stub EXPLORERFRAME_110 +# 111 stub EXPLORERFRAME_111 +# 134 stub EXPLORERFRAME_134 + +@ stdcall -private DllCanUnloadNow() +@ stub DllGetClassObject +@ stub DllGetVersion diff --git a/dlls/explorerframe/explorerframe_main.c b/dlls/explorerframe/explorerframe_main.c new file mode 100644 index 0000000..4fa5cc6 --- /dev/null +++ b/dlls/explorerframe/explorerframe_main.c @@ -0,0 +1,66 @@ +/* + * ExplorerFrame main functions + * + * Copyright 2010 David Hedberg + * + * 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 <stdarg.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "shlwapi.h" + +#include "wine/debug.h" + +#include "explorerframe_main.h" + +WINE_DEFAULT_DEBUG_CHANNEL(explorerframe); + +HINSTANCE explorerframe_hinstance; +LONG EFRAME_refCount = 0; + +/************************************************************************* + * DllMain (ExplorerFrame.@) + */ +BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) +{ + TRACE("%p, 0x%x, %p\n", hinst, fdwReason, fImpLoad); + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinst); + explorerframe_hinstance = hinst; + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + +/************************************************************************* + * DllCanUnloadNow (ExplorerFrame.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + TRACE("refCount is %d\n", EFRAME_refCount); + return EFRAME_refCount ? S_FALSE : S_OK; +} diff --git a/dlls/explorerframe/explorerframe_main.h b/dlls/explorerframe/explorerframe_main.h new file mode 100644 index 0000000..45be664 --- /dev/null +++ b/dlls/explorerframe/explorerframe_main.h @@ -0,0 +1,30 @@ +/* + * ExplorerFrame main include + * + * Copyright 2010 David Hedberg + * + * 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 + */ + +#ifndef __WINE_EXPLORERFRAME_H +#define __WINE_EXPLORERFRAME_H + +extern HINSTANCE explorerframe_hinstance; + +extern LONG EFRAME_refCount; +static inline void EFRAME_LockModule(void) { InterlockedIncrement( &EFRAME_refCount ); } +static inline void EFRAME_UnlockModule(void) { InterlockedDecrement( &EFRAME_refCount ); } + +#endif /* __WINE_EXPLORERFRAME_H */ diff --git a/dlls/explorerframe/version.rc b/dlls/explorerframe/version.rc new file mode 100644 index 0000000..257b1fc --- /dev/null +++ b/dlls/explorerframe/version.rc @@ -0,0 +1,29 @@ +/* + * ExplorerFrame Version Resource + * + * Copyright 2010 David Hedberg + * + * 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 + */ + +#define WINE_OLESELFREGISTER +#define WINE_FILEDESCRIPTION_STR "Wine ExplorerFrame" +#define WINE_FILENAME_STR "explorerframe.dll" +#define WINE_FILEVERSION 6,1,7600,16385 +#define WINE_FILEVERSION_STR "6.1.7600.16385" +#define WINE_PRODUCTVERSION 6,1,7600,16385 +#define WINE_PRODUCTVERSION_STR "6.1.7600.16385" + +#include "wine/wine_common_ver.rc"

1 0

Misha Koshelev : d3dx9: Complete test for D3DXCreateSphere.
by Alexandre Julliard 02 Aug '10

02 Aug '10

Module: wine Branch: master Commit: cc1738ad3cf20f1744626ae122942c2728b03939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc1738ad3cf20f1744626ae12… Author: Misha Koshelev <misha680(a)gmail.com> Date: Fri Jul 30 13:21:13 2010 -0500 d3dx9: Complete test for D3DXCreateSphere. --- dlls/d3dx9_36/tests/mesh.c | 432 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 428 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc1738ad3cf20f1744626…

1 0

Matteo Bruni : d3dcompiler_43: Add dll directory.
by Alexandre Julliard 02 Aug '10

02 Aug '10

Module: wine Branch: master Commit: 70962ee4d8a15659ee44c49b8c6316874fb11957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70962ee4d8a15659ee44c49b8… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Fri Jul 30 16:21:43 2010 +0200 d3dcompiler_43: Add dll directory. --- .gitignore | 1 + configure | 1 + configure.ac | 1 + dlls/d3dcompiler_43/Makefile.in | 13 ++++++++ dlls/d3dcompiler_43/d3dcompiler_43.spec | 17 +++++++++++ dlls/d3dcompiler_43/d3dcompiler_43_main.c | 45 +++++++++++++++++++++++++++++ dlls/d3dcompiler_43/version.rc | 26 ++++++++++++++++ 7 files changed, 104 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 78a693f..4e0346f 100644 --- a/.gitignore +++ b/.gitignore @@ -68,6 +68,7 @@ dlls/kernel32/nls/winerr_ptb.mc.rc dlls/kernel32/nls/winerr_ptg.mc.rc dlls/kernel32/nls/winerr_rus.mc.rc dlls/kernel32/nls/winerr_ukr.mc.rc +dlls/libd3dcompiler.def dlls/libd3dx9.def dlls/libkernel.def dlls/libwinspool.def diff --git a/configure b/configure index 6232cba..a5b8dd0 100755 --- a/configure +++ b/configure @@ -14429,6 +14429,7 @@ wine_fn_config_dll d3d8 enable_d3d8 d3d8 wine_fn_config_test dlls/d3d8/tests d3d8_test wine_fn_config_dll d3d9 enable_d3d9 d3d9 wine_fn_config_test dlls/d3d9/tests d3d9_test +wine_fn_config_dll d3dcompiler_43 enable_d3dcompiler_43 d3dcompiler wine_fn_config_dll d3dim enable_d3dim d3dim wine_fn_config_dll d3drm enable_d3drm d3drm wine_fn_config_test dlls/d3drm/tests d3drm_test diff --git a/configure.ac b/configure.ac index b7ceb8d..bacba41 100644 --- a/configure.ac +++ b/configure.ac @@ -2285,6 +2285,7 @@ WINE_CONFIG_DLL(d3d8,,[d3d8]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[d3d9]) WINE_CONFIG_TEST(dlls/d3d9/tests) +WINE_CONFIG_DLL(d3dcompiler_43,,[d3dcompiler]) WINE_CONFIG_DLL(d3dim,,[d3dim]) WINE_CONFIG_DLL(d3drm,,[d3drm]) WINE_CONFIG_TEST(dlls/d3drm/tests) diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in new file mode 100644 index 0000000..2510af4 --- /dev/null +++ b/dlls/d3dcompiler_43/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = d3dcompiler_43.dll +IMPORTLIB = d3dcompiler + +C_SRCS = \ + d3dcompiler_43_main.c + +RC_SRCS = version.rc + +@MAKE_DLL_RULES@ diff --git a/dlls/d3dcompiler_43/d3dcompiler_43.spec b/dlls/d3dcompiler_43/d3dcompiler_43.spec new file mode 100644 index 0000000..ab6e1d7 --- /dev/null +++ b/dlls/d3dcompiler_43/d3dcompiler_43.spec @@ -0,0 +1,17 @@ +@ stub D3DAssemble +@ stub DebugSetMute +@ stub D3DCompile +@ stub D3DCompressShaders +@ stub D3DCreateBlob +@ stub D3DDecompressShaders +@ stub D3DDisassemble10Effect +@ stub D3DDisassemble +@ stub D3DGetBlobPart +@ stub D3DGetDebugInfo +@ stub D3DGetInputAndOutputSignatureBlob +@ stub D3DGetInputSignatureBlob +@ stub D3DGetOutputSignatureBlob +@ stub D3DPreprocess +@ stub D3DReflect +@ stub D3DReturnFailure1 +@ stub D3DStripShader diff --git a/dlls/d3dcompiler_43/d3dcompiler_43_main.c b/dlls/d3dcompiler_43/d3dcompiler_43_main.c new file mode 100644 index 0000000..cdf69b7 --- /dev/null +++ b/dlls/d3dcompiler_43/d3dcompiler_43_main.c @@ -0,0 +1,45 @@ +/* + * Direct3D shader compiler main file + * + * Copyright 2010 Matteo Bruni 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 "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler); + +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(inst); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/d3dcompiler_43/version.rc b/dlls/d3dcompiler_43/version.rc new file mode 100644 index 0000000..5603735 --- /dev/null +++ b/dlls/d3dcompiler_43/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2010 Matteo Bruni 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine D3DCompiler" +#define WINE_FILENAME_STR "d3dcompiler_43.dll" +#define WINE_FILEVERSION 9,29,952,3111 +#define WINE_FILEVERSION_STR "9.29.952.3111" +#define WINE_PRODUCTVERSION 9,29,952,3111 +#define WINE_PRODUCTVERSION_STR "9.29.952.3111" + +#include "wine/wine_common_ver.rc"

1 0

Jacek Caban : jscript: Use generic property for Error.number.
by Alexandre Julliard 02 Aug '10

02 Aug '10

Module: wine Branch: master Commit: 6263f0079abaff354f6662794e36b569c795f7ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=6263f0079abaff354f6662794… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 2 11:10:03 2010 +0200 jscript: Use generic property for Error.number. --- dlls/jscript/error.c | 48 ++++++++++++-------------------------------- dlls/jscript/tests/api.js | 6 +++++ 2 files changed, 19 insertions(+), 35 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index e3cfce6..2465c77 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -29,7 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); typedef struct { DispatchEx dispex; - VARIANT number; VARIANT description; VARIANT message; } ErrorInstance; @@ -50,24 +49,6 @@ static inline ErrorInstance *error_this(vdisp_t *jsthis) return is_vclass(jsthis, JSCLASS_ERROR) ? error_from_vdisp(jsthis) : NULL; } -static HRESULT Error_number(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, - DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - ErrorInstance *This = error_from_vdisp(jsthis); - - TRACE("\n"); - - switch(flags) { - case DISPATCH_PROPERTYGET: - return VariantCopy(retv, &This->number); - case DISPATCH_PROPERTYPUT: - return VariantCopy(&This->number, get_arg(dp, 0)); - default: - FIXME("unimplemented flags %x\n", flags); - return E_NOTIMPL; - } -} - static HRESULT Error_description(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { @@ -203,7 +184,6 @@ static void Error_destructor(DispatchEx *dispex) { ErrorInstance *This = (ErrorInstance*)dispex; - VariantClear(&This->number); VariantClear(&This->description); VariantClear(&This->message); heap_free(This); @@ -212,7 +192,6 @@ static void Error_destructor(DispatchEx *dispex) static const builtin_prop_t Error_props[] = { {descriptionW, Error_description, 0}, {messageW, Error_message, 0}, - {numberW, Error_number, 0}, {toStringW, Error_toString, PROPF_METHOD} }; @@ -228,7 +207,6 @@ static const builtin_info_t Error_info = { static const builtin_prop_t ErrorInst_props[] = { {descriptionW, Error_description, 0}, {messageW, Error_message, 0}, - {numberW, Error_number, 0}, }; static const builtin_info_t ErrorInst_info = { @@ -265,18 +243,22 @@ static HRESULT alloc_error(script_ctx_t *ctx, DispatchEx *prototype, } static HRESULT create_error(script_ctx_t *ctx, DispatchEx *constr, - const UINT *number, const WCHAR *msg, DispatchEx **ret) + UINT number, const WCHAR *msg, DispatchEx **ret) { ErrorInstance *err; + VARIANT v; HRESULT hres; hres = alloc_error(ctx, NULL, constr, &err); if(FAILED(hres)) return hres; - if(number) { - V_VT(&err->number) = VT_I4; - V_I4(&err->number) = *number; + V_VT(&v) = VT_I4; + V_I4(&v) = number; + hres = jsdisp_propput_name(&err->dispex, numberW, &v, NULL/*FIXME*/, NULL/*FIXME*/); + if(FAILED(hres)) { + jsdisp_release(&err->dispex); + return hres; } V_VT(&err->message) = VT_BSTR; @@ -297,14 +279,13 @@ static HRESULT create_error(script_ctx_t *ctx, DispatchEx *constr, static HRESULT error_constr(script_ctx_t *ctx, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, DispatchEx *constr) { DispatchEx *err; - VARIANT numv; - UINT num; + UINT num = 0; BSTR msg = NULL; HRESULT hres; - V_VT(&numv) = VT_NULL; - if(arg_cnt(dp)) { + VARIANT numv; + hres = to_number(ctx, get_arg(dp, 0), ei, &numv); if(FAILED(hres) || (V_VT(&numv)==VT_R8 && isnan(V_R8(&numv)))) hres = to_string(ctx, get_arg(dp, 0), ei, &msg); @@ -326,10 +307,7 @@ static HRESULT error_constr(script_ctx_t *ctx, WORD flags, DISPPARAMS *dp, switch(flags) { case INVOKE_FUNC: case DISPATCH_CONSTRUCT: - if(V_VT(&numv) == VT_NULL) - hres = create_error(ctx, constr, NULL, msg, &err); - else - hres = create_error(ctx, constr, &num, msg, &err); + hres = create_error(ctx, constr, num, msg, &err); SysFreeString(msg); if(FAILED(hres)) @@ -477,7 +455,7 @@ static HRESULT throw_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCH WARN("%s\n", debugstr_w(buf)); id |= JSCRIPT_ERROR; - hres = create_error(ctx, constr, &id, buf, &err); + hres = create_error(ctx, constr, id, buf, &err); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index e05e5bb..f794244 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1772,10 +1772,16 @@ ok(err.message === "message", "err.message !== 'message'"); ok(err.toString() === (invokeVersion < 2 ? "[object Error]" : "Error: message"), "err.toString() = " + err.toString()); err = new Error(123); ok(err.number === 123, "err.number = " + err.number); +err.number = 254; +ok(err.number === 254, "err.number = " + err.number); err = new Error(0, "message"); ok(err.number === 0, "err.number = " + err.number); ok(err.message === "message", "err.message = " + err.message); ok(err.description === "message", "err.description = " + err.description); +err = new Error(); +ok(err.number === 0, "err.number = " + err.number); + +ok(!("number" in Error), "number is in Error"); tmp = new Object(); tmp.toString = function() { return "test"; };

1 0

Jacek Caban : jscript: Fixed test crash on some win9x installations.
by Alexandre Julliard 02 Aug '10

02 Aug '10

Module: wine Branch: master Commit: 636bc7494f6f9e25d585ee4986c69909e2cff854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=636bc7494f6f9e25d585ee498… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 2 11:09:08 2010 +0200 jscript: Fixed test crash on some win9x installations. --- dlls/jscript/tests/jscript.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 006e055..f7f1e30 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -335,7 +335,10 @@ static HRESULT set_script_prop(IActiveScript *engine, DWORD property, VARIANT *v hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptProperty, (void**)&script_prop); - ok(hres == S_OK, "Could not get IActiveScriptProperty iface: %08x\n", hres); + if(FAILED(hres)) { + win_skip("IActiveScriptProperty not supported\n"); + return E_NOTIMPL; + } hres = IActiveScriptProperty_SetProperty(script_prop, property, NULL, val); IActiveScriptProperty_Release(script_prop);

1 0

← Newer
1
...
81
82
83
84
85
86
87
88
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2010