Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 65766: [COMCTL32] * Do not add two additional pixels at the top margin of the toolbar. This is the behaviour of comctl32 v6 and our explorer depends on that to appear properly. We do...
by gadamopoulos＠svn.reactos.org 20 Dec '14

20 Dec '14

Author: gadamopoulos Date: Sat Dec 20 16:49:31 2014 New Revision: 65766 URL: http://svn.reactos.org/svn/reactos?rev=65766&view=rev Log: [COMCTL32] * Do not add two additional pixels at the top margin of the toolbar. This is the behaviour of comctl32 v6 and our explorer depends on that to appear properly. We don't have a proper solution for these differences in behavior and since we already opt to use the v6 behavior I think it is fine. CORE-5483 #resolve #comment Committed a slightly different version of the patch, thanks. Modified: trunk/reactos/dll/win32/comctl32/toolbar.c Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Sat Dec 20 16:49:31 2014 @@ -244,7 +244,12 @@ static inline int default_top_margin(const TOOLBAR_INFO *infoPtr) { +#if 0 return (infoPtr->dwStyle & TBSTYLE_FLAT ? 0 : TOP_BORDER); +#else + /* This is the behaviour in comctl32 v6 */ + return 0; +#endif } static inline BOOL TOOLBAR_HasDropDownArrows(DWORD exStyle)

1 0

[dquintana] 65765: [SHELL32] * Remove a leftover from when this file was C++. CORE-8846 #resolve #comment Should be fixed in trunk r65765, thanks.
by dquintana＠svn.reactos.org 20 Dec '14

20 Dec '14

Author: dquintana Date: Sat Dec 20 16:47:35 2014 New Revision: 65765 URL: http://svn.reactos.org/svn/reactos?rev=65765&view=rev Log: [SHELL32] * Remove a leftover from when this file was C++. CORE-8846 #resolve #comment Should be fixed in trunk r65765, thanks. Modified: trunk/reactos/dll/win32/shell32/wine/brsfolder.c Modified: trunk/reactos/dll/win32/shell32/wine/brsfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/brs… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/brsfolder.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/brsfolder.c [iso-8859-1] Sat Dec 20 16:47:35 2014 @@ -385,9 +385,6 @@ tvi.lParam = (LPARAM)lptvid; IShellFolder_AddRef(lpsf); -#ifdef __REACTOS__ - IEnumIDList_AddRef(pEnumIL); -#endif lptvid->lpsfParent = lpsf; lptvid->lpi = ILClone(pidl); lptvid->lpifq = pidlParent ? ILCombine(pidlParent, pidl) : ILClone(pidl);

1 0

[pschweitzer] 65764: [TREE] - Fix tree internal name - Add tree French translation
by pschweitzer＠svn.reactos.org 20 Dec '14

20 Dec '14

Author: pschweitzer Date: Sat Dec 20 16:41:23 2014 New Revision: 65764 URL: http://svn.reactos.org/svn/reactos?rev=65764&view=rev Log: [TREE] - Fix tree internal name - Add tree French translation Added: trunk/reactos/base/applications/cmdutils/tree/lang/fr-FR.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/tree/tree.rc Added: trunk/reactos/base/applications/cmdutils/tree/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/lang/fr-FR.rc (added) +++ trunk/reactos/base/applications/cmdutils/tree/lang/fr-FR.rc [iso-8859-1] Sat Dec 20 16:41:23 2014 @@ -0,0 +1,12 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "Affiche graphiquement la structure des dossiers d'un lecteur ou d'un chemin.\n\n\ +TREE [lecteur:][chemin] [/F] [/A]\n\n\ +\t/F Affiche le nom des fichiers dans chaque dossier.\n\ +\t/A Utiliser l'ASCII au lieu de l'unicode.\n" + IDS_NO_SUBDIRECTORIES "Aucun sous-rÃ©pertoire n'existe" + IDS_FOLDER_PATH "ÃnumÃ©ration du dossier\n" + IDS_VOL_SERIAL "Le numÃ©ro de sÃ©rie du volume est %x:%x\n" +END Propchange: trunk/reactos/base/applications/cmdutils/tree/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/tree/tree.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/tree.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/tree/tree.rc [iso-8859-1] Sat Dec 20 16:41:23 2014 @@ -7,7 +7,7 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Tree Walk Utility" #define REACTOS_STR_INTERNAL_NAME "tree" -#define REACTOS_STR_ORIGINAL_FILENAME "tree.exe" +#define REACTOS_STR_ORIGINAL_FILENAME "tree.com" #include <reactos/version.rc> /* UTF-8 */ @@ -18,3 +18,6 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif

