diff --git a/DEVELOPERS-HINTS b/DEVELOPERS-HINTS index b5718f61f90..c51afe23c29 100644 --- a/DEVELOPERS-HINTS +++ b/DEVELOPERS-HINTS @@ -102,6 +102,7 @@ DLLs (under dlls/): netapi32/ - Network interface newdev/ - New Hardware Device Library ntdll/ - NT implementation of kernel calls + objsel/ - Object Picker Dialog odbc32/ - Open DataBase Connectivity driver manager odbccp32/ - Open DataBase Connectivity driver installer ole32/ - 32 bit OLE 2.0 libraries diff --git a/configure b/configure index 1597380e317..ef0d07a5006 100755 --- a/configure +++ b/configure @@ -20204,7 +20204,7 @@ MAKE_LIB_RULES=libs/Makelib.rules MAKE_PROG_RULES=programs/Makeprog.rules - ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules libs/Makelib.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/activeds/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/advpack/Makefile dlls/advpack/tests/Makefile dlls/amstream/Makefile dlls/atl/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile dlls/cryptdll/Makefile dlls/ctl3d/Makefile dlls/d3d8/Makefile dlls/d3d9/Makefile dlls/d3dim/Makefile dlls/d3drm/Makefile dlls/d3dx8/Makefile dlls/d3dxof/Makefile dlls/dbghelp/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput/tests/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnet/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxdiagn/Makefile dlls/dxerr8/Makefile dlls/dxerr9/Makefile dlls/dxguid/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/glut32/Makefile dlls/hhctrl.ocx/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/itss/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/lzexpand/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile dlls/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msacm/tests/Makefile dlls/mscms/Makefile dlls/mscms/tests/Makefile dlls/msdmo/Makefile dlls/mshtml/Makefile dlls/mshtml/tests/Makefile dlls/msi/Makefile dlls/msi/tests/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvcrtd/tests/Makefile dlls/msvidc32/Makefile dlls/msvideo/Makefile dlls/mswsock/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/odbccp32/Makefile dlls/ole32/Makefile dlls/ole32/tests/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/powrprof/Makefile dlls/psapi/Makefile dlls/psapi/tests/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/quartz/tests/Makefile dlls/rasapi32/Makefile dlls/riched20/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/rsabase/tests/Makefile dlls/rsaenh/Makefile dlls/rsaenh/tests/Makefile dlls/secur32/Makefile dlls/sensapi/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/vdhcp.vxd/Makefile dlls/vdmdbg/Makefile dlls/version/Makefile dlls/version/tests/Makefile dlls/vmm.vxd/Makefile dlls/vnbt.vxd/Makefile dlls/vnetbios.vxd/Makefile dlls/vtdapi.vxd/Makefile dlls/vwin32.vxd/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winejack/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wldap32/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/wtsapi32/Makefile dlls/x11drv/Makefile documentation/Makefile fonts/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/unicode/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/hh/Makefile programs/msiexec/Makefile programs/notepad/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/taskmgr/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile" + ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules libs/Makelib.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/activeds/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/advpack/Makefile dlls/advpack/tests/Makefile dlls/amstream/Makefile dlls/atl/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile dlls/cryptdll/Makefile dlls/ctl3d/Makefile dlls/d3d8/Makefile dlls/d3d9/Makefile dlls/d3dim/Makefile dlls/d3drm/Makefile dlls/d3dx8/Makefile dlls/d3dxof/Makefile dlls/dbghelp/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput/tests/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnet/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxdiagn/Makefile dlls/dxerr8/Makefile dlls/dxerr9/Makefile dlls/dxguid/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/glut32/Makefile dlls/hhctrl.ocx/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/itss/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/lzexpand/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile dlls/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msacm/tests/Makefile dlls/mscms/Makefile dlls/mscms/tests/Makefile dlls/msdmo/Makefile dlls/mshtml/Makefile dlls/mshtml/tests/Makefile dlls/msi/Makefile dlls/msi/tests/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvcrtd/tests/Makefile dlls/msvidc32/Makefile dlls/msvideo/Makefile dlls/mswsock/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/objsel/Makefile dlls/odbc32/Makefile dlls/odbccp32/Makefile dlls/ole32/Makefile dlls/ole32/tests/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/powrprof/Makefile dlls/psapi/Makefile dlls/psapi/tests/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/quartz/tests/Makefile dlls/rasapi32/Makefile dlls/riched20/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/rsabase/tests/Makefile dlls/rsaenh/Makefile dlls/rsaenh/tests/Makefile dlls/secur32/Makefile dlls/sensapi/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/vdhcp.vxd/Makefile dlls/vdmdbg/Makefile dlls/version/Makefile dlls/version/tests/Makefile dlls/vmm.vxd/Makefile dlls/vnbt.vxd/Makefile dlls/vnetbios.vxd/Makefile dlls/vtdapi.vxd/Makefile dlls/vwin32.vxd/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winejack/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wldap32/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/wtsapi32/Makefile dlls/x11drv/Makefile documentation/Makefile fonts/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/unicode/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/hh/Makefile programs/msiexec/Makefile programs/notepad/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/taskmgr/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile" cat >confcache <<\_ACEOF @@ -20854,6 +20854,7 @@ do "dlls/newdev/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/newdev/Makefile" ;; "dlls/ntdll/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/ntdll/Makefile" ;; "dlls/ntdll/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/ntdll/tests/Makefile" ;; + "dlls/objsel/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/objsel/Makefile" ;; "dlls/odbc32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/odbc32/Makefile" ;; "dlls/odbccp32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/odbccp32/Makefile" ;; "dlls/ole32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/ole32/Makefile" ;; diff --git a/configure.ac b/configure.ac index ef253c6b072..85edc918755 100644 --- a/configure.ac +++ b/configure.ac @@ -1650,6 +1650,7 @@ dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile +dlls/objsel/Makefile dlls/odbc32/Makefile dlls/odbccp32/Makefile dlls/ole32/Makefile diff --git a/dlls/Makefile.in b/dlls/Makefile.in index f2b7e70adc8..58c7585e20e 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -98,6 +98,7 @@ BASEDIRS = \ netapi32 \ newdev \ ntdll \ + objsel \ odbc32 \ odbccp32 \ ole32 \ @@ -346,6 +347,7 @@ SYMLINKS_SO = \ netapi32.dll.so \ newdev.dll.so \ ntdll.dll.so \ + objsel.dll.so \ odbc32.dll.so \ odbccp32.dll.so \ ole32.dll.so \ @@ -743,6 +745,9 @@ newdev.dll.so: newdev/newdev.dll.so ntdll.dll.so: ntdll/ntdll.dll.so $(RM) $@ && $(LN_S) ntdll/ntdll.dll.so $@ +objsel.dll.so: objsel/objsel.dll.so + $(RM) $@ && $(LN_S) objsel/objsel.dll.so $@ + odbc32.dll.so: odbc32/odbc32.dll.so $(RM) $@ && $(LN_S) odbc32/odbc32.dll.so $@ @@ -1747,6 +1752,7 @@ mswsock/mswsock.dll.so: mswsock netapi32/netapi32.dll.so: netapi32 newdev/newdev.dll.so: newdev ntdll/ntdll.dll.so: ntdll +objsel/objsel.dll.so: objsel odbc32/odbc32.dll.so: odbc32 odbccp32/odbccp32.dll.so: odbccp32 ole32/ole32.dll.so: ole32 diff --git a/dlls/objsel/.cvsignore b/dlls/objsel/.cvsignore new file mode 100644 index 00000000000..6552dbaa63b --- /dev/null +++ b/dlls/objsel/.cvsignore @@ -0,0 +1,3 @@ +Makefile +objsel.dll.dbg.c +objsel.res diff --git a/dlls/objsel/Makefile.in b/dlls/objsel/Makefile.in new file mode 100644 index 00000000000..8758adc89e2 --- /dev/null +++ b/dlls/objsel/Makefile.in @@ -0,0 +1,18 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = objsel.dll +IMPORTS = ole32 oleaut32 user32 advapi32 kernel32 +EXTRALIBS = -lstrmiids -luuid $(LIBUNICODE) + +C_SRCS = \ + factory.c \ + objsel.c \ + regsvr.c + +RC_SRCS = objsel.rc + +@MAKE_DLL_RULES@ + +### Dependencies: diff --git a/dlls/objsel/factory.c b/dlls/objsel/factory.c new file mode 100644 index 00000000000..dafbfcd1bf1 --- /dev/null +++ b/dlls/objsel/factory.c @@ -0,0 +1,163 @@ +/* + * ClassFactory implementation for OBJSEL.dll + * + * Copyright (C) 2002 John K. Hohm + * Copyright (C) 2002 Robert Shearman + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "objsel_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(objsel); + + +/********************************************************************** + * OBJSEL_IClassFactory_QueryInterface (also IUnknown) + */ +static HRESULT WINAPI OBJSEL_IClassFactory_QueryInterface( + LPCLASSFACTORY iface, + REFIID riid, + LPVOID *ppvObj) +{ + TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + + if (ppvObj == NULL) return E_POINTER; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IClassFactory)) + { + *ppvObj = (LPVOID)iface; + IClassFactory_AddRef(iface); + return S_OK; + } + else if (IsEqualGUID(riid, &IID_IDsObjectPicker)) + { + return IClassFactory_CreateInstance(iface, NULL, riid, ppvObj); + } + + FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + + +/********************************************************************** + * OBJSEL_IClassFactory_AddRef (also IUnknown) + */ +static ULONG WINAPI OBJSEL_IClassFactory_AddRef(LPCLASSFACTORY iface) +{ + ClassFactoryImpl *This = (ClassFactoryImpl *)iface; + ULONG ref; + + TRACE("\n"); + + if (This == NULL) return E_POINTER; + + ref = InterlockedIncrement(&This->ref); + + if (ref == 1) + { + InterlockedIncrement(&dll_refs); + } + + return ref; +} + + +/********************************************************************** + * OBJSEL_IClassFactory_Release (also IUnknown) + */ +static ULONG WINAPI OBJSEL_IClassFactory_Release(LPCLASSFACTORY iface) +{ + ClassFactoryImpl *This = (ClassFactoryImpl *)iface; + ULONG ref; + + TRACE("\n"); + + if (This == NULL) return E_POINTER; + + ref = InterlockedDecrement(&This->ref); + + if (ref == 0) + { + InterlockedDecrement(&dll_refs); + } + + return ref; +} + + +/********************************************************************** + * OBJSEL_IClassFactory_CreateInstance + */ +static HRESULT WINAPI OBJSEL_IClassFactory_CreateInstance( + LPCLASSFACTORY iface, + LPUNKNOWN pUnkOuter, + REFIID riid, + LPVOID *ppvObj) +{ + TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + + if (ppvObj == NULL) return E_POINTER; + + /* Don't support aggregation (Windows doesn't) */ + if (pUnkOuter != NULL) return CLASS_E_NOAGGREGATION; + + if (IsEqualGUID(&IID_IDsObjectPicker, riid)) + { + return OBJSEL_IDsObjectPicker_Create(ppvObj); + } + + return CLASS_E_CLASSNOTAVAILABLE; +} + + +/********************************************************************** + * OBJSEL_IClassFactory_LockServer + */ +static HRESULT WINAPI OBJSEL_IClassFactory_LockServer( + LPCLASSFACTORY iface, + BOOL fLock) +{ + TRACE("\n"); + + if (fLock) + IClassFactory_AddRef(iface); + else + IClassFactory_Release(iface); + return S_OK; +} + + +/********************************************************************** + * IClassFactory_Vtbl + */ +static IClassFactoryVtbl IClassFactory_Vtbl = +{ + OBJSEL_IClassFactory_QueryInterface, + OBJSEL_IClassFactory_AddRef, + OBJSEL_IClassFactory_Release, + OBJSEL_IClassFactory_CreateInstance, + OBJSEL_IClassFactory_LockServer +}; + + +/********************************************************************** + * static ClassFactory instance + */ + +ClassFactoryImpl OBJSEL_ClassFactory = { &IClassFactory_Vtbl, 0 }; diff --git a/dlls/objsel/objsel.c b/dlls/objsel/objsel.c new file mode 100644 index 00000000000..490469c1211 --- /dev/null +++ b/dlls/objsel/objsel.c @@ -0,0 +1,211 @@ +/* + * Object Picker Dialog + * + * Copyright 2005 Thomas Weidenmueller + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "objsel_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(objsel); + +LONG dll_refs = 0; +HINSTANCE hInstance; + +/*********************************************************************** + * DllEntryPoint + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) +{ + switch(fdwReason) + { + case DLL_PROCESS_ATTACH: + hInstance = hinstDLL; + DisableThreadLibraryCalls(hInstance); + break; + } + return TRUE; +} + + +/*********************************************************************** + * DllGetClassObject (OBJSEL.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) +{ + TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + + *ppv = NULL; + + if (IsEqualGUID(rclsid, &CLSID_DsObjectPicker)) + return IClassFactory_QueryInterface((IClassFactory*)&OBJSEL_ClassFactory, iid, ppv); + + FIXME("\n\tCLSID:\t%s,\n\tIID:\t%s\n",debugstr_guid(rclsid),debugstr_guid(iid)); + return CLASS_E_CLASSNOTAVAILABLE; +} + + +/*********************************************************************** + * DllCanUnloadNow (OBJSEL.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return dll_refs != 0 ? S_FALSE : S_OK; +} + + +/********************************************************************** + * OBJSEL_IDsObjectPicker_Destroy (also IUnknown) + */ +static VOID WINAPI OBJSEL_IDsObjectPicker_Destroy(IDsObjectPickerImpl *This) +{ + HeapFree(GetProcessHeap(), + 0, + This); +} + + +/********************************************************************** + * OBJSEL_IDsObjectPicker_AddRef (also IUnknown) + */ +static ULONG WINAPI OBJSEL_IDsObjectPicker_AddRef(IDsObjectPicker * iface) +{ + IDsObjectPickerImpl *This = (IDsObjectPickerImpl *)iface; + ULONG ref; + + TRACE("\n"); + + if (This == NULL) return E_POINTER; + + ref = InterlockedIncrement(&This->ref); + + if (ref == 1) + { + InterlockedIncrement(&dll_refs); + } + + return ref; +} + + +/********************************************************************** + * OBJSEL_IDsObjectPicker_Release (also IUnknown) + */ +static ULONG WINAPI OBJSEL_IDsObjectPicker_Release(IDsObjectPicker * iface) +{ + IDsObjectPickerImpl *This = (IDsObjectPickerImpl *)iface; + ULONG ref; + + TRACE("\n"); + + if (This == NULL) return E_POINTER; + + ref = InterlockedDecrement(&This->ref); + + if (ref == 0) + { + InterlockedDecrement(&dll_refs); + OBJSEL_IDsObjectPicker_Destroy(This); + } + + return ref; +} + + +/********************************************************************** + * OBJSEL_IDsObjectPicker_QueryInterface (also IUnknown) + */ +static HRESULT WINAPI OBJSEL_IDsObjectPicker_QueryInterface( + IDsObjectPicker * iface, + REFIID riid, + LPVOID *ppvObj) +{ + TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + + if (ppvObj == NULL) return E_POINTER; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDsObjectPicker)) + { + *ppvObj = (LPVOID)iface; + OBJSEL_IDsObjectPicker_AddRef(iface); + return S_OK; + } + + FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + + +/********************************************************************** + * OBJSEL_IDsObjectPicker_Initialize + */ +static HRESULT WINAPI OBJSEL_IDsObjectPicker_Initialize( + IDsObjectPicker * iface, + PDSOP_INIT_INFO pInitInfo) +{ + FIXME("stub!\n"); + return S_OK; +} + + +/********************************************************************** + * OBJSEL_IDsObjectPicker_InvokeDialog + */ +static HRESULT WINAPI OBJSEL_IDsObjectPicker_InvokeDialog( + IDsObjectPicker * iface, + HWND hwndParent, + IDataObject** ppdoSelections) +{ + FIXME("stub!\n"); + return S_FALSE; +} + + +/********************************************************************** + * IDsObjectPicker_Vtbl + */ +static IDsObjectPickerVtbl IDsObjectPicker_Vtbl = +{ + OBJSEL_IDsObjectPicker_QueryInterface, + OBJSEL_IDsObjectPicker_AddRef, + OBJSEL_IDsObjectPicker_Release, + OBJSEL_IDsObjectPicker_Initialize, + OBJSEL_IDsObjectPicker_InvokeDialog +}; + + +/********************************************************************** + * OBJSEL_IDsObjectPicker_Create + */ +HRESULT WINAPI OBJSEL_IDsObjectPicker_Create(LPVOID *ppvObj) +{ + IDsObjectPickerImpl *Instance = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(IDsObjectPickerImpl)); + if (Instance != NULL) + { + Instance->lpVtbl = &IDsObjectPicker_Vtbl; + OBJSEL_IDsObjectPicker_AddRef((IDsObjectPicker *)Instance); + + *ppvObj = Instance; + return S_OK; + } + else + return E_OUTOFMEMORY; +} diff --git a/dlls/objsel/objsel.rc b/dlls/objsel/objsel.rc new file mode 100644 index 00000000000..f85b45f72ec --- /dev/null +++ b/dlls/objsel/objsel.rc @@ -0,0 +1,28 @@ +/* + * Object Picker Dialog + * + * Copyright 2005 Thomas Weidenmueller + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "windef.h" +#include "winbase.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define WINE_FILENAME_STR "objsel.dll" + +#include "wine/wine_common_ver.rc" diff --git a/dlls/objsel/objsel.spec b/dlls/objsel/objsel.spec new file mode 100644 index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/objsel/objsel.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/objsel/objsel_private.h b/dlls/objsel/objsel_private.h new file mode 100644 index 00000000000..68071dd45aa --- /dev/null +++ b/dlls/objsel/objsel_private.h @@ -0,0 +1,65 @@ +/* + * Object Picker Dialog Includes + * + * Copyright 2005 Thomas Weidenmueller + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include +#include +#include +#include "winerror.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "wingdi.h" +#include "winuser.h" + +#define COBJMACROS +#define COM_NO_WINDOWS_H + +#include "ole2.h" +#include "strmif.h" +#include "olectl.h" +#include "unknwn.h" +#include "objsel.h" +#include "wine/unicode.h" +#include "uuids.h" + +/********************************************************************** + * Dll lifetime tracking declaration for objsel.dll + */ + +extern LONG dll_refs; + +/********************************************************************** + * ClassFactory declaration for objsel.dll + */ +typedef struct +{ + IClassFactoryVtbl *lpVtbl; + LONG ref; +} ClassFactoryImpl; + +typedef struct +{ + IDsObjectPickerVtbl *lpVtbl; + LONG ref; +} IDsObjectPickerImpl; + +HRESULT WINAPI OBJSEL_IDsObjectPicker_Create(LPVOID *ppvObj); + +extern ClassFactoryImpl OBJSEL_ClassFactory; diff --git a/dlls/objsel/regsvr.c b/dlls/objsel/regsvr.c new file mode 100644 index 00000000000..2da0cc9075e --- /dev/null +++ b/dlls/objsel/regsvr.c @@ -0,0 +1,567 @@ +/* + * self-registerable dll functions for objsel.dll + * + * Copyright (C) 2004 Raphael Junqueira + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "config.h" + +#include +#include + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "winerror.h" + +#include "objbase.h" +#include "unknwn.h" +#include "objsel.h" + +#include "wine/debug.h" + +#include "initguid.h" + +WINE_DEFAULT_DEBUG_CHANNEL(objsel); + +/* + * Near the bottom of this file are the exported DllRegisterServer and + * DllUnregisterServer, which make all this worthwhile. + */ + +/*********************************************************************** + * interface for self-registering + */ +struct regsvr_interface { + IID const *iid; /* NULL for end of list */ + LPCSTR name; /* can be NULL to omit */ + IID const *base_iid; /* can be NULL to omit */ + int num_methods; /* can be <0 to omit */ + CLSID const *ps_clsid; /* can be NULL to omit */ + CLSID const *ps_clsid32; /* can be NULL to omit */ +}; + +static HRESULT register_interfaces(struct regsvr_interface const *list); +static HRESULT unregister_interfaces(struct regsvr_interface const *list); + +/** + * @todo: maybe adding typelibs support here + * [Software\\Classes\\CLSID\\{000C1090-0000-0000-C000-000000000046}\\TypeLib] 1080380217 + * @="{000C1092-0000-0000-C000-000000000046}" + */ +struct regsvr_coclass { + CLSID const *clsid; /* NULL for end of list */ + LPCSTR name; /* can be NULL to omit */ + LPCSTR iph32; /* can be NULL to omit */ + LPCSTR ips; /* can be NULL to omit */ + LPCSTR ips32; /* can be NULL to omit */ + LPCSTR ips32_tmodel; /* can be NULL to omit, if apartment, iph32 must be set */ + LPCSTR progid; /* can be NULL to omit */ + LPCSTR viprogid; /* can be NULL to omit */ + LPCSTR progid_extra; /* can be NULL to omit */ +}; + +static HRESULT register_coclasses(struct regsvr_coclass const *list); +static HRESULT unregister_coclasses(struct regsvr_coclass const *list); + +/*********************************************************************** + * static string constants + */ +static WCHAR const interface_keyname[10] = { + 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 0 }; +static WCHAR const base_ifa_keyname[14] = { + 'B', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', + 'e', 0 }; +static WCHAR const num_methods_keyname[11] = { + 'N', 'u', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', 0 }; +static WCHAR const ps_clsid_keyname[15] = { + 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', + 'i', 'd', 0 }; +static WCHAR const ps_clsid32_keyname[17] = { + 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', + 'i', 'd', '3', '2', 0 }; +static WCHAR const clsid_keyname[6] = { + 'C', 'L', 'S', 'I', 'D', 0 }; +static WCHAR const curver_keyname[7] = { + 'C', 'u', 'r', 'V', 'e', 'r', 0 }; +static WCHAR const iph32_keyname[] = { + 'I', 'n', 'P', 'r', 'o', 'c', 'H', 'a', 'n', 'd', 'l', 'e', 'r', + '3', '2', 0 }; +static WCHAR const ips_keyname[13] = { + 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', + 0 }; +static WCHAR const ips32_keyname[15] = { + 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', + '3', '2', 0 }; +static WCHAR const progid_keyname[7] = { + 'P', 'r', 'o', 'g', 'I', 'D', 0 }; +static WCHAR const viprogid_keyname[25] = { + 'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'd', 'e', 'p', + 'e', 'n', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'I', 'D', + 0 }; +static char const tmodel_valuename[] = "ThreadingModel"; + +/*********************************************************************** + * static helper functions + */ +static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid); +static LONG register_key_defvalueW(HKEY base, WCHAR const *name, + WCHAR const *value); +static LONG register_key_defvalueA(HKEY base, WCHAR const *name, + char const *value); +static LONG register_progid(WCHAR const *clsid, + char const *progid, char const *curver_progid, + char const *name, char const *extra); +static LONG recursive_delete_key(HKEY key); +static LONG recursive_delete_keyA(HKEY base, char const *name); +static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); + +/*********************************************************************** + * register_interfaces + */ +static HRESULT register_interfaces(struct regsvr_interface const *list) { + LONG res = ERROR_SUCCESS; + HKEY interface_key; + + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &interface_key, NULL); + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->iid; ++list) { + WCHAR buf[39]; + HKEY iid_key; + + StringFromGUID2(list->iid, buf, 39); + res = RegCreateKeyExW(interface_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &iid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_interface_key; + + if (list->name) { + res = RegSetValueExA(iid_key, NULL, 0, REG_SZ, + (CONST BYTE*)(list->name), + strlen(list->name) + 1); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->base_iid) { + register_key_guid(iid_key, base_ifa_keyname, list->base_iid); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (0 <= list->num_methods) { + static WCHAR const fmt[3] = { '%', 'd', 0 }; + HKEY key; + + res = RegCreateKeyExW(iid_key, num_methods_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + + wsprintfW(buf, fmt, list->num_methods); + res = RegSetValueExW(key, NULL, 0, REG_SZ, + (CONST BYTE*)buf, + (lstrlenW(buf) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->ps_clsid) { + register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->ps_clsid32) { + register_key_guid(iid_key, ps_clsid32_keyname, list->ps_clsid32); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + error_close_iid_key: + RegCloseKey(iid_key); + } + +error_close_interface_key: + RegCloseKey(interface_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * unregister_interfaces + */ +static HRESULT unregister_interfaces(struct regsvr_interface const *list) { + LONG res = ERROR_SUCCESS; + HKEY interface_key; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, + KEY_READ | KEY_WRITE, &interface_key); + if (res == ERROR_FILE_NOT_FOUND) return S_OK; + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->iid; ++list) { + WCHAR buf[39]; + + StringFromGUID2(list->iid, buf, 39); + res = recursive_delete_keyW(interface_key, buf); + } + + RegCloseKey(interface_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * register_coclasses + */ +static HRESULT register_coclasses(struct regsvr_coclass const *list) { + LONG res = ERROR_SUCCESS; + HKEY coclass_key; + + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL); + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->clsid; ++list) { + WCHAR buf[39]; + HKEY clsid_key; + + StringFromGUID2(list->clsid, buf, 39); + res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + + if (list->name) { + res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ, + (CONST BYTE*)(list->name), + strlen(list->name) + 1); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->iph32) { + HKEY iph32_key; + + res = RegCreateKeyExW(clsid_key, iph32_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &iph32_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = RegSetValueExA(iph32_key, NULL, 0, REG_SZ, + (CONST BYTE*)list->iph32, + lstrlenA(list->iph32) + 1); + RegCloseKey(iph32_key); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->ips) { + res = register_key_defvalueA(clsid_key, ips_keyname, list->ips); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->ips32) { + HKEY ips32_key; + + res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &ips32_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ, + (CONST BYTE*)list->ips32, + lstrlenA(list->ips32) + 1); + if (res == ERROR_SUCCESS && list->ips32_tmodel) + res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ, + (CONST BYTE*)list->ips32_tmodel, + strlen(list->ips32_tmodel) + 1); + RegCloseKey(ips32_key); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->progid) { + res = register_key_defvalueA(clsid_key, progid_keyname, + list->progid); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = register_progid(buf, list->progid, NULL, + list->name, list->progid_extra); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->viprogid) { + res = register_key_defvalueA(clsid_key, viprogid_keyname, + list->viprogid); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = register_progid(buf, list->viprogid, list->progid, + list->name, list->progid_extra); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + error_close_clsid_key: + RegCloseKey(clsid_key); + } + +error_close_coclass_key: + RegCloseKey(coclass_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * unregister_coclasses + */ +static HRESULT unregister_coclasses(struct regsvr_coclass const *list) { + LONG res = ERROR_SUCCESS; + HKEY coclass_key; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, + KEY_READ | KEY_WRITE, &coclass_key); + if (res == ERROR_FILE_NOT_FOUND) return S_OK; + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->clsid; ++list) { + WCHAR buf[39]; + + StringFromGUID2(list->clsid, buf, 39); + res = recursive_delete_keyW(coclass_key, buf); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + + if (list->progid) { + res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + } + + if (list->viprogid) { + res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + } + } + +error_close_coclass_key: + RegCloseKey(coclass_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * regsvr_key_guid + */ +static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid) { + WCHAR buf[39]; + + StringFromGUID2(guid, buf, 39); + return register_key_defvalueW(base, name, buf); +} + +/*********************************************************************** + * regsvr_key_defvalueW + */ +static LONG register_key_defvalueW( + HKEY base, + WCHAR const *name, + WCHAR const *value) { + LONG res; + HKEY key; + + res = RegCreateKeyExW(base, name, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) return res; + res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)value, + (lstrlenW(value) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + return res; +} + +/*********************************************************************** + * regsvr_key_defvalueA + */ +static LONG register_key_defvalueA( + HKEY base, + WCHAR const *name, + char const *value) { + LONG res; + HKEY key; + + res = RegCreateKeyExW(base, name, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) return res; + res = RegSetValueExA(key, NULL, 0, REG_SZ, (CONST BYTE*)value, + lstrlenA(value) + 1); + RegCloseKey(key); + return res; +} + +/*********************************************************************** + * regsvr_progid + */ +static LONG register_progid( + WCHAR const *clsid, + char const *progid, + char const *curver_progid, + char const *name, + char const *extra) { + LONG res; + HKEY progid_key; + + res = RegCreateKeyExA(HKEY_CLASSES_ROOT, progid, 0, + NULL, 0, KEY_READ | KEY_WRITE, NULL, + &progid_key, NULL); + if (res != ERROR_SUCCESS) return res; + + if (name) { + res = RegSetValueExA(progid_key, NULL, 0, REG_SZ, + (CONST BYTE*)name, strlen(name) + 1); + if (res != ERROR_SUCCESS) goto error_close_progid_key; + } + + if (clsid) { + res = register_key_defvalueW(progid_key, clsid_keyname, clsid); + if (res != ERROR_SUCCESS) goto error_close_progid_key; + } + + if (curver_progid) { + res = register_key_defvalueA(progid_key, curver_keyname, + curver_progid); + if (res != ERROR_SUCCESS) goto error_close_progid_key; + } + + if (extra) { + HKEY extra_key; + + res = RegCreateKeyExA(progid_key, extra, 0, + NULL, 0, KEY_READ | KEY_WRITE, NULL, + &extra_key, NULL); + if (res == ERROR_SUCCESS) + RegCloseKey(extra_key); + } + +error_close_progid_key: + RegCloseKey(progid_key); + return res; +} + +/*********************************************************************** + * recursive_delete_key + */ +static LONG recursive_delete_key(HKEY key) { + LONG res; + WCHAR subkey_name[MAX_PATH]; + DWORD cName; + HKEY subkey; + + for (;;) { + cName = sizeof(subkey_name) / sizeof(WCHAR); + res = RegEnumKeyExW(key, 0, subkey_name, &cName, + NULL, NULL, NULL, NULL); + if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { + res = ERROR_SUCCESS; /* presumably we're done enumerating */ + break; + } + res = RegOpenKeyExW(key, subkey_name, 0, + KEY_READ | KEY_WRITE, &subkey); + if (res == ERROR_FILE_NOT_FOUND) continue; + if (res != ERROR_SUCCESS) break; + + res = recursive_delete_key(subkey); + RegCloseKey(subkey); + if (res != ERROR_SUCCESS) break; + } + + if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); + return res; +} + +/*********************************************************************** + * recursive_delete_keyA + */ +static LONG recursive_delete_keyA(HKEY base, char const *name) { + LONG res; + HKEY key; + + res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); + if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; + if (res != ERROR_SUCCESS) return res; + res = recursive_delete_key(key); + RegCloseKey(key); + return res; +} + +/*********************************************************************** + * recursive_delete_keyW + */ +static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) { + LONG res; + HKEY key; + + res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); + if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; + if (res != ERROR_SUCCESS) return res; + res = recursive_delete_key(key); + RegCloseKey(key); + return res; +} + +/*********************************************************************** + * coclass list + */ +static struct regsvr_coclass const coclass_list[] = { + { + &CLSID_DsObjectPicker, + "DsObjectPicker", + NULL, + NULL, + "objsel.dll", + "Both", + NULL, + NULL + }, + { NULL } /* list terminator */ +}; + +/*********************************************************************** + * interface list + */ +static struct regsvr_interface const interface_list[] = { + { NULL } /* list terminator */ +}; + +/*********************************************************************** + * DllRegisterServer + */ +HRESULT WINAPI DllRegisterServer(void) { + HRESULT hr; + + TRACE("\n"); + + hr = register_coclasses(coclass_list); + if (SUCCEEDED(hr)) + hr = register_interfaces(interface_list); + return hr; +} + +/*********************************************************************** + * DllUnregisterServer + */ +HRESULT WINAPI DllUnregisterServer(void) { + HRESULT hr; + + TRACE("\n"); + + hr = unregister_coclasses(coclass_list); + if (SUCCEEDED(hr)) + hr = unregister_interfaces(interface_list); + return hr; +} diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 946f4ae6500..229a6c64160 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -60,6 +60,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "richole.h" #include "xmldom.h" #include "downloadmgr.h" +#include "objsel.h" /* FIXME: cguids declares GUIDs but does not define their values */ diff --git a/include/Makefile.in b/include/Makefile.in index 9e2c934679c..e2f7445fda8 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -190,6 +190,7 @@ WINDOWS_INCLUDES = \ ntsecapi.h \ ntstatus.h \ objbase.h \ + objsel.h \ odbcinst.h \ ole2.h \ ole2ver.h \ diff --git a/include/objsel.h b/include/objsel.h new file mode 100644 index 00000000000..dc5afd6066e --- /dev/null +++ b/include/objsel.h @@ -0,0 +1,170 @@ +/* + * objsel.h + * + * Object Picker Dialog + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ +#ifndef __OBJSEL_H_ +#define __OBJSEL_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +DEFINE_GUID(CLSID_DsObjectPicker, 0x17d6ccd8, 0x3b7b, 0x11d2, 0x00b9, 0xe0,0x00,0xc0,0x4f,0xd8,0xdb,0xf7); +DEFINE_GUID(IID_IDsObjectPicker, 0x0c87e64e, 0x3b7a, 0x11d2, 0x00b9, 0xe0,0x00,0xc0,0x4f,0xd8,0xdb,0xf7); + +#define CFSTR_DSOP_DS_SELECTION_LIST TEXT("CFSTR_DSOP_DS_SELECTION_LIST") + +/* up-level scope filters in the DSOP_UPLEVEL_FILTER_FLAGS structure */ +#define DSOP_FILTER_INCLUDE_ADVANCED_VIEW (0x1) +#define DSOP_FILTER_USERS (0x2) +#define DSOP_FILTER_BUILTIN_GROUPS (0x4) +#define DSOP_FILTER_WELL_KNOWN_PRINCIPALS (0x8) +#define DSOP_FILTER_UNIVERSAL_GROUPS_DL (0x10) +#define DSOP_FILTER_UNIVERSAL_GROUPS_SE (0x20) +#define DSOP_FILTER_GLOBAL_GROUPS_DL (0x40) +#define DSOP_FILTER_GLOBAL_GROUPS_SE (0x80) +#define DSOP_FILTER_DOMAIN_LOCAL_GROUPS_DL (0x100) +#define DSOP_FILTER_DOMAIN_LOCAL_GROUPS_SE (0x200) +#define DSOP_FILTER_CONTACTS (0x400) +#define DSOP_FILTER_COMPUTERS (0x800) + +typedef struct _DSOP_UPLEVEL_FILTER_FLAGS +{ + ULONG flBothModes; + ULONG flMixedModeOnly; + ULONG flNativeModeOnly; +} DSOP_UPLEVEL_FILTER_FLAGS, *PDSOP_UPLEVEL_FILTER_FLAGS; + +/* down-level scope filters in the DSOP_FILTER_FLAGS structure */ +#define DSOP_DOWNLEVEL_FILTER_USERS (0x80000001) +#define DSOP_DOWNLEVEL_FILTER_LOCAL_GROUPS (0x80000002) +#define DSOP_DOWNLEVEL_FILTER_GLOBAL_GROUPS (0x80000004) +#define DSOP_DOWNLEVEL_FILTER_COMPUTERS (0x80000008) +#define DSOP_DOWNLEVEL_FILTER_WORLD (0x80000010) +#define DSOP_DOWNLEVEL_FILTER_AUTHENTICATED_USER (0x80000020) +#define DSOP_DOWNLEVEL_FILTER_ANONYMOUS (0x80000040) +#define DSOP_DOWNLEVEL_FILTER_BATCH (0x80000080) +#define DSOP_DOWNLEVEL_FILTER_CREATOR_OWNER (0x80000100) +#define DSOP_DOWNLEVEL_FILTER_CREATOR_GROUP (0x80000200) +#define DSOP_DOWNLEVEL_FILTER_DIALUP (0x80000400) +#define DSOP_DOWNLEVEL_FILTER_INTERACTIVE (0x80000800) +#define DSOP_DOWNLEVEL_FILTER_NETWORK (0x80001000) +#define DSOP_DOWNLEVEL_FILTER_SERVICE (0x80002000) +#define DSOP_DOWNLEVEL_FILTER_SYSTEM (0x80004000) +#define DSOP_DOWNLEVEL_FILTER_EXCLUDE_BUILTIN_GROUPS (0x80008000) +#define DSOP_DOWNLEVEL_FILTER_TERMINAL_SERVER (0x80010000) +#define DSOP_DOWNLEVEL_FILTER_ALL_WELLKNOWN_SIDS (0x80020000) +#define DSOP_DOWNLEVEL_FILTER_LOCAL_SERVICE (0x80040000) +#define DSOP_DOWNLEVEL_FILTER_NETWORK_SERVICE (0x80080000) +#define DSOP_DOWNLEVEL_FILTER_REMOTE_LOGON (0x80100000) + +typedef struct _DSOP_FILTER_FLAGS +{ + DSOP_UPLEVEL_FILTER_FLAGS Uplevel; + ULONG flDownlevel; +} DSOP_FILTER_FLAGS, *PDSOP_FILTER_FLAGS; + +/* ADsPath format flags in the DSOP_SCOPE_INIT_INFO structure */ +#define DSOP_SCOPE_FLAG_STARTING_SCOPE (0x1) +#define DSOP_SCOPE_FLAG_WANT_PROVIDER_WINNT (0x2) +#define DSOP_SCOPE_FLAG_WANT_PROVIDER_LDAP (0x4) +#define DSOP_SCOPE_FLAG_WANT_PROVIDER_GC (0x8) +#define DSOP_SCOPE_FLAG_WANT_SID_PATH (0x10) +#define DSOP_SCOPE_FLAG_WANT_DOWNLEVEL_BUILTIN_PATH (0x20) +#define DSOP_SCOPE_FLAG_DEFAULT_FILTER_USERS (0x40) +#define DSOP_SCOPE_FLAG_DEFAULT_FILTER_GROUPS (0x80) +#define DSOP_SCOPE_FLAG_DEFAULT_FILTER_COMPUTERS (0x100) +#define DSOP_SCOPE_FLAG_DEFAULT_FILTER_CONTACTS (0x200) + +typedef struct _DSOP_SCOPE_INIT_INFO +{ + ULONG cbSize; + ULONG flType; + ULONG flScope; + DSOP_FILTER_FLAGS FilterFlags; + PCWSTR pwzDcName; + PCWSTR pwzADsPath; + HRESULT hr; +} DSOP_SCOPE_INIT_INFO, *PDSOP_SCOPE_INIT_INFO; +typedef const DSOP_SCOPE_INIT_INFO *PCDSOP_SCOPE_INIT_INFO; + +/* object picker options in the DSOP_INIT_INFO structure */ +#define DSOP_FLAG_MULTISELECT (0x1) +#define DSOP_FLAG_SKIP_TARGET_COMPUTER_DC_CHECK (0x2) + +typedef struct _DSOP_INIT_INFO +{ + ULONG cbSize; + PCWSTR pwzTargetComputer; + ULONG cDsScopeInfos; + PDSOP_SCOPE_INIT_INFO aDsScopeInfos; + ULONG flOptions; + ULONG cAttributesToFetch; + PCWSTR *apwzAttributeNames; +} DSOP_INIT_INFO, *PDSOP_INIT_INFO; + +typedef const DSOP_INIT_INFO *PCDSOP_INIT_INFO; + +/* selection scope types in the DS_SELECTION structure */ +#define DSOP_SCOPE_TYPE_TARGET_COMPUTER (0x1) +#define DSOP_SCOPE_TYPE_UPLEVEL_JOINED_DOMAIN (0x2) +#define DSOP_SCOPE_TYPE_DOWNLEVEL_JOINED_DOMAIN (0x4) +#define DSOP_SCOPE_TYPE_ENTERPRISE_DOMAIN (0x8) +#define DSOP_SCOPE_TYPE_GLOBAL_CATALOG (0x10) +#define DSOP_SCOPE_TYPE_EXTERNAL_UPLEVEL_DOMAIN (0x20) +#define DSOP_SCOPE_TYPE_EXTERNAL_DOWNLEVEL_DOMAIN (0x40) +#define DSOP_SCOPE_TYPE_WORKGROUP (0x80) +#define DSOP_SCOPE_TYPE_USER_ENTERED_UPLEVEL_SCOPE (0x100) +#define DSOP_SCOPE_TYPE_USER_ENTERED_DOWNLEVEL_SCOPE (0x200) + +typedef struct _DS_SELECTION +{ + PWSTR pwzName; + PWSTR pwzADsPath; + PWSTR pwzClass; + PWSTR pwzUPN; + VARIANT *pvarFetchedAttributes; + ULONG flScopeType; +} DS_SELECTION, *PDS_SELECTION; + +typedef struct _DS_SELECTION_LIST +{ + ULONG cItems; + ULONG cFetchedAttributes; + DS_SELECTION aDsSelection[ANYSIZE_ARRAY]; +} DS_SELECTION_LIST, *PDS_SELECTION_LIST; + +/***************************************************************************** + * IDsObjectPicker interface + */ +typedef struct IDsObjectPicker IDsObjectPicker; +#define INTERFACE IDsObjectPicker +DECLARE_INTERFACE_(IDsObjectPicker,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IDsObjectPicker methods ***/ + STDMETHOD(Initialize)(THIS_ PDSOP_INIT_INFO pInitInfo) PURE; + STDMETHOD(InvokeDialog)(THIS_ HWND hwndParent, IDataObject** ppdoSelections) PURE; +}; +#undef INTERFACE + + +#ifdef __cplusplus +} +#endif +#endif /* __OBJSEL_H_ */