Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 54982: [PORTCLS] * Fix a bug which closed an already invalid handle. * Allow only general registry keys to be deleted. * Do not close a key twice in the error case.
by akhaldi＠svn.reactos.org 15 Jan '12

15 Jan '12

Author: akhaldi Date: Sun Jan 15 20:27:15 2012 New Revision: 54982 URL: http://svn.reactos.org/svn/reactos?rev=54982&view=rev Log: [PORTCLS] * Fix a bug which closed an already invalid handle. * Allow only general registry keys to be deleted. * Do not close a key twice in the error case. Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp [iso-8859-1] Sun Jan 15 20:27:15 2012 @@ -31,20 +31,24 @@ } IMP_IRegistryKey; - CRegistryKey(IUnknown * OuterUnknown, HANDLE hKey) : m_hKey(hKey){} + CRegistryKey(IUnknown * OuterUnknown, HANDLE hKey, BOOL CanDelete) : m_hKey(hKey), m_Deleted(FALSE), m_CanDelete(CanDelete), m_Ref(0){} virtual ~CRegistryKey(); protected: HANDLE m_hKey; BOOL m_Deleted; + BOOL m_CanDelete; LONG m_Ref; }; CRegistryKey::~CRegistryKey() { - if (m_hKey) + if (!m_Deleted) + { + // close key only when has not been deleted yet ZwClose(m_hKey); + } } @@ -83,13 +87,22 @@ if (m_Deleted) { - return STATUS_INVALID_HANDLE; - } - + // key already deleted + return STATUS_INVALID_HANDLE; + } + + if (!m_CanDelete) + { + // only general keys can be deleted + return STATUS_ACCESS_DENIED; + } + + // delete key Status = ZwDeleteKey(m_hKey); if (NT_SUCCESS(Status)) { m_Deleted = TRUE; + m_hKey = NULL; } return Status; } @@ -164,7 +177,7 @@ return Status; } - RegistryKey = new(NonPagedPool, TAG_PORTCLASS)CRegistryKey(OuterUnknown, hKey); + RegistryKey = new(NonPagedPool, TAG_PORTCLASS)CRegistryKey(OuterUnknown, hKey, TRUE); if (!RegistryKey) return STATUS_INSUFFICIENT_RESOURCES; @@ -172,7 +185,6 @@ if (!NT_SUCCESS(Status)) { - ZwClose(hKey); delete RegistryKey; return Status; } @@ -278,6 +290,7 @@ PSUBDEVICE_DESCRIPTOR SubDeviceDescriptor; ISubdevice * Device; PSYMBOLICLINK_ENTRY SymEntry; + BOOL CanDelete = FALSE; DPRINT("PcNewRegistryKey entered\n"); @@ -304,6 +317,9 @@ } // try to create the key Status = ZwCreateKey(&hHandle, DesiredAccess, ObjectAttributes, 0, NULL, CreateOptions, Disposition); + + // key can be deleted + CanDelete = TRUE; } else if (RegistryKeyType == DeviceRegistryKey || RegistryKeyType == DriverRegistryKey || @@ -374,7 +390,7 @@ } // allocate new registry key object - RegistryKey = new(NonPagedPool, TAG_PORTCLASS)CRegistryKey(OuterUnknown, hHandle); + RegistryKey = new(NonPagedPool, TAG_PORTCLASS)CRegistryKey(OuterUnknown, hHandle, CanDelete); if (!RegistryKey) { // not enough memory @@ -394,4 +410,3 @@ DPRINT("PcNewRegistryKey result %p\n", *OutRegistryKey); return STATUS_SUCCESS; } -

1 0

[cgutman] 54981: - Merge r54980 from wlan-bringup
by cgutman＠svn.reactos.org 15 Jan '12

15 Jan '12

Author: cgutman Date: Sun Jan 15 19:53:52 2012 New Revision: 54981 URL: http://svn.reactos.org/svn/reactos?rev=54981&view=rev Log: - Merge r54980 from wlan-bringup Modified: trunk/reactos/ (props changed) trunk/reactos/dll/win32/netcfgx/CMakeLists.txt trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild trunk/reactos/dll/win32/netcfgx/precomp.h trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jan 15 19:53:52 2012 @@ -10,4 +10,4 @@ /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 /branches/shell32_new-bringup:51893-53652,53661,53700 /branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 -/branches/wlan-bringup:54895-54896,54899,54912-54913,54915-54916,54929-54930,54932-54934,54939,54941-54942,54944-54947 +/branches/wlan-bringup:54895-54896,54899,54912-54913,54915-54916,54929-54930,54932-54934,54939,54941-54942,54944-54947,54980 Modified: trunk/reactos/dll/win32/netcfgx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/CMakeLists.txt [iso-8859-1] Sun Jan 15 19:53:52 2012 @@ -22,6 +22,6 @@ uuid wine) -add_importlibs(netcfgx rpcrt4 setupapi advapi32 iphlpapi ole32 user32 comctl32 ws2_32 msvcrt kernel32 ntdll) +add_importlibs(netcfgx rpcrt4 setupapi advapi32 iphlpapi dhcpcsvc ole32 user32 comctl32 ws2_32 msvcrt kernel32 ntdll) add_pch(netcfgx precomp.h) add_cd_file(TARGET netcfgx DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild [iso-8859-1] Sun Jan 15 19:53:52 2012 @@ -8,7 +8,7 @@ <library>advapi32</library> <library>uuid</library> <library>iphlpapi</library> - <library>iphlpapi</library> + <library>dhcpcsvc</library> <library>wine</library> <library>ole32</library> <library>user32</library> Modified: trunk/reactos/dll/win32/netcfgx/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/precomp.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/precomp.h [iso-8859-1] Sun Jan 15 19:53:52 2012 @@ -14,6 +14,8 @@ #include <setupapi.h> #include <stdio.h> #include <iphlpapi.h> +#include <dhcpcsdk.h> +#include <dhcpcapi.h> #include <olectl.h> #include <netcfgn.h> #include "resource.h" Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/tcpipcon… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] Sun Jan 15 19:53:52 2012 @@ -3117,6 +3117,7 @@ WCHAR szBuffer[200]; TcpipSettings * pCurrentConfig, *pOldConfig; ULONG NTEInstance; + DWORD DhcpApiVersion; TcpipConfNotifyImpl * This = impl_from_INetCfgComponentControl(iface); @@ -3197,39 +3198,74 @@ RegSetValueExW(hKey, L"DefaultGatewayMetric", 0, REG_MULTI_SZ, (LPBYTE)L"\0", 2 * sizeof(WCHAR)); if (!pOldConfig->DhcpEnabled) { + /* Delete this adapter's current IP address */ DeleteIPAddress(pOldConfig->Ip->NTEContext); - //FIXME - // start dhcp client service for the adapter + + /* Delete all default routes for this adapter */ + dwSize = 0; + if (GetIpForwardTable(NULL, &dwSize, FALSE) == ERROR_INSUFFICIENT_BUFFER) + { + DWORD Index; + PMIB_IPFORWARDTABLE pIpForwardTable = (PMIB_IPFORWARDTABLE)CoTaskMemAlloc(dwSize); + if (pIpForwardTable) + { + if (GetIpForwardTable(pIpForwardTable, &dwSize, FALSE) == NO_ERROR) + { + for (Index = 0; Index < pIpForwardTable->dwNumEntries; Index++) + { + if (pIpForwardTable->table[Index].dwForwardIfIndex == pOldConfig->Index && + pIpForwardTable->table[Index].dwForwardDest == 0) + { + DeleteIpForwardEntry(&pIpForwardTable->table[Index]); + } + } + } + CoTaskMemFree(pIpForwardTable); + } + } } } else { - if (!pOldConfig->DhcpEnabled) - { + /* Open the DHCP API if DHCP is enabled */ + if (pOldConfig->DhcpEnabled && DhcpCApiInitialize(&DhcpApiVersion) == NO_ERROR) + { + /* We have to tell DHCP about this */ + DhcpStaticRefreshParams(pCurrentConfig->Index, + htonl(pCurrentConfig->Ip->IpAddress), + htonl(pCurrentConfig->Ip->u.Subnetmask)); + + /* Close the API */ + DhcpCApiCleanup(); + } + else + { + /* Delete this adapter's current static IP address */ DeleteIPAddress(pOldConfig->Ip->NTEContext); - //TODO - //delete multiple ip addresses when required - } - - //TODO - // add multiple ip addresses when required - if (AddIPAddress(htonl(pCurrentConfig->Ip->IpAddress), htonl(pCurrentConfig->Ip->u.Subnetmask), pCurrentConfig->Index, &pCurrentConfig->Ip->NTEContext, &NTEInstance) == NO_ERROR) - { - pStr = CreateMultiSzString(pCurrentConfig->Ip, IPADDR, &dwSize, FALSE); - if(pStr) - { - RegSetValueExW(hKey, L"IPAddress", 0, REG_MULTI_SZ, (LPBYTE)pStr, dwSize); - CoTaskMemFree(pStr); - } - - pStr = CreateMultiSzString(pCurrentConfig->Ip, SUBMASK, &dwSize, FALSE); - if(pStr) - { - RegSetValueExW(hKey, L"SubnetMask", 0, REG_MULTI_SZ, (LPBYTE)pStr, dwSize); - CoTaskMemFree(pStr); - } - } - + + /* Add the static IP address via the standard IPHLPAPI function */ + AddIPAddress(htonl(pCurrentConfig->Ip->IpAddress), + htonl(pCurrentConfig->Ip->u.Subnetmask), + pCurrentConfig->Index, + &pCurrentConfig->Ip->NTEContext, + &NTEInstance); + } + + pStr = CreateMultiSzString(pCurrentConfig->Ip, IPADDR, &dwSize, FALSE); + if(pStr) + { + RegSetValueExW(hKey, L"IPAddress", 0, REG_MULTI_SZ, (LPBYTE)pStr, dwSize); + CoTaskMemFree(pStr); + } + + pStr = CreateMultiSzString(pCurrentConfig->Ip, SUBMASK, &dwSize, FALSE); + if(pStr) + { + RegSetValueExW(hKey, L"SubnetMask", 0, REG_MULTI_SZ, (LPBYTE)pStr, dwSize); + CoTaskMemFree(pStr); + } + + /* Delete all default routes for this adapter */ dwSize = 0; if (GetIpForwardTable(NULL, &dwSize, FALSE) == ERROR_INSUFFICIENT_BUFFER) {

1 0

[cgutman] 54980: [NETCFGX] - Notify the DHCP service when a static IP address is assigned to an adapter
by cgutman＠svn.reactos.org 15 Jan '12

15 Jan '12

Author: cgutman Date: Sun Jan 15 19:46:14 2012 New Revision: 54980 URL: http://svn.reactos.org/svn/reactos?rev=54980&view=rev Log: [NETCFGX] - Notify the DHCP service when a static IP address is assigned to an adapter Modified: branches/wlan-bringup/dll/win32/netcfgx/CMakeLists.txt branches/wlan-bringup/dll/win32/netcfgx/netcfgx.rbuild branches/wlan-bringup/dll/win32/netcfgx/precomp.h branches/wlan-bringup/dll/win32/netcfgx/tcpipconf_notify.c Modified: branches/wlan-bringup/dll/win32/netcfgx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/dll/win32/netcfgx/… ============================================================================== --- branches/wlan-bringup/dll/win32/netcfgx/CMakeLists.txt [iso-8859-1] (original) +++ branches/wlan-bringup/dll/win32/netcfgx/CMakeLists.txt [iso-8859-1] Sun Jan 15 19:46:14 2012 @@ -22,6 +22,6 @@ uuid wine) -add_importlibs(netcfgx rpcrt4 setupapi advapi32 iphlpapi ole32 user32 comctl32 ws2_32 msvcrt kernel32 ntdll) +add_importlibs(netcfgx rpcrt4 setupapi advapi32 iphlpapi dhcpcsvc ole32 user32 comctl32 ws2_32 msvcrt kernel32 ntdll) add_pch(netcfgx precomp.h) add_cd_file(TARGET netcfgx DESTINATION reactos/system32 FOR all) Modified: branches/wlan-bringup/dll/win32/netcfgx/netcfgx.rbuild URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/dll/win32/netcfgx/… ============================================================================== --- branches/wlan-bringup/dll/win32/netcfgx/netcfgx.rbuild [iso-8859-1] (original) +++ branches/wlan-bringup/dll/win32/netcfgx/netcfgx.rbuild [iso-8859-1] Sun Jan 15 19:46:14 2012 @@ -8,7 +8,7 @@ <library>advapi32</library> <library>uuid</library> <library>iphlpapi</library> - <library>iphlpapi</library> + <library>dhcpcsvc</library> <library>wine</library> <library>ole32</library> <library>user32</library> Modified: branches/wlan-bringup/dll/win32/netcfgx/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/dll/win32/netcfgx/… ============================================================================== --- branches/wlan-bringup/dll/win32/netcfgx/precomp.h [iso-8859-1] (original) +++ branches/wlan-bringup/dll/win32/netcfgx/precomp.h [iso-8859-1] Sun Jan 15 19:46:14 2012 @@ -14,6 +14,8 @@ #include <setupapi.h> #include <stdio.h> #include <iphlpapi.h> +#include <dhcpcsdk.h> +#include <dhcpcapi.h> #include <olectl.h> #include <netcfgn.h> #include "resource.h" Modified: branches/wlan-bringup/dll/win32/netcfgx/tcpipconf_notify.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/dll/win32/netcfgx/… ============================================================================== --- branches/wlan-bringup/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] (original) +++ branches/wlan-bringup/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] Sun Jan 15 19:46:14 2012 @@ -3117,6 +3117,7 @@ WCHAR szBuffer[200]; TcpipSettings * pCurrentConfig, *pOldConfig; ULONG NTEInstance; + DWORD DhcpApiVersion; TcpipConfNotifyImpl * This = impl_from_INetCfgComponentControl(iface); @@ -3197,39 +3198,74 @@ RegSetValueExW(hKey, L"DefaultGatewayMetric", 0, REG_MULTI_SZ, (LPBYTE)L"\0", 2 * sizeof(WCHAR)); if (!pOldConfig->DhcpEnabled) { + /* Delete this adapter's current IP address */ DeleteIPAddress(pOldConfig->Ip->NTEContext); - //FIXME - // start dhcp client service for the adapter + + /* Delete all default routes for this adapter */ + dwSize = 0; + if (GetIpForwardTable(NULL, &dwSize, FALSE) == ERROR_INSUFFICIENT_BUFFER) + { + DWORD Index; + PMIB_IPFORWARDTABLE pIpForwardTable = (PMIB_IPFORWARDTABLE)CoTaskMemAlloc(dwSize); + if (pIpForwardTable) + { + if (GetIpForwardTable(pIpForwardTable, &dwSize, FALSE) == NO_ERROR) + { + for (Index = 0; Index < pIpForwardTable->dwNumEntries; Index++) + { + if (pIpForwardTable->table[Index].dwForwardIfIndex == pOldConfig->Index && + pIpForwardTable->table[Index].dwForwardDest == 0) + { + DeleteIpForwardEntry(&pIpForwardTable->table[Index]); + } + } + } + CoTaskMemFree(pIpForwardTable); + } + } } } else { - if (!pOldConfig->DhcpEnabled) - { + /* Open the DHCP API if DHCP is enabled */ + if (pOldConfig->DhcpEnabled && DhcpCApiInitialize(&DhcpApiVersion) == NO_ERROR) + { + /* We have to tell DHCP about this */ + DhcpStaticRefreshParams(pCurrentConfig->Index, + htonl(pCurrentConfig->Ip->IpAddress), + htonl(pCurrentConfig->Ip->u.Subnetmask)); + + /* Close the API */ + DhcpCApiCleanup(); + } + else + { + /* Delete this adapter's current static IP address */ DeleteIPAddress(pOldConfig->Ip->NTEContext); - //TODO - //delete multiple ip addresses when required - } - - //TODO - // add multiple ip addresses when required - if (AddIPAddress(htonl(pCurrentConfig->Ip->IpAddress), htonl(pCurrentConfig->Ip->u.Subnetmask), pCurrentConfig->Index, &pCurrentConfig->Ip->NTEContext, &NTEInstance) == NO_ERROR) - { - pStr = CreateMultiSzString(pCurrentConfig->Ip, IPADDR, &dwSize, FALSE); - if(pStr) - { - RegSetValueExW(hKey, L"IPAddress", 0, REG_MULTI_SZ, (LPBYTE)pStr, dwSize); - CoTaskMemFree(pStr); - } - - pStr = CreateMultiSzString(pCurrentConfig->Ip, SUBMASK, &dwSize, FALSE); - if(pStr) - { - RegSetValueExW(hKey, L"SubnetMask", 0, REG_MULTI_SZ, (LPBYTE)pStr, dwSize); - CoTaskMemFree(pStr); - } - } - + + /* Add the static IP address via the standard IPHLPAPI function */ + AddIPAddress(htonl(pCurrentConfig->Ip->IpAddress), + htonl(pCurrentConfig->Ip->u.Subnetmask), + pCurrentConfig->Index, + &pCurrentConfig->Ip->NTEContext, + &NTEInstance); + } + + pStr = CreateMultiSzString(pCurrentConfig->Ip, IPADDR, &dwSize, FALSE); + if(pStr) + { + RegSetValueExW(hKey, L"IPAddress", 0, REG_MULTI_SZ, (LPBYTE)pStr, dwSize); + CoTaskMemFree(pStr); + } + + pStr = CreateMultiSzString(pCurrentConfig->Ip, SUBMASK, &dwSize, FALSE); + if(pStr) + { + RegSetValueExW(hKey, L"SubnetMask", 0, REG_MULTI_SZ, (LPBYTE)pStr, dwSize); + CoTaskMemFree(pStr); + } + + /* Delete all default routes for this adapter */ dwSize = 0; if (GetIpForwardTable(NULL, &dwSize, FALSE) == ERROR_INSUFFICIENT_BUFFER) {

1 0

[rharabien] 54979: [SHELL32] - Improve code readability in defcontextmenu.cpp - Fix few leaks - Properly handle reference count when creating objects
by rharabien＠svn.reactos.org 15 Jan '12

15 Jan '12