1 0

[pschweitzer] 65763: [TREE] Convert resources strings to OEM before printing them on console. Fixes broken displays with special chars
by pschweitzer＠svn.reactos.org 20 Dec '14

20 Dec '14

Author: pschweitzer Date: Sat Dec 20 16:40:57 2014 New Revision: 65763 URL: http://svn.reactos.org/svn/reactos?rev=65763&view=rev Log: [TREE] Convert resources strings to OEM before printing them on console. Fixes broken displays with special chars Modified: trunk/reactos/base/applications/cmdutils/tree/tree.c Modified: trunk/reactos/base/applications/cmdutils/tree/tree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/tree.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/tree/tree.c [iso-8859-1] Sat Dec 20 16:40:57 2014 @@ -26,11 +26,13 @@ VOID PrintResourceString(INT resID, ...) { WCHAR tmpBuffer[STR_MAX]; + CHAR tmpBufferA[STR_MAX]; va_list arg_ptr; va_start(arg_ptr, resID); LoadStringW(GetModuleHandle(NULL), resID, tmpBuffer, STR_MAX); - vfwprintf(stdout, tmpBuffer, arg_ptr); + CharToOemW(tmpBuffer, tmpBufferA); + vfprintf(stdout, tmpBufferA, arg_ptr); va_end(arg_ptr); }

1 0

[akhaldi] 65762: [PSDK] Define rpcndr.h DECLSPEC_UUID in consistency with the one in winnt.h. Fixes some redefinition warnings.
by akhaldi＠svn.reactos.org 20 Dec '14

20 Dec '14

Author: akhaldi Date: Sat Dec 20 16:26:03 2014 New Revision: 65762 URL: http://svn.reactos.org/svn/reactos?rev=65762&view=rev Log: [PSDK] Define rpcndr.h DECLSPEC_UUID in consistency with the one in winnt.h. Fixes some redefinition warnings. Modified: trunk/reactos/include/psdk/rpcndr.h Modified: trunk/reactos/include/psdk/rpcndr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcndr.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/rpcndr.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/rpcndr.h [iso-8859-1] Sat Dec 20 16:26:03 2014 @@ -142,7 +142,14 @@ typedef void (__RPC_USER *NDR_NOTIFY_ROUTINE)(void); typedef void (__RPC_USER *NDR_NOTIFY2_ROUTINE)(boolean flag); -#define DECLSPEC_UUID(x) +#ifndef DECLSPEC_UUID + #if defined(_MSC_VER) && defined(__cplusplus) + #define DECLSPEC_UUID(x) __declspec(uuid(x)) + #else + #define DECLSPEC_UUID(x) + #endif +#endif /* DECLSPEC_UUID */ + #define MIDL_INTERFACE(x) struct struct _MIDL_STUB_MESSAGE;

1 0

[akhaldi] 65761: [RSHELL] Silence some MSVC linker warnings.
by akhaldi＠svn.reactos.org 20 Dec '14

20 Dec '14

