August 2010 - Wine-commits - list.winehq.org

Thomas Mullaly : urlmon: Implemented a path parser for opaque URIs.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 93d79ee18ee6bd7ebda63dc8c0557fd62c042e1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=93d79ee18ee6bd7ebda63dc8c… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jul 18 20:50:12 2010 -0400 urlmon: Implemented a path parser for opaque URIs. --- dlls/urlmon/tests/uri.c | 33 ++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 7cd11ff..acf6905 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -2245,6 +2245,34 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_UNKNOWN,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } + }, + { "urn:excepts:bad:%XY:encoded", 0, S_OK, FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_DISPLAY_URI|Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY| + Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME|Uri_HAS_HOST_TYPE|Uri_HAS_SCHEME, + TRUE, + { + {"urn:excepts:bad:%XY:encoded",S_OK,TRUE}, + {"",S_FALSE,FALSE}, + {"urn:excepts:bad:%XY:encoded",S_OK,TRUE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"excepts:bad:%XY:encoded",S_OK,TRUE}, + {"excepts:bad:%XY:encoded",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"urn:excepts:bad:%XY:encoded",S_OK,FALSE}, + {"urn",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_UNKNOWN,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } } }; @@ -2294,7 +2322,10 @@ static const invalid_uri invalid_uri_tests[] = { /* Invalid port with IPv6 address. */ {"http://[::ffff]:32xy",0,FALSE}, /* Not allowed to have backslashes with NO_CANONICALIZE. */ - {"gopher://www.google.com\\test",Uri_CREATE_NO_CANONICALIZE,FALSE} + {"gopher://www.google.com\\test",Uri_CREATE_NO_CANONICALIZE,FALSE}, + /* Not allowed to have invalid % encoded data in opaque URI path. */ + {"news:test%XX",0,FALSE}, + {"mailto:wine(a)winehq%G8.com",0,FALSE} }; typedef struct _uri_equality { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 9ab1dda..1b98b1a 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -1553,6 +1553,37 @@ static BOOL parse_path_hierarchical(const WCHAR **ptr, parse_data *data, DWORD f return TRUE; } +/* Parses the path of a opaque URI (much less strict then the parser + * for a hierarchical URI). + * + * NOTE: + * Windows allows invalid % encoded data to appear in opaque URI paths + * for unknown scheme types. + */ +static BOOL parse_path_opaque(const WCHAR **ptr, parse_data *data, DWORD flags) { + const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; + + data->path = *ptr; + + while(!is_path_delim(**ptr)) { + if(**ptr == '%' && known_scheme) { + if(!check_pct_encoded(ptr)) { + *ptr = data->path; + data->path = NULL; + return FALSE; + } else + continue; + } + + ++(*ptr); + } + + data->path_len = *ptr - data->path; + TRACE("(%p %p %x): Parsed opaque URI path %s len=%d\n", ptr, data, flags, + debugstr_wn(data->path, data->path_len), data->path_len); + return TRUE; +} + /* Determines how the URI should be parsed after the scheme information. * * If the scheme is followed, by "//" then, it is treated as an hierarchical URI @@ -1615,7 +1646,9 @@ static BOOL parse_hierpart(const WCHAR **ptr, parse_data *data, DWORD flags) { TRACE("(%p %p %x): Treating URI as an opaque URI.\n", ptr, data, flags); data->is_opaque = TRUE; - /* TODO: Handle opaque URI's, parse path. */ + if(!parse_path_opaque(ptr, data, flags)) + return FALSE; + return TRUE; }

1 0

Thomas Mullaly : urlmon: Implemented canonicalization function for hierarchical URI paths.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 300d0e1ad4aff3895c3c8db06c1c4bdd72892641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=300d0e1ad4aff3895c3c8db06… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Jul 19 21:05:30 2010 -0400 urlmon: Implemented canonicalization function for hierarchical URI paths. --- dlls/urlmon/tests/uri.c | 181 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 116 ++++++++++++++++++++++++++++++- 2 files changed, 296 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=300d0e1ad4aff3895c3c8…

1 0

Thomas Mullaly : urlmon: Implemented a function which removes dot segments from paths of hierarchical URIs .
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 5758b068aedbdd97e83e1fa2848d0f601b257234 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5758b068aedbdd97e83e1fa28… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Jul 22 22:49:44 2010 -0400 urlmon: Implemented a function which removes dot segments from paths of hierarchical URIs. --- dlls/urlmon/tests/uri.c | 205 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 94 +++++++++++++++++++++ 2 files changed, 299 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5758b068aedbdd97e83e1…