Author: rharabien Date: Sun Jan 15 19:45:02 2012 New Revision: 54979 URL: http://svn.reactos.org/svn/reactos?rev=54979&view=rev Log: [SHELL32] - Improve code readability in defcontextmenu.cpp - Fix few leaks - Properly handle reference count when creating objects Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp trunk/reactos/dll/win32/shell32/drive.cpp trunk/reactos/dll/win32/shell32/fprop.cpp Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/defconte… ============================================================================== --- trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] Sun Jan 15 19:45:02 2012 @@ -24,15 +24,15 @@ UINT iIdCmdFirst; UINT NumIds; CLSID ClassID; - IContextMenu *CMenu; - struct _DynamicShellEntry_ *Next; + IContextMenu *pCM; + struct _DynamicShellEntry_ *pNext; } DynamicShellEntry, *PDynamicShellEntry; typedef struct _StaticShellEntry_ { LPWSTR szVerb; LPWSTR szClass; - struct _StaticShellEntry_ *Next; + struct _StaticShellEntry_ *pNext; } StaticShellEntry, *PStaticShellEntry; class CDefaultContextMenu : @@ -51,15 +51,15 @@ UINT m_iIdSCMFirst; /* first static used id */ UINT m_iIdSCMLast; /* last static used id */ - void AddStaticEntry(const WCHAR *szVerb, const WCHAR *szClass); - void AddStaticEntryForKey(HKEY hKey, const WCHAR *szClass); - void AddStaticEntryForFileClass(const WCHAR *szExt); - BOOL IsShellExtensionAlreadyLoaded(const CLSID *szClass); - HRESULT LoadDynamicContextMenuHandler(HKEY hKey, const CLSID *szClass, BOOL bExternalInit); - UINT EnumerateDynamicContextHandlerForKey(HKEY hRootKey); - UINT InsertMenuItemsOfDynamicContextMenuExtension(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast); + void AddStaticEntry(LPCWSTR pwszVerb, LPCWSTR pwszClass); + void AddStaticEntryForKey(HKEY hKey, LPCWSTR pwszClass); + void AddStaticEntryForFileClass(LPCWSTR pwszExt); + BOOL IsShellExtensionAlreadyLoaded(const CLSID *pclsid); + HRESULT LoadDynamicContextMenuHandler(HKEY hKey, const CLSID *pclsid); + BOOL EnumerateDynamicContextHandlerForKey(HKEY hRootKey); + UINT InsertMenuItemsOfDynamicContextMenuExtension(HMENU hMenu, UINT IndexMenu, UINT idCmdFirst, UINT idCmdLast); UINT BuildBackgroundContextMenu(HMENU hMenu, UINT iIdCmdFirst, UINT iIdCmdLast, UINT uFlags); - UINT AddStaticContextMenusToMenu(HMENU hMenu, UINT indexMenu); + UINT AddStaticContextMenusToMenu(HMENU hMenu, UINT IndexMenu); UINT BuildShellItemContextMenu(HMENU hMenu, UINT iIdCmdFirst, UINT iIdCmdLast, UINT uFlags); HRESULT DoPaste(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoOpenOrExplore(LPCMINVOKECOMMANDINFO lpcmi); @@ -107,28 +107,25 @@ CDefaultContextMenu::~CDefaultContextMenu() { - PDynamicShellEntry dEntry, dNext; - PStaticShellEntry sEntry, sNext; - /* Free dynamic shell extension entries */ - dEntry = m_pDynamicEntries; - while (dEntry) - { - dNext = dEntry->Next; - dEntry->CMenu->Release(); - HeapFree(GetProcessHeap(), 0, dEntry); - dEntry = dNext; + PDynamicShellEntry pDynamicEntry = m_pDynamicEntries, pNextDynamic; + while (pDynamicEntry) + { + pNextDynamic = pDynamicEntry->pNext; + pDynamicEntry->pCM->Release(); + HeapFree(GetProcessHeap(), 0, pDynamicEntry); + pDynamicEntry = pNextDynamic; } /* Free static shell extension entries */ - sEntry = m_pStaticEntries; - while (sEntry) - { - sNext = sEntry->Next; - HeapFree(GetProcessHeap(), 0, sEntry->szClass); - HeapFree(GetProcessHeap(), 0, sEntry->szVerb); - HeapFree(GetProcessHeap(), 0, sEntry); - sEntry = sNext; + PStaticShellEntry pStaticEntry = m_pStaticEntries, pNextStatic; + while (pStaticEntry) + { + pNextStatic = pStaticEntry->pNext; + HeapFree(GetProcessHeap(), 0, pStaticEntry->szClass); + HeapFree(GetProcessHeap(), 0, pStaticEntry->szVerb); + HeapFree(GetProcessHeap(), 0, pStaticEntry); + pStaticEntry = pNextStatic; } if (m_pidlFolder) @@ -170,67 +167,60 @@ void CDefaultContextMenu::AddStaticEntry(const WCHAR *szVerb, const WCHAR *szClass) { - PStaticShellEntry curEntry; - PStaticShellEntry lastEntry = NULL; - - curEntry = m_pStaticEntries; - while(curEntry) - { - if (!wcsicmp(curEntry->szVerb, szVerb)) + PStaticShellEntry pEntry = m_pStaticEntries, pLastEntry = NULL; + while(pEntry) + { + if (!wcsicmp(pEntry->szVerb, szVerb)) { /* entry already exists */ return; } - lastEntry = curEntry; - curEntry = curEntry->Next; + pLastEntry = pEntry; + pEntry = pEntry->pNext; } TRACE("adding verb %s szClass %s\n", debugstr_w(szVerb), debugstr_w(szClass)); - curEntry = (StaticShellEntry *)HeapAlloc(GetProcessHeap(), 0, sizeof(StaticShellEntry)); - if (curEntry) - { - curEntry->Next = NULL; - curEntry->szVerb = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (wcslen(szVerb) + 1) * sizeof(WCHAR)); - if (curEntry->szVerb) - wcscpy(curEntry->szVerb, szVerb); - curEntry->szClass = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (wcslen(szClass) + 1) * sizeof(WCHAR)); - if (curEntry->szClass) - wcscpy(curEntry->szClass, szClass); + pEntry = (StaticShellEntry *)HeapAlloc(GetProcessHeap(), 0, sizeof(StaticShellEntry)); + if (pEntry) + { + pEntry->pNext = NULL; + pEntry->szVerb = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (wcslen(szVerb) + 1) * sizeof(WCHAR)); + if (pEntry->szVerb) + wcscpy(pEntry->szVerb, szVerb); + pEntry->szClass = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (wcslen(szClass) + 1) * sizeof(WCHAR)); + if (pEntry->szClass) + wcscpy(pEntry->szClass, szClass); } if (!wcsicmp(szVerb, L"open")) { /* open verb is always inserted in front */ - curEntry->Next = m_pStaticEntries; - m_pStaticEntries = curEntry; - } - else if (lastEntry) - lastEntry->Next = curEntry; + pEntry->pNext = m_pStaticEntries; + m_pStaticEntries = pEntry; + } + else if (pLastEntry) + pLastEntry->pNext = pEntry; else - m_pStaticEntries = curEntry; + m_pStaticEntries = pEntry; } void CDefaultContextMenu::AddStaticEntryForKey(HKEY hKey, const WCHAR *pwszClass) { - LONG result; - DWORD dwIndex; WCHAR wszName[40]; - DWORD dwSize; + DWORD cchName, dwIndex = 0; TRACE("AddStaticEntryForKey %x %ls\n", hKey, pwszClass); - dwIndex = 0; - do - { - dwSize = sizeof(wszName) / sizeof(WCHAR); - result = RegEnumKeyExW(hKey, dwIndex, wszName, &dwSize, NULL, NULL, NULL, NULL); - if (result == ERROR_SUCCESS) - AddStaticEntry(wszName, pwszClass); - - dwIndex++; - } while(result == ERROR_SUCCESS); + while(TRUE) + { + cchName = _countof(wszName); + if (RegEnumKeyExW(hKey, dwIndex++, wszName, &cchName, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + break; + + AddStaticEntry(wszName, pwszClass); + } } void @@ -303,28 +293,28 @@ BOOL HasClipboardData() { - BOOL ret = FALSE; - IDataObject * pda; - - if(SUCCEEDED(OleGetClipboard(&pda))) + BOOL bRet = FALSE; + IDataObject *pDataObj; + + if(SUCCEEDED(OleGetClipboard(&pDataObj))) { STGMEDIUM medium; FORMATETC formatetc; - TRACE("pda=%p\n", pda); + TRACE("pDataObj=%p\n", pDataObj); /* Set the FORMATETC structure*/ InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); - if(SUCCEEDED(pda->GetData(&formatetc, &medium))) - { - ret = TRUE; + if(SUCCEEDED(pDataObj->GetData(&formatetc, &medium))) + { + bRet = TRUE; ReleaseStgMedium(&medium); } - pda->Release(); - } - - return ret; + pDataObj->Release(); + } + + return bRet; } static @@ -342,188 +332,173 @@ } BOOL -CDefaultContextMenu::IsShellExtensionAlreadyLoaded(const CLSID * szClass) -{ - PDynamicShellEntry curEntry = m_pDynamicEntries; - - while(curEntry) - { - if (!memcmp(&curEntry->ClassID, szClass, sizeof(CLSID))) +CDefaultContextMenu::IsShellExtensionAlreadyLoaded(const CLSID *pclsid) +{ + PDynamicShellEntry pEntry = m_pDynamicEntries; + + while (pEntry) + { + if (!memcmp(&pEntry->ClassID, pclsid, sizeof(CLSID))) return TRUE; - curEntry = curEntry->Next; - } + pEntry = pEntry->pNext; + } + return FALSE; } - -HRESULT -CDefaultContextMenu::LoadDynamicContextMenuHandler(HKEY hKey, const CLSID *pClass, BOOL bExternalInit) +HRESULT +CDefaultContextMenu::LoadDynamicContextMenuHandler(HKEY hKey, const CLSID *pclsid) { HRESULT hr; - IContextMenu *cmobj; - IShellExtInit *shext; - PDynamicShellEntry curEntry; - LPOLESTR pstr; - - StringFromCLSID(*pClass, &pstr); - - TRACE("LoadDynamicContextMenuHandler entered with This %p hKey %p pClass %s bExternalInit %u\n", this, hKey, wine_dbgstr_guid(pClass), bExternalInit); - - if (IsShellExtensionAlreadyLoaded(pClass)) + + TRACE("LoadDynamicContextMenuHandler entered with This %p hKey %p pclsid %s\n", this, hKey, wine_dbgstr_guid(pclsid)); + + if (IsShellExtensionAlreadyLoaded(pclsid)) return S_OK; - hr = SHCoCreateInstance(NULL, pClass, NULL, IID_IContextMenu, (void**)&cmobj); + IContextMenu *pcm; + hr = SHCoCreateInstance(NULL, pclsid, NULL, IID_IContextMenu, (void**)&pcm); if (hr != S_OK) { ERR("SHCoCreateInstance failed %x\n", GetLastError()); return hr; } - if (bExternalInit) - { - hr = cmobj->QueryInterface(IID_IShellExtInit, (void**)&shext); - if (hr != S_OK) - { - ERR("Failed to query for interface IID_IShellExtInit hr %x pClass %s\n", hr, wine_dbgstr_guid(pClass)); - cmobj->Release(); - return hr; - } - - hr = shext->Initialize(m_pidlFolder, m_pDataObj, hKey); - shext->Release(); - if (hr != S_OK) - { - TRACE("Failed to initialize shell extension error %x pClass %s\n", hr, wine_dbgstr_guid(pClass)); - cmobj->Release(); - return hr; - } - } - - curEntry = (DynamicShellEntry *)HeapAlloc(GetProcessHeap(), 0, sizeof(DynamicShellEntry)); - if(!curEntry) - { - cmobj->Release(); + IShellExtInit *pExtInit; + hr = pcm->QueryInterface(IID_IShellExtInit, (void**)&pExtInit); + if (hr != S_OK) + { + ERR("Failed to query for interface IID_IShellExtInit hr %x pclsid %s\n", hr, wine_dbgstr_guid(pclsid)); + pcm->Release(); + return hr; + } + + hr = pExtInit->Initialize(m_pidlFolder, m_pDataObj, hKey); + pExtInit->Release(); + if (hr != S_OK) + { + TRACE("Failed to initialize shell extension error %x pclsid %s\n", hr, wine_dbgstr_guid(pclsid)); + pcm->Release(); + return hr; + } + + PDynamicShellEntry pEntry = (DynamicShellEntry *)HeapAlloc(GetProcessHeap(), 0, sizeof(DynamicShellEntry)); + if (!pEntry) + { + pcm->Release(); return E_OUTOFMEMORY; } - curEntry->iIdCmdFirst = 0; - curEntry->Next = NULL; - curEntry->NumIds = 0; - curEntry->CMenu = cmobj; - memcpy(&curEntry->ClassID, pClass, sizeof(CLSID)); + pEntry->iIdCmdFirst = 0; + pEntry->pNext = NULL; + pEntry->NumIds = 0; + pEntry->pCM = pcm; + memcpy(&pEntry->ClassID, pclsid, sizeof(CLSID)); if (m_pDynamicEntries) { - PDynamicShellEntry pEntry = m_pDynamicEntries; - - while (pEntry->Next) - pEntry = pEntry->Next; - - pEntry->Next = curEntry; + PDynamicShellEntry pLastEntry = m_pDynamicEntries; + + while (pLastEntry->pNext) + pLastEntry = pLastEntry->pNext; + + pLastEntry->pNext = pEntry; } else - m_pDynamicEntries = curEntry; - - return hr; -} - -UINT + m_pDynamicEntries = pEntry; + + return S_OK; +} + +BOOL CDefaultContextMenu::EnumerateDynamicContextHandlerForKey(HKEY hRootKey) { - WCHAR szKey[MAX_PATH] = {0}; - WCHAR szName[MAX_PATH] = {0}; - DWORD dwIndex, dwName; - LONG res; - HRESULT hResult; - UINT index; - CLSID clsid; + + WCHAR wszName[MAX_PATH], wszBuf[MAX_PATH], *pwszClsid; + DWORD cchName; + HRESULT hr; HKEY hKey; if (RegOpenKeyExW(hRootKey, L"shellex\\ContextMenuHandlers", 0, KEY_READ, &hKey) != ERROR_SUCCESS) { - TRACE("RegOpenKeyExW failed for key %s\n", debugstr_w(szKey)); - return 0; - } - - dwIndex = 0; - index = 0; - do - { - dwName = MAX_PATH; - res = RegEnumKeyExW(hKey, dwIndex, szName, &dwName, NULL, NULL, NULL, NULL); - if (res == ERROR_SUCCESS) - { - hResult = CLSIDFromString(szName, &clsid); - if (hResult != S_OK) + TRACE("RegOpenKeyExW failed\n"); + return FALSE; + } + + DWORD dwIndex = 0; + while (TRUE) + { + cchName = _countof(wszName); + if (RegEnumKeyExW(hKey, dwIndex++, wszName, &cchName, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + break; + + /* Key name or key value is CLSID */ + CLSID clsid; + hr = CLSIDFromString(wszName, &clsid); + if (hr == S_OK) + pwszClsid = wszName; + else + { + DWORD cchBuf = _countof(wszBuf); + if (RegGetValueW(hKey, wszName, NULL, RRF_RT_REG_SZ, NULL, wszBuf, &cchBuf) == ERROR_SUCCESS) + hr = CLSIDFromString(wszBuf, &clsid); + pwszClsid = wszBuf; + } + if (SUCCEEDED(hr)) + { + if (m_bGroupPolicyActive) { - dwName = MAX_PATH; - if (RegGetValueW(hKey, szName, NULL, RRF_RT_REG_SZ, NULL, szKey, &dwName) == ERROR_SUCCESS) + if (RegGetValueW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", + pwszClsid, + RRF_RT_REG_SZ, + NULL, + NULL, + NULL) == ERROR_SUCCESS) { - hResult = CLSIDFromString(szKey, &clsid); + LoadDynamicContextMenuHandler(hKey, &clsid); } } - if (SUCCEEDED(hResult)) - { - if (m_bGroupPolicyActive) - { - if (RegGetValueW(HKEY_LOCAL_MACHINE, - L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", - szKey, - RRF_RT_REG_SZ, - NULL, - NULL, - &dwName) == ERROR_SUCCESS) - { - LoadDynamicContextMenuHandler(hKey, &clsid, TRUE); - } - } - else - { - LoadDynamicContextMenuHandler(hKey, &clsid, TRUE); - } - } - } - dwIndex++; - } while(res == ERROR_SUCCESS); + else + LoadDynamicContextMenuHandler(hKey, &clsid); + } + } RegCloseKey(hKey); - return index; + return TRUE; } UINT -CDefaultContextMenu::InsertMenuItemsOfDynamicContextMenuExtension(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast) -{ - PDynamicShellEntry curEntry; - HRESULT hResult; - +CDefaultContextMenu::InsertMenuItemsOfDynamicContextMenuExtension(HMENU hMenu, UINT IndexMenu, UINT idCmdFirst, UINT idCmdLast) +{ if (!m_pDynamicEntries) { m_iIdSHEFirst = 0; m_iIdSHELast = 0; - return indexMenu; - } - - curEntry = m_pDynamicEntries; + return IndexMenu; + } + + PDynamicShellEntry pEntry = m_pDynamicEntries; idCmdFirst = 0x5000; idCmdLast = 0x6000; m_iIdSHEFirst = idCmdFirst; do { - hResult = curEntry->CMenu->QueryContextMenu(hMenu, indexMenu++, idCmdFirst, idCmdLast, CMF_NORMAL); - if (SUCCEEDED(hResult)) - { - curEntry->iIdCmdFirst = idCmdFirst; - curEntry->NumIds = LOWORD(hResult); - indexMenu += curEntry->NumIds; - idCmdFirst += curEntry->NumIds + 0x10; - } - TRACE("curEntry %p hresult %x contextmenu %p cmdfirst %x num ids %x\n", curEntry, hResult, curEntry->CMenu, curEntry->iIdCmdFirst, curEntry->NumIds); - curEntry = curEntry->Next; - } while(curEntry); + HRESULT hr = pEntry->pCM->QueryContextMenu(hMenu, IndexMenu++, idCmdFirst, idCmdLast, CMF_NORMAL); + if (SUCCEEDED(hr)) + { + pEntry->iIdCmdFirst = idCmdFirst; + pEntry->NumIds = LOWORD(hr); + IndexMenu += pEntry->NumIds; + idCmdFirst += pEntry->NumIds + 0x10; + } + TRACE("pEntry %p hr %x contextmenu %p cmdfirst %x num ids %x\n", pEntry, hr, pEntry->pCM, pEntry->iIdCmdFirst, pEntry->NumIds); + pEntry = pEntry->pNext; + } while (pEntry); m_iIdSHELast = idCmdFirst; TRACE("SH_LoadContextMenuHandlers first %x last %x\n", m_iIdSHEFirst, m_iIdSHELast); - return indexMenu; + return IndexMenu; } UINT @@ -533,45 +508,41 @@ UINT iIdCmdLast, UINT uFlags) { - MENUITEMINFOW mii; - WCHAR szBuffer[MAX_PATH]; - UINT indexMenu = 0; + UINT IndexMenu = 0; HMENU hSubMenu; - HKEY hKey; - - ZeroMemory(&mii, sizeof(mii)); TRACE("BuildBackgroundContextMenu entered\n"); if (!_ILIsDesktop(m_Dcm.pidlFolder)) { + WCHAR wszBuf[MAX_PATH]; + /* view option is only available in browsing mode */ - hSubMenu = LoadMenuA(shell32_hInstance, "MENU_001"); - if (hSubMenu) - { - szBuffer[0] = 0; - LoadStringW(shell32_hInstance, FCIDM_SHVIEW_VIEW, szBuffer, MAX_PATH); - szBuffer[MAX_PATH-1] = 0; - - TRACE("szBuffer %s\n", debugstr_w(szBuffer)); - + hSubMenu = LoadMenuW(shell32_hInstance, L"MENU_001"); + if (hSubMenu && LoadStringW(shell32_hInstance, FCIDM_SHVIEW_VIEW, wszBuf, _countof(wszBuf))) + { + TRACE("wszBuf %s\n", debugstr_w(wszBuf)); + + MENUITEMINFOW mii; + ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); mii.fMask = MIIM_TYPE | MIIM_STATE | MIIM_SUBMENU | MIIM_ID; mii.fType = MFT_STRING; mii.wID = iIdCmdFirst++; - mii.dwTypeData = szBuffer; - mii.cch = wcslen( mii.dwTypeData ); + mii.dwTypeData = wszBuf; + mii.cch = wcslen(mii.dwTypeData); mii.fState = MFS_ENABLED; mii.hSubMenu = hSubMenu; - InsertMenuItemW(hMenu, indexMenu++, TRUE, &mii); + InsertMenuItemW(hMenu, IndexMenu++, TRUE, &mii); DestroyMenu(hSubMenu); } } + hSubMenu = LoadMenuW(shell32_hInstance, L"MENU_002"); if (hSubMenu) { /* merge general background context menu in */ - iIdCmdFirst = Shell_MergeMenus(hMenu, GetSubMenu(hSubMenu, 0), indexMenu, 0, 0xFFFF, MM_DONTREMOVESEPS | MM_SUBMENUSHAVEIDS) + 1; + iIdCmdFirst = Shell_MergeMenus(hMenu, GetSubMenu(hSubMenu, 0), IndexMenu, 0, 0xFFFF, MM_DONTREMOVESEPS | MM_SUBMENUSHAVEIDS) + 1; DestroyMenu(hSubMenu); } @@ -582,6 +553,7 @@ } /* Load context menu handlers */ + HKEY hKey; if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"Directory\\Background", 0, KEY_READ, &hKey) == ERROR_SUCCESS) { EnumerateDynamicContextHandlerForKey(hKey); @@ -600,92 +572,88 @@ UINT CDefaultContextMenu::AddStaticContextMenusToMenu( HMENU hMenu, - UINT indexMenu) + UINT IndexMenu) { MENUITEMINFOW mii; UINT idResource; - PStaticShellEntry curEntry; - WCHAR szVerb[40]; - DWORD dwSize; + WCHAR wszVerb[40]; UINT fState; - UINT Length; mii.cbSize = sizeof(mii); mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; mii.fType = MFT_STRING; - mii.fState = MFS_ENABLED; mii.wID = 0x4000; mii.dwTypeData = NULL; m_iIdSCMFirst = mii.wID; - curEntry = m_pStaticEntries; - - while(curEntry) + PStaticShellEntry pEntry = m_pStaticEntries; + + while (pEntry) { fState = MFS_ENABLED; mii.dwTypeData = NULL; - if (!wcsicmp(curEntry->szVerb, L"open")) + if (!wcsicmp(pEntry->szVerb, L"open")) { fState |= MFS_DEFAULT; idResource = IDS_OPEN_VERB; } - else if (!wcsicmp(curEntry->szVerb, L"explore")) + else if (!wcsicmp(pEntry->szVerb, L"explore")) idResource = IDS_EXPLORE_VERB; - else if (!wcsicmp(curEntry->szVerb, L"runas")) + else if (!wcsicmp(pEntry->szVerb, L"runas")) idResource = IDS_RUNAS_VERB; - else if (!wcsicmp(curEntry->szVerb, L"edit")) + else if (!wcsicmp(pEntry->szVerb, L"edit")) idResource = IDS_EDIT_VERB; - else if (!wcsicmp(curEntry->szVerb, L"find")) + else if (!wcsicmp(pEntry->szVerb, L"find")) idResource = IDS_FIND_VERB; - else if (!wcsicmp(curEntry->szVerb, L"print")) + else if (!wcsicmp(pEntry->szVerb, L"print")) idResource = IDS_PRINT_VERB; - else if (!wcsicmp(curEntry->szVerb, L"printto")) - { - curEntry = curEntry->Next; + else if (!wcsicmp(pEntry->szVerb, L"printto")) + { + pEntry = pEntry->pNext; continue; } else idResource = 0; + /* By default use verb for menu item name */ + mii.dwTypeData = pEntry->szVerb; + if (idResource > 0) { - if (LoadStringW(shell32_hInstance, idResource, szVerb, sizeof(szVerb) / sizeof(WCHAR))) - mii.dwTypeData = szVerb; /* use translated verb */ + if (LoadStringW(shell32_hInstance, idResource, wszVerb, _countof(wszVerb))) + mii.dwTypeData = wszVerb; /* use translated verb */ else - ERR("Failed to load string, defaulting to NULL value for mii.dwTypeData\n"); + ERR("Failed to load string\n"); } else { WCHAR wszKey[256]; - Length = wcslen(curEntry->szClass) + wcslen(curEntry->szVerb) + 8; - if (Length < sizeof(wszKey) / sizeof(WCHAR)) + HRESULT hr = StringCbPrintfW(wszKey, sizeof(wszKey), L"%s\\shell\\%s", pEntry->szClass, pEntry->szVerb); + + if (SUCCEEDED(hr)) { - wcscpy(wszKey, curEntry->szClass); - wcscat(wszKey, L"\\shell\\"); - wcscat(wszKey, curEntry->szVerb); - dwSize = sizeof(szVerb); - - if (RegGetValueW(HKEY_CLASSES_ROOT, wszKey, NULL, RRF_RT_REG_SZ, NULL, szVerb, &dwSize) == ERROR_SUCCESS) - mii.dwTypeData = szVerb; /* use description for the menu entry */ - else - mii.dwTypeData = curEntry->szVerb; /* use verb for the menu entry */ + DWORD cbVerb = sizeof(wszVerb); + + if (RegGetValueW(HKEY_CLASSES_ROOT, wszKey, NULL, RRF_RT_REG_SZ, NULL, wszVerb, &cbVerb) == ERROR_SUCCESS) + mii.dwTypeData = wszVerb; /* use description for the menu entry */ } } mii.cch = wcslen(mii.dwTypeData); mii.fState = fState; - InsertMenuItemW(hMenu, indexMenu++, TRUE, &mii); + InsertMenuItemW(hMenu, IndexMenu++, TRUE, &mii); mii.wID++; - curEntry = curEntry->Next; - } + pEntry = pEntry->pNext; + } + m_iIdSCMLast = mii.wID - 1; - return indexMenu; + return IndexMenu; } void WINAPI _InsertMenuItemW( - HMENU hmenu, + HMENU hMenu, UINT indexMenu, BOOL fByPosition, UINT wID, @@ -694,24 +662,19 @@ UINT fState) { MENUITEMINFOW mii; - WCHAR szText[100]; + WCHAR wszText[100]; ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); if (fType == MFT_SEPARATOR) - { mii.fMask = MIIM_ID | MIIM_TYPE; - } else if (fType == MFT_STRING) { mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE; if ((ULONG_PTR)HIWORD((ULONG_PTR)dwTypeData) == 0) { - if (LoadStringW(shell32_hInstance, LOWORD((ULONG_PTR)dwTypeData), szText, sizeof(szText) / sizeof(WCHAR))) - { - szText[(sizeof(szText)/sizeof(WCHAR))-1] = 0; - mii.dwTypeData = szText; - } + if (LoadStringW(shell32_hInstance, LOWORD((ULONG_PTR)dwTypeData), wszText, _countof(wszText))) + mii.dwTypeData = wszText; else { ERR("failed to load string %p\n", dwTypeData); @@ -719,15 +682,13 @@ } } else - { - mii.dwTypeData = (LPWSTR) dwTypeData; - } + mii.dwTypeData = (LPWSTR)dwTypeData; mii.fState = fState; } mii.wID = wID; mii.fType = fType; - InsertMenuItemW( hmenu, indexMenu, fByPosition, &mii); + InsertMenuItemW(hMenu, indexMenu, fByPosition, &mii); } UINT @@ -737,53 +698,50 @@ UINT iIdCmdLast, UINT uFlags) { - WCHAR szPath[MAX_PATH]; - WCHAR szTemp[40]; HKEY hKey; - UINT indexMenu; - SFGAOF rfg; HRESULT hr; - BOOL bAddSep = FALSE; - GUID * guid; - BOOL bClipboardData; - STRRET strFile; - LPWSTR pOffset; - DWORD dwSize; TRACE("BuildShellItemContextMenu entered\n"); ASSERT(m_Dcm.cidl >= 1); + STRRET strFile; hr = m_Dcm.psf->GetDisplayNameOf(m_Dcm.apidl[0], SHGDN_FORPARSING, &strFile); if (hr == S_OK) { - hr = StrRetToBufW(&strFile, m_Dcm.apidl[0], szPath, MAX_PATH); + WCHAR wszPath[MAX_PATH]; + hr = StrRetToBufW(&strFile, m_Dcm.apidl[0], wszPath, _countof(wszPath)); if (hr == S_OK) { - pOffset = wcsrchr(szPath, L'.'); - if (pOffset) + LPCWSTR pwszExt = PathFindExtensionW(wszPath); + if (pwszExt[0]) { /* enumerate dynamic/static for a given file class */ - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, pOffset, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, pwszExt, 0, KEY_READ, &hKey) == ERROR_SUCCESS) { /* add static verbs */ - AddStaticEntryForFileClass(pOffset); + AddStaticEntryForFileClass(pwszExt); + /* load dynamic extensions from file extension key */ EnumerateDynamicContextHandlerForKey(hKey); RegCloseKey(hKey); } - dwSize = sizeof(szTemp); - if (RegGetValueW(HKEY_CLASSES_ROOT, pOffset, NULL, RRF_RT_REG_SZ, NULL, szTemp, &dwSize) == ERROR_SUCCESS) + + WCHAR wszTemp[40]; + DWORD dwSize = sizeof(wszTemp); + if (RegGetValueW(HKEY_CLASSES_ROOT, pwszExt, NULL, RRF_RT_REG_SZ, NULL, wszTemp, &dwSize) == ERROR_SUCCESS) { - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, szTemp, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, wszTemp, 0, KEY_READ, &hKey) == ERROR_SUCCESS) { /* add static verbs from progid key */ - AddStaticEntryForFileClass(szTemp); + AddStaticEntryForFileClass(wszTemp); + /* load dynamic extensions from progid key */ EnumerateDynamicContextHandlerForKey(hKey); RegCloseKey(hKey); } } } + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"*", 0, KEY_READ, &hKey) == ERROR_SUCCESS) { /* load default extensions */ @@ -795,14 +753,14 @@ else ERR("GetDisplayNameOf failed: %x\n", hr); - guid = _ILGetGUIDPointer(m_Dcm.apidl[0]); - if (guid) + GUID *pGuid = _ILGetGUIDPointer(m_Dcm.apidl[0]); + if (pGuid) { LPOLESTR pwszCLSID; WCHAR buffer[60]; wcscpy(buffer, L"CLSID\\"); - hr = StringFromCLSID(*guid, &pwszCLSID); + hr = StringFromCLSID(*pGuid, &pwszCLSID); if (hr == S_OK) { wcscpy(&buffer[6], pwszCLSID); @@ -829,7 +787,7 @@ } /* add static actions */ - rfg = SFGAO_BROWSABLE | SFGAO_CANCOPY | SFGAO_CANLINK | SFGAO_CANMOVE | SFGAO_CANDELETE | SFGAO_CANRENAME | SFGAO_HASPROPSHEET | SFGAO_FILESYSTEM | SFGAO_FOLDER; + SFGAOF rfg = SFGAO_BROWSABLE | SFGAO_CANCOPY | SFGAO_CANLINK | SFGAO_CANMOVE | SFGAO_CANDELETE | SFGAO_CANRENAME | SFGAO_HASPROPSHEET | SFGAO_FILESYSTEM | SFGAO_FOLDER; hr = m_Dcm.psf->GetAttributesOf(m_Dcm.cidl, m_Dcm.apidl, &rfg); if (FAILED(hr)) { @@ -865,31 +823,32 @@ } /* add static context menu handlers */ - indexMenu = AddStaticContextMenusToMenu(hMenu, 0); + UINT IndexMenu = AddStaticContextMenusToMenu(hMenu, 0); + /* now process dynamic context menu handlers */ - indexMenu = InsertMenuItemsOfDynamicContextMenuExtension(hMenu, indexMenu, iIdCmdFirst, iIdCmdLast); - TRACE("indexMenu %d\n", indexMenu); + BOOL bAddSep = FALSE; + IndexMenu = InsertMenuItemsOfDynamicContextMenuExtension(hMenu, IndexMenu, iIdCmdFirst, iIdCmdLast); + TRACE("IndexMenu %d\n", IndexMenu); if (_ILIsDrive(m_Dcm.apidl[0])) { /* The 'Format' option must be always available, - * thus it is not registered as a static shell extension - */ - _InsertMenuItemW(hMenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); - _InsertMenuItemW(hMenu, indexMenu++, TRUE, 0x7ABC, MFT_STRING, MAKEINTRESOURCEW(IDS_FORMATDRIVE), MFS_ENABLED); + * thus it is not registered as a static shell extension */ + _InsertMenuItemW(hMenu, IndexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); + _InsertMenuItemW(hMenu, IndexMenu++, TRUE, 0x7ABC, MFT_STRING, MAKEINTRESOURCEW(IDS_FORMATDRIVE), MFS_ENABLED); bAddSep = TRUE; } - bClipboardData = (HasClipboardData() && (rfg & SFGAO_FILESYSTEM)); + BOOL bClipboardData = (HasClipboardData() && (rfg & SFGAO_FILESYSTEM)); if (rfg & (SFGAO_CANCOPY | SFGAO_CANMOVE) || bClipboardData) { - _InsertMenuItemW(hMenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); + _InsertMenuItemW(hMenu, IndexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); if (rfg & SFGAO_CANMOVE) - _InsertMenuItemW(hMenu, indexMenu++, TRUE, FCIDM_SHVIEW_CUT, MFT_STRING, MAKEINTRESOURCEW(IDS_CUT), MFS_ENABLED); + _InsertMenuItemW(hMenu, IndexMenu++, TRUE, FCIDM_SHVIEW_CUT, MFT_STRING, MAKEINTRESOURCEW(IDS_CUT), MFS_ENABLED); if (rfg & SFGAO_CANCOPY) - _InsertMenuItemW(hMenu, indexMenu++, TRUE, FCIDM_SHVIEW_COPY, MFT_STRING, MAKEINTRESOURCEW(IDS_COPY), MFS_ENABLED); + _InsertMenuItemW(hMenu, IndexMenu++, TRUE, FCIDM_SHVIEW_COPY, MFT_STRING, MAKEINTRESOURCEW(IDS_COPY), MFS_ENABLED); if (bClipboardData) - _InsertMenuItemW(hMenu, indexMenu++, TRUE, FCIDM_SHVIEW_INSERT, MFT_STRING, MAKEINTRESOURCEW(IDS_INSERT), MFS_ENABLED); + _InsertMenuItemW(hMenu, IndexMenu++, TRUE, FCIDM_SHVIEW_INSERT, MFT_STRING, MAKEINTRESOURCEW(IDS_INSERT), MFS_ENABLED); bAddSep = TRUE; } @@ -897,8 +856,8 @@ if (rfg & SFGAO_CANLINK) { bAddSep = FALSE; - _InsertMenuItemW(hMenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); - _InsertMenuItemW(hMenu, indexMenu++, TRUE, FCIDM_SHVIEW_CREATELINK, MFT_STRING, MAKEINTRESOURCEW(IDS_CREATELINK), MFS_ENABLED); + _InsertMenuItemW(hMenu, IndexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); + _InsertMenuItemW(hMenu, IndexMenu++, TRUE, FCIDM_SHVIEW_CREATELINK, MFT_STRING, MAKEINTRESOURCEW(IDS_CREATELINK), MFS_ENABLED); } if (rfg & SFGAO_CANDELETE) @@ -906,25 +865,25 @@ if (bAddSep) { bAddSep = FALSE; - _InsertMenuItemW(hMenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); - } - _InsertMenuItemW(hMenu, indexMenu++, TRUE, FCIDM_SHVIEW_DELETE, MFT_STRING, MAKEINTRESOURCEW(IDS_DELETE), MFS_ENABLED); + _InsertMenuItemW(hMenu, IndexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); + } + _InsertMenuItemW(hMenu, IndexMenu++, TRUE, FCIDM_SHVIEW_DELETE, MFT_STRING, MAKEINTRESOURCEW(IDS_DELETE), MFS_ENABLED); } if (rfg & SFGAO_CANRENAME) { if (bAddSep) { - _InsertMenuItemW(hMenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); - } - _InsertMenuItemW(hMenu, indexMenu++, TRUE, FCIDM_SHVIEW_RENAME, MFT_STRING, MAKEINTRESOURCEW(IDS_RENAME), MFS_ENABLED); + _InsertMenuItemW(hMenu, IndexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); + } + _InsertMenuItemW(hMenu, IndexMenu++, TRUE, FCIDM_SHVIEW_RENAME, MFT_STRING, MAKEINTRESOURCEW(IDS_RENAME), MFS_ENABLED); bAddSep = TRUE; } if (rfg & SFGAO_HASPROPSHEET) { - _InsertMenuItemW(hMenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); - _InsertMenuItemW(hMenu, indexMenu++, TRUE, FCIDM_SHVIEW_PROPERTIES, MFT_STRING, MAKEINTRESOURCEW(IDS_PROPERTIES), MFS_ENABLED); + _InsertMenuItemW(hMenu, IndexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); + _InsertMenuItemW(hMenu, IndexMenu++, TRUE, FCIDM_SHVIEW_PROPERTIES, MFT_STRING, MAKEINTRESOURCEW(IDS_PROPERTIES), MFS_ENABLED); } return iIdCmdLast; @@ -933,16 +892,16 @@ HRESULT WINAPI CDefaultContextMenu::QueryContextMenu( - HMENU hmenu, - UINT indexMenu, + HMENU hMenu, + UINT IndexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) { if (m_Dcm.cidl) - idCmdFirst = BuildShellItemContextMenu(hmenu, idCmdFirst, idCmdLast, uFlags); + idCmdFirst = BuildShellItemContextMenu(hMenu, idCmdFirst, idCmdLast, uFlags); else - idCmdFirst = BuildBackgroundContextMenu(hmenu, idCmdFirst, idCmdLast, uFlags); + idCmdFirst = BuildBackgroundContextMenu(hMenu, idCmdFirst, idCmdLast, uFlags); return S_OK; } @@ -951,28 +910,25 @@ HRESULT NotifyShellViewWindow(LPCMINVOKECOMMANDINFO lpcmi, BOOL bRefresh) { - LPSHELLBROWSER lpSB; + /* Note: CWM_GETISHELLBROWSER returns not referenced object */ + LPSHELLBROWSER lpSB = (LPSHELLBROWSER)SendMessageA(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0); + if (!lpSB) + return E_FAIL; + LPSHELLVIEW lpSV = NULL; - HWND hwndSV = NULL; - - if((lpSB = (LPSHELLBROWSER)SendMessageA(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0))) - { - if(SUCCEEDED(lpSB->QueryActiveShellView(&lpSV))) - { - lpSV->GetWindow(&hwndSV); - } - } + if (FAILED(lpSB->QueryActiveShellView(&lpSV))) + return E_FAIL; if (LOWORD(lpcmi->lpVerb) == FCIDM_SHVIEW_REFRESH || bRefresh) - { - if (lpSV) - lpSV->Refresh(); - - return S_OK; - } - - SendMessageW(hwndSV, WM_COMMAND, MAKEWPARAM(LOWORD(lpcmi->lpVerb), 0), 0); - + lpSV->Refresh(); + else + { + HWND hwndSV = NULL; + if (SUCCEEDED(lpSV->GetWindow(&hwndSV))) + SendMessageW(hwndSV, WM_COMMAND, MAKEWPARAM(LOWORD(lpcmi->lpVerb), 0), 0); + } + + lpSV->Release(); return S_OK; } @@ -980,19 +936,14 @@ CDefaultContextMenu::DoPaste( LPCMINVOKECOMMANDINFO lpcmi) { - IDataObject * pda; + HRESULT hr; + + IDataObject *pda; + if (OleGetClipboard(&pda) != S_OK) + return E_FAIL; + STGMEDIUM medium; FORMATETC formatetc; - LPITEMIDLIST * apidl; - LPITEMIDLIST pidl; - IShellFolder *psfFrom = NULL, *psfDesktop, *psfTarget = NULL; - LPIDA lpcida; - ISFHelper *psfhlpdst, *psfhlpsrc; - HRESULT hr; - - if (OleGetClipboard(&pda) != S_OK) - return E_FAIL; - InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); hr = pda->GetData(&formatetc, &medium); @@ -1003,7 +954,7 @@ } /* lock the handle */ - lpcida = (LPIDA)GlobalLock(medium.hGlobal); + LPIDA lpcida = (LPIDA)GlobalLock(medium.hGlobal); if (!lpcida) { ReleaseStgMedium(&medium); @@ -1012,11 +963,13 @@ } /* convert the data into pidl */ - apidl = _ILCopyCidaToaPidl(&pidl, lpcida); + LPITEMIDLIST pidl; + LPITEMIDLIST *apidl = _ILCopyCidaToaPidl(&pidl, lpcida); if (!apidl) return E_FAIL; + IShellFolder *psfDesktop; if (FAILED(SHGetDesktopFolder(&psfDesktop))) { SHFree(pidl); @@ -1026,6 +979,8 @@ return E_FAIL; } + /* Find source folder */ + IShellFolder *psfFrom = NULL; if (_ILIsDesktop(pidl)) { /* use desktop shellfolder */ @@ -1044,6 +999,8 @@ return E_FAIL; } + /* Find target folder */ + IShellFolder *psfTarget = NULL; if (m_Dcm.cidl) { psfDesktop->Release(); @@ -1092,6 +1049,7 @@ } /* get source and destination shellfolder */ + ISFHelper *psfhlpdst; if (FAILED(psfTarget->QueryInterface(IID_ISFHelper, (LPVOID*)&psfhlpdst))) { ERR("no IID_ISFHelper for destination\n"); @@ -1106,6 +1064,7 @@ return E_FAIL; } + ISFHelper *psfhlpsrc; if (FAILED(psfFrom->QueryInterface(IID_ISFHelper, (LPVOID*)&psfhlpsrc))) { ERR("no IID_ISFHelper for source\n"); @@ -1146,42 +1105,30 @@ } BOOL -GetUniqueFileName(LPWSTR szBasePath, LPWSTR szExt, LPWSTR szTarget, BOOL bShortcut) -{ - UINT RetryCount = 0, Length; - WCHAR szLnk[40]; - HANDLE hFile; +GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut) +{ + WCHAR wszLink[40]; if (!bShortcut) - Length = LoadStringW(shell32_hInstance, IDS_LNK_FILE, szLnk, sizeof(szLnk) / sizeof(WCHAR)); - - do + { + if (!LoadStringW(shell32_hInstance, IDS_LNK_FILE, wszLink, _countof(wszLink))) + wszLink[0] = L'\0'; + } + + if (!bShortcut) + swprintf(pwszTarget, L"%s%s%s", wszLink, pwszBasePath, pwszExt); + else + swprintf(pwszTarget, L"%s%s", pwszBasePath, pwszExt); + + for (UINT i = 2; PathFileExistsW(pwszTarget); ++i) { if (!bShortcut) - { - if (RetryCount) - swprintf(szTarget, L"%s%s(%u).%s", szLnk, szBasePath, RetryCount, szExt); - else - swprintf(szTarget, L"%s%s.%s", szLnk, szBasePath, szExt); - } + swprintf(pwszTarget, L"%s%s (%u)%s", wszLink, pwszBasePath, i, pwszExt); else - { - if (RetryCount) - swprintf(szTarget, L"%s(%u).%s", szBasePath, RetryCount, szExt); - else - swprintf(szTarget, L"%s.%s", szBasePath, szExt); - } - - hFile = CreateFileW(szTarget, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); - if (hFile != INVALID_HANDLE_VALUE) - { - CloseHandle(hFile); - return TRUE; - } - - } while(RetryCount++ < 100); - - return FALSE; + swprintf(pwszTarget, L"%s (%u)%s", pwszBasePath, i, pwszExt); + } + + return TRUE; } @@ -1189,16 +1136,10 @@ CDefaultContextMenu::DoCreateLink( LPCMINVOKECOMMANDINFO lpcmi) { - WCHAR szPath[MAX_PATH]; - WCHAR szTarget[MAX_PATH] = {0}; - WCHAR szDirPath[MAX_PATH]; - LPWSTR pszFile; + WCHAR wszTarget[MAX_PATH]; + IPersistFile *ppf; + HRESULT hr; STRRET strFile; - LPWSTR pszExt; - HRESULT hr; - IShellLinkW * nLink; - IPersistFile * ipf; - static WCHAR szLnk[] = L"lnk"; if (m_Dcm.psf->GetDisplayNameOf(m_Dcm.apidl[0], SHGDN_FORPARSING, &strFile) != S_OK) { @@ -1206,47 +1147,50 @@ return E_FAIL; } - if (StrRetToBufW(&strFile, m_Dcm.apidl[0], szPath, MAX_PATH) != S_OK) - return E_FAIL; - - pszExt = wcsrchr(szPath, L'.'); - - if (pszExt && !wcsicmp(pszExt + 1, szLnk)) - { - if (!GetUniqueFileName(szPath, pszExt + 1, szTarget, TRUE)) + WCHAR wszPath[MAX_PATH]; + if (StrRetToBufW(&strFile, m_Dcm.apidl[0], wszPath, _countof(wszPath)) != S_OK) + return E_FAIL; + + LPWSTR pwszExt = PathFindExtensionW(wszPath); + + if (!wcsicmp(pwszExt, L".lnk")) + { + if (!GetUniqueFileName(wszPath, pwszExt, wszTarget, TRUE)) return E_FAIL; - hr = IShellLink_ConstructFromFile(NULL, IID_IPersistFile, m_Dcm.apidl[0], (LPVOID*)&ipf); + hr = IShellLink_ConstructFromFile(NULL, IID_IPersistFile, m_Dcm.apidl[0], (LPVOID*)&ppf); if (hr != S_OK) return hr; - hr = ipf->Save(szTarget, FALSE); - ipf->Release(); + hr = ppf->Save(wszTarget, FALSE); + ppf->Release(); NotifyShellViewWindow(lpcmi, TRUE); return hr; } else { - if (!GetUniqueFileName(szPath, szLnk, szTarget, TRUE)) + if (!GetUniqueFileName(wszPath, L".lnk", wszTarget, TRUE)) return E_FAIL; - hr = CShellLink::_CreatorClass::CreateInstance(NULL, IID_IShellLinkW, (void**)&nLink); + IShellLinkW *pLink; + hr = CShellLink::_CreatorClass::CreateInstance(NULL, IID_IShellLinkW, (void**)&pLink); if (hr != S_OK) return hr; - GetFullPathName(szPath, MAX_PATH, szDirPath, &pszFile); - if (pszFile) pszFile[0] = 0; - - if (SUCCEEDED(nLink->SetPath(szPath)) && - SUCCEEDED(nLink->SetWorkingDirectory(szDirPath))) - { - if (SUCCEEDED(nLink->QueryInterface(IID_IPersistFile, (LPVOID*)&ipf))) + WCHAR szDirPath[MAX_PATH], *pwszFile; + GetFullPathName(wszPath, MAX_PATH, szDirPath, &pwszFile); + if (pwszFile) pwszFile[0] = 0; + + if (SUCCEEDED(pLink->SetPath(wszPath)) && + SUCCEEDED(pLink->SetWorkingDirectory(szDirPath))) + { + if (SUCCEEDED(pLink->QueryInterface(IID_IPersistFile, (LPVOID*)&ppf))) { - hr = ipf->Save(szTarget, TRUE); - ipf->Release(); + hr = ppf->Save(wszTarget, TRUE); + ppf->Release(); } } - nLink->Release(); + pLink->Release(); NotifyShellViewWindow(lpcmi, TRUE); return hr; } @@ -1256,24 +1200,16 @@ CDefaultContextMenu::DoDelete( LPCMINVOKECOMMANDINFO lpcmi) { - HRESULT hr; STRRET strTemp; - WCHAR szPath[MAX_PATH]; - LPWSTR wszPath, wszPos; - SHFILEOPSTRUCTW op; - int ret; - LPSHELLBROWSER lpSB; - HWND hwnd; - - - hr = m_Dcm.psf->GetDisplayNameOf(m_Dcm.apidl[0], SHGDN_FORPARSING, &strTemp); + HRESULT hr = m_Dcm.psf->GetDisplayNameOf(m_Dcm.apidl[0], SHGDN_FORPARSING, &strTemp); if(hr != S_OK) { ERR("IShellFolder_GetDisplayNameOf failed with %x\n", hr); return hr; } - ZeroMemory(szPath, sizeof(szPath)); - hr = StrRetToBufW(&strTemp, m_Dcm.apidl[0], szPath, MAX_PATH); + + WCHAR wszPath[MAX_PATH]; + hr = StrRetToBufW(&strTemp, m_Dcm.apidl[0], wszPath, _countof(wszPath)); if (hr != S_OK) { ERR("StrRetToBufW failed with %x\n", hr); @@ -1281,43 +1217,45 @@ } /* Only keep the base path */ - wszPos = strrchrW(szPath, '\\'); - if (wszPos != NULL) - { - *(wszPos + 1) = '\0'; - } - - wszPath = BuildPathsList(szPath, m_Dcm.cidl, m_Dcm.apidl); - - ZeroMemory(&op, sizeof(op)); - op.hwnd = GetActiveWindow(); - op.wFunc = FO_DELETE; - op.pFrom = wszPath; - op.fFlags = FOF_ALLOWUNDO; - ret = SHFileOperationW(&op); - - if (ret) - { - ERR("SHFileOperation failed with 0x%x for %s\n", GetLastError(), debugstr_w(wszPath)); + LPWSTR pwszFilename = PathFindFileNameW(wszPath); + *pwszFilename = L'\0'; + + /* Build paths list */ + LPWSTR pwszPaths = BuildPathsList(wszPath, m_Dcm.cidl, m_Dcm.apidl); + if (!pwszPaths) + return E_FAIL; + + /* Delete them */ + SHFILEOPSTRUCTW FileOp; + ZeroMemory(&FileOp, sizeof(FileOp)); + FileOp.hwnd = GetActiveWindow(); + FileOp.wFunc = FO_DELETE; + FileOp.pFrom = pwszPaths; + FileOp.fFlags = FOF_ALLOWUNDO; + + if (SHFileOperationW(&FileOp) != 0) + { + ERR("SHFileOperation failed with 0x%x for %s\n", GetLastError(), debugstr_w(pwszPaths)); return S_OK; } - /* get the active IShellView */ - if ((lpSB = (LPSHELLBROWSER)SendMessageA(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0))) - { - /* is the treeview focused */ + /* Get the active IShellView */ + LPSHELLBROWSER lpSB = (LPSHELLBROWSER)SendMessageW(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0); + if (lpSB) + { + /* Is the treeview focused */ + HWND hwnd; if (SUCCEEDED(lpSB->GetControlWindow(FCW_TREE, &hwnd))) { + /* Remove selected items from treeview */ HTREEITEM hItem = TreeView_GetSelection(hwnd); if (hItem) - { (void)TreeView_DeleteItem(hwnd, hItem); - } } } NotifyShellViewWindow(lpcmi, TRUE); - HeapFree(GetProcessHeap(), 0, wszPath); + HeapFree(GetProcessHeap(), 0, pwszPaths); return S_OK; } @@ -1327,8 +1265,6 @@ LPCMINVOKECOMMANDINFO lpcmi, BOOL bCopy) { - LPSHELLBROWSER lpSB; - LPSHELLVIEW lpSV; LPDATAOBJECT pDataObj; HRESULT hr; @@ -1339,79 +1275,78 @@ return hr; } - lpSB = (LPSHELLBROWSER)SendMessageA(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0); + /* Note: CWM_GETISHELLBROWSER returns not referenced object */ + LPSHELLBROWSER lpSB = (LPSHELLBROWSER)SendMessageA(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0); if (!lpSB) { - TRACE("failed to get shellbrowser\n"); - return E_FAIL; - } - + ERR("failed to get shellbrowser\n"); + return E_FAIL; + } + + LPSHELLVIEW lpSV; hr = lpSB->QueryActiveShellView(&lpSV); if (FAILED(hr)) { - TRACE("failed to query the active shellview\n"); + ERR("failed to query the active shellview\n"); return hr; } hr = lpSV->GetItemObject(SVGIO_SELECTION, IID_IDataObject, (LPVOID*)&pDataObj); + if (SUCCEEDED(hr)) + { + hr = OleSetClipboard(pDataObj); + if (FAILED(hr)) + ERR("OleSetClipboard failed"); + pDataObj->Release(); + } else + ERR("failed to get item object\n"); + + lpSV->Release(); + return hr; +} + +HRESULT +CDefaultContextMenu::DoRename( + LPCMINVOKECOMMANDINFO lpcmi) +{ + /* get the active IShellView. Note: CWM_GETISHELLBROWSER returns not referenced object */ + LPSHELLBROWSER lpSB = (LPSHELLBROWSER)SendMessageA(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0); + if (!lpSB) + { + ERR("CWM_GETISHELLBROWSER failed\n"); + return E_FAIL; + } + + /* is the treeview focused */ + HWND hwnd; + if (SUCCEEDED(lpSB->GetControlWindow(FCW_TREE, &hwnd))) + { + HTREEITEM hItem = TreeView_GetSelection(hwnd); + if (hItem) + (void)TreeView_EditLabel(hwnd, hItem); + } + + LPSHELLVIEW lpSV; + HRESULT hr = lpSB->QueryActiveShellView(&lpSV); if (FAILED(hr)) { - TRACE("failed to get item object\n"); + ERR("CWM_GETISHELLBROWSER failed\n"); return hr; } - hr = OleSetClipboard(pDataObj); - if (FAILED(hr)) - { - WARN("OleSetClipboard failed"); - } - pDataObj->Release(); + lpSV->SelectItem(m_Dcm.apidl[0], + SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE | SVSI_FOCUSED | SVSI_SELECT); lpSV->Release(); return S_OK; } HRESULT -CDefaultContextMenu::DoRename( - LPCMINVOKECOMMANDINFO lpcmi) -{ - LPSHELLBROWSER lpSB; - LPSHELLVIEW lpSV; - HWND hwnd; - - /* get the active IShellView */ - if ((lpSB = (LPSHELLBROWSER)SendMessageA(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0))) - { - /* is the treeview focused */ - if (SUCCEEDED(lpSB->GetControlWindow(FCW_TREE, &hwnd))) - { - HTREEITEM hItem = TreeView_GetSelection(hwnd); - if (hItem) - { - (void)TreeView_EditLabel(hwnd, hItem); - } - } - - if(SUCCEEDED(lpSB->QueryActiveShellView(&lpSV))) - { - lpSV->SelectItem(m_Dcm.apidl[0], - SVSI_DESELECTOTHERS | SVSI_EDIT | SVSI_ENSUREVISIBLE | SVSI_FOCUSED | SVSI_SELECT); - lpSV->Release(); - return S_OK; - } - } - return E_FAIL; -} - -HRESULT CDefaultContextMenu::DoProperties( LPCMINVOKECOMMANDINFO lpcmi) { - WCHAR wszBuf[MAX_PATH]; - STRRET strFile; - const ITEMIDLIST *pidlParent, *pidlChild; HRESULT hr = S_OK; - - pidlParent = m_Dcm.pidlFolder; + const ITEMIDLIST *pidlParent = m_Dcm.pidlFolder, *pidlChild; + if (!pidlParent) { IPersistFolder2 *pf; @@ -1448,6 +1383,7 @@ } else if (_ILIsDrive(pidlChild)) { + WCHAR wszBuf[MAX_PATH]; ILGetDisplayName(pidlChild, wszBuf); if (!SH_ShowDriveProperties(wszBuf, pidlParent, &pidlChild)) hr = E_FAIL; @@ -1471,9 +1407,11 @@ if (m_Dcm.cidl > 1) WARN("SHMultiFileProperties is not yet implemented\n"); + STRRET strFile; hr = m_Dcm.psf->GetDisplayNameOf(pidlChild, SHGDN_FORPARSING, &strFile); if (SUCCEEDED(hr)) { + WCHAR wszBuf[MAX_PATH]; hr = StrRetToBufW(&strFile, pidlChild, wszBuf, _countof(wszBuf)); if (SUCCEEDED(hr)) hr = SH_ShowPropertiesDialog(wszBuf, pidlParent, &pidlChild); @@ -1497,15 +1435,15 @@ CDefaultContextMenu::DoFormat( LPCMINVOKECOMMANDINFO lpcmi) { - char sDrive[5] = {0}; - - if (!_ILGetDrive(m_Dcm.apidl[0], sDrive, sizeof(sDrive))) + char szDrive[8] = {0}; + + if (!_ILGetDrive(m_Dcm.apidl[0], szDrive, sizeof(szDrive))) { ERR("pidl is not a drive\n"); return E_FAIL; } - SHFormatDrive(lpcmi->hwnd, sDrive[0] - 'A', SHFMT_ID_DEFAULT, 0); + SHFormatDrive(lpcmi->hwnd, szDrive[0] - 'A', SHFMT_ID_DEFAULT, 0); return S_OK; } @@ -1513,22 +1451,22 @@ CDefaultContextMenu::DoDynamicShellExtensions( LPCMINVOKECOMMANDINFO lpcmi) { - UINT verb = LOWORD(lpcmi->lpVerb); - PDynamicShellEntry pCurrent = m_pDynamicEntries; + UINT idCmd = LOWORD(lpcmi->lpVerb); + PDynamicShellEntry pEntry = m_pDynamicEntries; TRACE("verb %p first %x last %x", lpcmi->lpVerb, m_iIdSHEFirst, m_iIdSHELast); - while(pCurrent && verb > pCurrent->iIdCmdFirst + pCurrent->NumIds) - pCurrent = pCurrent->Next; - - if (!pCurrent) - return E_FAIL; - - if (verb >= pCurrent->iIdCmdFirst && verb <= pCurrent->iIdCmdFirst + pCurrent->NumIds) + while(pEntry && idCmd > pEntry->iIdCmdFirst + pEntry->NumIds) + pEntry = pEntry->pNext; + + if (!pEntry) + return E_FAIL; + + if (idCmd >= pEntry->iIdCmdFirst && idCmd <= pEntry->iIdCmdFirst + pEntry->NumIds) { /* invoke the dynamic context menu */ - lpcmi->lpVerb = MAKEINTRESOURCEA(verb - pCurrent->iIdCmdFirst); - return pCurrent->CMenu->InvokeCommand(lpcmi); + lpcmi->lpVerb = MAKEINTRESOURCEA(idCmd - pEntry->iIdCmdFirst); + return pEntry->pCM->InvokeCommand(lpcmi); } return E_FAIL; @@ -1539,20 +1477,17 @@ CDefaultContextMenu::DoStaticShellExtensions( LPCMINVOKECOMMANDINFO lpcmi) { + PStaticShellEntry pEntry = m_pStaticEntries; + INT iCmd = LOWORD(lpcmi->lpVerb) - m_iIdSCMFirst; + HRESULT hr; + + while (pEntry && (iCmd--) > 0) + pEntry = pEntry->pNext; + + if (iCmd > 0) + return E_FAIL; + STRRET strFile; - WCHAR szPath[MAX_PATH]; - WCHAR szDir[MAX_PATH]; - SHELLEXECUTEINFOW sei; - PStaticShellEntry pCurrent = m_pStaticEntries; - int verb = LOWORD(lpcmi->lpVerb) - m_iIdSCMFirst; - HRESULT hr; - - while(pCurrent && verb-- > 0) - pCurrent = pCurrent->Next; - - if (verb > 0) - return E_FAIL; - hr = m_Dcm.psf->GetDisplayNameOf(m_Dcm.apidl[0], SHGDN_FORPARSING, &strFile); if (hr != S_OK) { @@ -1560,22 +1495,25 @@ return hr; } - hr = StrRetToBufW(&strFile, m_Dcm.apidl[0], szPath, MAX_PATH); + WCHAR wszPath[MAX_PATH]; + hr = StrRetToBufW(&strFile, m_Dcm.apidl[0], wszPath, MAX_PATH); if (hr != S_OK) return hr; - wcscpy(szDir, szPath); - PathRemoveFileSpec(szDir); - + WCHAR wszDir[MAX_PATH]; + wcscpy(wszDir, wszPath); + PathRemoveFileSpec(wszDir); + + SHELLEXECUTEINFOW sei; ZeroMemory(&sei, sizeof(sei)); sei.cbSize = sizeof(sei); sei.fMask = SEE_MASK_CLASSNAME; - sei.lpClass = pCurrent->szClass; + sei.lpClass = pEntry->szClass; sei.hwnd = lpcmi->hwnd; sei.nShow = SW_SHOWNORMAL; - sei.lpVerb = pCurrent->szVerb; - sei.lpFile = szPath; - sei.lpDirectory = szDir; + sei.lpVerb = pEntry->szVerb; + sei.lpFile = wszPath; + sei.lpDirectory = wszDir; ShellExecuteExW(&sei); return S_OK; } @@ -1623,17 +1561,13 @@ if (m_iIdSHEFirst && m_iIdSHELast) { if (LOWORD(lpcmi->lpVerb) >= m_iIdSHEFirst && LOWORD(lpcmi->lpVerb) <= m_iIdSHELast) - { return DoDynamicShellExtensions(lpcmi); - } } if (m_iIdSCMFirst && m_iIdSCMLast) { if (LOWORD(lpcmi->lpVerb) >= m_iIdSCMFirst && LOWORD(lpcmi->lpVerb) <= m_iIdSCMLast) - { return DoStaticShellExtensions(lpcmi); - } } FIXME("Unhandled Verb %xl\n", LOWORD(lpcmi->lpVerb)); @@ -1669,27 +1603,34 @@ REFIID riid, void **ppv) { - CComObject<CDefaultContextMenu> *theContextMenu; - CComPtr<IUnknown> result; - HRESULT hResult; - if (ppv == NULL) return E_POINTER; *ppv = NULL; - ATLTRY (theContextMenu = new CComObject<CDefaultContextMenu>); - if (theContextMenu == NULL) - return E_OUTOFMEMORY; - hResult = theContextMenu->QueryInterface(riid, (void **)&result); - if (FAILED(hResult)) - { - delete theContextMenu; - return hResult; - } - hResult = theContextMenu->Initialize(pdcm); - if (FAILED(hResult)) - return hResult; - *ppv = result.Detach(); - TRACE("This(%p)(%x) cidl %u\n", *ppv, hResult, pdcm->cidl); + + CComObject<CDefaultContextMenu> *pCM; + HRESULT hr = CComObject<CDefaultContextMenu>::CreateInstance(&pCM); + if (FAILED(hr)) + return hr; + pCM->AddRef(); // CreateInstance returns object with 0 ref count */ + + CComPtr<IUnknown> pResult; + hr = pCM->QueryInterface(riid, (void **)&pResult); + if (FAILED(hr)) + { + pCM->Release(); + return hr; + } + + hr = pCM->Initialize(pdcm); + if (FAILED(hr)) + { + pCM->Release(); + return hr; + } + + *ppv = pResult.Detach(); + pCM->Release(); + TRACE("This(%p) cidl %u\n", *ppv, pdcm->cidl); return S_OK; } @@ -1705,10 +1646,8 @@ REFIID riid, void **ppv) { - HRESULT hr = E_FAIL; - *ppv = NULL; - hr = IDefaultContextMenu_Constructor(pdcm, riid, ppv); + HRESULT hr = IDefaultContextMenu_Constructor(pdcm, riid, ppv); if (FAILED(hr)) ERR("IDefaultContextMenu_Constructor failed: %x\n", hr); TRACE("pcm %p hr %x\n", pdcm, hr); @@ -1734,8 +1673,6 @@ IContextMenu **ppcm) { DEFCONTEXTMENU pdcm; - HRESULT hr; - pdcm.hwnd = hwnd; pdcm.pcmcb = NULL; pdcm.pidlFolder = pidlFolder; @@ -1746,7 +1683,7 @@ pdcm.cKeys = nKeys; pdcm.aKeys = ahkeyClsKeys; - hr = SHCreateDefaultContextMenu(&pdcm, IID_IContextMenu, (void**)ppcm); + HRESULT hr = SHCreateDefaultContextMenu(&pdcm, IID_IContextMenu, (void**)ppcm); return hr; } Modified: trunk/reactos/dll/win32/shell32/drive.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.cp… ============================================================================== --- trunk/reactos/dll/win32/shell32/drive.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/drive.cpp [iso-8859-1] Sun Jan 15 19:45:02 2012 @@ -123,11 +123,9 @@ { HPSXA hpsx = NULL; HPROPSHEETPAGE hpsp[MAX_PROPERTY_SHEET_PAGE]; - WCHAR wszName[256]; PROPSHEETHEADERW psh; - HRESULT hr; CComObject<CDrvDefExt> *pDrvDefExt = NULL; - + ZeroMemory(&psh, sizeof(PROPSHEETHEADERW)); psh.dwSize = sizeof(PROPSHEETHEADERW); psh.dwFlags = 0; // FIXME: make it modeless @@ -135,6 +133,7 @@ psh.nStartPage = 0; psh.phpage = hpsp; + WCHAR wszName[256]; if (GetVolumeInformationW(pwszDrive, wszName, sizeof(wszName) / sizeof(WCHAR), NULL, NULL, NULL, NULL, 0)) { psh.pszCaption = wszName; @@ -148,13 +147,14 @@ } CComPtr<IDataObject> pDataObj; - hr = SHCreateDataObject(pidlFolder, 1, apidl, NULL, IID_IDataObject, (LPVOID *)&pDataObj); + HRESULT hr = SHCreateDataObject(pidlFolder, 1, apidl, NULL, IID_IDataObject, (LPVOID *)&pDataObj); if (SUCCEEDED(hr)) { - ATLTRY(pDrvDefExt = new CComObject<CDrvDefExt>); - if (pDrvDefExt) - { + hr = CComObject<CDrvDefExt>::CreateInstance(&pDrvDefExt); + if (SUCCEEDED(hr)) + { + pDrvDefExt->AddRef(); // CreateInstance returns object with 0 ref count hr = pDrvDefExt->Initialize(pidlFolder, pDataObj, NULL); if (SUCCEEDED(hr)) { Modified: trunk/reactos/dll/win32/shell32/fprop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.cp… ============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/fprop.cpp [iso-8859-1] Sun Jan 15 19:45:02 2012 @@ -97,8 +97,6 @@ BOOL SH_ShowPropertiesDialog(LPCWSTR pwszPath, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST *apidl) { - HRESULT hr; - HPROPSHEETPAGE hppages[MAX_PROPERTY_SHEET_PAGE]; HPSXA hpsxa[3] = {NULL, NULL, NULL}; CComObject<CFileDefExt> *pFileDefExt = NULL; @@ -107,6 +105,7 @@ if (pwszPath == NULL || !wcslen(pwszPath)) return FALSE; + HPROPSHEETPAGE hppages[MAX_PROPERTY_SHEET_PAGE]; memset(hppages, 0x0, sizeof(HPROPSHEETPAGE) * MAX_PROPERTY_SHEET_PAGE); /* Make a copy of path */ @@ -129,13 +128,14 @@ Header.pszCaption = PathFindFileNameW(wszPath); CComPtr<IDataObject> pDataObj; - hr = SHCreateDataObject(pidlFolder, 1, apidl, NULL, IID_IDataObject, (LPVOID *)&pDataObj); + HRESULT hr = SHCreateDataObject(pidlFolder, 1, apidl, NULL, IID_IDataObject, (LPVOID *)&pDataObj); if (SUCCEEDED(hr)) { - ATLTRY(pFileDefExt = new CComObject<CFileDefExt>); - if (pFileDefExt) + hr = CComObject<CFileDefExt>::CreateInstance(&pFileDefExt); + if (SUCCEEDED(hr)) { + pFileDefExt->AddRef(); // CreateInstance returns object with 0 ref count hr = pFileDefExt->Initialize(pidlFolder, pDataObj, NULL); if (SUCCEEDED(hr)) {