Author: akhaldi Date: Sat Dec 20 16:24:21 2014 New Revision: 65761 URL: http://svn.reactos.org/svn/reactos?rev=65761&view=rev Log: [RSHELL] Silence some MSVC linker warnings. Modified: trunk/reactos/base/shell/rshell/rshell.spec Modified: trunk/reactos/base/shell/rshell/rshell.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/rshell.s… ============================================================================== --- trunk/reactos/base/shell/rshell/rshell.spec [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/rshell.spec [iso-8859-1] Sat Dec 20 16:24:21 2014 @@ -1,10 +1,10 @@ -@ stdcall DllCanUnloadNow() -@ stdcall DllGetClassObject(ptr ptr ptr) -@ stdcall DllRegisterServer() -@ stdcall DllUnregisterServer() -@ stdcall CStartMenu_Constructor(ptr ptr) -@ stdcall CMenuDeskBar_Constructor(ptr ptr); -@ stdcall CMenuSite_Constructor(ptr ptr); -@ stdcall CMenuBand_Constructor(ptr ptr); -@ stdcall CMergedFolder_Constructor(ptr ptr); -@ stdcall ShellDDEInit(long); +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() +@ stdcall CStartMenu_Constructor(ptr ptr) +@ stdcall CMenuDeskBar_Constructor(ptr ptr); +@ stdcall CMenuSite_Constructor(ptr ptr); +@ stdcall CMenuBand_Constructor(ptr ptr); +@ stdcall CMergedFolder_Constructor(ptr ptr); +@ stdcall ShellDDEInit(long);

1 0

[dquintana] 65760: [SHELL32] Mark the halfplementation as such. CORE-3938
by dquintana＠svn.reactos.org 20 Dec '14

20 Dec '14

Author: dquintana Date: Sat Dec 20 16:22:43 2014 New Revision: 65760 URL: http://svn.reactos.org/svn/reactos?rev=65760&view=rev Log: [SHELL32] Mark the halfplementation as such. CORE-3938 Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] Sat Dec 20 16:22:43 2014 @@ -574,6 +574,7 @@ } else if(IsEqualIID(riid, IID_IExtractIconA) && (cidl == 1)) { + // FIXME: This is not correct, it does not show the right icons LPITEMIDLIST pidlItem = ILCombine(pidl, apidl[0]); pObj = IExtractIconA_Constructor(pidlItem); SHFree(pidlItem); @@ -581,6 +582,7 @@ } else if (IsEqualIID(riid, IID_IExtractIconW) && (cidl == 1)) { + // FIXME: This is not correct, it does not show the right icons LPITEMIDLIST pidlItem = ILCombine(pidl, apidl[0]); pObj = IExtractIconW_Constructor(pidlItem); SHFree(pidlItem);

1 0

[dquintana] 65759: [SHELL32] * Halfplement IExtractIconAW support into the recycle bin. This is not fully correct as it always uses the fallback file icon, but it's better than nothing at all. CORE...
by dquintana＠svn.reactos.org 20 Dec '14

20 Dec '14

Author: dquintana Date: Sat Dec 20 16:20:32 2014 New Revision: 65759 URL: http://svn.reactos.org/svn/reactos?rev=65759&view=rev Log: [SHELL32] * Halfplement IExtractIconAW support into the recycle bin. This is not fully correct as it always uses the fallback file icon, but it's better than nothing at all. CORE-3938 Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] Sat Dec 20 16:20:32 2014 @@ -571,6 +571,20 @@ IDropTarget * pDt = NULL; hr = QueryInterface(IID_PPV_ARG(IDropTarget, &pDt)); pObj = pDt; + } + else if(IsEqualIID(riid, IID_IExtractIconA) && (cidl == 1)) + { + LPITEMIDLIST pidlItem = ILCombine(pidl, apidl[0]); + pObj = IExtractIconA_Constructor(pidlItem); + SHFree(pidlItem); + hr = S_OK; + } + else if (IsEqualIID(riid, IID_IExtractIconW) && (cidl == 1)) + { + LPITEMIDLIST pidlItem = ILCombine(pidl, apidl[0]); + pObj = IExtractIconW_Constructor(pidlItem); + SHFree(pidlItem); + hr = S_OK; } else hr = E_NOINTERFACE;

