Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 29686: - implement loading of shell new items in context menus - these are responsible for showing creating "new file type extension" item
by janderwald＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: janderwald Date: Fri Oct 19 23:32:16 2007 New Revision: 29686 URL: http://svn.reactos.org/svn/reactos?rev=29686&view=rev Log: - implement loading of shell new items in context menus - these are responsible for showing creating "new file type extension" item Modified: trunk/reactos/dll/win32/shell32/shell32_main.h trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.h (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.h Fri Oct 19 23:32:16 2007 @@ -82,6 +82,7 @@ LPCLASSFACTORY IClassFactory_Constructor(REFCLSID); IContextMenu2 * ISvItemCm_Constructor(LPSHELLFOLDER pSFParent, LPCITEMIDLIST pidl, LPCITEMIDLIST *aPidls, UINT uItemCount); +IContextMenu2 * ISvStaticItemCm_Constructor(LPSHELLFOLDER pSFParent, LPCITEMIDLIST pidl, LPCITEMIDLIST *apidl, UINT cidl, HKEY hKey); IContextMenu2 * ISvBgCm_Constructor(LPSHELLFOLDER pSFParent, BOOL bDesktop); LPSHELLVIEW IShellView_Constructor(LPSHELLFOLDER); Modified: trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_bg_c… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c Fri Oct 19 23:32:16 2007 @@ -48,8 +48,208 @@ BOOL bDesktop; } BgCmImpl; +typedef enum +{ + SHELLNEW_TYPE_COMMAND = 1, + SHELLNEW_TYPE_DATA = 2, + SHELLNEW_TYPE_FILENAME = 4, + SHELLNEW_TYPE_NULLFILE = 8 +}SHELLNEW_TYPE; + + +typedef struct __SHELLNEW_ITEM__ +{ + SHELLNEW_TYPE Type; + LPWSTR szTarget; + LPWSTR szDesc; + LPWSTR szIcon; + struct __SHELLNEW_ITEM__ * Next; +}SHELLNEW_ITEM, *PSHELLNEW_ITEM; + static const IContextMenu2Vtbl cmvt; + +static PSHELLNEW_ITEM s_SnHead = NULL; + + +PSHELLNEW_ITEM LoadItem(LPWSTR szKeyName) +{ + HKEY hKey; + DWORD dwIndex; + WCHAR szName[MAX_PATH]; + WCHAR szCommand[MAX_PATH]; + WCHAR szDesc[MAX_PATH]; + WCHAR szIcon[MAX_PATH]; + DWORD dwName, dwCommand, dwDesc; + LONG result; + PSHELLNEW_ITEM pNewItem; + + static const WCHAR szShellNew[] = { '\\','S','h','e','l','l','N','e','w',0 }; + static const WCHAR szCmd[] = { 'C','o','m','m','a','n','d',0 }; + static const WCHAR szData[] = { 'D','a','t','a',0 }; + static const WCHAR szFileName[] = { 'F','i','l','e','N','a','m','e', 0 }; + static const WCHAR szNullFile[] = { 'N','u','l','l','F','i','l','e', 0 }; + static const WCHAR szDefaultIcon[] ={ '\\','D','e','f','a','u','l','t','I','c','o','n',0 }; + + result = RegOpenKeyExW(HKEY_CLASSES_ROOT,szKeyName,0,KEY_READ,&hKey); + + if (result != ERROR_SUCCESS) + { + return NULL; + } + + dwName = MAX_PATH; + result = RegGetValueW(hKey,NULL,NULL,RRF_RT_REG_SZ,NULL,szName, &dwName); + + RegCloseKey(hKey); + szDesc[0] = L'\0'; + szIcon[0] = L'\0'; + if (result == ERROR_SUCCESS) + { + dwDesc = MAX_PATH; + RegGetValueW(HKEY_CLASSES_ROOT,szName,NULL,RRF_RT_REG_SZ,NULL,szDesc,&dwDesc); + dwDesc = MAX_PATH; + wcscat(szName, szDefaultIcon); + RegGetValueW(HKEY_CLASSES_ROOT,szName,NULL,RRF_RT_REG_SZ,NULL,szIcon,&dwDesc); + } + + wcscpy(szName, szKeyName); + wcscat(szName, szShellNew); + result = RegOpenKeyExW(HKEY_CLASSES_ROOT,szName,0,KEY_READ,&hKey); + + //TRACE("LoadItem keyname %s szName %s szDesc %s szIcon %s\n", debugstr_w(szKeyName), debugstr_w(szName), debugstr_w(szDesc), debugstr_w(szIcon)); + + + if (result != ERROR_SUCCESS) + { + return NULL; + } + + dwIndex = 0; + pNewItem = NULL; + + do + { + dwName = MAX_PATH; + dwCommand = MAX_PATH; + result = RegEnumValueW(hKey,dwIndex,szName,&dwName,NULL,NULL,(LPBYTE)szCommand, &dwCommand); + if (result == ERROR_SUCCESS) + { + long type = -1; + LPWSTR szTarget = szCommand; + //TRACE("szName %s szCommand %s\n", debugstr_w(szName), debugstr_w(szCommand)); + if (!wcsicmp(szName, szCmd)) + { + type = SHELLNEW_TYPE_COMMAND; + }else if (!wcsicmp(szName, szData)) + { + type = SHELLNEW_TYPE_DATA; + } + else if (!wcsicmp(szName, szFileName)) + { + type = SHELLNEW_TYPE_FILENAME; + } + else if (!wcsicmp(szName, szNullFile)) + { + type = SHELLNEW_TYPE_NULLFILE; + szTarget = NULL; + } + if (type != -1) + { + pNewItem = HeapAlloc(GetProcessHeap(), 0, sizeof(SHELLNEW_ITEM)); + pNewItem->Type = type; + if (szTarget) + pNewItem->szTarget = wcsdup(szTarget); + else + pNewItem->szTarget = NULL; + + pNewItem->szDesc = wcsdup(szDesc); + pNewItem->szIcon = wcsdup(szIcon); + pNewItem->Next = NULL; + break; + } + } + dwIndex++; + }while(result != ERROR_NO_MORE_ITEMS); + RegCloseKey(hKey); + return pNewItem; +} + + +BOOL +LoadShellNewItems() +{ + DWORD dwIndex; + WCHAR szName[MAX_PATH]; + LONG result; + PSHELLNEW_ITEM pNewItem; + PSHELLNEW_ITEM pCurItem = NULL; + + dwIndex = 0; + do + { + result = RegEnumKeyW(HKEY_CLASSES_ROOT,dwIndex,szName,MAX_PATH); + if (result == ERROR_SUCCESS) + { + pNewItem = LoadItem(szName); + if (pNewItem) + { + if (pCurItem) + { + pCurItem->Next = pNewItem; + pCurItem = pNewItem; + } + else + { + pCurItem = s_SnHead = pNewItem; + } + } + } + dwIndex++; + }while(result != ERROR_NO_MORE_ITEMS); + + if (s_SnHead == NULL) + return FALSE; + else + return TRUE; +} +VOID +InsertShellNewItems(HMENU hMenu, UINT idFirst, UINT idMenu) +{ + MENUITEMINFOW mii; + PSHELLNEW_ITEM pCurItem; + + if (s_SnHead == NULL) + { + if (!LoadShellNewItems()) + return; + + } + + ZeroMemory(&mii, sizeof(mii)); + mii.cbSize = sizeof(mii); + + mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; //MIIM_BITMAP; + mii.fType = MFT_STRING; + mii.fState = MFS_ENABLED; + + pCurItem = s_SnHead; + + while(pCurItem) + { + mii.dwTypeData = pCurItem->szDesc; + mii.cch = strlenW(mii.dwTypeData); + mii.wID = idFirst; + if (InsertMenuItemW(hMenu, idMenu, TRUE, &mii)) + { + idMenu++; + idFirst++; + } + pCurItem = pCurItem->Next; + } +} + + /************************************************************************** * ISVBgCm_Constructor() @@ -150,6 +350,7 @@ { HMENU hMyMenu; UINT idMax; + MENUITEMINFOW mii; HRESULT hr; BgCmImpl *This = (BgCmImpl *)iface; @@ -179,6 +380,13 @@ } DestroyMenu(hMyMenu); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_SUBMENU; + if (GetMenuItemInfoW(hMenu, 10, TRUE, &mii)) + { + InsertShellNewItems(mii.hSubMenu, 0x6000, 0x6000); + } + TRACE("(%p)->returning 0x%x\n",This,hr); return hr; }

1 0