1 0

[akhaldi] 54978: [DDK] * Don't include wdm.h twice in portcls.h.
by akhaldi＠svn.reactos.org 15 Jan '12

15 Jan '12

Author: akhaldi Date: Sun Jan 15 19:10:19 2012 New Revision: 54978 URL: http://svn.reactos.org/svn/reactos?rev=54978&view=rev Log: [DDK] * Don't include wdm.h twice in portcls.h. Modified: trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Sun Jan 15 19:10:19 2012 @@ -143,14 +143,6 @@ #include <ks.h> #include <ksmedia.h> #include <drmk.h> - -#ifdef __cplusplus -extern "C" { -#include <wdm.h> -} -#else -#include <wdm.h> -#endif #ifndef PC_NO_IMPORTS #define PORTCLASSAPI EXTERN_C __declspec(dllimport)

1 0

[rharabien] 54977: [SHELL32] - Don't load shell extensions from * key for background context menu. Fixes #6668 (background context menu not working after installing Notepad++) - Properly set pidlFo...
by rharabien＠svn.reactos.org 15 Jan '12

15 Jan '12

Author: rharabien Date: Sun Jan 15 16:45:36 2012 New Revision: 54977 URL: http://svn.reactos.org/svn/reactos?rev=54977&view=rev Log: [SHELL32] - Don't load shell extensions from * key for background context menu. Fixes #6668 (background context menu not working after installing Notepad++) - Properly set pidlFolder argument in extensions Initialize function call - Fix openwithmenu.rgs file creating two keys instead of one Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp trunk/reactos/dll/win32/shell32/res/rgs/openwithmenu.rgs Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/defconte… ============================================================================== --- trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] Sun Jan 15 16:45:36 2012 @@ -42,6 +42,7 @@ private: DEFCONTEXTMENU m_Dcm; IDataObject *m_pDataObj; + LPCITEMIDLIST m_pidlFolder; DWORD m_bGroupPolicyActive; PDynamicShellEntry m_pDynamicEntries; /* first dynamic shell extension entry */ UINT m_iIdSHEFirst; /* first used id */ @@ -92,8 +93,9 @@ CDefaultContextMenu::CDefaultContextMenu() { - memset (&m_Dcm, 0, sizeof(m_Dcm)); + memset(&m_Dcm, 0, sizeof(m_Dcm)); m_pDataObj = NULL; + m_pidlFolder = NULL; m_bGroupPolicyActive = 0; m_pDynamicEntries = NULL; m_iIdSHEFirst = 0; @@ -108,7 +110,7 @@ PDynamicShellEntry dEntry, dNext; PStaticShellEntry sEntry, sNext; - /* free dynamic shell extension entries */ + /* Free dynamic shell extension entries */ dEntry = m_pDynamicEntries; while (dEntry) { @@ -117,7 +119,8 @@ HeapFree(GetProcessHeap(), 0, dEntry); dEntry = dNext; } - /* free static shell extension entries */ + + /* Free static shell extension entries */ sEntry = m_pStaticEntries; while (sEntry) { @@ -127,6 +130,11 @@ HeapFree(GetProcessHeap(), 0, sEntry); sEntry = sNext; } + + if (m_pidlFolder) + ILFree((_ITEMIDLIST*)m_pidlFolder); + if (m_pDataObj) + m_pDataObj->Release(); } HRESULT WINAPI CDefaultContextMenu::Initialize(const DEFCONTEXTMENU *pdcm) @@ -136,6 +144,25 @@ TRACE("cidl %u\n", pdcm->cidl); if (SUCCEEDED(SHCreateDataObject(pdcm->pidlFolder, pdcm->cidl, pdcm->apidl, NULL, IID_IDataObject, (void**)&pDataObj))) m_pDataObj = pDataObj; + + if (!pdcm->cidl) + { + /* Init pidlFolder only if is background context menu. See IShellExtInit::Initialize */ + if (pdcm->pidlFolder) + m_pidlFolder = ILClone(pdcm->pidlFolder); + else + { + IPersistFolder2 *pf = NULL; + if (SUCCEEDED(pdcm->psf->QueryInterface(IID_IPersistFolder2, (PVOID*)&pf))) + { + if (FAILED(pf->GetCurFolder((_ITEMIDLIST**)&m_pidlFolder))) + ERR("GetCurFolder failed\n"); + pf->Release(); + } + } + TRACE("pidlFolder %p\n", m_pidlFolder); + } + CopyMemory(&m_Dcm, pdcm, sizeof(DEFCONTEXTMENU)); return S_OK; } @@ -362,7 +389,7 @@ return hr; } - hr = shext->Initialize(NULL, m_pDataObj, hKey); + hr = shext->Initialize(m_pidlFolder, m_pDataObj, hKey); shext->Release(); if (hr != S_OK) { @@ -553,18 +580,8 @@ TRACE("disabling paste options\n"); DisablePasteOptions(hMenu); } - /* load extensions from HKCR\* key */ - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, - L"*", - 0, - KEY_READ, - &hKey) == ERROR_SUCCESS) - { - EnumerateDynamicContextHandlerForKey(hKey); - RegCloseKey(hKey); - } - - /* load create new shell extension */ + + /* Load context menu handlers */ if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"Directory\\Background", 0, KEY_READ, &hKey) == ERROR_SUCCESS) { EnumerateDynamicContextHandlerForKey(hKey); Modified: trunk/reactos/dll/win32/shell32/res/rgs/openwithmenu.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/rgs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/res/rgs/openwithmenu.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/res/rgs/openwithmenu.rgs [iso-8859-1] Sun Jan 15 16:45:36 2012 @@ -29,7 +29,7 @@ { NoRemove ContextMenuHandlers { - ForceRemove Open With = s '{09799AFB-AD67-11d1-ABCD-00C04FC30936}' + ForceRemove 'Open With' = s '{09799AFB-AD67-11d1-ABCD-00C04FC30936}' { } }