1 0

Thomas Mullaly : urlmon: Implemented canonicalization function for paths in opaque URIs.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 42e8af7a4a33591fe0bd5231a45a7b7350f89982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e8af7a4a33591fe0bd5231a… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jul 25 16:00:50 2010 -0400 urlmon: Implemented canonicalization function for paths in opaque URIs. --- dlls/urlmon/tests/uri.c | 202 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 83 +++++++++++++++++++- 2 files changed, 284 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42e8af7a4a33591fe0bd5…

1 0

Thomas Mullaly : urlmon: Implemented IUri_GetPath.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 1e09e44510dcc56007ed7f91913666601eb52b79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e09e44510dcc56007ed7f919… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jul 25 16:21:05 2010 -0400 urlmon: Implemented IUri_GetPath. --- dlls/urlmon/tests/uri.c | 188 +++++++++++++++++++++++----------------------- dlls/urlmon/uri.c | 26 +++++-- 2 files changed, 113 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e09e44510dcc56007ed7…

1 0

Huw Davies : rpcrt4: Add a missing STUBLESS_INITOUT case.
by Alexandre Julliard 02 Aug '10

02 Aug '10

Module: wine Branch: master Commit: 300536d88e0370d66391759fde414aa3accbc467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=300536d88e0370d66391759fd… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 2 15:24:53 2010 +0100 rpcrt4: Add a missing STUBLESS_INITOUT case. --- dlls/rpcrt4/ndr_stubless.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index ed7912f..243c55a 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1258,6 +1258,8 @@ static LONG_PTR *stub_do_old_args(MIDL_STUB_MESSAGE *pStubMsg, if (pParam->param_direction == RPC_FC_IN_PARAM_BASETYPE) call_freer(pStubMsg, pArg, pTypeFormat); break; + case STUBLESS_INITOUT: + break; case STUBLESS_UNMARSHAL: if (pParam->param_direction == RPC_FC_IN_PARAM_BASETYPE) call_unmarshaller(pStubMsg, &pArg, pTypeFormat, 0); @@ -1512,13 +1514,6 @@ LONG WINAPI NdrStubCall2( if (pThis) *(void **)args = ((CStdStubBuffer *)pThis)->pvServerObject; - /* order of phases: - * 1. STUBLESS_UNMARHSAL - unmarshal [in] params from buffer - * 2. STUBLESS_CALLSERVER - send/receive buffer - * 3. STUBLESS_CALCSIZE - get [out] buffer size - * 4. STUBLESS_GETBUFFER - allocate [out] buffer - * 5. STUBLESS_MARHSAL - marshal [out] params to buffer - */ for (phase = STUBLESS_UNMARSHAL; phase <= STUBLESS_FREE; phase++) { TRACE("phase = %d\n", phase);

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/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 + +(a)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 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 : shell32: Replace some checks with calls to _ILIsEmpty().
by Alexandre Julliard 02 Aug '10

02 Aug '10

Module: wine Branch: master Commit: a690db9f1e78219d09d4a0771556bed3483fda6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a690db9f1e78219d09d4a0771… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Mon Aug 2 14:33:40 2010 +0200 shell32: Replace some checks with calls to _ILIsEmpty(). --- dlls/shell32/brsfolder.c | 4 ++-- dlls/shell32/pidl.c | 4 ++-- dlls/shell32/shfldr_unixfs.c | 12 ++++++------ dlls/shell32/shlfolder.c | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 83ed1dd..77c55c8 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -239,7 +239,7 @@ static void InitializeTreeView( browse_info *info ) return; } - if (pidlChild && pidlChild->mkid.cb) { + if (!_ILIsEmpty(pidlChild)) { hr = IShellFolder_BindToObject(lpsfParent, pidlChild, 0, &IID_IShellFolder, (LPVOID*)&lpsfRoot); } else { lpsfRoot = lpsfParent; @@ -519,7 +519,7 @@ static LRESULT BrsFolder_Treeview_Expand( browse_info *info, NMTREEVIEWW *pnmtv if ((pnmtv->itemNew.state & TVIS_EXPANDEDONCE)) return 0; - if (lptvid->lpi && lptvid->lpi->mkid.cb) { + if (!_ILIsEmpty(lptvid->lpi)) { r = IShellFolder_BindToObject( lptvid->lpsfParent, lptvid->lpi, 0, &IID_IShellFolder, (LPVOID *)&lpsf2 ); } else { diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index a596ebf..1c9cf22 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -217,7 +217,7 @@ BOOL WINAPI ILRemoveLastID(LPITEMIDLIST pidl) { TRACE_(shell)("pidl=%p\n",pidl); - if (!pidl || !pidl->mkid.cb) + if (_ILIsEmpty(pidl)) return FALSE; ILFindLastID(pidl)->mkid.cb = 0; return TRUE; @@ -2062,7 +2062,7 @@ DWORD _ILSimpleGetTextW (LPCITEMIDLIST pidl, LPWSTR szOut, UINT uOutSize) */ LPPIDLDATA _ILGetDataPointer(LPCITEMIDLIST pidl) { - if(pidl && pidl->mkid.cb != 0x00) + if(!_ILIsEmpty(pidl)) return (LPPIDLDATA)pidl->mkid.abID; return NULL; } diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 9ae030f..35eb8e3 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -716,7 +716,7 @@ static HRESULT UNIXFS_initialize_target_folder(UnixFolder *This, const char *szB WCHAR *dos_name; /* Determine the path's length bytes */ - while (current && current->mkid.cb) { + while (!_ILIsEmpty(current)) { dwPathLen += UNIXFS_filename_from_shitemid(current, NULL) + 1; /* For the '/' */ current = ILGetNext(current); }; @@ -734,7 +734,7 @@ static HRESULT UNIXFS_initialize_target_folder(UnixFolder *This, const char *szB pNextDir += strlen(szBasePath); if (This->m_dwPathMode == PATHMODE_UNIX || IsEqualCLSID(&CLSID_MyDocuments, This->m_pCLSID)) This->m_dwAttributes |= SFGAO_FILESYSTEM; - while (current && current->mkid.cb) { + while (!_ILIsEmpty(current)) { pNextDir += UNIXFS_filename_from_shitemid(current, pNextDir); *pNextDir++ = '/'; current = ILGetNext(current); @@ -948,7 +948,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_BindToObject(IShellFolder2* iface TRACE("(iface=%p, pidl=%p, pbcReserver=%p, riid=%p, ppvOut=%p)\n", iface, pidl, pbcReserved, riid, ppvOut); - if (!pidl || !pidl->mkid.cb) + if (_ILIsEmpty(pidl)) return E_INVALIDARG; if (IsEqualCLSID(This->m_pCLSID, &CLSID_FolderShortcut)) { @@ -993,8 +993,8 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_CompareIDs(IShellFolder2* iface, TRACE("(iface=%p, lParam=%ld, pidl1=%p, pidl2=%p)\n", iface, lParam, pidl1, pidl2); - isEmpty1 = !pidl1 || !pidl1->mkid.cb; - isEmpty2 = !pidl2 || !pidl2->mkid.cb; + isEmpty1 = _ILIsEmpty(pidl1); + isEmpty2 = _ILIsEmpty(pidl2); if (isEmpty1 && isEmpty2) return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); @@ -1160,7 +1160,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_GetDisplayNameOf(IShellFolder2* i if ((GET_SHGDN_FOR(uFlags) & SHGDN_FORPARSING) && (GET_SHGDN_RELATION(uFlags) != SHGDN_INFOLDER)) { - if (!pidl || !pidl->mkid.cb) { + if (_ILIsEmpty(pidl)) { lpName->uType = STRRET_WSTR; if (This->m_dwPathMode == PATHMODE_UNIX) { UINT len = MultiByteToWideChar(CP_UNIXCP, 0, This->m_pszPath, -1, NULL, 0); diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 230d7c6..9ab34a9 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -271,7 +271,7 @@ HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, TRACE("(%p %s %p %s %p)\n", pidlRoot, debugstr_w(pathRoot), pidlComplete, debugstr_guid(riid), ppvOut); - if (!pidlRoot || !ppvOut || !pidlComplete || !pidlComplete->mkid.cb) + if (!pidlRoot || !ppvOut || _ILIsEmpty(pidlComplete)) return E_INVALIDARG; *ppvOut = NULL;

1 0