[hpoussin] 29685: Activate define override check in rbuild Cleanup some .rbuild files Set __REACTOS__ as overridable ; it should be removed after next winesync
by hpoussin＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: hpoussin Date: Fri Oct 19 19:27:44 2007 New Revision: 29685 URL: http://svn.reactos.org/svn/reactos?rev=29685&view=rev Log: Activate define override check in rbuild Cleanup some .rbuild files Set __REACTOS__ as overridable ; it should be removed after next winesync Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/ReactOS-ppc.rbuild trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild trunk/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild trunk/reactos/include/reactos/idl/idl.rbuild trunk/reactos/lib/3rdparty/mingw/mingw.rbuild trunk/reactos/lib/rtl/rtl.rbuild trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild (original) +++ trunk/reactos/ReactOS-generic.rbuild Fri Oct 19 19:27:44 2007 @@ -3,17 +3,17 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="baseaddress.rbuild" /> - <define name="__REACTOS__" /> + <define name="__REACTOS__" overridable="true" /> <if property="MP" value="1"> - <define name="CONFIG_SMP" value="1" /> + <define name="CONFIG_SMP">1</define> </if> <if property="DBG" value="1"> - <define name="DBG" value="1" /> + <define name="DBG">1</define> <define name="_SEH_ENABLE_TRACE" /> <property name="DBG_OR_KDBG" value="true" /> </if> <if property="KDBG" value="1"> - <define name="KDBG" value="1" /> + <define name="KDBG">1</define> <property name="DBG_OR_KDBG" value="true" /> </if> Modified: trunk/reactos/ReactOS-ppc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-ppc.rbuild?rev=296… ============================================================================== --- trunk/reactos/ReactOS-ppc.rbuild (original) +++ trunk/reactos/ReactOS-ppc.rbuild Fri Oct 19 19:27:44 2007 @@ -16,19 +16,19 @@ <define name="_M_PPC" /> <define name="_PPC_" /> <define name="__PowerPC__" /> - <define name="stdcall" empty="true" /> - <define name="__stdcall__" empty="true" /> - <define name="fastcall" empty="true" /> - <define name="cdecl" empty="true" /> - <define name="__cdecl__" empty="true" /> - <define name="dllimport" empty="true" /> - <define name="WORDS_BIGENDIAN" empty="true" /> - <define name="__MSVCRT__" empty="true" /> + <define name="stdcall"/> + <define name="__stdcall__"/> + <define name="fastcall"/> + <define name="cdecl"/> + <define name="__cdecl__"/> + <define name="dllimport"/> + <define name="WORDS_BIGENDIAN"/> + <define name="__MSVCRT__"/> <define name="__NO_CTYPE_INLINES" />  <define name="__MINGW_IMPORT">extern</define> - <define name="_CRTIMP" empty="true" /> - <define name="'__declspec(x)'" empty="true" /> + <define name="_CRTIMP"/> + <define name="'__declspec(x)'"/> <compilerflag>-fshort-wchar</compilerflag> <compilerflag>-fsigned-char</compilerflag> <compilerflag>-mfull-toc</compilerflag> Modified: trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole2.tlb/stdo… ============================================================================== --- trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild (original) +++ trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild Fri Oct 19 19:27:44 2007 @@ -2,7 +2,6 @@ <module name="std_ole_v2" type="embeddedtypelib"> <include base="std_ole_v2">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__WINESRC__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> @@ -15,7 +14,6 @@ <include base="stdole2">.</include> <include base="ReactOS">include/reactos/wine</include> <dependency>std_ole_v2</dependency> - <define name="__REACTOS__" /> <define name="__WINESRC__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild Fri Oct 19 19:27:44 2007 @@ -12,7 +12,6 @@ <define name="__USE_W32API" /> <define name="_NTDDK_" /> - <define name="DBG" /> <define name="PC_NO_IMPORTS" /> <include base="portcls">../include</include> Modified: trunk/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild (original) +++ trunk/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild Fri Oct 19 19:27:44 2007 @@ -14,7 +14,6 @@ <include base="mpu401">..</include> <library>ntoskrnl</library> <library>portcls</library> - <define name="DBG" /> <define name="__USE_W32API" />  <file>adapter.cpp</file> Modified: trunk/reactos/include/reactos/idl/idl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/idl.rb… ============================================================================== --- trunk/reactos/include/reactos/idl/idl.rbuild (original) +++ trunk/reactos/include/reactos/idl/idl.rbuild Fri Oct 19 19:27:44 2007 @@ -4,49 +4,41 @@ <module name="pnp_server" type="rpcserver"> <include base="ReactOS">.</include> <include base="ReactOS">w32api/include</include> - <define name="_X86_" /> <file>pnp.idl</file> </module> <module name="pnp_client" type="rpcclient"> <include base="ReactOS">.</include> <include base="ReactOS">w32api/include</include> - <define name="_X86_" /> <file>pnp.idl</file> </module> <module name="scm_server" type="rpcserver"> <include base="ReactOS">.</include> <include base="ReactOS">w32api/include</include> - <define name="_X86_" /> <file switches="--oldnames">svcctl.idl</file> </module> <module name="scm_client" type="rpcclient"> <include base="ReactOS">.</include> <include base="ReactOS">w32api/include</include> - <define name="_X86_" /> <file switches="--oldnames">svcctl.idl</file> </module> <module name="eventlog_server" type="rpcserver"> <include base="ReactOS">.</include> <include base="ReactOS">w32api/include</include> - <define name="_X86_" /> <file switches="--oldnames">eventlogrpc.idl</file> </module> <module name="eventlog_client" type="rpcclient" > <include base="ReactOS">.</include> <include base="ReactOS">w32api/include</include> - <define name="_X86_" /> <file switches="--oldnames">eventlogrpc.idl</file> </module> <module name="lsa_server" type="rpcserver"> <include base="ReactOS">.</include> <include base="ReactOS">w32api/include</include> - <define name="_X86_" /> <file switches="--oldnames">lsa.idl</file> </module> <module name="lsa_client" type="rpcclient"> <include base="ReactOS">.</include> <include base="ReactOS">w32api/include</include> - <define name="_X86_" /> <file switches="--oldnames">lsa.idl</file> </module> </group> Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw.r… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/mingw.rbuild (original) +++ trunk/reactos/lib/3rdparty/mingw/mingw.rbuild Fri Oct 19 19:27:44 2007 @@ -20,7 +20,7 @@ <file>wcscmpi.c</file> <file>_wgetopt.c</file> <if property="ARCH" value="i386"> - <file>pseudo-reloc.c</file> + <file>pseudo-reloc.c</file> </if> </module> <module name="mingw_main" type="staticlibrary" isstartuplib="true" allowwarnings="true"> Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=296… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild (original) +++ trunk/reactos/lib/rtl/rtl.rbuild Fri Oct 19 19:27:44 2007 @@ -25,8 +25,8 @@ <file>debug.c</file> <file>except.c</file> <file>interlocked.c</file> - <file>rtlmem.s</file> - <file>rtlswap.s</file> + <file>rtlmem.s</file> + <file>rtlswap.s</file> <file>thread.c</file> </directory> </if> Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Oct 19 19:27:44 2007 @@ -816,18 +816,16 @@ const Define& define = *data.defines[i]; if ( used_defs && used_defs->find ( define.name ) != used_defs->end () ) { -#if 0 /* FIXME: activate */ if ( !define.overridable ) { throw InvalidOperationException ( __FILE__, __LINE__, - "Invalid override of define '%s' in '%s'", + "Invalid override of define '%s' in module '%s'", define.name.c_str (), module.name.c_str () ); } -#endif if ( backend->configuration.Verbose ) - printf("%s define overridden in '%s' module\n", + printf("Define '%s' overridden in module '%s'\n", define.name.c_str (), module.name.c_str () ); continue; }

1 0