1 0

[pschweitzer] 54976: [RAPPS] Update FireFox links. Convert CreateCabFile.bat to CreateCabFile.sh
by pschweitzer＠svn.reactos.org 15 Jan '12

15 Jan '12

Author: pschweitzer Date: Sun Jan 15 15:22:28 2012 New Revision: 54976 URL: http://svn.reactos.org/svn/reactos?rev=54976&view=rev Log: [RAPPS] Update FireFox links. Convert CreateCabFile.bat to CreateCabFile.sh Added: trunk/reactos/base/applications/rapps/CreateCabFile.sh (with props) Modified: trunk/reactos/base/applications/rapps/rapps/firefox36.txt trunk/reactos/base/applications/rapps/rapps/firefox5.txt Added: trunk/reactos/base/applications/rapps/CreateCabFile.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/Cr… ============================================================================== --- trunk/reactos/base/applications/rapps/CreateCabFile.sh (added) +++ trunk/reactos/base/applications/rapps/CreateCabFile.sh [iso-8859-1] Sun Jan 15 15:22:28 2012 @@ -1,0 +1,1 @@ +../../../output-MinGW-i386/host-tools/tools/cabman/cabman -M raw -S rappmgr.cab rapps/*.txt Propchange: trunk/reactos/base/applications/rapps/CreateCabFile.sh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/applications/rapps/CreateCabFile.sh ------------------------------------------------------------------------------ svn:executable = * Modified: trunk/reactos/base/applications/rapps/rapps/firefox36.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox36.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox36.txt [iso-8859-1] Sun Jan 15 15:22:28 2012 @@ -2,59 +2,59 @@ [Section] Name = Mozilla Firefox 3.6 -Version = 3.6.24 +Version = 3.6.25 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. -Size = 8.3M +Size = 7.5M Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. -Size = 8.1M +Size = 7.4M URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. -Size = 8.1M +Size = 7.4M URLSite = http://www.mozilla-europe.org/es/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. -Size = 8.1M +Size = 7.6M URLSite = http://www.mozilla-europe.org/fr/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. -Size = 8.1M +Size = 7.4M URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. -Size = 9.0M +Size = 8.2M URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². -Size = 8.5M +Size = 7.8M URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.041b] Description = NajpopulÃ¡rnejÅ¡Ã a jeden z najlepÅ¡Ãch slobodnÃ½ webovÃ½ch prehliadaÄov. -Size = 8.5MB +Size = 7.8MB URLSite = http://www.mozilla-europe.org/sk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². -Size = 8.5M +Size = 7.7M URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… Modified: trunk/reactos/base/applications/rapps/rapps/firefox5.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox5.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox5.txt [iso-8859-1] Sun Jan 15 15:22:28 2012 @@ -1,60 +1,60 @@ ï»¿; UTF-8 [Section] -Name = Mozilla Firefox 8 -Version = 8.0.1 +Name = Mozilla Firefox 9 +Version = 9.0.1 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. -Size = 14.1M +Size = 14.6M Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/8.0.1/win32/en… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-9.0/win… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. -Size = 13.9M +Size = 14.4M URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/8.0.1/win32/de… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-9.0/win… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. -Size = 13.9M +Size = 14.4M URLSite = http://www.mozilla-europe.org/es/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/8.0.1/win32/es… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-9.0/win… [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. -Size = 14.2M +Size = 14.7M URLSite = http://www.mozilla-europe.org/fr/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/8.0.1/win32/fr… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-9.0/win… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. -Size = 13.9M +Size = 14.4M URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/8.0.1/win32/nb… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-9.0/win… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. -Size = 14.8M +Size = 15.3M URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/8.0.1/win32/pl… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-9.0/win… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². -Size = 14.3M +Size = 14.8M URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/8.0.1/win32/ru… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-9.0/win… [Section.041b] Description = NajpopulÃ¡rnejÅ¡Ã a jeden z najlepÅ¡Ãch slobodnÃ½ webovÃ½ch prehliadaÄov. -Size = 14.6MB +Size = 15.1MB URLSite = http://www.mozilla-europe.org/sk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/8.0.1/win32/sk… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-9.0/win… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². -Size = 14.3M +Size = 14.8M URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/8.0.1/win32/uk… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-9.0/win…

1 0

[ion] 54975: Note, none of this code is being used/called yet. [KERNEL32]: Implement BasepSxsCloseHandles, BasepReplaceProcessThreadTokens, BasepIsProcessAllowed, BasepCheckWebBladeHashes, BasepIsI...
by ion＠svn.reactos.org 15 Jan '12

15 Jan '12

Author: ion Date: Sun Jan 15 14:49:49 2012 New Revision: 54975 URL: http://svn.reactos.org/svn/reactos?rev=54975&view=rev Log: Note, none of this code is being used/called yet. [KERNEL32]: Implement BasepSxsCloseHandles, BasepReplaceProcessThreadTokens, BasepIsProcessAllowed, BasepCheckWebBladeHashes, BasepIsImageVersionOk which will be needed for the future CreateProcess re-implementation. These functions partly support SxS, Safer (Authz) and Application Certification features added in XP/2003. We also emulate support for Computer Server, Web Blade Server and Embedded ReactOS. The last function does correct image version checks to prevent invalid binaries from running. [KERNEL32]: Implement BaseUpdateVDMEntry and BaseCheckForVDM using the new CSRSS messages (not implemented on the server-side yet). Stubplement BaseCheckVDM. These will be needed for future VDM-stub-support (primarly so we can run 16-bit installers). [KERNEL32]: Implement BasepFreeAppCompatData, BasepCheckBadapp, and IsShimInfrastructureDisabled (exported as BaseIsAppcompatInfrastructureDisabled). These stub most of the required/exported application compatibility APIs, as long as someone sets DisableAppCompat in \\Registry\\MACHINE\\System\\CurrentControlSet\\Control\\Session Manager\\AppCompatibility. Modified: trunk/reactos/dll/win32/kernel32/client/appcache.c trunk/reactos/dll/win32/kernel32/client/dllmain.c trunk/reactos/dll/win32/kernel32/client/proc.c trunk/reactos/dll/win32/kernel32/client/utils.c trunk/reactos/dll/win32/kernel32/client/vdm.c trunk/reactos/dll/win32/kernel32/include/kernel32.h trunk/reactos/dll/win32/kernel32/kernel32.pspec trunk/reactos/dll/win32/kernel32/kernel32.spec Modified: trunk/reactos/dll/win32/kernel32/client/appcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/appcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/appcache.c [iso-8859-1] Sun Jan 15 14:49:49 2012 @@ -13,17 +13,171 @@ #define NDEBUG #include <debug.h> +/* GLOBALS ********************************************************************/ + +ULONG g_ShimsEnabled; + /* FUNCTIONS ******************************************************************/ -/* - * @unimplemented +BOOLEAN +WINAPI +IsShimInfrastructureDisabled(VOID) +{ + HANDLE KeyHandle; + NTSTATUS Status; + KEY_VALUE_PARTIAL_INFORMATION KeyInfo; + ULONG ResultLength; + UNICODE_STRING OptionKey = RTL_CONSTANT_STRING(L"\\Registry\\MACHINE\\System\\CurrentControlSet\\Control\\SafeBoot\\Option"); + UNICODE_STRING AppCompatKey = RTL_CONSTANT_STRING(L"\\Registry\\MACHINE\\System\\CurrentControlSet\\Control\\Session Manager\\AppCompatibility"); + UNICODE_STRING PolicyKey = RTL_CONSTANT_STRING(L"\\Registry\\MACHINE\\Software\\Policies\\Microsoft\\Windows\\AppCompat"); + UNICODE_STRING OptionValue = RTL_CONSTANT_STRING(L"OptionValue"); + UNICODE_STRING DisableAppCompat = RTL_CONSTANT_STRING(L"DisableAppCompat"); + UNICODE_STRING DisableEngine = RTL_CONSTANT_STRING(L"DisableEngine"); + OBJECT_ATTRIBUTES OptionKeyAttributes = RTL_CONSTANT_OBJECT_ATTRIBUTES(&OptionKey, OBJ_CASE_INSENSITIVE); + OBJECT_ATTRIBUTES AppCompatKeyAttributes = RTL_CONSTANT_OBJECT_ATTRIBUTES(&AppCompatKey, OBJ_CASE_INSENSITIVE); + OBJECT_ATTRIBUTES PolicyKeyAttributes = RTL_CONSTANT_OBJECT_ATTRIBUTES(&PolicyKey, OBJ_CASE_INSENSITIVE); + + /* + * This is a TROOLEAN, -1 means we haven't yet figured it out. + * 0 means shims are enabled, and 1 means shims are disabled! + */ + if (g_ShimsEnabled == -1) + { + /* Open the safe mode key */ + Status = NtOpenKey(&KeyHandle, 1, &OptionKeyAttributes); + if (NT_SUCCESS(Status)) + { + /* Check if this is safemode */ + Status = NtQueryValueKey(KeyHandle, + &OptionValue, + KeyValuePartialInformation, + &KeyInfo, + sizeof(KeyInfo), + &ResultLength); + NtClose(KeyHandle); + if ((NT_SUCCESS(Status)) && + (KeyInfo.Type == REG_DWORD) && + (KeyInfo.DataLength == sizeof(ULONG)) && + (KeyInfo.Data[0] == TRUE)) + { + /* It is, so disable shims! */ + g_ShimsEnabled = TRUE; + } + else + { + /* Open the app compatibility engine settings key */ + Status = NtOpenKey(&KeyHandle, 1, &AppCompatKeyAttributes); + if (NT_SUCCESS(Status)) + { + /* Check if the app compat engine is turned off */ + Status = NtQueryValueKey(KeyHandle, + &DisableAppCompat, + KeyValuePartialInformation, + &KeyInfo, + sizeof(KeyInfo), + &ResultLength); + NtClose(KeyHandle); + if ((NT_SUCCESS(Status)) && + (KeyInfo.Type == REG_DWORD) && + (KeyInfo.DataLength == sizeof(ULONG)) && + (KeyInfo.Data[0] == TRUE)) + { + /* It is, so disable shims! */ + g_ShimsEnabled = TRUE; + } + else + { + /* Finally, open the app compatibility policy key */ + Status = NtOpenKey(&KeyHandle, 1, &PolicyKeyAttributes); + if (NT_SUCCESS(Status)) + { + /* Check if the system policy disables app compat */ + Status = NtQueryValueKey(KeyHandle, + &DisableEngine, + KeyValuePartialInformation, + &KeyInfo, + sizeof(KeyInfo), + &ResultLength), + NtClose(KeyHandle); + if ((NT_SUCCESS(Status)) && + (KeyInfo.Type == REG_DWORD) && + (KeyInfo.DataLength == sizeof(ULONG)) && + (KeyInfo.Data[0] == TRUE)) + { + /* It does, so disable shims! */ + g_ShimsEnabled = TRUE; + } + else + { + /* No keys are set, so enable shims! */ + g_ShimsEnabled = FALSE; + } + } + } + } + } + } + } + + /* Return if shims are disabled or not ("Enabled == 1" means disabled!) */ + return g_ShimsEnabled ? TRUE : FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +BaseCheckAppcompatCache(IN PWCHAR ApplicationName, + IN HANDLE FileHandle, + IN PWCHAR Environment, + OUT PULONG Reason) +{ + UNIMPLEMENTED; + if (Reason) *Reason = 0; + return TRUE; +} + +/* + * @implemented */ NTSTATUS WINAPI -BasepCheckBadapp(int a, wchar_t *Str, int b, int c, int d, int e, int f, int g, int h) -{ - STUB; - return STATUS_NOT_IMPLEMENTED; +BasepCheckBadapp(IN HANDLE FileHandle, + IN PWCHAR ApplicationName, + IN PWCHAR Environment, + IN USHORT ExeType, + IN PVOID* SdbQueryAppCompatData, + IN PULONG SdbQueryAppCompatDataSize, + IN PVOID* SxsData, + IN PULONG SxsDataSize, + OUT PULONG FusionFlags) +{ + NTSTATUS Status = STATUS_SUCCESS; + ULONG Reason = 0; + + /* Is shimming enabled by group policy? */ + if (IsShimInfrastructureDisabled()) + { + /* Nothing to worry about */ + Status = STATUS_SUCCESS; + } + else + { + /* It is, check if we know about this app */ + if (!BaseCheckAppcompatCache(ApplicationName, + FileHandle, + Environment, + &Reason)) + { + /* We don't support this yet */ + UNIMPLEMENTED; + Status = STATUS_ACCESS_DENIED; + } + } + + /* Return caller the status */ + return Status; } /* @@ -47,39 +201,16 @@ } /* - * @unimplemented - */ -VOID -WINAPI -BasepFreeAppCompatData(PVOID A, PVOID B) -{ - STUB; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -BaseIsAppcompatInfrastructureDisabled(VOID) -{ - STUB; - return TRUE; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -BaseCheckAppcompatCache(ULONG Unknown1, - ULONG Unknown2, - ULONG Unknown3, - PULONG Unknown4) -{ - STUB; - if (Unknown4) *Unknown4 = 0; - return TRUE; + * @implemented + */ +VOID +WINAPI +BasepFreeAppCompatData(IN PVOID AppCompatData, + IN PVOID AppCompatSxsData) +{ + /* Free the input pointers if present */ + if (AppCompatData) RtlFreeHeap(RtlGetProcessHeap(), 0, AppCompatData); + if (AppCompatSxsData) RtlFreeHeap(RtlGetProcessHeap(), 0, AppCompatSxsData); } /* @@ -94,6 +225,9 @@ STUB; } +/* + * @unimplemented + */ NTSTATUS WINAPI BaseCleanupAppcompatCache(VOID) @@ -102,6 +236,9 @@ return STATUS_NOT_IMPLEMENTED; } +/* + * @unimplemented + */ NTSTATUS WINAPI BaseCleanupAppcompatCacheSupport(PVOID pUnknown) @@ -110,6 +247,9 @@ return STATUS_NOT_IMPLEMENTED; } +/* + * @unimplemented + */ BOOL WINAPI BaseInitAppcompatCache(VOID) @@ -118,6 +258,9 @@ return FALSE; } +/* + * @unimplemented + */ BOOL WINAPI BaseInitAppcompatCacheSupport(VOID) @@ -126,6 +269,9 @@ return FALSE; } +/* + * @unimplemented + */ PVOID WINAPI GetComPlusPackageInstallStatus(VOID) @@ -134,15 +280,18 @@ return NULL; } +/* + * @unimplemented + */ BOOL WINAPI SetComPlusPackageInstallStatus(LPVOID lpInfo) -{ +{ STUB; return FALSE; } - - /* + +/* * @unimplemented */ VOID Modified: trunk/reactos/dll/win32/kernel32/client/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/dllmain.c [iso-8859-1] Sun Jan 15 14:49:49 2012 @@ -303,6 +303,10 @@ return FALSE; } + /* Initialize application certification globals */ + InitializeListHead(&BasepAppCertDllsList); + RtlInitializeCriticalSection(&gcsAppCert); + /* Insert more dll attach stuff here! */ DllInitialized = TRUE; DPRINT("Initialization complete\n"); Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Sun Jan 15 14:49:49 2012 @@ -42,7 +42,406 @@ CALLBACK ConsoleControlDispatcher(DWORD CodeAndFlag); +BOOLEAN g_AppCertInitialized; +BOOLEAN g_HaveAppCerts; +LIST_ENTRY BasepAppCertDllsList; +RTL_CRITICAL_SECTION gcsAppCert; +PBASEP_APPCERT_EMBEDDED_FUNC fEmbeddedCertFunc; +NTSTATUS g_AppCertStatus; + +RTL_QUERY_REGISTRY_TABLE BasepAppCertTable[2] = +{ + { + BasepConfigureAppCertDlls, + 1, + L"AppCertDlls", + &BasepAppCertDllsList, + 0, + NULL, + 0 + }, + {} +}; + +PSAFER_REPLACE_PROCESS_THREAD_TOKENS g_SaferReplaceProcessThreadTokens; +HMODULE gSaferHandle = (HMODULE)-1; + /* FUNCTIONS ****************************************************************/ + +VOID +WINAPI +StuffStdHandle(IN HANDLE ProcessHandle, + IN HANDLE StandardHandle, + IN PHANDLE Address) +{ + NTSTATUS Status; + HANDLE DuplicatedHandle; + SIZE_T Dummy; + + /* Duplicate the handle */ + Status = NtDuplicateObject(NtCurrentProcess(), + StandardHandle, + ProcessHandle, + &DuplicatedHandle, + DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES, + 0, + 0); + if (NT_SUCCESS(Status)) + { + /* Write it */ + NtWriteVirtualMemory(ProcessHandle, + Address, + &DuplicatedHandle, + sizeof(HANDLE), + &Dummy); + } +} + +BOOLEAN +WINAPI +BuildSubSysCommandLine(IN LPWSTR SubsystemName, + IN LPWSTR ApplicationName, + IN LPWSTR CommandLine, + OUT PUNICODE_STRING SubsysCommandLine) +{ + UNICODE_STRING CommandLineString, ApplicationNameString; + PWCHAR Buffer; + ULONG Length; + + /* Convert to unicode strings */ + RtlInitUnicodeString(&CommandLineString, ApplicationName); + RtlInitUnicodeString(&ApplicationNameString, CommandLine); + + /* Allocate buffer for the output string */ + Length = CommandLineString.MaximumLength + ApplicationNameString.MaximumLength + 32; + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length); + RtlInitEmptyUnicodeString(SubsysCommandLine, Buffer, Length); + if (!Buffer) + { + /* Fail, no memory */ + BaseSetLastNTError(STATUS_NO_MEMORY); + return FALSE; + } + + /* Build the final subsystem command line */ + RtlAppendUnicodeToString(SubsysCommandLine, SubsystemName); + RtlAppendUnicodeStringToString(SubsysCommandLine, &CommandLineString); + RtlAppendUnicodeToString(SubsysCommandLine, L" /C "); + RtlAppendUnicodeStringToString(SubsysCommandLine, &ApplicationNameString); + return TRUE; +} + +BOOLEAN +WINAPI +BasepIsImageVersionOk(IN ULONG ImageMajorVersion, + IN ULONG ImageMinorVersion) +{ + /* Accept images for NT 3.1 or higher, as long as they're not newer than us */ + return ((ImageMajorVersion >= 3) && + ((ImageMajorVersion != 3) || + (ImageMinorVersion >= 10)) && + (ImageMajorVersion <= SharedUserData->NtMajorVersion) && + ((ImageMajorVersion != SharedUserData->NtMajorVersion) || + (ImageMinorVersion <= SharedUserData->NtMinorVersion))); +} + +NTSTATUS +WINAPI +BasepCheckWebBladeHashes(IN HANDLE FileHandle) +{ + NTSTATUS Status; + CHAR Hash[16]; + + /* Get all the MD5 hashes */ + Status = RtlComputeImportTableHash(FileHandle, Hash, 1); + if (!NT_SUCCESS(Status)) return Status; + + /* Depending on which suite this is, run a bsearch and block the appropriate ones */ + if (SharedUserData->SuiteMask & VER_SUITE_COMPUTE_SERVER) + { + DPRINT1("Egad! This is a ReactOS Compute Server and we should prevent you from using certain APIs...but we won't."); + } + else if (SharedUserData->SuiteMask & VER_SUITE_STORAGE_SERVER) + { + DPRINT1("Gasp! This is a ReactOS Storage Server and we should prevent you from using certain APIs...but we won't."); + } + else if (SharedUserData->SuiteMask & VER_SUITE_BLADE) + { + DPRINT1("Golly! This is a ReactOS Web Blade Server and we should prevent you from using certain APIs...but we won't."); + } + + /* Actually, fuck it, don't block anything, we're open source */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +BasepSaveAppCertRegistryValue(IN PLIST_ENTRY List, + IN PWCHAR ComponentName, + IN PWCHAR DllName) +{ + /* Pretty much the only thing this key is used for, is malware */ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +BasepConfigureAppCertDlls(IN PWSTR ValueName, + IN ULONG ValueType, + IN PVOID ValueData, + IN ULONG ValueLength, + IN PVOID Context, + IN PVOID EntryContext) +{ + /* Add this to the certification list */ + return BasepSaveAppCertRegistryValue(Context, ValueName, ValueData); +} + +NTSTATUS +WINAPI +BasepIsProcessAllowed(IN PCHAR ApplicationName) +{ + NTSTATUS Status; + PWCHAR Buffer; + UINT Length; + HMODULE TrustLibrary; + PBASEP_APPCERT_ENTRY Entry; + ULONG CertFlag; + PLIST_ENTRY NextEntry; + HANDLE KeyHandle; + UNICODE_STRING CertKey = RTL_CONSTANT_STRING(L"\\Registry\\MACHINE\\System\\CurrentControlSet\\Control\\Session Manager\\AppCertDlls"); + OBJECT_ATTRIBUTES KeyAttributes = RTL_CONSTANT_OBJECT_ATTRIBUTES(&CertKey, OBJ_CASE_INSENSITIVE); + + /* Try to initialize the certification subsystem */ + while (!g_AppCertInitialized) + { + /* Defaults */ + Status = STATUS_SUCCESS; + Buffer = NULL; + + /* Acquire the lock while initializing and see if we lost a race */ + RtlEnterCriticalSection(&gcsAppCert); + if (g_AppCertInitialized) break; + + /* On embedded, there is a special DLL */ + if (SharedUserData->SuiteMask & VER_SUITE_EMBEDDEDNT) + { + /* Allocate a buffer for the name */ + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + MAX_PATH * sizeof(WCHAR) + + sizeof(UNICODE_NULL)); + if (!Buffer) + { + /* Fail if no memory */ + Status = STATUS_NO_MEMORY; + } + else + { + /* Now get the system32 directory in our buffer, make sure it fits */ + Length = GetSystemDirectoryW(Buffer, MAX_PATH - sizeof("EmbdTrst.DLL")); + if ((Length) && (Length <= MAX_PATH - sizeof("EmbdTrst.DLL"))) + { + /* Add a slash if needed, and add the embedded cert DLL name */ + if (Buffer[Length - 1] != '\\') Buffer[Length++] = '\\'; + RtlCopyMemory(&Buffer[Length], + L"EmbdTrst.DLL", + sizeof(L"EmbdTrst.DLL")); + + /* Try to load it */ + TrustLibrary = LoadLibraryW(Buffer); + if (TrustLibrary) + { + /* And extract the special function out of it */ + fEmbeddedCertFunc = (PVOID)GetProcAddress(TrustLibrary, + "ImageOkToRunOnEmbeddedNT"); + } + } + + /* If we didn't get this far, set a failure code */ + if (!fEmbeddedCertFunc) Status = STATUS_UNSUCCESSFUL; + } + } + else + { + /* Other systems have a registry entry for this */ + Status = NtOpenKey(&KeyHandle, KEY_READ, &KeyAttributes); + if (NT_SUCCESS(Status)) + { + /* Close it, we'll query it through Rtl */ + NtClose(KeyHandle); + + /* Do the query, which will call a special callback */ + Status = RtlQueryRegistryValues(2, + L"Session Manager", + BasepAppCertTable, + 0, + 0); + if (Status == 0xC0000034) Status = STATUS_SUCCESS; + } + } + + /* Free any buffer if we had one */ + if (Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + + /* Check for errors, or a missing embedded/custom certification DLL */ + if (!NT_SUCCESS(Status) || + (!(fEmbeddedCertFunc) && (IsListEmpty(&BasepAppCertDllsList)))) + { + /* The subsystem is not active on this machine, so give up */ + g_HaveAppCerts = FALSE; + g_AppCertStatus = Status; + } + else + { + /* We have certification DLLs active, remember this */ + g_HaveAppCerts = TRUE; + } + + /* We are done the initialization phase, release the lock */ + g_AppCertInitialized = TRUE; + RtlLeaveCriticalSection(&gcsAppCert); + } + + /* If there's no certification DLLs present, return the failure code */ + if (!g_HaveAppCerts) return g_AppCertStatus; + + /* Otherwise, assume success and make sure we have *something* */ + ASSERT(fEmbeddedCertFunc || !IsListEmpty(&BasepAppCertDllsList)); + Status = STATUS_SUCCESS; + + /* If the something is an embedded certification DLL, call it and return */ + if (fEmbeddedCertFunc) return fEmbeddedCertFunc(ApplicationName); + + /* Otherwise we have custom certification DLLs, parse them */ + NextEntry = BasepAppCertDllsList.Flink; + CertFlag = 2; + while (NextEntry != &BasepAppCertDllsList) + { + /* Make sure the entry has a callback */ + Entry = CONTAINING_RECORD(NextEntry, BASEP_APPCERT_ENTRY, Entry); + ASSERT(Entry->fPluginCertFunc != NULL); + + /* Call it and check if it failed */ + Status = Entry->fPluginCertFunc(ApplicationName, 1); + if (!NT_SUCCESS(Status)) CertFlag = 3; + + /* Move on */ + NextEntry = NextEntry->Flink; + } + + /* Now loop them again */ + NextEntry = BasepAppCertDllsList.Flink; + while (NextEntry != &BasepAppCertDllsList) + { + /* Make sure the entry has a callback */ + Entry = CONTAINING_RECORD(NextEntry, BASEP_APPCERT_ENTRY, Entry); + ASSERT(Entry->fPluginCertFunc != NULL); + + /* Call it, this time with the flag from the loop above */ + Status = Entry->fPluginCertFunc(ApplicationName, CertFlag); + } + + /* All done, return the status */ + return Status; +} + +NTSTATUS +WINAPI +BasepReplaceProcessThreadTokens(IN HANDLE TokenHandle, + IN HANDLE ProcessHandle, + IN HANDLE ThreadHandle) +{ + NTSTATUS Status; + ANSI_STRING SaferiReplaceProcessThreadTokens = RTL_CONSTANT_STRING("SaferiReplaceProcessThreadTokens"); + + /* Enter the application certification lock */ + RtlEnterCriticalSection(&gcsAppCert); + + /* Check if we already know the function */ + if (g_SaferReplaceProcessThreadTokens) + { + /* Call it */ + Status = g_SaferReplaceProcessThreadTokens(TokenHandle, + ProcessHandle, + ThreadHandle) ? + STATUS_SUCCESS : + STATUS_UNSUCCESSFUL; + } + else + { + /* Check if the app certification DLL isn't loaded */ + if (!(gSaferHandle) || + (gSaferHandle == (HMODULE)-1) || + (gSaferHandle == (HMODULE)-2)) + { + /* Then we can't call the function */ + Status = STATUS_ENTRYPOINT_NOT_FOUND; + } + else + { + /* We have the DLL, find the address of the Safer function */ + Status = LdrGetProcedureAddress(gSaferHandle, + &SaferiReplaceProcessThreadTokens, + 0, + (PVOID*)&g_SaferReplaceProcessThreadTokens); + if (NT_SUCCESS(Status)) + { + /* Found it, now call it */ + Status = g_SaferReplaceProcessThreadTokens(TokenHandle, + ProcessHandle, + ThreadHandle) ? + STATUS_SUCCESS : + STATUS_UNSUCCESSFUL; + } + else + { + /* We couldn't find it, so this must be an unsupported DLL */ + LdrUnloadDll(gSaferHandle); + gSaferHandle = NULL; + Status = STATUS_ENTRYPOINT_NOT_FOUND; + } + } + } + + /* Release the lock and return the result */ + RtlLeaveCriticalSection(&gcsAppCert); + return Status; +} + +VOID +WINAPI +BasepSxsCloseHandles(IN PBASE_MSG_SXS_HANDLES Handles) +{ + NTSTATUS Status; + + /* Sanity checks */ + ASSERT(Handles != NULL); + ASSERT(Handles->Process == NULL || Handles->Process == NtCurrentProcess()); + + /* Close the file handle */ + if (Handles->File) + { + Status = NtClose(Handles->File); + ASSERT(NT_SUCCESS(Status)); + } + + /* Close the section handle */ + if (Handles->Section) + { + Status = NtClose(Handles->Section); + ASSERT(NT_SUCCESS(Status)); + } + + /* Unmap the section view */ + if (Handles->ViewBase.QuadPart) + { + Status = NtUnmapViewOfSection(NtCurrentProcess(), + (PVOID)Handles->ViewBase.LowPart); + ASSERT(NT_SUCCESS(Status)); + } +} static LONG BaseExceptionFilter(EXCEPTION_POINTERS *ExceptionInfo) @@ -608,7 +1007,7 @@ { ProcessParameters->ConsoleFlags = 1; } - + /* See if the first 1MB should be reserved */ if ((ULONG_PTR)ApplicationPathName & 1) { Modified: trunk/reactos/dll/win32/kernel32/client/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] Sun Jan 15 14:49:49 2012 @@ -131,7 +131,7 @@ } } - + if (NT_SUCCESS(Status)) BaseNamedObjectDirectory = BnoHandle; Quickie: @@ -812,7 +812,7 @@ BasepUnicodeStringTo8BitString = RtlUnicodeStringToAnsiString; BasepUnicodeStringTo8BitSize = BasepUnicodeStringToAnsiSize; Basep8BitStringToUnicodeSize = BasepAnsiStringToUnicodeSize; - + /* FIXME: Old, deprecated way */ bIsFileApiAnsi = TRUE; } @@ -895,15 +895,39 @@ /* * @unimplemented */ -BOOL -WINAPI -BasepCheckWinSaferRestrictions(IN DWORD Unknown1, - IN DWORD Unknown2, - IN DWORD Unknown3, - IN DWORD Unknown4, - IN DWORD Unknown5, - IN DWORD Unknown6) -{ - STUB; - return FALSE; -} +NTSTATUS +WINAPI +BasepCheckWinSaferRestrictions(IN HANDLE UserToken, + IN LPWSTR ApplicationName, + IN HANDLE FileHandle, + OUT PBOOLEAN InJob, + OUT PHANDLE NewToken, + OUT PHANDLE JobHandle) +{ + NTSTATUS Status; + + /* Validate that there's a name */ + if ((ApplicationName) && *(ApplicationName)) + { + /* Validate that the required output parameters are there */ + if ((InJob) && (NewToken) && (JobHandle)) + { + /* Do the work (one day...) */ + UNIMPLEMENTED; + Status = STATUS_SUCCESS; + } + else + { + /* Act as if SEH hit this */ + Status = STATUS_ACCESS_VIOLATION; + } + } + else + { + /* Input is invalid */ + Status = STATUS_INVALID_PARAMETER; + } + + /* Return the status */ + return Status; +} Modified: trunk/reactos/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/vdm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/vdm.c [iso-8859-1] Sun Jan 15 14:49:49 2012 @@ -65,22 +65,122 @@ BOOL WINAPI -BaseCheckForVDM(IN HANDLE hProcess, - OUT LPDWORD lpExitCode) +BaseCheckVDM(IN ULONG BinaryType, + IN PCWCH ApplicationName, + IN PCWCH CommandLine, + IN PCWCH CurrentDirectory, + IN PANSI_STRING AnsiEnvironment, + IN PCSR_API_MESSAGE Msg, + IN OUT PULONG iTask, + IN DWORD CreationFlags, + IN LPSTARTUPINFOW StartupInfo) +{ + /* This is not supported */ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +WINAPI +BaseUpdateVDMEntry(IN ULONG UpdateIndex, + IN OUT PHANDLE WaitHandle, + IN ULONG IndexInfo, + IN ULONG BinaryType) +{ + NTSTATUS Status; + CSR_API_MESSAGE Msg; + ULONG CsrRequest = MAKE_CSR_API(UPDATE_VDM_ENTRY, CSR_CONSOLE); + + /* Check what update is being sent */ + switch (UpdateIndex) + { + /* VDM is being undone */ + case VdmEntryUndo: + + /* Tell the server how far we had gotten along */ + Msg.Data.UpdateVdmEntry.iTask = (ULONG)*WaitHandle; + Msg.Data.UpdateVdmEntry.VDMCreationState = IndexInfo; + break; + + /* VDM is ready with a new process handle */ + case VdmEntryUpdateProcess: + + /* Send it the process handle */ + Msg.Data.UpdateVdmEntry.VDMProcessHandle = *WaitHandle; + Msg.Data.UpdateVdmEntry.iTask = IndexInfo; + break; + } + + /* Also check what kind of binary this is for the console handle */ + if (BinaryType == BINARY_TYPE_WOW) + { + /* Magic value for 16-bit apps */ + Msg.Data.UpdateVdmEntry.ConsoleHandle = (HANDLE)-1; + } + else if (Msg.Data.UpdateVdmEntry.iTask) + { + /* No handle for true VDM */ + Msg.Data.UpdateVdmEntry.ConsoleHandle = 0; + } + else + { + /* Otherwise, send the regular consoel handle */ + Msg.Data.UpdateVdmEntry.ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + } + + /* Finally write the index and binary type */ + Msg.Data.UpdateVdmEntry.EntryIndex = UpdateIndex; + Msg.Data.UpdateVdmEntry.BinaryType = BinaryType; + + /* Send the message to CSRSS */ + Status = CsrClientCallServer(&Msg, NULL, CsrRequest, sizeof(Msg)); + if (!(NT_SUCCESS(Status)) || !(NT_SUCCESS(Msg.Status))) + { + /* Handle failure */ + BaseSetLastNTError(Msg.Status); + return FALSE; + } + + /* If this was an update, CSRSS returns a new wait handle */ + if (UpdateIndex == VdmEntryUpdateProcess) + { + /* Return it to the caller */ + *WaitHandle = Msg.Data.UpdateVdmEntry.WaitObjectForParent; + } + + /* We made it */ + return TRUE; +} + +BOOL +WINAPI +BaseCheckForVDM(IN HANDLE ProcessHandle, + OUT LPDWORD ExitCode) { NTSTATUS Status; EVENT_BASIC_INFORMATION EventBasicInfo; + CSR_API_MESSAGE Msg; + ULONG CsrRequest = MAKE_CSR_API(GET_VDM_EXIT_CODE, CSR_CONSOLE); /* It's VDM if the process is actually a wait handle (an event) */ - Status = NtQueryEvent(hProcess, + Status = NtQueryEvent(ProcessHandle, EventBasicInformation, &EventBasicInfo, sizeof(EventBasicInfo), NULL); if (!NT_SUCCESS(Status)) return FALSE; - /* FIXME: Send a message to csrss */ - return FALSE; + /* Setup the input parameters */ + Msg.Data.GetVdmExitCode.ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + Msg.Data.GetVdmExitCode.hParent = ProcessHandle; + + /* Call CSRSS */ + Status = CsrClientCallServer(&Msg, NULL, CsrRequest, sizeof(Msg)); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Get the exit code from the reply */ + *ExitCode = Msg.Data.GetVdmExitCode.ExitCode; + return TRUE; } BOOL @@ -97,7 +197,7 @@ /* Clear the buffer in case we fail */ CmdLineString->Buffer = 0; - + /* Always return the same size */ *VdmSize = 0x1000000; @@ -109,7 +209,7 @@ SetLastError(ERROR_INVALID_NAME); return FALSE; } - + /* Check if this is VDM with a DOS Sequence ID */ if (DosSeqId) { @@ -132,7 +232,7 @@ (BinaryType == 0x10) ? L" " : L"-w", (BinaryType == 0x40) ? 's' : ' '); } - + /* Create the actual string */ return RtlCreateUnicodeString(CmdLineString, CommandLine); } @@ -147,13 +247,13 @@ /* Start by assuming unknown type */ NameType = 1; - + /* Loop all the environment names */ for (i = 0; i < (sizeof(BasepEnvNameType) / sizeof(ENV_INFO)); i++) { /* Get this entry */ EnvInfo = &BasepEnvNameType[i]; - + /* Check if it matches the name */ if ((EnvInfo->NameLength == NameLength) && !(_wcsnicmp(EnvInfo->Name, Name, NameLength))) @@ -163,7 +263,7 @@ break; } } - + /* Return what we found, or unknown if nothing */ return NameType; } @@ -174,10 +274,10 @@ IN PUNICODE_STRING UnicodeEnv) { ULONG Dummy = 0; - + /* Clear the ASCII buffer since Rtl creates this for us */ if (AnsiEnv->Buffer) RtlFreeAnsiString(AnsiEnv); - + /* The Unicode buffer is build by hand, though */ if (UnicodeEnv->Buffer) { @@ -231,7 +331,7 @@ SetLastError(ERROR_BAD_ENVIRONMENT); goto Quickie; } - + /* Count how much space the whole environment takes */ p = Environment; while ((*p++ != UNICODE_NULL) && (*p != UNICODE_NULL)) EnvironmentSize++; @@ -251,7 +351,7 @@ NewEnvironment = NULL; goto Quickie; } - + /* Begin parsing the new environment */ p = NewEnvironment; @@ -259,12 +359,12 @@ /* Terminate it */ *p++ = UNICODE_NULL; - + /* Initialize the unicode string to hold it */ EnvironmentSize = (p - NewEnvironment) * sizeof(WCHAR); RtlInitEmptyUnicodeString(UnicodeEnv, NewEnvironment, EnvironmentSize); UnicodeEnv->Length = EnvironmentSize; - + /* Create the ASCII version of it */ Status = RtlUnicodeStringToAnsiString(AnsiEnv, UnicodeEnv, TRUE); if (!NT_SUCCESS(Status)) @@ -282,14 +382,14 @@ Quickie: /* Cleanup path starts here, start by destroying the envrionment copy */ if (!(lpEnvironment) && (Environment)) RtlDestroyEnvironment(Environment); - + /* See if we are here due to failure */ if (NewEnvironment) { /* Initialize the paths to be empty */ RtlInitEmptyUnicodeString(UnicodeEnv, NULL, 0); RtlInitEmptyAnsiString(AnsiEnv, NULL, 0); - + /* Free the environment copy */ RegionSize = 0; Status = NtFreeVirtualMemory(NtCurrentProcess(), @@ -298,7 +398,7 @@ MEM_RELEASE); ASSERT(NT_SUCCESS(Status)); } - + /* Return the result */ return Result; } Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Sun Jan 15 14:49:49 2012 @@ -68,6 +68,42 @@ #define HANDLE_CREATE_NEW_CONSOLE (HANDLE)-3 #define HANDLE_CREATE_NO_WINDOW (HANDLE)-4 +// +// This stuff maybe should go in a vdm.h? +// +typedef enum _VDM_ENTRY_CODE +{ + VdmEntryUndo, + VdmEntryUpdateProcess, + VdmEntryUpdateControlCHandler +} VDM_ENTRY_CODE; + +// +// Undo States +// +#define VDM_UNDO_PARTIAL 0x01 +#define VDM_UNDO_FULL 0x02 +#define VDM_UNDO_REUSE 0x04 +#define VDM_UNDO_COMPLETED 0x08 + +// +// Binary Types to share with VDM +// +#define BINARY_TYPE_EXE 0x01 +#define BINARY_TYPE_COM 0x02 +#define BINARY_TYPE_PIF 0x03 +#define BINARY_TYPE_DOS 0x10 +#define BINARY_TYPE_SEPARATE_WOW 0x20 +#define BINARY_TYPE_WOW 0x40 +#define BINARY_TYPE_WOW_EX 0x80 + +// +// VDM States +// +#define VDM_NOT_LOADED 0x01 +#define VDM_NOT_READY 0x02 +#define VDM_READY 0x04 + /* Undocumented CreateProcess flag */ #define STARTF_SHELLPRIVATE 0x400 @@ -299,6 +335,64 @@ IN PVOID Environment ); +LPWSTR +WINAPI +BaseComputeProcessExePath( + IN LPWSTR FullPath +); + +ULONG +WINAPI +BaseIsDosApplication( + IN PUNICODE_STRING PathName, + IN NTSTATUS Status +); + +NTSTATUS +WINAPI +BasepCheckBadapp( + IN HANDLE FileHandle, + IN PWCHAR ApplicationName, + IN PWCHAR Environment, + IN USHORT ExeType, + IN PVOID* SdbQueryAppCompatData, + IN PULONG SdbQueryAppCompatDataSize, + IN PVOID* SxsData, + IN PULONG SxsDataSize, + OUT PULONG FusionFlags +); + +BOOLEAN +WINAPI +IsShimInfrastructureDisabled( + VOID +); + +BOOL +NTAPI +BaseDestroyVDMEnvironment( + IN PANSI_STRING AnsiEnv, + IN PUNICODE_STRING UnicodeEnv +); + +BOOL +WINAPI +BaseGetVdmConfigInfo( + IN LPCWSTR Reserved, + IN ULONG DosSeqId, + IN ULONG BinaryType, + IN PUNICODE_STRING CmdLineString, + OUT PULONG VdmSize +); + +BOOL +NTAPI +BaseCreateVDMEnvironment( + IN PWCHAR lpEnvironment, + IN PANSI_STRING AnsiEnv, + IN PUNICODE_STRING UnicodeEnv +); + VOID WINAPI InitCommandLines(VOID); @@ -323,7 +417,57 @@ IN PVOID Context, OUT BOOLEAN *StopEnumeration); -VOID -WINAPI -BaseMarkFileForDelete(IN HANDLE FileHandle, - IN ULONG FileAttributes); +typedef NTSTATUS +(NTAPI *PBASEP_APPCERT_PLUGIN_FUNC)( + IN PCHAR ApplicationName, + IN ULONG CertFlag +); + +typedef NTSTATUS +(NTAPI *PBASEP_APPCERT_EMBEDDED_FUNC)( + IN PCHAR ApplicationName +); + +typedef NTSTATUS +(NTAPI *PSAFER_REPLACE_PROCESS_THREAD_TOKENS)( + IN HANDLE Token, + IN HANDLE Process, + IN HANDLE Thread +); + +typedef struct _BASEP_APPCERT_ENTRY +{ + LIST_ENTRY Entry; + UNICODE_STRING Name; + PBASEP_APPCERT_PLUGIN_FUNC fPluginCertFunc; +} BASEP_APPCERT_ENTRY, *PBASEP_APPCERT_ENTRY; + +typedef struct _BASE_MSG_SXS_HANDLES +{ + HANDLE File; + HANDLE Process; + HANDLE Section; + LARGE_INTEGER ViewBase; +} BASE_MSG_SXS_HANDLES, *PBASE_MSG_SXS_HANDLES; + +NTSTATUS +NTAPI +BasepConfigureAppCertDlls( + IN PWSTR ValueName, + IN ULONG ValueType, + IN PVOID ValueData, + IN ULONG ValueLength, + IN PVOID Context, + IN PVOID EntryContext +); + +extern LIST_ENTRY BasepAppCertDllsList; +extern RTL_CRITICAL_SECTION gcsAppCert; + +VOID +WINAPI +BaseMarkFileForDelete( + IN HANDLE FileHandle, + IN ULONG FileAttributes +); + Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Sun Jan 15 14:49:49 2012 @@ -23,7 +23,7 @@ @ stdcall BaseDumpAppcompatCache() @ stdcall BaseFlushAppcompatCache() @ stdcall BaseInitAppcompatCacheSupport() -@ stdcall BaseIsAppcompatInfrastructureDisabled() +@ stdcall BaseIsAppcompatInfrastructureDisabled() IsShimInfrastructureDisabled @ stdcall BaseProcessInitPostImport() ; missing in Win 7 @ stdcall BaseQueryModuleData(str str ptr ptr ptr) ;check @ stdcall BaseUpdateAppcompatCache(long long long) Modified: trunk/reactos/dll/win32/kernel32/kernel32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] Sun Jan 15 14:49:49 2012 @@ -23,7 +23,7 @@ @ stdcall BaseDumpAppcompatCache() @ stdcall BaseFlushAppcompatCache() @ stdcall BaseInitAppcompatCacheSupport() -@ stdcall BaseIsAppcompatInfrastructureDisabled() +@ stdcall BaseIsAppcompatInfrastructureDisabled() IsShimInfrastructureDisabled @ stdcall BaseProcessInitPostImport() ; missing in Win 7 @ stdcall BaseQueryModuleData(str str ptr ptr ptr) ;check @ stdcall BaseUpdateAppcompatCache(long long long)

1 0

[rharabien] 54974: [SHELL32] - Add New menu to context menu handlers. Fixes regression introduced by r54959. - Remove unwanted files See issue #6823 for more details.
by rharabien＠svn.reactos.org 15 Jan '12

15 Jan '12

Author: rharabien Date: Sun Jan 15 14:25:11 2012 New Revision: 54974 URL: http://svn.reactos.org/svn/reactos?rev=54974&view=rev Log: [SHELL32] - Add New menu to context menu handlers. Fixes regression introduced by r54959. - Remove unwanted files See issue #6823 for more details. Removed: trunk/reactos/dll/win32/shell32/res/Copy of rgs/ Modified: trunk/reactos/dll/win32/shell32/res/rgs/newmenu.rgs Modified: trunk/reactos/dll/win32/shell32/res/rgs/newmenu.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/rgs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/res/rgs/newmenu.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/res/rgs/newmenu.rgs [iso-8859-1] Sun Jan 15 14:25:11 2012 @@ -11,4 +11,19 @@ } } } + NoRemove Directory + { + NoRemove Background + { + NoRemove shellex + { + NoRemove ContextMenuHandlers + { + ForceRemove New = s '{D969A300-E7FF-11d0-A93B-00A0C90F2719}' + { + } + } + } + } + } }

1 0

[rharabien] 54973: [SHELL32] - Revert r54967. Test bots should already work.
by rharabien＠svn.reactos.org 15 Jan '12

15 Jan '12

Author: rharabien Date: Sun Jan 15 13:38:59 2012 New Revision: 54973 URL: http://svn.reactos.org/svn/reactos?rev=54973&view=rev Log: [SHELL32] - Revert r54967. Test bots should already work. Modified: trunk/reactos/dll/win32/shell32/control.cpp Modified: trunk/reactos/dll/win32/shell32/control.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/control.… ============================================================================== --- trunk/reactos/dll/win32/shell32/control.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/control.cpp [iso-8859-1] Sun Jan 15 13:38:59 2012 @@ -348,146 +348,102 @@ Control_DoInterface(panel, hWnd, hInst); } -static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) - /* forms to parse: - * foo.cpl,@sp,str - * foo.cpl,@sp - * foo.cpl,,str - * foo.cpl @sp - * foo.cpl str - * "a path\foo.cpl" - */ -{ - LPWSTR buffer; - LPWSTR beg = NULL; - LPWSTR end; - WCHAR ch; - LPCWSTR ptr, ptr2; - WCHAR szName[MAX_PATH]; - unsigned sp = 0; - LPWSTR extraPmts = NULL; - int quoted = 0; - BOOL spSet = FALSE; - HANDLE hMutex; - UINT Length; - - ptr = wcsrchr(wszCmd, L'\\'); - ptr2 = wcsrchr(wszCmd, L','); - if (!ptr2) - { - ptr2 = wszCmd + wcslen(wszCmd) + 1; - } - - if (ptr) - ptr++; +static void Control_DoLaunch(CPanel *pPanel, HWND hWnd, LPCWSTR pwszCmd) +{ + /* Make a pwszCmd copy so we can modify it */ + LPWSTR pwszCmdCopy = _wcsdup(pwszCmd); + if (!pwszCmdCopy) + return; + + LPWSTR pwszPath = pwszCmdCopy, pwszArg = NULL, pwszArg2 = NULL; + + /* Path can be quoted */ + if (pwszPath[0] == L'"') + { + ++pwszPath; + pwszArg = wcschr(pwszPath, L'"'); + if (pwszArg) + *(pwszArg++) = '\0'; + } else - ptr = wszCmd; - - Length = (ptr2 - ptr); - if (Length >= MAX_PATH) + pwszArg = pwszCmdCopy; + + /* First argument starts after space or ','. Note: we ignore characters between '"' and ',' or ' '. */ + if (pwszArg) + pwszArg = wcspbrk(pwszArg, L" ,"); + if (pwszArg) + { + /* NULL terminate path and find first character of arg */ + *(pwszArg++) = L'\0'; + if (pwszArg[0] == L'"') + { + ++pwszArg; + pwszArg2 = wcschr(pwszArg, L'"'); + if (pwszArg2) + *(pwszArg2++) = L'\0'; + } else + pwszArg2 = pwszArg; + + /* Second argument always starts with ','. Note: we ignore characters between '"' and ','. */ + if (pwszArg2) + pwszArg2 = wcschr(pwszArg2, L','); + } + + TRACE("Launch %ls, arg %ls, arg2 %ls\n", pwszPath, pwszArg, pwszArg2); + + /* Create a mutex to disallow running multiple instances */ + HANDLE hMutex = CreateMutexW(NULL, TRUE, PathFindFileNameW(pwszPath)); + if (!hMutex || GetLastError() == ERROR_ALREADY_EXISTS) + { + TRACE("Next instance disallowed\n"); + if (hMutex) + CloseHandle(hMutex); return; - - memcpy(szName, (LPVOID)ptr, Length * sizeof(WCHAR)); - szName[Length] = L'\0'; - hMutex = CreateMutexW(NULL, TRUE, szName); - - if ((!hMutex) || (GetLastError() == ERROR_ALREADY_EXISTS)) - return; - buffer = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, (wcslen(wszCmd) + 1) * sizeof(*wszCmd)); - if (!buffer) - { - CloseHandle(hMutex); - return; - } - - TRACE("[shell32, Control_DoLaunch] wszCmd = %ws\n", wszCmd); - - end = wcscpy(buffer, wszCmd); - for (;;) - { - ch = *end; - if (ch == '"') - quoted = !quoted; - - if (!quoted && (ch == ',' || ch == '\0')) - { - *end = '\0'; - if (beg) - { - if (*beg == '@') - { - sp = atoiW(beg + 1); - spSet = TRUE; - } - else if (*beg == '\0') - { - sp = 0; - spSet = TRUE; - } - else - { - extraPmts = beg; - } - } - - if (ch == '\0') break; - beg = end + 1; - if (ch == ' ') - while (end[1] == ' ') - end++; - } - end++; - } - while ((ptr = StrChrW(buffer, '"'))) - memmove((LPVOID)ptr, ptr+1, wcslen(ptr)*sizeof(WCHAR)); - - while ((ptr = StrChrW(extraPmts, '"'))) - memmove((LPVOID)ptr, ptr+1, wcslen(ptr)*sizeof(WCHAR)); - - TRACE("[shell32, Control_DoLaunch] cmd %s, extra %s, sp %d\n", debugstr_w(buffer), debugstr_w(extraPmts), sp); - - Control_LoadApplet(hWnd, buffer, panel); - - if (panel->first) - { - CPlApplet* applet = panel->first; - - TRACE("[shell32, Control_DoLaunch] applet->count %d, applet->info[sp].szName %ws\n", applet->count, applet->info[sp].szName); - - assert(applet && applet->next == NULL); - if (sp >= applet->count) - { - WARN("Out of bounds (%u >= %u), setting to 0\n", sp, applet->count); - sp = 0; - } - - if ((extraPmts) && extraPmts[0] && (!spSet)) - { - while ((lstrcmpiW(extraPmts, applet->info[sp].szName)) && (sp < applet->count)) - sp++; - - if (sp >= applet->count) - { - ReleaseMutex(hMutex); - CloseHandle(hMutex); - Control_UnloadApplet(applet); - HeapFree(GetProcessHeap(), 0, buffer); - return; - } - } - - if (applet->info[sp].dwSize) - { - if (!applet->proc(applet->hWnd, CPL_DBLCLK, sp, applet->info[sp].lData)) - applet->proc(applet->hWnd, CPL_STARTWPARMSA, sp, (LPARAM)extraPmts); - } - - Control_UnloadApplet(applet); - } + } + + /* Load applet cpl */ + TRACE("Load applet %ls\n", pwszPath); + Control_LoadApplet(hWnd, pwszPath, pPanel); + if (pPanel->first) + { + /* First pPanel applet is the new one */ + CPlApplet *pApplet = pPanel->first; + assert(pApplet && pApplet->next == NULL); + TRACE("pApplet->count %d\n", pApplet->count); + + /* Note: if there is only one applet, first argument is ignored */ + INT i = 0; + if (pApplet->count > 1 && pwszArg && pwszArg[0]) + { + /* If arg begins with '@', number specifies applet index */ + if (pwszArg[0] == L'@') + i = _wtoi(pwszArg + 1); + else + { + /* Otherwise it's applet name */ + for (i = 0; i < (INT)pApplet->count; ++i) + if (!wcscmp(pwszArg, pApplet->info[i].szName)) + break; + } + } + + if (i >= 0 && i < (INT)pApplet->count && pApplet->info[i].dwSize) + { + /* Start the applet */ + TRACE("Starting applet %d\n", i); + if (!pApplet->proc(pApplet->hWnd, CPL_DBLCLK, i, pApplet->info[i].lData)) + pApplet->proc(pApplet->hWnd, CPL_STARTWPARMSA, i, (LPARAM)pwszArg); + } else + ERR("Applet not found: %ls\n", pwszArg ? pwszArg : L"NULL"); + + Control_UnloadApplet(pApplet); + } + else + ERR("Failed to load applet %ls\n", pwszPath); ReleaseMutex(hMutex); CloseHandle(hMutex); - HeapFree(GetProcessHeap(), 0, buffer); + free(pwszCmdCopy); } /************************************************************************* @@ -496,22 +452,22 @@ */ EXTERN_C void WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow) { - CPanel panel; + CPanel Panel; TRACE("(%p, %p, %s, 0x%08x)\n", hWnd, hInst, debugstr_w(cmd), nCmdShow); - memset(&panel, 0, sizeof(panel)); + memset(&Panel, 0, sizeof(Panel)); if (!cmd || !*cmd) { TRACE("[shell32, Control_RunDLLW] Calling Control_DoWindow\n"); - Control_DoWindow(&panel, hWnd, hInst); + Control_DoWindow(&Panel, hWnd, hInst); } else { TRACE("[shell32, Control_RunDLLW] Calling Control_DoLaunch\n"); - Control_DoLaunch(&panel, hWnd, cmd); + Control_DoLaunch(&Panel, hWnd, cmd); } }

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