1 0

[dquintana] 65758: [NETSHELL] * Move to shellext folder. * Do not initialize the notification SSO, stobject will do so (like in Windows). * Move some GUIDs to a shared header. [STOBJECT] * Initiali...
by dquintana＠svn.reactos.org 20 Dec '14

20 Dec '14

Author: dquintana Date: Sat Dec 20 16:12:35 2014 New Revision: 65758 URL: http://svn.reactos.org/svn/reactos?rev=65758&view=rev Log: [NETSHELL] * Move to shellext folder. * Do not initialize the notification SSO, stobject will do so (like in Windows). * Move some GUIDs to a shared header. [STOBJECT] * Initialize netshell's SSO the way Windows does it. Fixes network icon inconsistency. * Move some GUIDs to a shared header. CORE-8818 #resolve Fixed in trunk r65758. Added: trunk/reactos/dll/shellext/netshell/ - copied from r65755, trunk/reactos/dll/win32/netshell/ Removed: trunk/reactos/dll/win32/netshell/ Modified: trunk/reactos/dll/shellext/CMakeLists.txt trunk/reactos/dll/shellext/netshell/CMakeLists.txt trunk/reactos/dll/shellext/netshell/netshell.cpp trunk/reactos/dll/shellext/netshell/precomp.h trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp trunk/reactos/dll/shellext/stobject/csystray.cpp trunk/reactos/dll/shellext/stobject/csystray.h trunk/reactos/dll/shellext/stobject/precomp.h trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/include/reactos/shlguid_undoc.h Modified: trunk/reactos/dll/shellext/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/CMakeLists.tx… ============================================================================== --- trunk/reactos/dll/shellext/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/CMakeLists.txt [iso-8859-1] Sat Dec 20 16:12:35 2014 @@ -3,5 +3,6 @@ add_subdirectory(deskmon) add_subdirectory(devcpux) add_subdirectory(fontext) +add_subdirectory(netshell) add_subdirectory(slayer) add_subdirectory(stobject) Modified: trunk/reactos/dll/shellext/netshell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/CMak… ============================================================================== --- trunk/reactos/dll/shellext/netshell/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/CMakeLists.txt [iso-8859-1] Sat Dec 20 16:12:35 2014 @@ -1,3 +1,5 @@ + +project(SHELL) set_cpp(WITH_RUNTIME) Modified: trunk/reactos/dll/shellext/netshell/netshell.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/nets… ============================================================================== --- trunk/reactos/dll/shellext/netshell/netshell.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/netshell.cpp [iso-8859-1] Sat Dec 20 16:12:35 2014 @@ -3,9 +3,6 @@ #include <olectl.h> HINSTANCE netshell_hInstance; -const GUID CLSID_LANConnectUI = {0x7007ACC5, 0x3202, 0x11D1, {0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E}}; -const GUID CLSID_NetworkConnections = {0x7007ACC7, 0x3202, 0x11D1, {0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E}}; -const GUID CLSID_LanConnectStatusUI = {0x7007ACCF, 0x3202, 0x11D1, {0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E}}; static const WCHAR szNetConnectClass[] = L"CLSID\\{7007ACC7-3202-11D1-AAD2-00805FC1270E}"; static const WCHAR szLanConnectUI[] = L"CLSID\\{7007ACC5-3202-11D1-AAD2-00805FC1270E}"; Modified: trunk/reactos/dll/shellext/netshell/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/prec… ============================================================================== --- trunk/reactos/dll/shellext/netshell/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/precomp.h [iso-8859-1] Sat Dec 20 16:12:35 2014 @@ -18,6 +18,7 @@ #include <setupapi.h> #include <devguid.h> #include <netcon.h> +#include <shlguid_undoc.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -54,9 +55,6 @@ /* globals */ extern HINSTANCE netshell_hInstance; -extern const GUID CLSID_NetworkConnections; -extern const GUID CLSID_LANConnectUI; -extern const GUID CLSID_LanConnectStatusUI; /* shfldr_netconnect.c */ HRESULT ShowNetConnectionProperties(INetConnection * pNetConnect, HWND hwnd); Modified: trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/shfl… ============================================================================== --- trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/shfldr_netconnect.cpp [iso-8859-1] Sat Dec 20 16:12:35 2014 @@ -138,20 +138,6 @@ CNetworkConnections::CNetworkConnections() { - ref = 0; - HRESULT hr = CoCreateInstance(CLSID_LanConnectStatusUI, NULL, CLSCTX_INPROC_SERVER, IID_IOleCommandTarget, (LPVOID*)&lpOleCmd); - if (FAILED(hr)) - { - ERR("CoCreateInstance failed\n"); - lpOleCmd = NULL; - } - else - { - hr = lpOleCmd->Exec(&CGID_ShellServiceObject, 2, OLECMDEXECOPT_DODEFAULT, NULL, NULL); - if (FAILED(hr)) - ERR("Exec CGID_ShellServiceObject failed\n"); - } - pidlRoot = _ILCreateNetConnect(); /* my qualified pidl */ } Modified: trunk/reactos/dll/shellext/stobject/csystray.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/csys… ============================================================================== --- trunk/reactos/dll/shellext/stobject/csystray.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/csystray.cpp [iso-8859-1] Sat Dec 20 16:12:35 2014 @@ -15,11 +15,31 @@ }; const int g_NumIcons = _countof(g_IconHandlers); -const GUID CLSID_SysTray = { 0x35CEC8A3, 0x2BE6, 0x11D2, { 0x87, 0x73, 0x92, 0xE2, 0x20, 0x52, 0x41, 0x53 } }; - CSysTray::CSysTray() {} CSysTray::~CSysTray() {} +HRESULT CSysTray::InitNetShell() +{ + HRESULT hr = CoCreateInstance(CLSID_ConnectionTray, 0, 1u, IID_PPV_ARG(IOleCommandTarget, &pctNetShell)); + if (FAILED(hr)) + return hr; + + return pctNetShell->Exec(&CGID_ShellServiceObject, + OLECMDID_NEW, + OLECMDEXECOPT_DODEFAULT, NULL, NULL); +} + +HRESULT CSysTray::ShutdownNetShell() +{ + if (!pctNetShell) + return S_FALSE; + HRESULT hr = pctNetShell->Exec(&CGID_ShellServiceObject, + OLECMDID_SAVE, + OLECMDEXECOPT_DODEFAULT, NULL, NULL); + pctNetShell.Release(); + return hr; +} + HRESULT CSysTray::InitIcons() { TRACE("Initializing Notification icons...\n"); @@ -30,7 +50,7 @@ return hr; } - return S_OK; + return InitNetShell(); } HRESULT CSysTray::ShutdownIcons() @@ -43,7 +63,7 @@ return hr; } - return S_OK; + return ShutdownNetShell(); } HRESULT CSysTray::UpdateIcons() Modified: trunk/reactos/dll/shellext/stobject/csystray.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/csys… ============================================================================== --- trunk/reactos/dll/shellext/stobject/csystray.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/csystray.h [iso-8859-1] Sat Dec 20 16:12:35 2014 @@ -22,6 +22,8 @@ public CWindowImpl<CSysTray, CWindow, CMessageWndClass>, public IOleCommandTarget { + CComPtr<IOleCommandTarget> pctNetShell; + // TODO: keep icon handlers here HWND hwndSysTray; @@ -36,6 +38,9 @@ HRESULT ShutdownIcons(); HRESULT UpdateIcons(); HRESULT ProcessIconMessage(UINT uMsg, WPARAM wParam, LPARAM lParam); + + HRESULT InitNetShell(); + HRESULT ShutdownNetShell(); public: HRESULT NotifyIcon(INT code, UINT uId, HICON hIcon, LPCWSTR szTip); Modified: trunk/reactos/dll/shellext/stobject/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/prec… ============================================================================== --- trunk/reactos/dll/shellext/stobject/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/precomp.h [iso-8859-1] Sat Dec 20 16:12:35 2014 @@ -26,6 +26,8 @@ #include <atlbase.h> #include <atlcom.h> #include <atlwin.h> +#include <undocshell.h> +#include <shellutils.h> #include <shellapi.h> @@ -62,46 +64,3 @@ extern HRESULT STDMETHODCALLTYPE Volume_Shutdown(_In_ CSysTray * pSysTray); extern HRESULT STDMETHODCALLTYPE Volume_Update(_In_ CSysTray * pSysTray); extern HRESULT STDMETHODCALLTYPE Volume_Message(_In_ CSysTray * pSysTray, UINT uMsg, WPARAM wParam, LPARAM lParam); - -/* --------------- Utils ------------------------------ */ - -static __inline ULONG -Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...) -{ - char szMsg[512]; - char *szMsgStart; - const char *fname; - va_list vl; - ULONG uRet; - - fname = strrchr(filename, '\\'); - if (fname == NULL) - { - fname = strrchr(filename, '/'); - } - - if (fname == NULL) - fname = filename; - else - fname++; - - szMsgStart = szMsg + sprintf(szMsg, "[%10lu] %s:%d: ", GetTickCount(), fname, line); - - va_start(vl, lpFormat); - uRet = (ULONG) vsprintf(szMsgStart, lpFormat, vl); - va_end(vl); - - OutputDebugStringA(szMsg); - - return uRet; -} - -#define DbgPrint(fmt, ...) \ - Win32DbgPrint(__FILE__, __LINE__, fmt, ##__VA_ARGS__) - -#if 1 -#define FAILED_UNEXPECTEDLY(hr) (FAILED(hr) && (DbgPrint("Unexpected failure %08x.\n", hr), TRUE)) -#else -#define FAILED_UNEXPECTEDLY(hr) FAILED(hr) -#endif - Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Sat Dec 20 16:12:35 2014 @@ -133,7 +133,6 @@ add_subdirectory(netcfgx) add_subdirectory(netevent) add_subdirectory(netid) -add_subdirectory(netshell) add_subdirectory(newdev) add_subdirectory(npptools) add_subdirectory(ntdsapi) Modified: trunk/reactos/include/reactos/shlguid_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/shlguid_un… ============================================================================== --- trunk/reactos/include/reactos/shlguid_undoc.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/shlguid_undoc.h [iso-8859-1] Sat Dec 20 16:12:35 2014 @@ -114,6 +114,15 @@ DEFINE_GUID(CGID_MenuDeskBar, 0x5C9F0A12, 0x959E, 0x11D0, 0xA3, 0xA4, 0x00, 0xA0, 0xC9, 0x08, 0x26, 0x36); +DEFINE_GUID(CLSID_LANConnectUI, 0x7007ACC5, 0x3202, 0x11D1, 0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E); +DEFINE_GUID(CLSID_NetworkConnections, 0x7007ACC7, 0x3202, 0x11D1, 0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E); +DEFINE_GUID(CLSID_LanConnectStatusUI, 0x7007ACCF, 0x3202, 0x11D1, 0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E); + +DEFINE_GUID(CLSID_SysTray, 0x35CEC8A3, 0x2BE6, 0x11D2, 0x87, 0x73, 0x92, 0xE2, 0x20, 0x52, 0x41, 0x53); + + +#define CLSID_ConnectionTray CLSID_LanConnectStatusUI + #define CGID_IExplorerToolbar IID_IExplorerToolbar #define SID_IExplorerToolbar IID_IExplorerToolbar #define SID_ITargetFrame2 IID_ITargetFrame2