[hpoussin] 29684: Add an 'overridable' attribute on defines. Suggestion by Marc Piulachs
by hpoussin＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: hpoussin Date: Fri Oct 19 19:06:11 2007 New Revision: 29684 URL: http://svn.reactos.org/svn/reactos?rev=29684&view=rev Log: Add an 'overridable' attribute on defines. Suggestion by Marc Piulachs Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/define.cpp trunk/reactos/tools/rbuild/project.dtd trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Oct 19 19:06:11 2007 @@ -813,25 +813,35 @@ } for ( i = 0; i < data.defines.size(); i++ ) { - const Define& d = *data.defines[i]; - if (used_defs && used_defs->find(d.name) != used_defs->end()) + const Define& define = *data.defines[i]; + if ( used_defs && used_defs->find ( define.name ) != used_defs->end () ) { +#if 0 /* FIXME: activate */ + if ( !define.overridable ) + { + throw InvalidOperationException ( __FILE__, + __LINE__, + "Invalid override of define '%s' in '%s'", + define.name.c_str (), + module.name.c_str () ); + } +#endif if ( backend->configuration.Verbose ) printf("%s define overridden in '%s' module\n", - d.name.c_str (), module.name.c_str () ); + define.name.c_str (), module.name.c_str () ); continue; } fprintf ( fMakefile, " -D%s", - d.name.c_str() ); - if ( d.value.size() ) + define.name.c_str() ); + if ( define.value.size() ) fprintf ( fMakefile, "=%s", - d.value.c_str() ); - if (used_defs) - used_defs->insert(used_defs->begin(), d.name); + define.value.c_str() ); + if ( used_defs ) + used_defs->insert(used_defs->begin(), define.name); } if ( generateAssignment ) { Modified: trunk/reactos/tools/rbuild/define.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/define.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/define.cpp (original) +++ trunk/reactos/tools/rbuild/define.cpp Fri Oct 19 19:06:11 2007 @@ -63,12 +63,21 @@ Define::Initialize() { const XMLAttribute* att = node->GetAttribute ( "name", true ); - const XMLAttribute* bck = node->GetAttribute ( "backend", false ); + + att = node->GetAttribute ( "name", true ); assert(att); name = att->value; value = node->value; - if ( bck ) - backend = bck->value; + + att = node->GetAttribute ( "backend", false ); + if ( att ) + backend = att->value; + + att = node->GetAttribute ( "overridable", false ); + if ( att ) + overridable = ( att->value == "true" || att->value == "yes" ); + else + overridable = false; } void Modified: trunk/reactos/tools/rbuild/project.dtd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.dtd?r… ============================================================================== --- trunk/reactos/tools/rbuild/project.dtd (original) +++ trunk/reactos/tools/rbuild/project.dtd Fri Oct 19 19:06:11 2007 @@ -37,6 +37,7 @@ <!ELEMENT define (#PCDATA)> <!ATTLIST define name %CIdentifier; #REQUIRED + overridable (true) #IMPLIED > <!ELEMENT directory (compilationunit*|directory*|group*|cdfile|file*|if*|ifnot*|module+|pch*|xi:include*)+> Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Fri Oct 19 19:06:11 2007 @@ -426,6 +426,7 @@ std::string name; std::string value; std::string backend; + bool overridable; Define ( const Project& project, const XMLElement& defineNode );

1 0

[mnordell] 29683: Deleted definition of a variable named ScsiPortIsr that was directly followed by the declaration of the function with the same name.
by mnordell＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: mnordell Date: Fri Oct 19 18:27:32 2007 New Revision: 29683 URL: http://svn.reactos.org/svn/reactos?rev=29683&view=rev Log: Deleted definition of a variable named ScsiPortIsr that was directly followed by the declaration of the function with the same name. Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c Fri Oct 19 18:27:32 2007 @@ -122,7 +122,6 @@ IN UCHAR Lun, IN UCHAR QueueTag); -static KSERVICE_ROUTINE ScsiPortIsr; static BOOLEAN STDCALL ScsiPortIsr(IN PKINTERRUPT Interrupt, IN PVOID ServiceContext);

1 0

[hpoussin] 29682: Ignore compiler flags when generating resource macro
by hpoussin＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: hpoussin Date: Fri Oct 19 18:16:18 2007 New Revision: 29682 URL: http://svn.reactos.org/svn/reactos?rev=29682&view=rev Log: Ignore compiler flags when generating resource macro Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Oct 19 18:16:18 2007 @@ -766,12 +766,16 @@ const char* assignmentOperation, const string& macro, const IfableData& data, - set<string> *used_defs ) + set<string> *used_defs, + bool generatingCompilerMacro ) { size_t i; bool generateAssignment; - generateAssignment = (use_pch && module.pch != NULL ) || data.includes.size () > 0 || data.defines.size () > 0 || data.compilerFlags.size () > 0; + if ( generatingCompilerMacro ) + generateAssignment = (use_pch && module.pch != NULL ) || data.includes.size () > 0 || data.defines.size () > 0 || data.compilerFlags.size () > 0; + else + generateAssignment = (use_pch && module.pch != NULL ) || data.includes.size () > 0 || data.defines.size () > 0; if ( generateAssignment ) { fprintf ( fMakefile, @@ -787,15 +791,17 @@ backend->GetFullPath ( *GetPrecompiledHeaderFilename () ).c_str () ); } - string compilerParameters = GenerateCompilerParametersFromVector ( data.compilerFlags ); - if ( compilerParameters.size () > 0 ) - { - fprintf ( - fMakefile, - " %s", - compilerParameters.c_str () ); - } - + if ( generatingCompilerMacro ) + { + string compilerParameters = GenerateCompilerParametersFromVector ( data.compilerFlags ); + if ( compilerParameters.size () > 0 ) + { + fprintf ( + fMakefile, + " %s", + compilerParameters.c_str () ); + } + } for ( i = 0; i < data.includes.size(); i++ ) { const Include& include = *data.includes[i]; @@ -845,11 +851,13 @@ GenerateMacro ( assignmentOperation, cflagsMacro, data, - &used_defs ); + &used_defs, + true ); GenerateMacro ( assignmentOperation, windresflagsMacro, data, - NULL ); + NULL, + false ); if ( linkerFlags != NULL ) { Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Fri Oct 19 18:16:18 2007 @@ -137,7 +137,8 @@ void GenerateMacro ( const char* assignmentOperation, const std::string& macro, const IfableData& data, - std::set<std::string>* used_defs ); + std::set<std::string>* used_defs, + bool generatingCompilerMacro ); void GenerateMacros ( const char* op, const IfableData& data, const std::vector<LinkerFlag*>* linkerFlags,

1 0

[hpoussin] 29681: Support define overriding in child .rbuild files See issue #2745 for more details.
by hpoussin＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: hpoussin Date: Fri Oct 19 17:24:06 2007 New Revision: 29681 URL: http://svn.reactos.org/svn/reactos?rev=29681&view=rev Log: Support define overriding in child .rbuild files See issue #2745 for more details. Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/mingw.h trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Fri Oct 19 17:24:06 2007 @@ -372,35 +372,31 @@ ProjectNode.GetProjectFilename ().c_str () ); } -string -MingwBackend::GenerateIncludesAndDefines ( IfableData& data ) const +void +MingwBackend::GenerateProjectCFlagsMacro ( const char* assignmentOperation, + const IfableData& data ) const { set<string> used_defs; - string includeParameters = MingwModuleHandler::GenerateGccIncludeParametersFromVector ( data.includes ); - string defineParameters = MingwModuleHandler::GenerateGccDefineParametersFromVector ( data.defines, used_defs ); - return includeParameters + " " + defineParameters; -} - -void -MingwBackend::GenerateProjectCFlagsMacro ( const char* assignmentOperation, - IfableData& data ) const -{ - fprintf ( - fMakefile, - "PROJECT_CFLAGS %s", - assignmentOperation ); - - fprintf ( fMakefile, - " %s", - GenerateIncludesAndDefines ( data ).c_str() ); - - fprintf ( fMakefile, "\n" ); + + if ( data.includes.size () > 0 ) + fprintf ( + fMakefile, + "PROJECT_CFLAGS %s %s\n", + assignmentOperation, + MingwModuleHandler::GenerateGccIncludeParametersFromVector ( data.includes ).c_str ()); + + if ( data.defines.size () > 0 ) + fprintf ( + fMakefile, + "PROJECT_CDEFINES %s %s\n", + assignmentOperation, + MingwModuleHandler::GenerateGccDefineParametersFromVector ( data.defines, used_defs ).c_str ()); } void MingwBackend::GenerateGlobalCFlagsAndProperties ( const char* assignmentOperation, - IfableData& data ) const + const IfableData& data ) const { size_t i; @@ -420,7 +416,7 @@ for ( i = 0; i < data.ifs.size(); i++ ) { - If& rIf = *data.ifs[i]; + const If& rIf = *data.ifs[i]; if ( rIf.data.defines.size() || rIf.data.includes.size() || rIf.data.ifs.size() ) @@ -523,8 +519,8 @@ GenerateGlobalCFlagsAndProperties ( "=", ProjectNode.non_if_data ); GenerateProjectGccOptions ( "=", ProjectNode.non_if_data ); - fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CFLAGS)\n" ); - fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CFLAGS)\n" ); + fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CFLAGS) $(PROJECT_CDEFINES)\n" ); + fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CFLAGS) $(PROJECT_CDEFINES)\n" ); fprintf ( fMakefile, "PROJECT_LFLAGS := %s\n", GenerateProjectLFLAGS ().c_str () ); fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" ); Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h Fri Oct 19 17:24:06 2007 @@ -62,11 +62,10 @@ void CreateMakefile (); void CloseMakefile () const; void GenerateHeader () const; - std::string GenerateIncludesAndDefines ( IfableData& data ) const; void GenerateProjectCFlagsMacro ( const char* assignmentOperation, - IfableData& data ) const; + const IfableData& data ) const; void GenerateGlobalCFlagsAndProperties ( const char* op, - IfableData& data ) const; + const IfableData& data ) const; void GenerateProjectGccOptionsMacro ( const char* assignmentOperation, IfableData& data ) const; void GenerateProjectGccOptions ( const char* assignmentOperation, Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Oct 19 17:24:06 2007 @@ -629,7 +629,7 @@ /* static */ string MingwModuleHandler::GenerateGccDefineParametersFromVector ( const vector<Define*>& defines, - set<string>& used_defs) + set<string>& used_defs) { string parameters; @@ -640,8 +640,8 @@ continue; if (parameters.length () > 0) parameters += " "; - if (define.name.find('(') != string::npos) - parameters += "$(QT)"; + if (define.name.find('(') != string::npos) + parameters += "$(QT)"; parameters += "-D"; parameters += define.name; if (define.value.length () > 0) @@ -649,8 +649,8 @@ parameters += "="; parameters += define.value; } - if (define.name.find('(') != string::npos) - parameters += "$(QT)"; + if (define.name.find('(') != string::npos) + parameters += "$(QT)"; used_defs.insert(used_defs.begin(),define.name); } return parameters; @@ -659,7 +659,7 @@ string MingwModuleHandler::GenerateGccDefineParameters () const { - set<string> used_defs; + set<string> used_defs; string parameters = GenerateGccDefineParametersFromVector ( module.project.non_if_data.defines, used_defs ); string s = GenerateGccDefineParametersFromVector ( module.non_if_data.defines, used_defs ); if ( s.length () > 0 ) @@ -765,7 +765,8 @@ MingwModuleHandler::GenerateMacro ( const char* assignmentOperation, const string& macro, - const IfableData& data ) + const IfableData& data, + set<string> *used_defs ) { size_t i; bool generateAssignment; @@ -806,7 +807,14 @@ } for ( i = 0; i < data.defines.size(); i++ ) { - Define& d = *data.defines[i]; + const Define& d = *data.defines[i]; + if (used_defs && used_defs->find(d.name) != used_defs->end()) + { + if ( backend->configuration.Verbose ) + printf("%s define overridden in '%s' module\n", + d.name.c_str (), module.name.c_str () ); + continue; + } fprintf ( fMakefile, " -D%s", @@ -816,6 +824,8 @@ fMakefile, "=%s", d.value.c_str() ); + if (used_defs) + used_defs->insert(used_defs->begin(), d.name); } if ( generateAssignment ) { @@ -827,16 +837,19 @@ MingwModuleHandler::GenerateMacros ( const char* assignmentOperation, const IfableData& data, - const vector<LinkerFlag*>* linkerFlags ) + const vector<LinkerFlag*>* linkerFlags, + set<string>& used_defs ) { size_t i; GenerateMacro ( assignmentOperation, cflagsMacro, - data ); + data, + &used_defs ); GenerateMacro ( assignmentOperation, windresflagsMacro, - data ); + data, + NULL ); if ( linkerFlags != NULL ) { @@ -886,7 +899,8 @@ GenerateMacros ( "+=", rIf.data, - NULL ); + NULL, + used_defs ); fprintf ( fMakefile, "endif\n\n" ); @@ -2020,6 +2034,8 @@ void MingwModuleHandler::GenerateOtherMacros () { + set<string> used_defs; + cflagsMacro = ssprintf ("%s_CFLAGS", module.name.c_str ()); nasmflagsMacro = ssprintf ("%s_NASMFLAGS", module.name.c_str ()); windresflagsMacro = ssprintf ("%s_RCFLAGS", module.name.c_str ()); @@ -2031,7 +2047,14 @@ GenerateMacros ( "=", module.non_if_data, - &module.linkerFlags ); + &module.linkerFlags, + used_defs ); + + GenerateMacros ( + "+=", + module.project.non_if_data, + NULL, + used_defs ); vector<FileLocation> s; if ( module.importLibrary ) Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Fri Oct 19 17:24:06 2007 @@ -136,10 +136,12 @@ std::string GenerateLinkerParameters () const; void GenerateMacro ( const char* assignmentOperation, const std::string& macro, - const IfableData& data ); + const IfableData& data, + std::set<std::string>* used_defs ); void GenerateMacros ( const char* op, const IfableData& data, - const std::vector<LinkerFlag*>* linkerFlags ); + const std::vector<LinkerFlag*>* linkerFlags, + std::set<std::string>& used_defs ); void GenerateSourceMacros ( const char* assignmentOperation, const IfableData& data ); void GenerateObjectMacros ( const char* assignmentOperation,

1 0

[hpoussin] 29680: Const-ify Define class
by hpoussin＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: hpoussin Date: Fri Oct 19 17:20:27 2007 New Revision: 29680 URL: http://svn.reactos.org/svn/reactos?rev=29680&view=rev Log: Const-ify Define class Modified: trunk/reactos/tools/rbuild/define.cpp trunk/reactos/tools/rbuild/project.dtd trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/define.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/define.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/define.cpp (original) +++ trunk/reactos/tools/rbuild/define.cpp Fri Oct 19 17:20:27 2007 @@ -33,7 +33,7 @@ } Define::Define ( const Project& project, - const Module* module, + const Module* module, const XMLElement& defineNode ) : project(project), module(module), @@ -43,16 +43,16 @@ } Define::Define ( const Project& project, - const Module* module, - const std::string name_, - const std::string backend_) + const Module* module, + const std::string& name_, + const std::string& backend_) : project(project), module(module), node(NULL) { name = name_; value = ""; - backend = backend_; + backend = backend_; } Define::~Define () @@ -63,13 +63,12 @@ Define::Initialize() { const XMLAttribute* att = node->GetAttribute ( "name", true ); - const XMLAttribute* empty = node->GetAttribute ( "empty", false ); - const XMLAttribute* bck = node->GetAttribute ( "backend", false ); + const XMLAttribute* bck = node->GetAttribute ( "backend", false ); assert(att); name = att->value; - value = node->value; - if ( bck ) backend = bck->value; - if( empty ) value = " "; + value = node->value; + if ( bck ) + backend = bck->value; } void Modified: trunk/reactos/tools/rbuild/project.dtd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.dtd?r… ============================================================================== --- trunk/reactos/tools/rbuild/project.dtd (original) +++ trunk/reactos/tools/rbuild/project.dtd Fri Oct 19 17:20:27 2007 @@ -37,8 +37,6 @@ <!ELEMENT define (#PCDATA)> <!ATTLIST define name %CIdentifier; #REQUIRED - value %Text; #IMPLIED - empty (true) #IMPLIED > <!ELEMENT directory (compilationunit*|directory*|group*|cdfile|file*|if*|ifnot*|module+|pch*|xi:include*)+> Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Fri Oct 19 17:20:27 2007 @@ -434,8 +434,8 @@ const XMLElement& defineNode ); Define ( const Project& project, const Module* module, - const std::string name_, - const std::string backend_ = "" ); + const std::string& name_, + const std::string& backend_ = "" ); ~Define(); void ProcessXML(); private:

1 0

[janderwald] 29679: - fix creating context menu entry for shortcut - add static context menu entry (under windows xp sp2 it is defined under ".lnk", however this is a little mess to define static handlers in one place and dynamic in another)
by janderwald＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: janderwald Date: Fri Oct 19 17:01:55 2007 New Revision: 29679 URL: http://svn.reactos.org/svn/reactos?rev=29679&view=rev Log: - fix creating context menu entry for shortcut - add static context menu entry (under windows xp sp2 it is defined under ".lnk", however this is a little mess to define static handlers in one place and dynamic in another) Modified: trunk/reactos/boot/bootdata/hivecls.inf Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf (original) +++ trunk/reactos/boot/bootdata/hivecls.inf Fri Oct 19 17:01:55 2007 @@ -115,7 +115,8 @@ HKCR,"lnkfile","IsShortcut",0x00000000,"yes" HKCR,"lnkfile\CLSID","",0x00000000,"{00021401-0000-0000-C000-000000000046}" HKCR,"lnkfile\shellex\IconHandler","",0x00000000,"{00021401-0000-0000-C000-000000000046}" -HKCR,lnkfile\shellex\ContextMenuHandlers\{00021401-0000-0000-C000-000000000046},,, +HKCR,"lnkfile\shellex\ContextMenuHandlers\{00021401-0000-0000-C000-000000000046}","",0x00000000,"" +HKCR,"lnkfile\shellnew","",0x00020000,"%SystemRoot%\system32\rundll32.exe appwiz.cpl,NewLinkHere %1" ; Text Documents HKCR,".log","",0x00000000,"txtfile"

1 0

[janderwald] 29678: Author: Evan Teran <evan.teran@gmail.com> - Fix typo in GlobalAlloc parameters.
by janderwald＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: janderwald Date: Fri Oct 19 15:15:50 2007 New Revision: 29678 URL: http://svn.reactos.org/svn/reactos?rev=29678&view=rev Log: Author: Evan Teran <evan.teran(a)gmail.com> - Fix typo in GlobalAlloc parameters. Modified: trunk/reactos/dll/win32/shell32/shell32_main.c Modified: trunk/reactos/dll/win32/shell32/shell32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.c (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.c Fri Oct 19 15:15:50 2007 @@ -97,7 +97,7 @@ /* Return the path to the executable */ DWORD len, size=16; - hargv=GlobalAlloc(size, 0); + hargv=GlobalAlloc(0, size); argv=GlobalLock(hargv); for (;;) {

1 0

[janderwald] 29677: - add printer folder - patch by Huw D M Davies (http://www.winehq.org/pipermail/wine-patches/2005-April/016926.html) - register bitbucket context menu extension
by janderwald＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: janderwald Date: Fri Oct 19 15:03:05 2007 New Revision: 29677 URL: http://svn.reactos.org/svn/reactos?rev=29677&view=rev Log: - add printer folder - patch by Huw D M Davies (http://www.winehq.org/pipermail/wine-patches/2005-April/016926.html) - register bitbucket context menu extension Added: trunk/reactos/dll/win32/shell32/shfldr_printers.c (with props) Modified: trunk/reactos/dll/win32/shell32/recyclebin.c trunk/reactos/dll/win32/shell32/regsvr.c trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shell32_main.h trunk/reactos/dll/win32/shell32/shellole.c Modified: trunk/reactos/dll/win32/shell32/recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/recycleb… ============================================================================== --- trunk/reactos/dll/win32/shell32/recyclebin.c (original) +++ trunk/reactos/dll/win32/shell32/recyclebin.c Fri Oct 19 15:03:05 2007 @@ -175,7 +175,7 @@ || IsEqualGUID(riid, &IID_IPersistFolder2)) *ppvObject = &This->lpPersistFolderVtbl; - if (IsEqualGUID(riid, &IID_IContextMenu)) + if (IsEqualIID(riid, &IID_IContextMenu)) *ppvObject = &This->lpCmt; if (*ppvObject != NULL) @@ -586,6 +586,12 @@ FIXME("stub\n"); return S_OK; } + +/************************************************************************* + * BitBucket context menu + * + */ + static HRESULT WINAPI RecycleBin_IContextMenu_QueryInterface( IContextMenu* iface, REFIID riid, void** ppvObject ) { @@ -622,16 +628,17 @@ return E_INVALIDARG; memset( &mii, 0, sizeof(mii) ); - mii.cbSize = sizeof (mii); + mii.cbSize = sizeof(mii); mii.fMask = MIIM_TYPE | MIIM_ID | MIIM_STATE; mii.dwTypeData = (LPWSTR)szOpen; mii.cch = strlenW( mii.dwTypeData ); mii.wID = idCmdFirst + id++; mii.fState = MFS_ENABLED; mii.fType = MFT_STRING; + if (!InsertMenuItemW( hmenu, indexMenu, TRUE, &mii )) return E_FAIL; - This->iIdOpen = 0; + This->iIdOpen = 1; mii.fState = MFS_ENABLED; mii.dwTypeData = (LPWSTR)szEmpty; @@ -642,9 +649,7 @@ TRACE("RecycleBin_IContextMenu_QueryContextMenu failed to insert item properties"); return E_FAIL; } - This->iIdEmpty = 1; - id++; - + This->iIdEmpty = 2; mii.fState = MFS_ENABLED; mii.dwTypeData = (LPWSTR)szProperties; mii.cch = strlenW( mii.dwTypeData ); @@ -654,9 +659,7 @@ TRACE("RecycleBin_IContextMenu_QueryContextMenu failed to insert item properties"); return E_FAIL; } - This->iIdProperties = 2; - id++; - + This->iIdProperties = 3; return MAKE_HRESULT( SEVERITY_SUCCESS, 0, id ); } @@ -665,9 +668,16 @@ { RecycleBin * This = impl_from_IContextMenu(iface); - TRACE("%p %p\n", This, lpici ); - - return E_FAIL; + TRACE("%p %p verb %p\n", This, lpici, lpici->lpVerb); + + if ( lpici->lpVerb == MAKEINTRESOURCEA(This->iIdProperties)) + { + WCHAR szDrive = 'C'; + SH_ShowRecycleBinProperties(szDrive); + return S_OK; + } + + return S_OK; } static HRESULT WINAPI Modified: trunk/reactos/dll/win32/shell32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/regsvr.c… ============================================================================== --- trunk/reactos/dll/win32/shell32/regsvr.c (original) +++ trunk/reactos/dll/win32/shell32/regsvr.c Fri Oct 19 15:03:05 2007 @@ -75,6 +75,7 @@ LPCSTR clsid_str; /* can be NULL to omit */ LPCSTR progid; /* can be NULL to omit */ UINT idDefaultIcon; /* can be 0 to omit */ +// CLSID const *clsid_menu; /* can be NULL to omit */ }; /* flags for regsvr_coclass.flags */ @@ -131,6 +132,7 @@ 'a', 'u', 'l', 't', 'M', 'e', 'n', 'u', 0 }; static WCHAR const defaulticon_keyname[] = { 'D','e','f','a','u','l','t','I','c','o','n',0}; +static WCHAR const contextmenu_keyname[] = { 'C', 'o', 'n', 't', 'e', 'x', 't', 'M', 'e', 'n', 'u', 'H', 'a', 'n', 'd', 'l', 'e', 'r', 's', 0 }; static char const tmodel_valuename[] = "ThreadingModel"; static char const wfparsing_valuename[] = "WantsFORPARSING"; static char const attributes_valuename[] = "Attributes"; @@ -375,6 +377,28 @@ RegCloseKey(progid_key); if (res != ERROR_SUCCESS) goto error_close_clsid_key; } + if (IsEqualIID(list->clsid, &CLSID_RecycleBin)) {//if (list->clsid_menu) { + HKEY shellex_key, cmenu_key, menuhandler_key; + res = RegCreateKeyExW(clsid_key, shellex_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &shellex_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + res = RegCreateKeyExW(shellex_key, contextmenu_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &cmenu_key, NULL); + if (res != ERROR_SUCCESS) { + RegCloseKey(shellex_key); + goto error_close_clsid_key; + } + + StringFromGUID2(list->clsid, buf, 39); //clsid_menu + res = RegCreateKeyExW(cmenu_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &menuhandler_key, NULL); + RegCloseKey(menuhandler_key); + RegCloseKey(cmenu_key); + RegCloseKey(shellex_key); + } error_close_clsid_key: RegCloseKey(clsid_key); @@ -555,6 +579,13 @@ "shell32.dll", "Apartment" }, + { &CLSID_Printers, + "Printers & Fax", + 0, + NULL, + "shell32.dll", + "Apartment" + }, { &CLSID_MyComputer, "My Computer", IDS_MYCOMPUTER, @@ -634,6 +665,7 @@ NULL, NULL, IDI_SHELL_FULL_RECYCLE_BIN +// &CLSID_RecycleBin }, { &CLSID_ShellFSFolder, "Shell File System Folder", Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild Fri Oct 19 15:03:05 2007 @@ -24,6 +24,7 @@ <library>version</library> <library>devmgr</library> <library>rtl</library> + <library>winspool</library> <file>authors.c</file> <file>autocomplete.c</file> <file>brsfolder.c</file> @@ -52,6 +53,7 @@ <file>shfldr_desktop.c</file> <file>shfldr_fs.c</file> <file>shfldr_mycomp.c</file> + <file>shfldr_printers.c</file> <file>shlexec.c</file> <file>shlfileop.c</file> <file>shlfolder.c</file> Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.h (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.h Fri Oct 19 15:03:05 2007 @@ -90,6 +90,7 @@ HRESULT WINAPI IShellLink_ConstructFromFile(IUnknown * pUnkOuter, REFIID riid, LPCITEMIDLIST pidl, LPVOID * ppv); HRESULT WINAPI ISF_Desktop_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); HRESULT WINAPI ISF_MyComputer_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); +HRESULT WINAPI ISF_Printers_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); HRESULT WINAPI IDropTargetHelper_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *pfd, LPBC *ppV); HRESULT WINAPI IControlPanel_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); Modified: trunk/reactos/dll/win32/shell32/shellole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellole… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellole.c (original) +++ trunk/reactos/dll/win32/shell32/shellole.c Fri Oct 19 15:03:05 2007 @@ -75,6 +75,7 @@ {&CLSID_FolderShortcut, &FolderShortcut_Constructor}, {&CLSID_MyDocuments, &MyDocuments_Constructor}, #endif + {&CLSID_Printers, &ISF_Printers_Constructor}, {&CLSID_RecycleBin, &RecycleBin_Constructor}, {NULL,NULL} }; Added: trunk/reactos/dll/win32/shell32/shfldr_printers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_p… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_printers.c (added) +++ trunk/reactos/dll/win32/shell32/shfldr_printers.c Fri Oct 19 15:03:05 2007 @@ -1,0 +1,847 @@ +/* + * Virtual Printers Folder + * + * Copyright 1997 Marcus Meissner + * Copyright 1998, 1999, 2002 Juergen Schmied + * Copyright 2005 Huw Davies + * + * 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 "wine/port.h" + +#include <stdlib.h> +#include <string.h> +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "winerror.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "wingdi.h" +#include "winuser.h" +#include "winspool.h" + +#include "ole2.h" +#include "shlguid.h" + +#include "enumidlist.h" +#include "pidl.h" +#include "undocshell.h" +#include "shell32_main.h" +#include "shresdef.h" +#include "shlwapi.h" +#include "shellfolder.h" +#include "wine/debug.h" +#include "debughlp.h" +#include "shfldr.h" +#include "shresdef.h" + +WINE_DEFAULT_DEBUG_CHANNEL (shell); + +/*********************************************************************** + * Printers_IExtractIconW implementation + */ +typedef struct +{ + IExtractIconWVtbl *lpVtbl; + IExtractIconAVtbl *lpvtblExtractIconA; + volatile LONG ref; + LPITEMIDLIST pidl; +} IExtractIconWImpl; + +#define _IExtractIconA_Offset ((int)(&(((IExtractIconWImpl*)0)->lpvtblExtractIconA))) +#define _ICOM_THIS_From_IExtractIconA(class, name) class* This = (class*)(((char*)name)-_IExtractIconA_Offset); + +/************************************************************************** + * IExtractIconW_QueryInterface + */ +static HRESULT WINAPI IEI_Printers_fnQueryInterface(IExtractIconW *iface, REFIID riid, LPVOID *ppvObj) +{ + IExtractIconWImpl *This = (IExtractIconWImpl *)iface; + + TRACE("(%p)->(\n\tIID:\t%s,%p)\n", This, debugstr_guid(riid), ppvObj); + + *ppvObj = NULL; + + if (IsEqualIID(riid, &IID_IUnknown)) + { + *ppvObj = This; + } + else if (IsEqualIID(riid, &IID_IExtractIconW)) + { + *ppvObj = (IExtractIconW*)This; + } + else if (IsEqualIID(riid, &IID_IExtractIconA)) + { + *ppvObj = (IExtractIconA*)&(This->lpvtblExtractIconA); + } + + if(*ppvObj) + { + IExtractIconW_AddRef((IExtractIconW*) *ppvObj); + TRACE("-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj); + return S_OK; + } + TRACE("-- Interface: E_NOINTERFACE\n"); + return E_NOINTERFACE; +} + +/************************************************************************** + * IExtractIconW_AddRef + */ +static ULONG WINAPI IEI_Printers_fnAddRef(IExtractIconW * iface) +{ + IExtractIconWImpl *This = (IExtractIconWImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(count=%lu)\n", This, refCount - 1); + + return refCount; +} + +/************************************************************************** + * IExtractIconW_Release + */ +static ULONG WINAPI IEI_Printers_fnRelease(IExtractIconW * iface) +{ + IExtractIconWImpl *This = (IExtractIconWImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(count=%lu)\n", This, refCount + 1); + + if (!refCount) + { + TRACE(" destroying IExtractIcon(%p)\n",This); + SHFree(This->pidl); + HeapFree(GetProcessHeap(),0,This); + return 0; + } + return refCount; +} + +/************************************************************************** + * IExtractIconW_GetIconLocation + * + * mapping filetype to icon + */ +static HRESULT WINAPI IEI_Printers_fnGetIconLocation( + IExtractIconW * iface, + UINT uFlags, /* GIL_ flags */ + LPWSTR szIconFile, + UINT cchMax, + int *piIndex, + UINT *pwFlags) /* returned GIL_ flags */ +{ + IExtractIconWImpl *This = (IExtractIconWImpl *)iface; + + TRACE("(%p) (flags=%u %p %u %p %p)\n", This, uFlags, szIconFile, cchMax, piIndex, pwFlags); + + if (pwFlags) + *pwFlags = 0; + + lstrcpynW(szIconFile, swShell32Name, cchMax); + *piIndex = -IDI_SHELL_PRINTER; /* FIXME: other icons for default, network, print to file */ + + TRACE("-- %s %x\n", debugstr_w(szIconFile), *piIndex); + return NOERROR; +} + +/************************************************************************** + * IExtractIconW_Extract + */ +static HRESULT WINAPI IEI_Printers_fnExtract(IExtractIconW *iface, LPCWSTR pszFile, + UINT nIconIndex, HICON *phiconLarge, + HICON *phiconSmall, UINT nIconSize) +{ + IExtractIconWImpl *This = (IExtractIconWImpl *)iface; + int index; + + FIXME("(%p) (file=%p index=%d %p %p size=%x) semi-stub\n", This, debugstr_w(pszFile), + (signed)nIconIndex, phiconLarge, phiconSmall, nIconSize); + + index = SIC_GetIconIndex(pszFile, nIconIndex, 0); + + if (phiconLarge) + *phiconLarge = ImageList_GetIcon(ShellBigIconList, index, ILD_TRANSPARENT); + + if (phiconSmall) + *phiconSmall = ImageList_GetIcon(ShellSmallIconList, index, ILD_TRANSPARENT); + + return S_OK; +} + +static struct IExtractIconWVtbl eivt = +{ + IEI_Printers_fnQueryInterface, + IEI_Printers_fnAddRef, + IEI_Printers_fnRelease, + IEI_Printers_fnGetIconLocation, + IEI_Printers_fnExtract +}; + +/************************************************************************** + * IExtractIconA_QueryInterface + */ +static HRESULT WINAPI IEIA_Printers_fnQueryInterface(IExtractIconA * iface, REFIID riid, LPVOID *ppvObj) +{ + _ICOM_THIS_From_IExtractIconA(IExtractIconW, iface); + + return IExtractIconW_QueryInterface(This, riid, ppvObj); +} + +/************************************************************************** + * IExtractIconA_AddRef + */ +static ULONG WINAPI IEIA_Printers_fnAddRef(IExtractIconA * iface) +{ + _ICOM_THIS_From_IExtractIconA(IExtractIconW, iface); + + return IExtractIconW_AddRef(This); +} +/************************************************************************** + * IExtractIconA_Release + */ +static ULONG WINAPI IEIA_Printers_fnRelease(IExtractIconA * iface) +{ + _ICOM_THIS_From_IExtractIconA(IExtractIconW, iface); + + return IExtractIconW_AddRef(This); +} + +/************************************************************************** + * IExtractIconA_GetIconLocation + */ +static HRESULT WINAPI IEIA_Printers_fnGetIconLocation( + IExtractIconA * iface, + UINT uFlags, + LPSTR szIconFile, + UINT cchMax, + int * piIndex, + UINT * pwFlags) +{ + HRESULT ret; + LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, cchMax * sizeof(WCHAR)); + _ICOM_THIS_From_IExtractIconA(IExtractIconW, iface); + + TRACE("(%p) (flags=%u %p %u %p %p)\n", This, uFlags, szIconFile, cchMax, piIndex, pwFlags); + + ret = IExtractIconW_GetIconLocation(This, uFlags, lpwstrFile, cchMax, piIndex, pwFlags); + WideCharToMultiByte(CP_ACP, 0, lpwstrFile, -1, szIconFile, cchMax, NULL, NULL); + HeapFree(GetProcessHeap(), 0, lpwstrFile); + + TRACE("-- %s %x\n", szIconFile, *piIndex); + return ret; +} +/************************************************************************** + * IExtractIconA_Extract + */ +static HRESULT WINAPI IEIA_Printers_fnExtract(IExtractIconA *iface, LPCSTR pszFile, + UINT nIconIndex, HICON *phiconLarge, + HICON *phiconSmall, UINT nIconSize) +{ + HRESULT ret; + INT len = MultiByteToWideChar(CP_ACP, 0, pszFile, -1, NULL, 0); + LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + _ICOM_THIS_From_IExtractIconA(IExtractIconW, iface); + + TRACE("(%p) (file=%p index=%u %p %p size=%u)\n", This, pszFile, nIconIndex, phiconLarge, phiconSmall, nIconSize); + + MultiByteToWideChar(CP_ACP, 0, pszFile, -1, lpwstrFile, len); + ret = IExtractIconW_Extract(This, lpwstrFile, nIconIndex, phiconLarge, phiconSmall, nIconSize); + HeapFree(GetProcessHeap(), 0, lpwstrFile); + return ret; +} + +static struct IExtractIconAVtbl eiavt = +{ + IEIA_Printers_fnQueryInterface, + IEIA_Printers_fnAddRef, + IEIA_Printers_fnRelease, + IEIA_Printers_fnGetIconLocation, + IEIA_Printers_fnExtract +}; + +/************************************************************************** + * IExtractIcon_Constructor + */ +static IUnknown *IEI_Printers_Constructor(LPCITEMIDLIST pidl) +{ + IExtractIconWImpl* ei; + + TRACE("%p\n", pidl); + + ei = HeapAlloc(GetProcessHeap(),0,sizeof(IExtractIconWImpl)); + ei->ref = 1; + ei->lpVtbl = &eivt; + ei->lpvtblExtractIconA = &eiavt; + ei->pidl=ILClone(pidl); + + pdump(pidl); + + TRACE("(%p)\n", ei); + return (IUnknown *)ei; +} + +/*********************************************************************** + * Printers folder implementation + */ + +typedef struct { + IShellFolder2Vtbl *lpVtbl; + IPersistFolder2Vtbl *lpVtblPersistFolder2; + + DWORD ref; + + CLSID *pclsid; + + LPITEMIDLIST pidlRoot; /* absolute pidl */ + + int dwAttributes; /* attributes returned by GetAttributesOf FIXME: use it */ +} IGenericSFImpl; + +#define _IPersistFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2))) +#define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset); + +#define _IUnknown_(This) (IShellFolder*)&(This->lpVtbl) +#define _IShellFolder_(This) (IShellFolder*)&(This->lpVtbl) + +#define _IPersist_(This) (IPersist*)&(This->lpVtblPersistFolder2) +#define _IPersistFolder_(This) (IPersistFolder*)&(This->lpVtblPersistFolder2) +#define _IPersistFolder2_(This) (IPersistFolder2*)&(This->lpVtblPersistFolder2) + +/************************************************************************** + * ISF_Printers_fnQueryInterface + * + * NOTE does not support IPersist/IPersistFolder + */ +static HRESULT WINAPI ISF_Printers_fnQueryInterface( + IShellFolder2 * iface, REFIID riid, LPVOID * ppvObj) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); + + *ppvObj = NULL; + + if (IsEqualIID (riid, &IID_IUnknown) || + IsEqualIID (riid, &IID_IShellFolder) || + IsEqualIID (riid, &IID_IShellFolder2)) + { + *ppvObj = This; + } + + else if (IsEqualIID (riid, &IID_IPersist) || + IsEqualIID (riid, &IID_IPersistFolder) || + IsEqualIID (riid, &IID_IPersistFolder2)) + { + *ppvObj = _IPersistFolder2_ (This); + } + + if (*ppvObj) + { + IUnknown_AddRef ((IUnknown *) (*ppvObj)); + TRACE ("-- Interface: (%p)->(%p)\n", ppvObj, *ppvObj); + return S_OK; + } + TRACE ("-- Interface: E_NOINTERFACE\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI ISF_Printers_fnAddRef (IShellFolder2 * iface) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE ("(%p)->(count=%lu)\n", This, refCount - 1); + + return refCount; +} + +static ULONG WINAPI ISF_Printers_fnRelease (IShellFolder2 * iface) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + TRACE ("(%p)->(count=%lu)\n", This, refCount + 1); + + if (!refCount) + { + TRACE ("-- destroying IShellFolder(%p)\n", This); + if (This->pidlRoot) + SHFree (This->pidlRoot); + LocalFree ((HLOCAL) This); + return 0; + } + return refCount; +} + +/************************************************************************** + * ISF_Printers_fnParseDisplayName + * + * This is E_NOTIMPL in Windows too. + */ +static HRESULT WINAPI ISF_Printers_fnParseDisplayName (IShellFolder2 * iface, + HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, + DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + TRACE("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n", + This, hwndOwner, pbc, lpszDisplayName, debugstr_w(lpszDisplayName), + pchEaten, ppidl, pdwAttributes); + + *ppidl = 0; + if (pchEaten) + *pchEaten = 0; + + return E_NOTIMPL; +} + +/************************************************************************** + * CreatePrintersEnumList() + */ +static BOOL CreatePrintersEnumList(IEnumIDList *list, DWORD dwFlags) +{ + BOOL ret = TRUE; + + TRACE("(%p)->(flags=0x%08lx) \n",list,dwFlags); + + /* enumerate the folders */ + if (dwFlags & SHCONTF_NONFOLDERS) + { + DWORD needed, num, i; + PRINTER_INFO_4W *pi; + + EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, 4, NULL, 0, &needed, &num); + pi = HeapAlloc(GetProcessHeap(), 0, needed); + if(!EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, 4, (LPBYTE)pi, needed, &needed, &num)) { + HeapFree(GetProcessHeap(), 0, pi); + return FALSE; + } + + for(i = 0; i < num; i++) { + DWORD len = strlenW(pi[i].pPrinterName); + LPITEMIDLIST pidl = _ILAlloc(PT_VALUEW, (len + 1) * sizeof(WCHAR)); + LPPIDLDATA data = _ILGetDataPointer(pidl); + memcpy(data->u.valueW.name, pi[i].pPrinterName, (len + 1) * sizeof(WCHAR)); + AddToEnumList(list, pidl); + } + + HeapFree(GetProcessHeap(), 0, pi); + } + return ret; +} + +/************************************************************************** + * ISF_Printers_fnEnumObjects + */ +static HRESULT WINAPI ISF_Printers_fnEnumObjects (IShellFolder2 * iface, + HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST * ppEnumIDList) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + TRACE ("(%p)->(HWND=%p flags=0x%08lx pplist=%p)\n", + This, hwndOwner, dwFlags, ppEnumIDList); + + if(!ppEnumIDList) return E_OUTOFMEMORY; + *ppEnumIDList = IEnumIDList_Constructor(); + if (*ppEnumIDList) + CreatePrintersEnumList(*ppEnumIDList, dwFlags); + + TRACE ("-- (%p)->(new ID List: %p)\n", This, *ppEnumIDList); + + return (*ppEnumIDList) ? S_OK : E_OUTOFMEMORY; +} + +/************************************************************************** + * ISF_Printers_fnBindToObject + */ +static HRESULT WINAPI ISF_Printers_fnBindToObject (IShellFolder2 * iface, + LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p)->(pidl=%p,%p,%s,%p)\n", + This, pidl, pbcReserved, shdebugstr_guid (riid), ppvOut); + + return E_NOTIMPL; +} + +/************************************************************************** + * ISF_Printers_fnBindToStorage + */ +static HRESULT WINAPI ISF_Printers_fnBindToStorage (IShellFolder2 * iface, + LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p)->(pidl=%p,%p,%s,%p) stub\n", + This, pidl, pbcReserved, shdebugstr_guid (riid), ppvOut); + + *ppvOut = NULL; + return E_NOTIMPL; +} + +/************************************************************************** + * ISF_Printers_fnCompareIDs + */ +static HRESULT WINAPI ISF_Printers_fnCompareIDs (IShellFolder2 * iface, + LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p)->(0x%08lx,pidl1=%p,pidl2=%p): stub\n", This, lParam, pidl1, pidl2); + return E_NOTIMPL; +} + +/************************************************************************** + * ISF_Printers_fnCreateViewObject + */ +static HRESULT WINAPI ISF_Printers_fnCreateViewObject (IShellFolder2 * iface, + HWND hwndOwner, REFIID riid, LPVOID * ppvOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p)->(hwnd=%p,%s,%p): stub\n", + This, hwndOwner, shdebugstr_guid (riid), ppvOut); + + return E_NOTIMPL; +} + +/************************************************************************** + * ISF_Printers_fnGetAttributesOf + */ +static HRESULT WINAPI ISF_Printers_fnGetAttributesOf (IShellFolder2 * iface, + UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p)->(cidl=%d apidl=%p mask=0x%08lx): stub\n", + This, cidl, apidl, *rgfInOut); + + return E_NOTIMPL; +} + +/************************************************************************** + * ISF_Printers_fnGetUIObjectOf + * + * PARAMETERS + * HWND hwndOwner, //[in ] Parent window for any output + * UINT cidl, //[in ] array size + * LPCITEMIDLIST* apidl, //[in ] simple pidl array + * REFIID riid, //[in ] Requested Interface + * UINT* prgfInOut, //[ ] reserved + * LPVOID* ppvObject) //[out] Resulting Interface + * + */ +static HRESULT WINAPI ISF_Printers_fnGetUIObjectOf (IShellFolder2 * iface, + HWND hwndOwner, UINT cidl, LPCITEMIDLIST * apidl, + REFIID riid, UINT * prgfInOut, LPVOID * ppvOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + IUnknown *pObj = NULL; + HRESULT hr = E_INVALIDARG; + + TRACE ("(%p)->(%p,%u,apidl=%p,%s,%p,%p)\n", + This, hwndOwner, cidl, apidl, shdebugstr_guid (riid), prgfInOut, ppvOut); + + if (!ppvOut) + return hr; + + *ppvOut = NULL; + + if ((IsEqualIID (riid, &IID_IExtractIconA) || IsEqualIID(riid, &IID_IExtractIconW)) && (cidl == 1)) + { + IUnknown *pUnk = IEI_Printers_Constructor(apidl[0]); + hr = IUnknown_QueryInterface(pUnk, riid, (void**)&pObj); + IUnknown_Release(pUnk); + } + else + hr = E_NOINTERFACE; + + if (SUCCEEDED(hr) && !pObj) + hr = E_OUTOFMEMORY; + + *ppvOut = pObj; + TRACE ("(%p)->hr=0x%08lx\n", This, hr); + return hr; +} + +/************************************************************************** + * ISF_Printers_fnGetDisplayNameOf + * + */ +static HRESULT WINAPI ISF_Printers_fnGetDisplayNameOf (IShellFolder2 * iface, + LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + WCHAR *name; + DWORD len; + + TRACE ("(%p)->(pidl=%p,0x%08lx,%p)\n", This, pidl, dwFlags, strRet); + pdump (pidl); + + if (!strRet) + return E_INVALIDARG; + + name = _ILGetDataPointer(pidl)->u.valueW.name; + len = strlenW(name); + + strRet->uType = STRRET_WSTR; + strRet->u.pOleStr = SHAlloc((len + 1) * sizeof(WCHAR)); + memcpy(strRet->u.pOleStr, name, (len + 1) * sizeof(WCHAR)); + + TRACE("ret %s\n", debugstr_w(strRet->u.pOleStr)); + + return S_OK; +} + +/************************************************************************** + * ISF_Printers_fnSetNameOf + * Changes the name of a file object or subfolder, possibly changing its item + * identifier in the process. + * + * PARAMETERS + * HWND hwndOwner, //[in ] Owner window for output + * LPCITEMIDLIST pidl, //[in ] simple pidl of item to change + * LPCOLESTR lpszName, //[in ] the items new display name + * DWORD dwFlags, //[in ] SHGNO formatting flags + * LPITEMIDLIST* ppidlOut) //[out] simple pidl returned + */ +static HRESULT WINAPI ISF_Printers_fnSetNameOf (IShellFolder2 * iface, + HWND hwndOwner, LPCITEMIDLIST pidl, /* simple pidl */ + LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p)->(%p,pidl=%p,%s,%lu,%p)\n", This, hwndOwner, pidl, + debugstr_w (lpName), dwFlags, pPidlOut); + + return E_FAIL; +} + +static HRESULT WINAPI ISF_Printers_fnGetDefaultSearchGUID(IShellFolder2 *iface, + GUID * pguid) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ISF_Printers_fnEnumSearches (IShellFolder2 *iface, + IEnumExtraSearch ** ppenum) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + FIXME ("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ISF_Printers_fnGetDefaultColumn (IShellFolder2 * iface, + DWORD dwRes, ULONG * pSort, ULONG * pDisplay) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p): stub\n", This); + + return E_NOTIMPL; +} +static HRESULT WINAPI ISF_Printers_fnGetDefaultColumnState ( + IShellFolder2 * iface, UINT iColumn, DWORD * pcsFlags) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p): stub\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ISF_Printers_fnGetDetailsEx (IShellFolder2 * iface, + LPCITEMIDLIST pidl, const SHCOLUMNID * pscid, VARIANT * pv) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + FIXME ("(%p): stub\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ISF_Printers_fnGetDetailsOf (IShellFolder2 * iface, + LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS * psd) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p)->(%p %i %p): stub\n", This, pidl, iColumn, psd); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ISF_Printers_fnMapColumnToSCID ( + IShellFolder2 * iface, UINT column, SHCOLUMNID * pscid) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + FIXME ("(%p): stub\n", This); + return E_NOTIMPL; +} + +static IShellFolder2Vtbl vt_ShellFolder2 = +{ + ISF_Printers_fnQueryInterface, + ISF_Printers_fnAddRef, + ISF_Printers_fnRelease, + ISF_Printers_fnParseDisplayName, + ISF_Printers_fnEnumObjects, + ISF_Printers_fnBindToObject, + ISF_Printers_fnBindToStorage, + ISF_Printers_fnCompareIDs, + ISF_Printers_fnCreateViewObject, + ISF_Printers_fnGetAttributesOf, + ISF_Printers_fnGetUIObjectOf, + ISF_Printers_fnGetDisplayNameOf, + ISF_Printers_fnSetNameOf, + /* ShellFolder2 */ + ISF_Printers_fnGetDefaultSearchGUID, + ISF_Printers_fnEnumSearches, + ISF_Printers_fnGetDefaultColumn, + ISF_Printers_fnGetDefaultColumnState, + ISF_Printers_fnGetDetailsEx, + ISF_Printers_fnGetDetailsOf, + ISF_Printers_fnMapColumnToSCID +}; + +/************************************************************************ + * IPF_Printers_QueryInterface + */ +static HRESULT WINAPI IPF_Printers_QueryInterface ( + IPersistFolder2 * iface, REFIID iid, LPVOID * ppvObj) +{ + _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface); + + TRACE ("(%p)\n", This); + + return IUnknown_QueryInterface (_IUnknown_ (This), iid, ppvObj); +} + +/************************************************************************ + * IPF_Printers_AddRef + */ +static ULONG WINAPI IPF_Printers_AddRef (IPersistFolder2 * iface) +{ + _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface); + + TRACE ("(%p)->(count=%lu)\n", This, This->ref); + + return IUnknown_AddRef (_IUnknown_ (This)); +} + +/************************************************************************ + * IPF_Printers_Release + */ +static ULONG WINAPI IPF_Printers_Release (IPersistFolder2 * iface) +{ + _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface); + + TRACE ("(%p)->(count=%lu)\n", This, This->ref); + + return IUnknown_Release (_IUnknown_ (This)); +} + +/************************************************************************ + * IPF_Printers_GetClassID + */ +static HRESULT WINAPI IPF_Printers_GetClassID ( + IPersistFolder2 * iface, CLSID * lpClassId) +{ + _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface); + + TRACE ("(%p)\n", This); + + *lpClassId = CLSID_Printers; + + return S_OK; +} + +/************************************************************************ + * IPF_Printers_Initialize + * + */ +static HRESULT WINAPI IPF_Printers_Initialize ( + IPersistFolder2 * iface, LPCITEMIDLIST pidl) +{ + _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface); + FIXME ("(%p)->(%p): stub\n", This, pidl); + return E_NOTIMPL; +} + +/************************************************************************** + * IPF_Printers_fnGetCurFolder + */ +static HRESULT WINAPI IPF_Printers_GetCurFolder ( + IPersistFolder2 * iface, LPITEMIDLIST * pidl) +{ + _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface); + + TRACE ("(%p)->(%p)\n", This, pidl); + + *pidl = ILClone (This->pidlRoot); + return S_OK; +} + +static IPersistFolder2Vtbl vt_PersistFolder2 = +{ + IPF_Printers_QueryInterface, + IPF_Printers_AddRef, + IPF_Printers_Release, + IPF_Printers_GetClassID, + IPF_Printers_Initialize, + IPF_Printers_GetCurFolder +}; + +/************************************************************************** + * ISF_Printers_Constructor + */ +HRESULT WINAPI ISF_Printers_Constructor ( + IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) +{ + IGenericSFImpl *sf; + HRESULT hr; + + TRACE ("unkOut=%p %s\n", pUnkOuter, shdebugstr_guid (riid)); + + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + sf = HeapAlloc( GetProcessHeap(), 0, sizeof(*sf) ); + if (!sf) + return E_OUTOFMEMORY; + + sf->ref = 1; + sf->lpVtbl = &vt_ShellFolder2; + sf->lpVtblPersistFolder2 = &vt_PersistFolder2; + + sf->pidlRoot = _ILCreatePrinters(); /* my qualified pidl */ + + hr = IUnknown_QueryInterface( _IUnknown_(sf), riid, ppv ); + IUnknown_Release( _IUnknown_(sf) ); + + TRACE ("--(%p)\n", *ppv); + return hr; +} Propchange: trunk/reactos/dll/win32/shell32/shfldr_printers.c ------------------------------------------------------------------------------ svn:eol-style = native

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