1 0

[dquintana] 65757: [RSHELL] * Make rshell.dll able to register its classes and support CoCreateInstance.
by dquintana＠svn.reactos.org 20 Dec '14

20 Dec '14

Author: dquintana Date: Sat Dec 20 16:04:45 2014 New Revision: 65757 URL: http://svn.reactos.org/svn/reactos?rev=65757&view=rev Log: [RSHELL] * Make rshell.dll able to register its classes and support CoCreateInstance. Modified: trunk/reactos/base/shell/rshell/CMakeLists.txt trunk/reactos/base/shell/rshell/misc.cpp trunk/reactos/base/shell/rshell/rshell.spec Modified: trunk/reactos/base/shell/rshell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMakeLis… ============================================================================== --- trunk/reactos/base/shell/rshell/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMakeLists.txt [iso-8859-1] Sat Dec 20 16:04:45 2014 @@ -31,6 +31,7 @@ add_importlibs(rshell uxtheme shlwapi + advapi32 shell32 comctl32 gdi32 Modified: trunk/reactos/base/shell/rshell/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/misc.cpp… ============================================================================== --- trunk/reactos/base/shell/rshell/misc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/misc.cpp [iso-8859-1] Sat Dec 20 16:04:45 2014 @@ -39,10 +39,84 @@ CRShellModule gModule; CAtlWinModule gWinModule; +HINSTANCE g_hRShell; + +static LSTATUS inline _RegSetStringValueW(HKEY hKey, LPCWSTR lpValueName, LPCWSTR lpStringData) +{ + DWORD dwStringDataLen = lstrlenW(lpStringData); + + return RegSetValueExW(hKey, lpValueName, 0, REG_SZ, (BYTE *) lpStringData, 2 * (dwStringDataLen + 1)); +} + +static HRESULT RegisterComponent(REFGUID clsid, LPCWSTR szDisplayName) +{ + WCHAR szFilename[MAX_PATH]; + WCHAR szClsid[MAX_PATH]; + WCHAR szRoot[MAX_PATH]; + + if (!StringFromGUID2(clsid, szClsid, _countof(szClsid))) + return E_FAIL; + + if (!GetModuleFileNameW(g_hRShell, szFilename, _countof(szFilename))) + return E_FAIL; + + HRESULT hr = StringCchPrintfW(szRoot, 0x104u, L"CLSID\\%s", szClsid); + if (FAILED(hr)) + return hr; + + DWORD dwDisposition; + HKEY hkRoot; + if (RegCreateKeyExW(HKEY_CLASSES_ROOT, szRoot, 0, NULL, 0, KEY_WRITE, 0, &hkRoot, &dwDisposition) != 0) + return E_FAIL; + + HKEY hkServer; + + _RegSetStringValueW(hkRoot, NULL, szDisplayName); + + if (RegCreateKeyExW(hkRoot, L"InprocServer32", 0, NULL, 0, KEY_SET_VALUE, 0, &hkServer, &dwDisposition) != 0) + { + RegCloseKey(hkRoot); + return E_FAIL; + } + + _RegSetStringValueW(hkServer, NULL, szFilename); + _RegSetStringValueW(hkServer, L"ThreadingModel", L"Both"); + + RegCloseKey(hkServer); + RegCloseKey(hkRoot); + return S_OK; +} + +static HRESULT UnregisterComponent(REFGUID clsid) +{ + WCHAR szClsid[MAX_PATH]; + WCHAR szRoot[MAX_PATH]; + HKEY hkRoot; + + if (!StringFromGUID2(clsid, szClsid, _countof(szClsid))) + return E_FAIL; + + HRESULT hr = StringCchPrintfW(szRoot, 0x104u, L"CLSID\\%s", szClsid); + if (FAILED(hr)) + return hr; + + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, szRoot, 0, KEY_WRITE, &hkRoot) != 0) + return E_FAIL; + + RegDeleteKeyW(hkRoot, L"InprocServer32"); + RegCloseKey(hkRoot); + + RegDeleteKeyW(HKEY_CLASSES_ROOT, szRoot); + + return S_OK; +} + STDAPI_(BOOL) DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID fImpLoad) { if (dwReason == DLL_PROCESS_ATTACH) { + g_hRShell = hInstance; + /* HACK - the global constructors don't run, so I placement new them here */ new (&gModule) CRShellModule; new (&gWinModule) CAtlWinModule; @@ -58,3 +132,97 @@ } return TRUE; } + +HRESULT +WINAPI +DllCanUnloadNow(void) +{ + gModule.DllCanUnloadNow(); + return S_FALSE; +} + +STDAPI +DllRegisterServer(void) +{ + RegisterComponent(CLSID_StartMenu, L"Shell Start Menu"); + RegisterComponent(CLSID_MenuDeskBar, L"Shell Menu Desk Bar"); + RegisterComponent(CLSID_MenuBand, L"Shell Menu Band"); + RegisterComponent(CLSID_MenuBandSite, L"Shell Menu Band Site"); + RegisterComponent(CLSID_MergedFolder, L"Merged Shell Folder"); + return S_OK; +} + +STDAPI +DllUnregisterServer(void) +{ + UnregisterComponent(CLSID_StartMenu); + UnregisterComponent(CLSID_MenuDeskBar); + UnregisterComponent(CLSID_MenuBand); + UnregisterComponent(CLSID_MenuBandSite); + UnregisterComponent(CLSID_MergedFolder); + return S_OK; +} + +class CRShellClassFactory : + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IClassFactory +{ +private: + CLSID m_Clsid; + +public: + CRShellClassFactory() {} + virtual ~CRShellClassFactory() {} + + HRESULT Initialize(REFGUID clsid) + { + m_Clsid = clsid; + return S_OK; + } + + /* IClassFactory */ + virtual HRESULT WINAPI CreateInstance(LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObject) + { + *ppvObject = NULL; + + if (IsEqualCLSID(m_Clsid, CLSID_StartMenu)) + return CStartMenu_Constructor(riid, ppvObject); + + if (IsEqualCLSID(m_Clsid, CLSID_MenuDeskBar)) + return CMenuDeskBar_Constructor(riid, ppvObject); + + if (IsEqualCLSID(m_Clsid, CLSID_MenuBand)) + return CMenuBand_Constructor(riid, ppvObject); + + if (IsEqualCLSID(m_Clsid, CLSID_MenuBandSite)) + return CMenuSite_Constructor(riid, ppvObject); + + if (IsEqualCLSID(m_Clsid, CLSID_MergedFolder)) + return CMergedFolder_Constructor(riid, ppvObject); + + return E_NOINTERFACE; + } + + virtual HRESULT WINAPI LockServer(BOOL fLock) + { + return E_NOTIMPL; + } + + BEGIN_COM_MAP(CRShellClassFactory) + COM_INTERFACE_ENTRY_IID(IID_IClassFactory, IClassFactory) + END_COM_MAP() +}; + +STDAPI +DllGetClassObject( +REFCLSID rclsid, +REFIID riid, +LPVOID *ppv) +{ + if (!ppv) + return E_INVALIDARG; + + *ppv = NULL; + + return ShellObjectCreatorInit<CRShellClassFactory>(rclsid, riid, ppv); +} Modified: trunk/reactos/base/shell/rshell/rshell.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/rshell.s… ============================================================================== --- trunk/reactos/base/shell/rshell/rshell.spec [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/rshell.spec [iso-8859-1] Sat Dec 20 16:04:45 2014 @@ -1,3 +1,7 @@ +@ stdcall DllCanUnloadNow() +@ stdcall DllGetClassObject(ptr ptr ptr) +@ stdcall DllRegisterServer() +@ stdcall DllUnregisterServer() @ stdcall CStartMenu_Constructor(ptr ptr) @ stdcall CMenuDeskBar_Constructor(ptr ptr); @ stdcall CMenuSite_Constructor(ptr ptr);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs