Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 35208: Fix exports
by hpoussin＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: hpoussin Date: Sat Aug 9 02:57:02 2008 New Revision: 35208 URL: http://svn.reactos.org/svn/reactos?rev=35208&view=rev Log: Fix exports Modified: trunk/reactos/dll/keyboard/kbdbga/kbdbga.def trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.def trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.def Modified: trunk/reactos/dll/keyboard/kbdbga/kbdbga.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbga/kbdbga… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbga/kbdbga.def [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbga/kbdbga.def [iso-8859-1] Sat Aug 9 02:57:02 2008 @@ -4,5 +4,5 @@ LIBRARY kbdbga.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;EOF Modified: trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbgm/kbdbgm… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.def [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.def [iso-8859-1] Sat Aug 9 02:57:02 2008 @@ -4,5 +4,5 @@ LIBRARY kbdbgm.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;EOF Modified: trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbgt/kbdbgt… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.def [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.def [iso-8859-1] Sat Aug 9 02:57:02 2008 @@ -4,5 +4,5 @@ LIBRARY kbdbgt.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;EOF

1 0

[hpoussin] 35207: Replace .def file by a .spec file
by hpoussin＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: hpoussin Date: Sat Aug 9 02:56:27 2008 New Revision: 35207 URL: http://svn.reactos.org/svn/reactos?rev=35207&view=rev Log: Replace .def file by a .spec file Added: trunk/reactos/dll/cpl/mmsys/mmsys.spec (with props) Removed: trunk/reactos/dll/cpl/mmsys/mmsys.def Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c (contents, props changed) trunk/reactos/dll/cpl/mmsys/mmsys.h (props changed) trunk/reactos/dll/cpl/mmsys/mmsys.rbuild trunk/reactos/dll/cpl/mmsys/mmsys.rc (props changed) trunk/reactos/dll/cpl/mmsys/resource.h (props changed) trunk/reactos/dll/cpl/mmsys/sounds.c (props changed) trunk/reactos/dll/cpl/mmsys/volume.c (props changed) Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] Sat Aug 9 02:56:27 2008 @@ -76,7 +76,7 @@ VOID WINAPI ShowDriverSettingsAfterForkA(HWND hwnd, HINSTANCE hInstance, - LPTSTR lpszCmd, + LPSTR lpszCmd, int nCmdShow) { DPRINT1("ShowDriverSettingsAfterForkA() stubs\n"); @@ -85,7 +85,7 @@ VOID WINAPI ShowDriverSettingsAfterFork(HWND hwnd, HINSTANCE hInstance, - LPTSTR lpszCmd, + LPSTR lpszCmd, int nCmdShow) { DPRINT1("ShowDriverSettingsAfterFork() stubs\n"); @@ -93,9 +93,9 @@ BOOL WINAPI ShowMMCPLPropertySheet(HWND hwnd, - LPCTSTR pszPropSheet, - LPTSTR pszName, - LPTSTR pszCaption) + LPCSTR pszPropSheet, + LPSTR pszName, + LPSTR pszCaption) { DPRINT1("ShowMMCPLPropertySheet() stubs\n"); return TRUE; @@ -122,7 +122,7 @@ VOID WINAPI mmseRunOnceA(HWND hwnd, HINSTANCE hInstance, - LPTSTR lpszCmd, + LPSTR lpszCmd, int nCmdShow) { DPRINT1("mmseRunOnceA() stubs\n"); @@ -149,7 +149,7 @@ VOID WINAPI ShowFullControlPanel(HWND hwnd, HINSTANCE hInstance, - LPTSTR lpszCmd, + LPSTR lpszCmd, int nCmdShow) { DPRINT1("ShowFullControlPanel() stubs\n"); Propchange: trunk/reactos/dll/cpl/mmsys/mmsys.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date revision Removed: trunk/reactos/dll/cpl/mmsys/mmsys.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.def?re… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.def [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.def (removed) @@ -1,20 +1,0 @@ -LIBRARY mmsys.cpl - -EXPORTS -CPlApplet@16 -mmseRunOnce -mmseRunOnceW -mmseRunOnceA -ShowMMCPLPropertySheet -ShowAudioPropertySheet -DllCanUnloadNow -DllGetClassObject -ShowDriverSettingsAfterFork -ShowDriverSettingsAfterForkW -ShowDriverSettingsAfterForkA -MediaClassInstaller@12 -MediaPropPageProvider -;Multichannel -ShowFullControlPanel - -; EOF Propchange: trunk/reactos/dll/cpl/mmsys/mmsys.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date revision Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.rbuild [iso-8859-1] Sat Aug 9 02:56:27 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="mmsys" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MMSYS}" installbase="system32" installname="mmsys.cpl" unicode="yes"> - <importlibrary definition="mmsys.def" /> + <importlibrary definition="mmsys.spec.def" /> <include base="mmsys">.</include> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> @@ -21,4 +21,5 @@ <file>audio.c</file> <file>voice.c</file> <file>mmsys.rc</file> + <file>mmsys.spec</file> </module> Propchange: trunk/reactos/dll/cpl/mmsys/mmsys.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date revision Added: trunk/reactos/dll/cpl/mmsys/mmsys.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.spec?r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.spec (added) +++ trunk/reactos/dll/cpl/mmsys/mmsys.spec [iso-8859-1] Sat Aug 9 02:56:27 2008 @@ -1,0 +1,15 @@ +@ stdcall CPlApplet(ptr long ptr ptr) +@ stdcall mmseRunOnce(ptr ptr str long) +@ stdcall mmseRunOnceW(ptr ptr wstr long) +@ stdcall mmseRunOnceA(ptr ptr str long) +@ stdcall ShowMMCPLPropertySheet(ptr str str str) +@ stdcall ShowAudioPropertySheet(ptr ptr str long) +@ stdcall DllCanUnloadNow() +@ stdcall DllGetClassObject(ptr ptr ptr) +@ stdcall ShowDriverSettingsAfterFork(ptr ptr str long) +@ stdcall ShowDriverSettingsAfterForkW(ptr ptr wstr long) +@ stdcall ShowDriverSettingsAfterForkA(ptr ptr str long) +@ stdcall MediaClassInstaller(long ptr ptr) +@ stdcall MediaPropPageProvider(ptr ptr ptr) +;Multichannel +@ stdcall ShowFullControlPanel(ptr ptr str long) Propchange: trunk/reactos/dll/cpl/mmsys/mmsys.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/cpl/mmsys/resource.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date revision Propchange: trunk/reactos/dll/cpl/mmsys/sounds.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date revision Propchange: trunk/reactos/dll/cpl/mmsys/volume.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date revision

1 0

[hpoussin] 35206: Replace .def file by a .spec file
by hpoussin＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: hpoussin Date: Sat Aug 9 02:55:45 2008 New Revision: 35206 URL: http://svn.reactos.org/svn/reactos?rev=35206&view=rev Log: Replace .def file by a .spec file Added: trunk/reactos/dll/win32/lpk/lpk.spec (with props) Removed: trunk/reactos/dll/win32/lpk/lpk.def Modified: trunk/reactos/dll/win32/lpk/lpk.rbuild Removed: trunk/reactos/dll/win32/lpk/lpk.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lpk/lpk.def?rev=… ============================================================================== --- trunk/reactos/dll/win32/lpk/lpk.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lpk/lpk.def (removed) @@ -1,20 +1,0 @@ -; $Id: gdi32.def 33598 2008-05-19 10:20:39Z greatlrd $ -; -; lpk.def -; -; ReactOS Operating System -; -LIBRARY lpk.dll -EXPORTS -LpkInitialize@4 -LpkTabbedTextOut@48 -LpkDllInitialize@12 -LpkDrawTextEx@40 -LpkEditControl@0 -LpkExtTextOut@36 -LpkGetCharacterPlacement@28 -LpkGetTextExtentExPoint@36 -LpkPSMTextOut@24 -LpkUseGDIWidthCache@20 -ftsWordBreak@20 - Modified: trunk/reactos/dll/win32/lpk/lpk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lpk/lpk.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/lpk/lpk.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lpk/lpk.rbuild [iso-8859-1] Sat Aug 9 02:55:45 2008 @@ -1,5 +1,5 @@ <module name="lpk" type="win32dll" baseaddress="${BASEADDRESS_LPK}" installbase="system32" installname="lpk.dll" unicode="yes"> - <importlibrary definition="lpk.def" /> + <importlibrary definition="lpk.spec.def" /> <include base="lpk">include</include> <define name="_DISABLE_TIDENTS" /> <define name="WINVER">0x0600</define> @@ -14,4 +14,5 @@ <file>stub.c</file> <file>lpk.rc</file> + <file>lpk.spec</file> </module> Added: trunk/reactos/dll/win32/lpk/lpk.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lpk/lpk.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/lpk/lpk.spec (added) +++ trunk/reactos/dll/win32/lpk/lpk.spec [iso-8859-1] Sat Aug 9 02:55:45 2008 @@ -1,0 +1,11 @@ +@ stdcall LpkInitialize(long) +@ stdcall LpkTabbedTextOut(long long long long long long long long long long long long) +@ stdcall LpkDllInitialize(ptr long ptr) +@ stdcall LpkDrawTextEx(long long long long long long long long long long) +@ extern LpkEditControl +@ stdcall LpkExtTextOut(long long long long long long long long long) +@ stdcall LpkGetCharacterPlacement(long long long long long long long) +@ stdcall LpkGetTextExtentExPoint(long long long long long long long long long) +@ stdcall LpkPSMTextOut(long long long long long long) +@ stdcall LpkUseGDIWidthCache(long long long long long) +@ stdcall ftsWordBreak(long long long long long) Propchange: trunk/reactos/dll/win32/lpk/lpk.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hpoussin] 35205: Replace .def file by a .spec file
by hpoussin＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: hpoussin Date: Sat Aug 9 02:01:23 2008 New Revision: 35205 URL: http://svn.reactos.org/svn/reactos?rev=35205&view=rev Log: Replace .def file by a .spec file Added: trunk/reactos/drivers/video/videoprt/videoprt.spec (with props) Removed: trunk/reactos/drivers/video/videoprt/videoprt.def Modified: trunk/reactos/drivers/video/videoprt/videoprt.rbuild Removed: trunk/reactos/drivers/video/videoprt/videoprt.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.def [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.def (removed) @@ -1,118 +1,0 @@ -; -; videoprt.def - export definition file for ReactOS -; -EXPORTS -VideoPortAcquireDeviceLock@4 -VideoPortAcquireSpinLock@12 -VideoPortAcquireSpinLockAtDpcLevel@8 -VideoPortAllocateBuffer@12 -VideoPortAllocateCommonBuffer@24 -VideoPortAllocateContiguousMemory -VideoPortAllocatePool@16 -;VideoPortAssociateEventsWithDmaHandle -VideoPortCheckForDeviceExistence@28 -VideoPortClearEvent@8 -VideoPortCompareMemory(a)12=NTOSKRNL.RtlCompareMemory -;VideoPortCompleteDma -VideoPortCreateEvent@16 -VideoPortCreateSecondaryDisplay@12 -VideoPortCreateSpinLock@8 -VideoPortDDCMonitorHelper@16 -VideoPortDebugPrint -VideoPortDeleteEvent@8 -VideoPortDeleteSpinLock@8 -VideoPortDisableInterrupt@4 -;VideoPortDoDma -VideoPortEnableInterrupt@4 -VideoPortEnumerateChildren@8 -;VideoPortFlushRegistry -VideoPortFreeCommonBuffer -VideoPortFreeDeviceBase@8 -VideoPortFreePool@8 -VideoPortGetAccessRanges@32 -VideoPortGetAgpServices@8 -VideoPortGetAssociatedDeviceExtension@4 -;VideoPortGetAssociatedDeviceID -VideoPortGetBusData@24 -;VideoPortGetBytesUsed -;VideoPortGetCommonBuffer -VideoPortGetCurrentIrql@0 -VideoPortGetDeviceBase@20 -VideoPortGetDeviceData@16 -VideoPortGetDmaAdapter@8 -;VideoPortGetDmaContext -;VideoPortGetMdl -VideoPortGetRegistryParameters@20 -VideoPortGetRomImage@16 -VideoPortGetVersion@8 -VideoPortGetVgaStatus@8 -VideoPortInitialize@16 -VideoPortInt10@8 -VideoPortInterlockedDecrement(a)4=NTOSKRNL.InterlockedDecrement -VideoPortInterlockedExchange(a)8=NTOSKRNL.InterlockedExchange -VideoPortInterlockedIncrement(a)4=NTOSKRNL.InterlockedIncrement -VideoPortLockBuffer@16 -;VideoPortLockPages -VideoPortLogError@16 -VideoPortMapBankedMemory@40 -;VideoPortMapDmaMemory -VideoPortMapMemory@24 -VideoPortMoveMemory(a)12=NTOSKRNL.RtlMoveMemory -VideoPortPutDmaAdapter@8 -VideoPortQueryPerformanceCounter@8 -VideoPortQueryServices@12 -VideoPortQuerySystemTime(a)4=NTOSKRNL.KeQuerySystemTime -VideoPortQueueDpc@12 -VideoPortReadPortUchar(a)4=HAL.READ_PORT_UCHAR -VideoPortReadPortUshort(a)4=HAL.READ_PORT_USHORT -VideoPortReadPortUlong(a)4=HAL.READ_PORT_ULONG -VideoPortReadPortBufferUchar(a)12=HAL.READ_PORT_BUFFER_UCHAR -VideoPortReadPortBufferUshort(a)12=HAL.READ_PORT_BUFFER_USHORT -VideoPortReadPortBufferUlong(a)12=HAL.READ_PORT_BUFFER_ULONG -VideoPortReadRegisterUchar(a)4=NTOSKRNL.READ_REGISTER_UCHAR -VideoPortReadRegisterUshort(a)4=NTOSKRNL.READ_REGISTER_USHORT -VideoPortReadRegisterUlong(a)4=NTOSKRNL.READ_REGISTER_ULONG -VideoPortReadRegisterBufferUchar(a)12=NTOSKRNL.READ_REGISTER_BUFFER_UCHAR -VideoPortReadRegisterBufferUshort(a)12=NTOSKRNL.READ_REGISTER_BUFFER_USHORT -VideoPortReadRegisterBufferUlong(a)12=NTOSKRNL.READ_REGISTER_BUFFER_ULONG -;VideoPortReadStateEvent -VideoPortRegisterBugcheckCallback@16 -VideoPortReleaseBuffer@8 -VideoPortReleaseCommonBuffer@28 -VideoPortReleaseDeviceLock@4 -VideoPortReleaseSpinLock@12 -VideoPortReleaseSpinLockFromDpcLevel@8 -VideoPortScanRom@16 -VideoPortSetBusData@24 -;VideoPortSetBytesUsed -;VideoPortSetDmaContext -VideoPortSetEvent@8 -VideoPortSetRegistryParameters@16 -VideoPortSetTrappedEmulatorPorts@12 -;VideoPortSignalDmaComplete -VideoPortStallExecution(a)4=HAL.KeStallExecutionProcessor -;VideoPortStartDma -VideoPortStartTimer@4 -VideoPortStopTimer@4 -VideoPortSynchronizeExecution@16 -VideoPortUnlockBuffer@8 -;VideoPortUnlockPages -;VideoPortUnmapDmaMemory -VideoPortUnmapMemory@12 -VideoPortVerifyAccessRanges@12 -VideoPortWaitForSingleObject@12 -VideoPortWritePortUchar(a)8=HAL.WRITE_PORT_UCHAR -VideoPortWritePortUshort(a)8=HAL.WRITE_PORT_USHORT -VideoPortWritePortUlong(a)8=HAL.WRITE_PORT_ULONG -VideoPortWritePortBufferUchar(a)12=HAL.WRITE_PORT_BUFFER_UCHAR -VideoPortWritePortBufferUshort(a)12=HAL.WRITE_PORT_BUFFER_USHORT -VideoPortWritePortBufferUlong(a)12=HAL.WRITE_PORT_BUFFER_ULONG -VideoPortWriteRegisterUchar(a)8=NTOSKRNL.WRITE_REGISTER_UCHAR -VideoPortWriteRegisterUshort(a)8=NTOSKRNL.WRITE_REGISTER_USHORT -VideoPortWriteRegisterUlong(a)8=NTOSKRNL.WRITE_REGISTER_ULONG -VideoPortWriteRegisterBufferUchar(a)12=NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR -VideoPortWriteRegisterBufferUshort(a)12=NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT -VideoPortWriteRegisterBufferUlong(a)12=NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG -VideoPortZeroMemory(a)8=NTOSKRNL.RtlZeroMemory -VideoPortZeroDeviceMemory(a)8=NTOSKRNL.RtlZeroMemory -VpNotifyEaData@8 Modified: trunk/reactos/drivers/video/videoprt/videoprt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.rbuild [iso-8859-1] Sat Aug 9 02:01:23 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="videoprt" type="kernelmodedriver" installbase="system32/drivers" installname="videoprt.sys"> - <importlibrary definition="videoprt.def" /> + <importlibrary definition="videoprt.spec.def" /> <include base="videoprt">.</include> <include base="ntoskrnl">include</include> <define name="_VIDEOPORT_" /> @@ -22,4 +22,5 @@ <file>timer.c</file> <file>videoprt.c</file> <file>videoprt.rc</file> + <file>videoprt.spec</file> </module> Added: trunk/reactos/drivers/video/videoprt/videoprt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.spec (added) +++ trunk/reactos/drivers/video/videoprt/videoprt.spec [iso-8859-1] Sat Aug 9 02:01:23 2008 @@ -1,0 +1,114 @@ +@ stdcall VideoPortAcquireDeviceLock(ptr) +@ stdcall VideoPortAcquireSpinLock(ptr ptr ptr) +@ stdcall VideoPortAcquireSpinLockAtDpcLevel(ptr ptr) +@ stdcall VideoPortAllocateBuffer(ptr long ptr) +@ stdcall VideoPortAllocateCommonBuffer(ptr ptr long ptr long ptr) +@ stdcall VideoPortAllocateContiguousMemory(ptr long long long) +@ stdcall VideoPortAllocatePool(ptr long long long) +;VideoPortAssociateEventsWithDmaHandle +@ stdcall VideoPortCheckForDeviceExistence(ptr long long long long long long) +@ stdcall VideoPortClearEvent(ptr ptr) +@ stdcall VideoPortCompareMemory(ptr ptr long) NTOSKRNL.RtlCompareMemory +;VideoPortCompleteDma +@ stdcall VideoPortCreateEvent(ptr long ptr ptr) +@ stdcall VideoPortCreateSecondaryDisplay(ptr ptr long) +@ stdcall VideoPortCreateSpinLock(ptr ptr) +@ stdcall VideoPortDDCMonitorHelper(ptr ptr ptr long) +@ cdecl VideoPortDebugPrint(long ptr) +@ stdcall VideoPortDeleteEvent(ptr ptr) +@ stdcall VideoPortDeleteSpinLock(ptr ptr) +@ stdcall VideoPortDisableInterrupt(ptr) +;VideoPortDoDma +@ stdcall VideoPortEnableInterrupt(ptr) +@ stdcall VideoPortEnumerateChildren(ptr ptr) +;VideoPortFlushRegistry +@ stdcall VideoPortFreeCommonBuffer(ptr long ptr long long long) +@ stdcall VideoPortFreeDeviceBase(ptr ptr) +@ stdcall VideoPortFreePool(ptr ptr) +@ stdcall VideoPortGetAccessRanges(ptr long ptr long ptr ptr ptr ptr) +@ stdcall VideoPortGetAgpServices(ptr ptr) +@ stdcall VideoPortGetAssociatedDeviceExtension(ptr) +;VideoPortGetAssociatedDeviceID +@ stdcall VideoPortGetBusData(ptr long long ptr long long) +;VideoPortGetBytesUsed +;VideoPortGetCommonBuffer +@ stdcall VideoPortGetCurrentIrql() +@ stdcall VideoPortGetDeviceBase(ptr long long long long) +@ stdcall VideoPortGetDeviceData(ptr long ptr ptr) +@ stdcall VideoPortGetDmaAdapter(ptr ptr) +;VideoPortGetDmaContext +;VideoPortGetMdl +@ stdcall VideoPortGetRegistryParameters(ptr wstr long ptr ptr) +@ stdcall VideoPortGetRomImage(ptr ptr long long) +@ stdcall VideoPortGetVersion(ptr ptr) +@ stdcall VideoPortGetVgaStatus(ptr ptr) +@ stdcall VideoPortInitialize(ptr ptr ptr ptr) +@ stdcall VideoPortInt10(ptr ptr) +@ fastcall VideoPortInterlockedDecrement(ptr) NTOSKRNL.InterlockedDecrement +@ fastcall VideoPortInterlockedExchange(ptr long) NTOSKRNL.InterlockedExchange +@ fastcall VideoPortInterlockedIncrement(ptr) NTOSKRNL.InterlockedIncrement +@ stdcall VideoPortLockBuffer(ptr ptr long long) +;VideoPortLockPages +@ stdcall VideoPortLogError(ptr ptr long long) +@ stdcall VideoPortMapBankedMemory(ptr long long ptr ptr ptr long long ptr ptr) +;VideoPortMapDmaMemory +@ stdcall VideoPortMapMemory(ptr long long ptr ptr ptr) +@ stdcall VideoPortMoveMemory(ptr ptr long) NTOSKRNL.RtlMoveMemory +@ stdcall VideoPortPutDmaAdapter(ptr ptr) +@ stdcall VideoPortQueryPerformanceCounter(ptr ptr) +@ stdcall VideoPortQueryServices(ptr long ptr) +@ stdcall VideoPortQuerySystemTime(ptr) NTOSKRNL.KeQuerySystemTime +@ stdcall VideoPortQueueDpc(ptr ptr ptr) +@ stdcall VideoPortReadPortUchar(ptr) HAL.READ_PORT_UCHAR +@ stdcall VideoPortReadPortUshort(ptr) HAL.READ_PORT_USHORT +@ stdcall VideoPortReadPortUlong(ptr) HAL.READ_PORT_ULONG +@ stdcall VideoPortReadPortBufferUchar(ptr ptr long) HAL.READ_PORT_BUFFER_UCHAR +@ stdcall VideoPortReadPortBufferUshort(ptr ptr long) HAL.READ_PORT_BUFFER_USHORT +@ stdcall VideoPortReadPortBufferUlong(ptr ptr long) HAL.READ_PORT_BUFFER_ULONG +@ stdcall VideoPortReadRegisterUchar(ptr) NTOSKRNL.READ_REGISTER_UCHAR +@ stdcall VideoPortReadRegisterUshort(ptr) NTOSKRNL.READ_REGISTER_USHORT +@ stdcall VideoPortReadRegisterUlong(ptr) NTOSKRNL.READ_REGISTER_ULONG +@ stdcall VideoPortReadRegisterBufferUchar(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_UCHAR +@ stdcall VideoPortReadRegisterBufferUshort(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_USHORT +@ stdcall VideoPortReadRegisterBufferUlong(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_ULONG +;VideoPortReadStateEvent +@ stdcall VideoPortRegisterBugcheckCallback(ptr long ptr long) +@ stdcall VideoPortReleaseBuffer(ptr ptr) +@ stdcall VideoPortReleaseCommonBuffer(ptr ptr long long long ptr long) +@ stdcall VideoPortReleaseDeviceLock(ptr) +@ stdcall VideoPortReleaseSpinLock(ptr ptr long) +@ stdcall VideoPortReleaseSpinLockFromDpcLevel(ptr ptr) +@ stdcall VideoPortScanRom(ptr ptr long ptr) +@ stdcall VideoPortSetBusData(ptr long long ptr long long) +;VideoPortSetBytesUsed +;VideoPortSetDmaContext +@ stdcall VideoPortSetEvent(ptr ptr) +@ stdcall VideoPortSetRegistryParameters(ptr wstr ptr long) +@ stdcall VideoPortSetTrappedEmulatorPorts(ptr long ptr) +;VideoPortSignalDmaComplete +@ stdcall VideoPortStallExecution(ptr) HAL.KeStallExecutionProcessor +;VideoPortStartDma +@ stdcall VideoPortStartTimer(ptr) +@ stdcall VideoPortStopTimer(ptr) +@ stdcall VideoPortSynchronizeExecution(ptr long ptr ptr) +@ stdcall VideoPortUnlockBuffer(ptr ptr) +;VideoPortUnlockPages +;VideoPortUnmapDmaMemory +@ stdcall VideoPortUnmapMemory(ptr ptr ptr) +@ stdcall VideoPortVerifyAccessRanges(ptr long ptr) +@ stdcall VideoPortWaitForSingleObject(ptr ptr ptr) +@ stdcall VideoPortWritePortUchar(ptr long) HAL.WRITE_PORT_UCHAR +@ stdcall VideoPortWritePortUshort(ptr long) HAL.WRITE_PORT_USHORT +@ stdcall VideoPortWritePortUlong(ptr long) HAL.WRITE_PORT_ULONG +@ stdcall VideoPortWritePortBufferUchar(ptr ptr long) HAL.WRITE_PORT_BUFFER_UCHAR +@ stdcall VideoPortWritePortBufferUshort(ptr ptr long) HAL.WRITE_PORT_BUFFER_USHORT +@ stdcall VideoPortWritePortBufferUlong(ptr ptr long) HAL.WRITE_PORT_BUFFER_ULONG +@ stdcall VideoPortWriteRegisterUchar(ptr long) NTOSKRNL.WRITE_REGISTER_UCHAR +@ stdcall VideoPortWriteRegisterUshort(ptr long) NTOSKRNL.WRITE_REGISTER_USHORT +@ stdcall VideoPortWriteRegisterUlong(ptr long) NTOSKRNL.WRITE_REGISTER_ULONG +@ stdcall VideoPortWriteRegisterBufferUchar(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR +@ stdcall VideoPortWriteRegisterBufferUshort(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT +@ stdcall VideoPortWriteRegisterBufferUlong(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG +@ stdcall VideoPortZeroMemory(ptr long) NTOSKRNL.RtlZeroMemory +@ stdcall VideoPortZeroDeviceMemory(ptr long) NTOSKRNL.RtlZeroMemory +@ stdcall VpNotifyEaData(ptr ptr) Propchange: trunk/reactos/drivers/video/videoprt/videoprt.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 35204: - add 2 resource strings - rewrite recyclebin item handling - partly implement recycle bin item context menu - rewrite Trash_CanTrashFile to support volume serial numbers - recycle bin shows now correct deleted file details for files
by janderwald＠svn.reactos.org 09 Aug '08

09 Aug '08

Author: janderwald Date: Fri Aug 8 20:48:18 2008 New Revision: 35204 URL: http://svn.reactos.org/svn/reactos?rev=35204&view=rev Log: - add 2 resource strings - rewrite recyclebin item handling - partly implement recycle bin item context menu - rewrite Trash_CanTrashFile to support volume serial numbers - recycle bin shows now correct deleted file details for files Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/pidl.h trunk/reactos/dll/win32/shell32/recyclebin.c trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -625,6 +625,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Ñúçäàâàíåòî íà íîâà ïàïêà å íåâúçìîæíî: íåäîñòàòú÷íè ïðàâà." IDS_CREATEFOLDER_CAPTION "Ãðåøêà ïðè ñúçäàâàíå íà íîâà ïàïêà" Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -622,6 +622,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -624,6 +624,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Nelze vytvoøit novou sloku, protoe pøístup byl odepøen." IDS_CREATEFOLDER_CAPTION "Chyba pøi pokusu vytvoøit nový adresáø" Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -622,6 +622,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -625,6 +625,8 @@ IDS_COPY "Kopieren" IDS_DELETE "Löschen" IDS_PROPERTIES "Eigenschaften" + IDS_CUT "Ausschneiden" + IDS_RESTORE "Wiederherstellen" IDS_CREATEFOLDER_DENIED "Es konnte kein neues Verzeichnis erstellt werden: Zugriff verweigert." IDS_CREATEFOLDER_CAPTION "Es trat ein Fehler beim Erstellen eines neuen Verzeichnisses auf." Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -622,6 +622,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Äåí Þôáí äõíáôÞ ç äçìéïõñãßá ôïõ öáêÝëïõ: Äåí åðéôñÝðåôáé ç ðñüóâáóç." IDS_CREATEFOLDER_CAPTION "ÓöÜëìá êáôÜ ôçí äçìéïõñãßá íÝïõ öáêÝëïõ" Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -622,6 +622,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -606,7 +606,6 @@ IDS_SHV_COLUMN_LOCATION "Location" IDS_SHV_COLUMN_MODEL "Model" - /* special folders */ IDS_DESKTOP "Desktop" IDS_MYCOMPUTER "My Computer" @@ -624,6 +623,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -624,6 +624,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "No se puede crear nueva carpeta: Permiso denegado." IDS_CREATEFOLDER_CAPTION "Error durante la creación de una nueva carpeta" Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -622,6 +622,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Uutta kansiota ei voitu luoda: Oikeudet eivät riitä." IDS_CREATEFOLDER_CAPTION "Virhe luotaessa uutta kansiota" Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -626,6 +626,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Impossible de créer le nouveau dossier : permission refusée." IDS_CREATEFOLDER_CAPTION "Erreur lors de la création du nouveau dossier" Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -625,6 +625,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Nem hozható létre új mappa: Nincs hozzá engedélyed." IDS_CREATEFOLDER_CAPTION "Hiba a mappa létrehozásakor" Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -623,6 +623,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Impossibile creare la cartella: Accesso negato." IDS_CREATEFOLDER_CAPTION "Errore durante la creazione della cartella" Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -622,6 +622,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Vµ¢tH_ðì¬Å«Ü¹ñÅµ½: ANZX ª èÜ¹ñB" IDS_CREATEFOLDER_CAPTION "Vµ¢tH_Ìì¬ÉG[ª¶µÜµ½" Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -622,6 +622,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -622,6 +622,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -601,6 +601,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Kunne ikke opprette ny mappe: tilgang nektet." IDS_CREATEFOLDER_CAPTION "Klarte ikke opprette ny mappe" Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -628,6 +628,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Nie mogê utworzyæ nowego katalogu: Brak dostêpu." IDS_CREATEFOLDER_CAPTION "B³¹d przy tworzeniu nowego katalogu." Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -624,6 +624,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Não pode criar nova pasta: Permissão negada." IDS_CREATEFOLDER_CAPTION "Erro durante a criação da nova pasta" Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -624,6 +624,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Não é possível criar nova pasta: Permissão negada." IDS_CREATEFOLDER_CAPTION "Erro durante a criação da nova pasta" Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -621,6 +621,8 @@ IDS_COPY "Êîïèðîâàòü" IDS_DELETE "Óäàëèòü" IDS_PROPERTIES "Ñâîéñòâà" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Íåâîçìîæíî ñîçäàòü ïàïêó - íåò ïîëíîìî÷èé." IDS_CREATEFOLDER_CAPTION "Îøèáêà âî âðåìÿ ñîçäàíèÿ ïàïêè" Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -628,6 +628,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Nie je moné vytvori nový prieèinok: Prístup zamietnutý." IDS_CREATEFOLDER_CAPTION "Chyba poèas vytvárania nového prieèinka" Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -622,6 +622,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -622,6 +622,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -622,6 +622,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Yeni dizin oluþturulamýyor: Eriþim engellendi." IDS_CREATEFOLDER_CAPTION "Dizin oluþturma sýrasýnda hata" Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -623,6 +623,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Íå âäàëîñÿ ñòâîðèòè íîâó ïàïêó: Â³äìîâà ó äîñòóï³." IDS_CREATEFOLDER_CAPTION "Ïîìèëêà ïðè ñòâîðåíí³ íîâî¿ ïàïêè" Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -611,6 +611,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -623,6 +623,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/pidl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.h?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/pidl.h [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -135,6 +135,16 @@ WCHAR szName[1]; }PIDLPrinterStruct; +typedef struct tagPIDLRecycleStruct +{ + FILETIME LastModification; + FILETIME DeletionTime; + ULARGE_INTEGER FileSize; + ULARGE_INTEGER PhysicalFileSize; + DWORD Attributes; + WCHAR szName[1]; +}PIDLRecycleStruct; + typedef struct tagGUIDStruct { BYTE dummy; /* offset 01 is unknown */ @@ -195,9 +205,10 @@ CHAR szName[1]; /*06*/ /* terminated by 0x00 0x00 */ } htmlhelp; struct tagPIDLCPanelStruct cpanel; - struct tagValueW valueW; + struct tagValueW valueW; struct tagPIDLFontStruct cfont; struct tagPIDLPrinterStruct cprinter; + struct tagPIDLRecycleStruct crecycle; }u; } PIDLDATA, *LPPIDLDATA; #include "poppack.h" Modified: trunk/reactos/dll/win32/shell32/recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/recycleb… ============================================================================== --- trunk/reactos/dll/win32/shell32/recyclebin.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/recyclebin.c [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -77,13 +77,13 @@ #define COLUMNS_COUNT 6 -static HRESULT FormatDateTime(LPWSTR buffer, int size, FILETIME ft) +static HRESULT FormatDateTime(LPWSTR buffer, int size, FILETIME * ft) { FILETIME lft; SYSTEMTIME time; int ret; - FileTimeToLocalFileTime(&ft, &lft); + FileTimeToLocalFileTime(ft, &lft); FileTimeToSystemTime(&lft, &time); ret = GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time, NULL, buffer, size); @@ -105,8 +105,8 @@ { const IShellFolder2Vtbl *lpVtbl; const IPersistFolder2Vtbl *lpPersistFolderVtbl; - const IContextMenuVtbl *lpCmt; - const IShellExtInitVtbl *lpSEI; + const IContextMenu2Vtbl *lpContextMenu2; + const IShellExtInitVtbl *lpSEI; LONG refCount; INT iIdOpen; @@ -114,16 +114,18 @@ INT iIdProperties; LPITEMIDLIST pidl; + LPCITEMIDLIST apidl; } RecycleBin; -static const IContextMenuVtbl recycleBincmVtbl; +static const IContextMenu2Vtbl recycleBincmVtblFolder; +static const IContextMenu2Vtbl recycleBincmVtblBitbucketItem; static const IShellFolder2Vtbl recycleBinVtbl; static const IPersistFolder2Vtbl recycleBinPersistVtbl; static const IShellExtInitVtbl eivt; -static RecycleBin *impl_from_IContextMenu(IContextMenu *iface) -{ - return (RecycleBin *)((char *)iface - FIELD_OFFSET(RecycleBin, lpCmt)); +static RecycleBin *impl_from_IContextMenu2(IContextMenu2 *iface) +{ + return (RecycleBin *)((char *)iface - FIELD_OFFSET(RecycleBin, lpContextMenu2)); } static RecycleBin *impl_from_IPersistFolder(IPersistFolder2 *iface) @@ -150,9 +152,9 @@ return E_OUTOFMEMORY; ZeroMemory(obj, sizeof(RecycleBin)); obj->lpVtbl = &recycleBinVtbl; - obj->lpSEI = &eivt; + obj->lpSEI = &eivt; obj->lpPersistFolderVtbl = &recycleBinPersistVtbl; - obj->lpCmt = &recycleBincmVtbl; + obj->lpContextMenu2 = NULL; if (FAILED(ret = IUnknown_QueryInterface((IUnknown *)obj, riid, ppOutput))) { RecycleBin_Destructor(obj); @@ -183,9 +185,11 @@ || IsEqualGUID(riid, &IID_IPersistFolder2)) *ppvObject = &This->lpPersistFolderVtbl; - if (IsEqualIID(riid, &IID_IContextMenu)) - *ppvObject = &This->lpCmt; - + if (IsEqualIID(riid, &IID_IContextMenu) || IsEqualGUID(riid, &IID_IContextMenu2)) + { + This->lpContextMenu2 = &recycleBincmVtblFolder; + *ppvObject = &This->lpContextMenu2; + } if(IsEqualIID(riid, &IID_IShellExtInit)) { *ppvObject = &(This->lpSEI); @@ -237,12 +241,48 @@ return (PDELETED_FILE_DETAILS_W)&pidl->mkid.abID; } +static LPITEMIDLIST _ILCreateRecycleItem(PDELETED_FILE_DETAILS_W pFileDetails) +{ + PIDLDATA tmp; + LPITEMIDLIST pidl; + PIDLRecycleStruct * p; + int size0 = (char*)&tmp.u.crecycle.szName-(char*)&tmp.u.crecycle; + int size = size0; + + tmp.type = 0x00; + size += (wcslen(pFileDetails->FileName) + 1) * sizeof(WCHAR); + + pidl = (LPITEMIDLIST)SHAlloc(size + 4); + if (!pidl) + return pidl; + + pidl->mkid.cb = size+2; + memcpy(pidl->mkid.abID, &tmp, 2+size0); + + p = &((PIDLDATA*)pidl->mkid.abID)->u.crecycle; + RtlCopyMemory(p, pFileDetails, sizeof(DELETED_FILE_DETAILS_W)); + wcscpy(p->szName, pFileDetails->FileName); + *(WORD*)((char*)pidl+(size+2)) = 0; + return pidl; +} + +static PIDLRecycleStruct * _ILGetRecycleStruct(LPCITEMIDLIST pidl) +{ + LPPIDLDATA pdata = _ILGetDataPointer(pidl); + + if (pdata && pdata->type==0x00) + return (PIDLRecycleStruct*)&(pdata->u.crecycle); + + return NULL; +} + + BOOL WINAPI CBEnumBitBucket(IN PVOID Context, IN HANDLE hDeletedFile) { PDELETED_FILE_DETAILS_W pFileDetails; - DWORD dwSize, dwTotalSize; + DWORD dwSize; LPITEMIDLIST pidl = NULL; BOOL ret; @@ -256,17 +296,13 @@ ERR("GetDeletedFileDetailsW failed\n"); return FALSE; } - dwTotalSize = FIELD_OFFSET(ITEMIDLIST, mkid.abID) + dwSize; - - pidl = SHAlloc(dwTotalSize); - if (!pidl) + + pFileDetails = SHAlloc(dwSize); + if (!pFileDetails) { ERR("No memory\n"); return FALSE; } - - pidl->mkid.cb = dwTotalSize; - pFileDetails = UnpackDetailsFromPidl(pidl); if (!GetDeletedFileDetailsW(hDeletedFile, dwSize, @@ -274,11 +310,22 @@ NULL)) { ERR("GetDeletedFileDetailsW failed\n"); + SHFree(pFileDetails); + return FALSE; + } + + pidl = _ILCreateRecycleItem(pFileDetails); + if (!pidl) + { + SHFree(pFileDetails); + return FALSE; + } + + ret = AddToEnumList((IEnumIDList*)Context, pidl); + + if (!ret) SHFree(pidl); - return FALSE; - } - - ret = AddToEnumList((IEnumIDList*)Context, pidl); + SHFree(pFileDetails); TRACE("Returning %d\n", ret); CloseRecycleBinHandle(hDeletedFile); return ret; @@ -345,27 +392,42 @@ static HRESULT WINAPI RecycleBin_CreateViewObject(IShellFolder2 *iface, HWND hwndOwner, REFIID riid, void **ppv) { RecycleBin *This = (RecycleBin *)iface; - HRESULT ret; + LPSHELLVIEW pShellView; + HRESULT hr = E_NOINTERFACE; + TRACE("(%p, %p, %s, %p)\n", This, hwndOwner, debugstr_guid(riid), ppv); + if (!ppv) + return hr; + *ppv = NULL; - if (IsEqualGUID(riid, &IID_IShellView)) - { - IShellView *tmp; - CSFV sfv; - - ZeroMemory(&sfv, sizeof(sfv)); - sfv.cbSize = sizeof(sfv); - sfv.pshf = (IShellFolder *)This; - - TRACE("Calling SHCreateShellFolderViewEx\n"); - ret = SHCreateShellFolderViewEx(&sfv, &tmp); - TRACE("Result: %08x, output: %p\n", (unsigned int)ret, tmp); - *ppv = tmp; - return ret; - } - - return E_NOINTERFACE; + + if (IsEqualIID (riid, &IID_IDropTarget)) + { + WARN ("IDropTarget not implemented\n"); + hr = E_NOTIMPL; + } + else if (IsEqualIID (riid, &IID_IContextMenu) || IsEqualIID (riid, &IID_IContextMenu2)) + { + This->lpContextMenu2 = &recycleBincmVtblFolder; + *ppv = &This->lpContextMenu2; + This->refCount++; + hr = S_OK; + } + else if (IsEqualIID (riid, &IID_IShellView)) + { + pShellView = IShellView_Constructor ((IShellFolder *) iface); + if (pShellView) + { + hr = IShellView_QueryInterface (pShellView, riid, ppv); + IShellView_Release (pShellView); + } + } + else + return hr; + TRACE ("-- (%p)->(interface=%p)\n", This, ppv); + return hr; + } static HRESULT WINAPI RecycleBin_GetAttributesOf(IShellFolder2 *This, UINT cidl, LPCITEMIDLIST *apidl, @@ -376,17 +438,49 @@ return S_OK; } -static HRESULT WINAPI RecycleBin_GetUIObjectOf(IShellFolder2 *This, HWND hwndOwner, UINT cidl, LPCITEMIDLIST *apidl, - REFIID riid, UINT *rgfReserved, void **ppv) -{ - FIXME("(%p, %p, %d, {%p, ...}, %s, %p, %p): stub!\n", This, hwndOwner, cidl, apidl[0], debugstr_guid(riid), rgfReserved, ppv); +static HRESULT WINAPI RecycleBin_GetUIObjectOf(IShellFolder2 *iface, HWND hwndOwner, UINT cidl, LPCITEMIDLIST *apidl, + REFIID riid, UINT *prgfInOut, void **ppv) +{ + IUnknown *pObj = NULL; + HRESULT hr = E_INVALIDARG; + RecycleBin * This = (RecycleBin*)iface; + + TRACE ("(%p)->(%p,%u,apidl=%p, %p %p)\n", This, + hwndOwner, cidl, apidl, prgfInOut, ppv); + + if (!ppv) + return hr; + *ppv = NULL; - return E_NOTIMPL; + + if ((IsEqualIID (riid, &IID_IContextMenu) || IsEqualIID(riid, &IID_IContextMenu2)) && (cidl >= 1)) + { + This->lpContextMenu2 = &recycleBincmVtblBitbucketItem; + pObj = (IUnknown*)(&This->lpContextMenu2); + This->apidl = apidl[0]; + IUnknown_AddRef(pObj); + hr = S_OK; + } + else if (IsEqualIID (riid, &IID_IDropTarget) && (cidl >= 1)) + { + hr = IShellFolder_QueryInterface (iface, &IID_IDropTarget, (LPVOID *) & pObj); + } + else + hr = E_NOINTERFACE; + + if (SUCCEEDED(hr) && !pObj) + hr = E_OUTOFMEMORY; + + *ppv = pObj; + TRACE ("(%p)->hr=0x%08x\n", This, hr); + return hr; } static HRESULT WINAPI RecycleBin_GetDisplayNameOf(IShellFolder2 *This, LPCITEMIDLIST pidl, SHGDNF uFlags, STRRET *pName) { - PDELETED_FILE_DETAILS_W pFileDetails; + PIDLRecycleStruct *pFileDetails; + LPWSTR pFileName; + TRACE("(%p, %p, %x, %p)\n", This, pidl, (unsigned int)uFlags, pName); @@ -400,12 +494,27 @@ return S_OK; } - pFileDetails = UnpackDetailsFromPidl(pidl); - pName->uType = STRRET_WSTR; - pName->u.pOleStr = StrDupW(&pFileDetails->FileName[0]); + pFileDetails = _ILGetRecycleStruct(pidl); + if (!pFileDetails) + { + pName->u.cStr[0] = 0; + pName->uType = STRRET_CSTR; + return E_INVALIDARG; + } + + pFileName = wcsrchr(pFileDetails->szName, L'\\'); + if (!pFileName) + { + pName->u.cStr[0] = 0; + pName->uType = STRRET_CSTR; + return E_UNEXPECTED; + } + + pName->u.pOleStr = StrDupW(pFileName + 1); if (pName->u.pOleStr == NULL) return E_OUTOFMEMORY; + pName->uType = STRRET_WSTR; return S_OK; } @@ -414,34 +523,6 @@ { TRACE("\n"); return E_FAIL; /* not supported */ -} - -static HRESULT WINAPI RecycleBin_GetClassID(IPersistFolder2 *This, CLSID *pClassID) -{ - TRACE("(%p, %p)\n", This, pClassID); - if (This == NULL || pClassID == NULL) - return E_INVALIDARG; - memcpy(pClassID, &CLSID_RecycleBin, sizeof(CLSID)); - return S_OK; -} - -static HRESULT WINAPI RecycleBin_Initialize(IPersistFolder2 *iface, LPCITEMIDLIST pidl) -{ - RecycleBin *This = impl_from_IPersistFolder(iface); - TRACE("(%p, %p)\n", This, pidl); - - This->pidl = ILClone(pidl); - if (This->pidl == NULL) - return E_OUTOFMEMORY; - return S_OK; -} - -static HRESULT WINAPI RecycleBin_GetCurFolder(IPersistFolder2 *iface, LPITEMIDLIST *ppidl) -{ - RecycleBin *This = impl_from_IPersistFolder(iface); - TRACE("\n"); - *ppidl = ILClone(This->pidl); - return S_OK; } static HRESULT WINAPI RecycleBin_GetDefaultSearchGUID(IShellFolder2 *iface, GUID *pguid) @@ -485,8 +566,11 @@ static HRESULT WINAPI RecycleBin_GetDetailsOf(IShellFolder2 *iface, LPCITEMIDLIST pidl, UINT iColumn, LPSHELLDETAILS pDetails) { RecycleBin *This = (RecycleBin *)iface; - PDELETED_FILE_DETAILS_W pFileDetails; + PIDLRecycleStruct * pFileDetails; WCHAR buffer[MAX_PATH]; + WCHAR szTypeName[100]; + LPWSTR pszBackslash; + UINT Length; TRACE("(%p, %p, %d, %p)\n", This, pidl, iColumn, pDetails); if (iColumn >= COLUMNS_COUNT) @@ -503,25 +587,38 @@ if (iColumn == COLUMN_NAME) return RecycleBin_GetDisplayNameOf(iface, pidl, SHGDN_NORMAL, &pDetails->str); - pFileDetails = UnpackDetailsFromPidl(pidl); + pFileDetails = _ILGetRecycleStruct(pidl); switch (iColumn) { case COLUMN_DATEDEL: - FormatDateTime(buffer, MAX_PATH, pFileDetails->DeletionTime); + FormatDateTime(buffer, MAX_PATH, &pFileDetails->DeletionTime); break; case COLUMN_DELFROM: - lstrcpyW(buffer, &pFileDetails->FileName[0]); - PathRemoveFileSpecW(buffer); + pszBackslash = wcsrchr(pFileDetails->szName, L'\\'); + Length = (pszBackslash - pFileDetails->szName); + memcpy((LPVOID)buffer, pFileDetails->szName, Length * sizeof(WCHAR)); + buffer[Length] = L'\0'; break; case COLUMN_SIZE: StrFormatKBSizeW(pFileDetails->FileSize.QuadPart, buffer, MAX_PATH); break; case COLUMN_MTIME: - FormatDateTime(buffer, MAX_PATH, pFileDetails->LastModification); + FormatDateTime(buffer, MAX_PATH, &pFileDetails->LastModification); break; case COLUMN_TYPE: - /* TODO */ - buffer[0] = 0; + szTypeName[0] = L'\0'; + lstrcpyW(buffer,PathFindExtensionW(pFileDetails->szName)); + if (!( HCR_MapTypeToValueW(buffer, buffer, sizeof(buffer)/sizeof(WCHAR), TRUE) && + HCR_MapTypeToValueW(buffer, szTypeName, sizeof(szTypeName)/sizeof(WCHAR), FALSE ))) + { + lstrcpyW (szTypeName, PathFindExtensionW(pFileDetails->szName)); + strcatW(szTypeName, L"-"); + Length = wcslen(szTypeName); + if (LoadStringW(shell32_hInstance, IDS_SHV_COLUMN1, &szTypeName[Length], (sizeof(szTypeName)/sizeof(WCHAR))- Length)) + szTypeName[(sizeof(szTypeName)/sizeof(WCHAR))-1] = L'\0'; + } + pDetails->str.uType = STRRET_WSTR; + return SHStrDupW(szTypeName, &pDetails->str.u.pOleStr); break; default: return E_FAIL; @@ -571,6 +668,34 @@ RecycleBin_MapColumnToSCID }; +static HRESULT WINAPI RecycleBin_IPersistFolder2_GetClassID(IPersistFolder2 *This, CLSID *pClassID) +{ + TRACE("(%p, %p)\n", This, pClassID); + if (This == NULL || pClassID == NULL) + return E_INVALIDARG; + memcpy(pClassID, &CLSID_RecycleBin, sizeof(CLSID)); + return S_OK; +} + +static HRESULT WINAPI RecycleBin_IPersistFolder2_Initialize(IPersistFolder2 *iface, LPCITEMIDLIST pidl) +{ + RecycleBin *This = impl_from_IPersistFolder(iface); + TRACE("(%p, %p)\n", This, pidl); + + This->pidl = ILClone(pidl); + if (This->pidl == NULL) + return E_OUTOFMEMORY; + return S_OK; +} + +static HRESULT WINAPI RecycleBin_IPersistFolder2_GetCurFolder(IPersistFolder2 *iface, LPITEMIDLIST *ppidl) +{ + RecycleBin *This = impl_from_IPersistFolder(iface); + TRACE("\n"); + *ppidl = ILClone(This->pidl); + return S_OK; +} + static HRESULT WINAPI RecycleBin_IPersistFolder2_QueryInterface(IPersistFolder2 *This, REFIID riid, void **ppvObject) { return RecycleBin_QueryInterface((IShellFolder2 *)impl_from_IPersistFolder(This), riid, ppvObject); @@ -594,23 +719,13 @@ RecycleBin_IPersistFolder2_Release, /* IPersist */ - RecycleBin_GetClassID, + RecycleBin_IPersistFolder2_GetClassID, /* IPersistFolder */ - RecycleBin_Initialize, + RecycleBin_IPersistFolder2_Initialize, /* IPersistFolder2 */ - RecycleBin_GetCurFolder + RecycleBin_IPersistFolder2_GetCurFolder }; -/************************************************************************* - * SHUpdateRecycleBinIcon [SHELL32.@] - * - * Undocumented - */ -HRESULT WINAPI SHUpdateRecycleBinIcon(void) -{ - FIXME("stub\n"); - return S_OK; -} /************************************************************************* * BitBucket IShellExtInit interface */ @@ -659,31 +774,31 @@ */ static HRESULT WINAPI -RecycleBin_IContextMenu_QueryInterface( IContextMenu* iface, REFIID riid, void** ppvObject ) -{ - return RecycleBin_QueryInterface((IShellFolder2 *)impl_from_IContextMenu(iface), riid, ppvObject); +RecycleBin_IContextMenu2Folder_QueryInterface( IContextMenu2* iface, REFIID riid, void** ppvObject ) +{ + return RecycleBin_QueryInterface((IShellFolder2 *)impl_from_IContextMenu2(iface), riid, ppvObject); } static ULONG WINAPI -RecycleBin_IContextMenu_AddRef( IContextMenu* iface ) -{ - return RecycleBin_AddRef((IShellFolder2 *)impl_from_IContextMenu(iface)); +RecycleBin_IContextMenu2Folder_AddRef( IContextMenu2* iface ) +{ + return RecycleBin_AddRef((IShellFolder2 *)impl_from_IContextMenu2(iface)); } static ULONG WINAPI -RecycleBin_IContextMenu_Release( IContextMenu* iface ) -{ - return RecycleBin_Release((IShellFolder2 *)impl_from_IContextMenu(iface)); +RecycleBin_IContextMenu2Folder_Release( IContextMenu2* iface ) +{ + return RecycleBin_Release((IShellFolder2 *)impl_from_IContextMenu2(iface)); } static HRESULT WINAPI -RecycleBin_IContextMenu_QueryContextMenu( IContextMenu* iface, HMENU hmenu, UINT indexMenu, +RecycleBin_IContextMenu2Folder_QueryContextMenu( IContextMenu2* iface, HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags ) { WCHAR szBuffer[100]; MENUITEMINFOW mii; int id = 1; - RecycleBin * This = impl_from_IContextMenu(iface); + RecycleBin * This = impl_from_IContextMenu2(iface); TRACE("%p %p %u %u %u %u\n", This, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags ); @@ -715,7 +830,7 @@ mii.wID = idCmdFirst + id++; if (!InsertMenuItemW( hmenu, idCmdLast, TRUE, &mii )) { - TRACE("RecycleBin_IContextMenu_QueryContextMenu failed to insert item properties"); + TRACE("RecycleBin_IContextMenu2Folder_QueryContextMenu failed to insert item properties"); return E_FAIL; } This->iIdEmpty = 2; @@ -723,13 +838,13 @@ } static HRESULT WINAPI -RecycleBin_IContextMenu_InvokeCommand( IContextMenu* iface, LPCMINVOKECOMMANDINFO lpici ) +RecycleBin_IContextMenu2Folder_InvokeCommand( IContextMenu2* iface, LPCMINVOKECOMMANDINFO lpici ) { HRESULT hr; LPSHELLBROWSER lpSB; LPSHELLVIEW lpSV = NULL; - RecycleBin * This = impl_from_IContextMenu(iface); + RecycleBin * This = impl_from_IContextMenu2(iface); TRACE("%p %p verb %p\n", This, lpici, lpici->lpVerb); @@ -765,10 +880,10 @@ } static HRESULT WINAPI -RecycleBin_IContextMenu_GetCommandString( IContextMenu* iface, UINT_PTR idCmd, UINT uType, +RecycleBin_IContextMenu2Folder_GetCommandString( IContextMenu2* iface, UINT_PTR idCmd, UINT uType, UINT* pwReserved, LPSTR pszName, UINT cchMax ) { - RecycleBin * This = impl_from_IContextMenu(iface); + RecycleBin * This = impl_from_IContextMenu2(iface); FIXME("%p %lu %u %p %p %u\n", This, idCmd, uType, pwReserved, pszName, cchMax ); @@ -776,15 +891,189 @@ return E_NOTIMPL; } -static const IContextMenuVtbl recycleBincmVtbl = -{ - RecycleBin_IContextMenu_QueryInterface, - RecycleBin_IContextMenu_AddRef, - RecycleBin_IContextMenu_Release, - RecycleBin_IContextMenu_QueryContextMenu, - RecycleBin_IContextMenu_InvokeCommand, - RecycleBin_IContextMenu_GetCommandString +/************************************************************************** +* RecycleBin_IContextMenu2Item_HandleMenuMsg() +*/ +static HRESULT WINAPI RecycleBin_IContextMenu2Folder_HandleMenuMsg( + IContextMenu2 *iface, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + RecycleBin * This = impl_from_IContextMenu2(iface); + + TRACE("RecycleBin_IContextMenu2Item_IContextMenu2Folder_HandleMenuMsg (%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam); + + return E_NOTIMPL; +} + + +static const IContextMenu2Vtbl recycleBincmVtblFolder = +{ + RecycleBin_IContextMenu2Folder_QueryInterface, + RecycleBin_IContextMenu2Folder_AddRef, + RecycleBin_IContextMenu2Folder_Release, + RecycleBin_IContextMenu2Folder_QueryContextMenu, + RecycleBin_IContextMenu2Folder_InvokeCommand, + RecycleBin_IContextMenu2Folder_GetCommandString, + RecycleBin_IContextMenu2Folder_HandleMenuMsg }; + + +/************************************************************************** +* IContextMenu2 Bitbucket Item Implementation +*/ + +/************************************************************************ + * RecycleBin_IContextMenu2Item_QueryInterface + */ +static HRESULT WINAPI RecycleBin_IContextMenu2Item_QueryInterface(IContextMenu2 * iface, REFIID iid, LPVOID * ppvObject) +{ + RecycleBin * This = impl_from_IContextMenu2(iface); + + TRACE("(%p)\n", This); + + return RecycleBin_QueryInterface((IShellFolder2*)This, iid, ppvObject); +} + +/************************************************************************ + * RecycleBin_IContextMenu2Item_AddRef + */ +static ULONG WINAPI RecycleBin_IContextMenu2Item_AddRef(IContextMenu2 * iface) +{ + RecycleBin * This = impl_from_IContextMenu2(iface); + + TRACE("(%p)->(count=%u)\n", This, This->refCount); + + return RecycleBin_AddRef((IShellFolder2*)This); +} + +/************************************************************************ + * RecycleBin_IContextMenu2Item_Release + */ +static ULONG WINAPI RecycleBin_IContextMenu2Item_Release(IContextMenu2 * iface) +{ + RecycleBin * This = impl_from_IContextMenu2(iface); + + TRACE("(%p)->(count=%u)\n", This, This->refCount); + + return RecycleBin_Release((IShellFolder2*)This); +} + +/************************************************************************** +* RecycleBin_IContextMenu2Item_QueryContextMenu() +*/ +static HRESULT WINAPI RecycleBin_IContextMenu2Item_QueryContextMenu( + IContextMenu2 *iface, + HMENU hMenu, + UINT indexMenu, + UINT idCmdFirst, + UINT idCmdLast, + UINT uFlags) +{ + char szBuffer[30] = {0}; + ULONG Count = 1; + + RecycleBin * This = impl_from_IContextMenu2(iface); + + TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n", + This, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); + + if (LoadStringA(shell32_hInstance, IDS_RESTORE, szBuffer, sizeof(szBuffer)/sizeof(char))) + { + szBuffer[(sizeof(szBuffer)/sizeof(char))-1] = L'\0'; + _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_STRING, szBuffer, MFS_ENABLED); + Count++; + } + + if (LoadStringA(shell32_hInstance, IDS_CUT, szBuffer, sizeof(szBuffer)/sizeof(char))) + { + _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_SEPARATOR, NULL, MFS_ENABLED); + szBuffer[(sizeof(szBuffer)/sizeof(char))-1] = L'\0'; + _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_STRING, szBuffer, MFS_ENABLED); + } + + if (LoadStringA(shell32_hInstance, IDS_DELETE, szBuffer, sizeof(szBuffer)/sizeof(char))) + { + szBuffer[(sizeof(szBuffer)/sizeof(char))-1] = L'\0'; + _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_SEPARATOR, NULL, MFS_ENABLED); + _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_STRING, szBuffer, MFS_ENABLED); + } + + if (LoadStringA(shell32_hInstance, IDS_PROPERTIES, szBuffer, sizeof(szBuffer)/sizeof(char))) + { + szBuffer[(sizeof(szBuffer)/sizeof(char))-1] = L'\0'; + _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_SEPARATOR, NULL, MFS_ENABLED); + _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_STRING, szBuffer, MFS_DEFAULT); + } + + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, Count); +} + + +/************************************************************************** +* RecycleBin_IContextMenu2Item_InvokeCommand() +*/ +static HRESULT WINAPI RecycleBin_IContextMenu2Item_InvokeCommand( + IContextMenu2 *iface, + LPCMINVOKECOMMANDINFO lpcmi) +{ + RecycleBin * This = impl_from_IContextMenu2(iface); + + TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n",This,lpcmi,lpcmi->lpVerb, lpcmi->hwnd); + + return S_OK; +} + +/************************************************************************** + * RecycleBin_IContextMenu2Item_GetCommandString() + * + */ +static HRESULT WINAPI RecycleBin_IContextMenu2Item_GetCommandString( + IContextMenu2 *iface, + UINT_PTR idCommand, + UINT uFlags, + UINT* lpReserved, + LPSTR lpszName, + UINT uMaxNameLen) +{ + RecycleBin * This = impl_from_IContextMenu2(iface); + + TRACE("(%p)->(idcom=%lx flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); + + + return E_FAIL; +} + + + +/************************************************************************** +* RecycleBin_IContextMenu2Item_HandleMenuMsg() +*/ +static HRESULT WINAPI RecycleBin_IContextMenu2Item_HandleMenuMsg( + IContextMenu2 *iface, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + RecycleBin * This = impl_from_IContextMenu2(iface); + + TRACE("RecycleBin_IContextMenu2Item_HandleMenuMsg (%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam); + + return E_NOTIMPL; +} + +static const IContextMenu2Vtbl recycleBincmVtblBitbucketItem = +{ + RecycleBin_IContextMenu2Item_QueryInterface, + RecycleBin_IContextMenu2Item_AddRef, + RecycleBin_IContextMenu2Item_Release, + RecycleBin_IContextMenu2Item_QueryContextMenu, + RecycleBin_IContextMenu2Item_InvokeCommand, + RecycleBin_IContextMenu2Item_GetCommandString, + RecycleBin_IContextMenu2Item_HandleMenuMsg +}; + void toggleNukeOnDeleteOption(HWND hwndDlg, BOOL bEnable) { @@ -989,58 +1278,78 @@ BOOL TRASH_CanTrashFile(LPCWSTR wszPath) { - LONG res; + LONG ret; + DWORD dwNukeOnDelete, dwType, VolSerialNumber, MaxComponentLength; + DWORD FileSystemFlags, dwSize, dwDisposition; HKEY hKey; - DWORD RegSerial, dwNukeOnDelete, dwType; - DWORD dwLength; - - - static WCHAR szKey[] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Bitbucket\\c"; + WCHAR szBuffer[10]; + WCHAR szKey[150] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Bitbucket\\Volume\\"; + if (wszPath[1] != L':') { - /* path is UNC */ - return FALSE; + /* path is UNC */ + return FALSE; } - szKey[62] = wszPath[0]; - res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szKey, 0, KEY_QUERY_VALUE, &hKey); - if (res != ERROR_SUCCESS) + if (GetDriveTypeW(wszPath) != DRIVE_FIXED) { - FIXME("Failed to open registry path\n"); - return FALSE; + /* no bitbucket on removable media */ + return FALSE; } - dwLength = sizeof(RegSerial); - res = RegQueryValueExW(hKey, L"VolumeSerialNumber", NULL, &dwType, (LPBYTE)&RegSerial, &dwLength); - if (res == ERROR_SUCCESS) + + if (!GetVolumeInformationW(wszPath, NULL, 0, &VolSerialNumber, &MaxComponentLength, &FileSystemFlags, NULL, 0)) { - DWORD FileSystemFlags, MaxComponentLength, VolSerialNumber; - - GetVolumeInformationW(wszPath, NULL, 0, &VolSerialNumber, &MaxComponentLength, &FileSystemFlags, NULL, 0); - if (VolSerialNumber != RegSerial) + ERR("GetVolumeInformationW failed with %u\n", GetLastError()); + return FALSE; + } + + sprintfW(szBuffer, L"%04X-%04X", LOWORD(VolSerialNumber), HIWORD(VolSerialNumber)); + wcscat(szKey, szBuffer); + + if (RegCreateKeyExW(HKEY_CURRENT_USER, szBuffer, 0, NULL, 0, KEY_WRITE, NULL, &hKey, &dwDisposition) != ERROR_SUCCESS) + { + ERR("RegCreateKeyExW failed\n"); + return FALSE; + } + + if (dwDisposition & REG_CREATED_NEW_KEY) + { + /* per default move to bitbucket */ + dwNukeOnDelete = 0; + RegSetValueExW(hKey, L"NukeOnDelete", 0, REG_DWORD, (LPBYTE)&dwNukeOnDelete, sizeof(DWORD)); + /* per default unlimited size */ + dwSize = -1; + RegSetValueExW(hKey, L"MaxSize", 0, REG_DWORD, (LPBYTE)&dwSize, sizeof(DWORD)); + RegCloseKey(hKey); + return TRUE; + } + else + { + dwSize = sizeof(dwNukeOnDelete); + ret = RegQueryValueExW(hKey, L"NukeOnDelete", NULL, &dwType, (LPBYTE)&dwNukeOnDelete, &dwSize); + if (ret != ERROR_SUCCESS) { - /* FIXME - * the current volume was mounted on a different path - */ - FIXME("mismatched serial volume number\n"); + sprintfW(szBuffer, L"ret %u\n", ret); + MessageBoxW(NULL, szBuffer, NULL, MB_OK); RegCloseKey(hKey); + if (ret == ERROR_FILE_NOT_FOUND) + { + /* restore key and enable bitbucket */ + dwNukeOnDelete = 0; + RegSetValueExW(hKey, L"NukeOnDelete", 0, REG_DWORD, (LPBYTE)&dwNukeOnDelete, sizeof(DWORD)); + } + return TRUE; + } + else if (dwNukeOnDelete) + { + /* do not delete to bitbucket */ return FALSE; } + /* FIXME + * check if bitbucket is full + */ + return TRUE; } - - dwLength = sizeof(dwNukeOnDelete); - res = RegQueryValueExW(hKey, L"NukeOnDelete", NULL, &dwType, (LPBYTE)&dwNukeOnDelete, &dwLength); - if (res == ERROR_SUCCESS && dwNukeOnDelete == 0x0) - { - RegCloseKey(hKey); - return FALSE; - } - - /* FIXME - * check if trash is already full - */ - - RegCloseKey(hKey); - return TRUE; } BOOL @@ -1049,3 +1358,14 @@ TRACE("(%s)\n", debugstr_w(wszPath)); return DeleteFileToRecycleBinW(wszPath); } + +/************************************************************************* + * SHUpdateRecycleBinIcon [SHELL32.@] + * + * Undocumented + */ +HRESULT WINAPI SHUpdateRecycleBinIcon(void) +{ + FIXME("stub\n"); + return S_OK; +} Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -158,6 +158,8 @@ #define IDS_SHV_COLUMN_COMMENTS 320 #define IDS_SHV_COLUMN_LOCATION 321 #define IDS_SHV_COLUMN_MODEL 322 +#define IDS_CUT 323 +#define IDS_RESTORE 324 /* Note: this string is referenced from the registry */ #define IDS_RECYCLEBIN_FOLDER_NAME 8964

1 0

[janderwald] 35203: * add registry key for bitbucket shell folder
by janderwald＠svn.reactos.org 08 Aug '08

08 Aug '08

Author: janderwald Date: Fri Aug 8 17:31:15 2008 New Revision: 35203 URL: http://svn.reactos.org/svn/reactos?rev=35203&view=rev Log: * add registry key for bitbucket shell folder Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf trunk/reactos/boot/bootdata/hivesft_i386.inf Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] Fri Aug 8 17:31:15 2008 @@ -32,6 +32,8 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\ClassicStartMenu",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\ClassicStartMenu","{208D2C60-3AEA-1069-A2D7-08002B30309D}",0x00010001,0x00000000 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Bitbucket",,0x00000012 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Bitbucket\Volume",,0x00000012 ; CMD Settings HKLM,"SOFTWARE\Microsoft\Command Processor","AutoRun",0x00020000,"" Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] Fri Aug 8 17:31:15 2008 @@ -32,6 +32,8 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\ClassicStartMenu",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\ClassicStartMenu","{208D2C60-3AEA-1069-A2D7-08002B30309D}",0x00010001,0x00000000 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Bitbucket",,0x00000012 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Bitbucket\Volume",,0x00000012 ; CMD Settings HKLM,"SOFTWARE\Microsoft\Command Processor","AutoRun",0x00020000,""

1 0

[janderwald] 35202: - add a baseaddress for SXS (based on Vista SP1)
by janderwald＠svn.reactos.org 08 Aug '08

08 Aug '08

Author: janderwald Date: Fri Aug 8 17:28:16 2008 New Revision: 35202 URL: http://svn.reactos.org/svn/reactos?rev=35202&view=rev Log: - add a baseaddress for SXS (based on Vista SP1) Modified: trunk/reactos/baseaddress.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=352… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Fri Aug 8 17:28:16 2008 @@ -73,6 +73,7 @@ <property name="BASEADDRESS_DESKMON" value="0x6d400000" /> <property name="BASEADDRESS_DESKADP" value="0x6d410000" /> <property name="BASEADDRESS_WLDAP32" value="0x6e130000" /> + <property name="BASEADDRESS_SXS" value="0x6e160000" /> <property name="BASEADDRESS_SCHANNEL" value="0x6e360000" /> <property name="BASEADDRESS_COMPSTUI" value="0x6ec10000" /> <property name="BASEADDRESS_CLB" value="0x6f2b0000" />

1 0

[janderwald] 35201: * register printer shell folder * move printer column descriptors to resource files * fix enumeration of printers
by janderwald＠svn.reactos.org 08 Aug '08

08 Aug '08

Author: janderwald Date: Fri Aug 8 16:50:24 2008 New Revision: 35201 URL: http://svn.reactos.org/svn/reactos?rev=35201&view=rev Log: * register printer shell folder * move printer column descriptors to resource files * fix enumeration of printers Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/pidl.c trunk/reactos/dll/win32/shell32/pidl.h trunk/reactos/dll/win32/shell32/regsvr.c trunk/reactos/dll/win32/shell32/shfldr_fonts.c trunk/reactos/dll/win32/shell32/shfldr_printers.c trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -602,6 +602,11 @@ IDS_SHV_COLUMN_FONTTYPE "Fonttype" IDS_SHV_COLUMN_WORKGROUP "Workgroup" IDS_SHV_NETWORKLOCATION "Network Location" + IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Comments" + IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_MODEL "Model" // special folders IDS_DESKTOP "Ðàáîòíà ïëîù" @@ -617,6 +622,9 @@ IDS_SELECT "Èçáîð" IDS_OPEN "Îòâàðÿíå" IDS_CREATELINK "Ñúçäàâàíå íà &âðúçêà" + IDS_COPY "Copy" + IDS_DELETE "Delete" + IDS_PROPERTIES "Properties" IDS_CREATEFOLDER_DENIED "Ñúçäàâàíåòî íà íîâà ïàïêà å íåâúçìîæíî: íåäîñòàòú÷íè ïðàâà." IDS_CREATEFOLDER_CAPTION "Ãðåøêà ïðè ñúçäàâàíå íà íîâà ïàïêà" Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -599,6 +599,11 @@ IDS_SHV_COLUMN_FONTTYPE "Fonttype" IDS_SHV_COLUMN_WORKGROUP "Workgroup" IDS_SHV_NETWORKLOCATION "Network Location" + IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Comments" + IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_MODEL "Model" /* special folders */ IDS_DESKTOP "Desktop" Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -601,6 +601,11 @@ IDS_SHV_COLUMN_FONTTYPE "Fonttype" IDS_SHV_COLUMN_WORKGROUP "Workgroup" IDS_SHV_NETWORKLOCATION "Network Location" + IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Comments" + IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_MODEL "Model" /* special folders */ IDS_DESKTOP "Plocha" Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -599,6 +599,11 @@ IDS_SHV_COLUMN_FONTTYPE "Fonttype" IDS_SHV_COLUMN_WORKGROUP "Workgroup" IDS_SHV_NETWORKLOCATION "Network Location" + IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Comments" + IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_MODEL "Model" /* special folders */ IDS_DESKTOP "Desktop" Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -601,6 +601,12 @@ IDS_SHV_COLUMN_FONTTYPE "Schriftartentyp" IDS_SHV_COLUMN_WORKGROUP "Arbeitsgruppe" IDS_SHV_NETWORKLOCATION "Netzwerkstandort" + IDS_SHV_COLUMN_DOCUMENTS "Dokumente" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Kommentare" + IDS_SHV_COLUMN_LOCATION "Ort" + IDS_SHV_COLUMN_MODEL "Model" + /* special folders */ IDS_DESKTOP "Desktop" Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -599,6 +599,11 @@ IDS_SHV_COLUMN_FONTTYPE "Fonttype" IDS_SHV_COLUMN_WORKGROUP "Workgroup" IDS_SHV_NETWORKLOCATION "Network Location" + IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Comments" + IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_MODEL "Model" /* special folders */ IDS_DESKTOP "ÅðéöÜíåéá åñãáóßáò" Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -599,6 +599,11 @@ IDS_SHV_COLUMN_FONTTYPE "Fonttype" IDS_SHV_COLUMN_WORKGROUP "Workgroup" IDS_SHV_NETWORKLOCATION "Network Location" + IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Comments" + IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_MODEL "Model" /* special folders */ IDS_DESKTOP "Desktop" Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -600,6 +600,12 @@ IDS_SHV_COLUMN_FONTTYPE "Fonttype" IDS_SHV_COLUMN_WORKGROUP "Workgroup" IDS_SHV_NETWORKLOCATION "Network Location" + IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Comments" + IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_MODEL "Model" + /* special folders */ IDS_DESKTOP "Desktop" Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -601,6 +601,11 @@ IDS_SHV_COLUMN_FONTTYPE "Fonttype" IDS_SHV_COLUMN_WORKGROUP "Workgroup" IDS_SHV_NETWORKLOCATION "Network Location" + IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Comments" + IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_MODEL "Model" /* special folders */ IDS_DESKTOP "Escritorio" Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -599,6 +599,11 @@ IDS_SHV_COLUMN_FONTTYPE "Fonttype" IDS_SHV_COLUMN_WORKGROUP "Workgroup" IDS_SHV_NETWORKLOCATION "Network Location" + IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Comments" + IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_MODEL "Model" /* special folders */ IDS_DESKTOP "Työpöytä" Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -603,6 +603,11 @@ IDS_SHV_COLUMN_FONTTYPE "Fonttype" IDS_SHV_COLUMN_WORKGROUP "Workgroup" IDS_SHV_NETWORKLOCATION "Network Location" + IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Comments" + IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_MODEL "Model" /* special folders */ IDS_DESKTOP "Bureau" Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -602,6 +602,11 @@ IDS_SHV_COLUMN_FONTTYPE "Fonttype" IDS_SHV_COLUMN_WORKGROUP "Workgroup" IDS_SHV_NETWORKLOCATION "Network Location" + IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Comments" + IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_MODEL "Model" /* special folders */ IDS_DESKTOP "Asztal" Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -600,6 +600,11 @@ IDS_SHV_COLUMN_FONTTYPE "Fonttype" IDS_SHV_COLUMN_WORKGROUP "Workgroup" IDS_SHV_NETWORKLOCATION "Network Location" + IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Comments" + IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_MODEL "Model" /* special folders */ IDS_DESKTOP "Desktop" Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -599,6 +599,11 @@ IDS_SHV_COLUMN_FONTTYPE "Fonttype" IDS_SHV_COLUMN_WORKGROUP "Workgroup" IDS_SHV_NETWORKLOCATION "Network Location" + IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Comments" + IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_MODEL "Model" /* special folders */ IDS_DESKTOP "fXNgbv" Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -599,6 +599,11 @@ IDS_SHV_COLUMN_FONTTYPE "Fonttype" IDS_SHV_COLUMN_WORKGROUP "Workgroup" IDS_SHV_NETWORKLOCATION "Network Location" + IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Comments" + IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_MODEL "Model" /* special folders */ IDS_DESKTOP "Desktop" Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -599,6 +599,11 @@ IDS_SHV_COLUMN_FONTTYPE "Fonttype" IDS_SHV_COLUMN_WORKGROUP "Workgroup" IDS_SHV_NETWORKLOCATION "Network Location" + IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Comments" + IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_MODEL "Model" /* special folders */ IDS_DESKTOP "Desktop" Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -578,6 +578,11 @@ IDS_SHV_COLUMN_FONTTYPE "Fonttype" IDS_SHV_COLUMN_WORKGROUP "Workgroup" IDS_SHV_NETWORKLOCATION "Network Location" + IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Comments" + IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_MODEL "Model" /* special folders */ IDS_DESKTOP "Skrivebord" Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -605,6 +605,11 @@ IDS_SHV_COLUMN_FONTTYPE "Fonttype" IDS_SHV_COLUMN_WORKGROUP "Workgroup" IDS_SHV_NETWORKLOCATION "Network Location" + IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Comments" + IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_MODEL "Model" /* special folders */ IDS_DESKTOP "Pulpit" Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -601,6 +601,11 @@ IDS_SHV_COLUMN_FONTTYPE "Fonttype" IDS_SHV_COLUMN_WORKGROUP "Workgroup" IDS_SHV_NETWORKLOCATION "Network Location" + IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Comments" + IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_MODEL "Model" /* special folders */ IDS_DESKTOP "Área de trabalho" Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -601,6 +601,11 @@ IDS_SHV_COLUMN_FONTTYPE "Fonttype" IDS_SHV_COLUMN_WORKGROUP "Workgroup" IDS_SHV_NETWORKLOCATION "Network Location" + IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Comments" + IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_MODEL "Model" /* special folders */ IDS_DESKTOP "Ambiente de trabalho" Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -598,6 +598,11 @@ IDS_SHV_COLUMN_FONTTYPE "Òèï øðèôòà" IDS_SHV_COLUMN_WORKGROUP "Ðàáî÷àÿ ãðóïïà" IDS_SHV_NETWORKLOCATION "Ñåòåâîå ðàñïîëîæåíèå" + IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Comments" + IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_MODEL "Model" /* special folders */ IDS_DESKTOP "Ðàáî÷èé ñòîë" Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -605,6 +605,11 @@ IDS_SHV_COLUMN_FONTTYPE "Fonttype" IDS_SHV_COLUMN_WORKGROUP "Workgroup" IDS_SHV_NETWORKLOCATION "Network Location" + IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Comments" + IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_MODEL "Model" /* special folders */ IDS_DESKTOP "Pracovná plocha" Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -599,6 +599,11 @@ IDS_SHV_COLUMN_FONTTYPE "Fonttype" IDS_SHV_COLUMN_WORKGROUP "Workgroup" IDS_SHV_NETWORKLOCATION "Network Location" + IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Comments" + IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_MODEL "Model" /* special folders */ IDS_DESKTOP "Desktop" Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -599,6 +599,11 @@ IDS_SHV_COLUMN_FONTTYPE "Fonttype" IDS_SHV_COLUMN_WORKGROUP "Workgroup" IDS_SHV_NETWORKLOCATION "Network Location" + IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Comments" + IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_MODEL "Model" /* special folders */ IDS_DESKTOP "Desktop" Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -599,6 +599,11 @@ IDS_SHV_COLUMN_FONTTYPE "Fonttype" IDS_SHV_COLUMN_WORKGROUP "Workgroup" IDS_SHV_NETWORKLOCATION "Network Location" + IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Comments" + IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_MODEL "Model" /* special folders */ IDS_DESKTOP "Masaüstü" Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -600,6 +600,11 @@ IDS_SHV_COLUMN_FONTTYPE "Fonttype" IDS_SHV_COLUMN_WORKGROUP "Workgroup" IDS_SHV_NETWORKLOCATION "Network Location" + IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Comments" + IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_MODEL "Model" /* special folders */ IDS_DESKTOP "Ðîáî÷èé ñò³ë" Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -588,6 +588,11 @@ IDS_SHV_COLUMN_FONTTYPE "Fonttype" IDS_SHV_COLUMN_WORKGROUP "Workgroup" IDS_SHV_NETWORKLOCATION "Network Location" + IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Comments" + IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_MODEL "Model" /* special folders */ IDS_DESKTOP "×ÀÃæ" Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -600,6 +600,11 @@ IDS_SHV_COLUMN_FONTTYPE "Fonttype" IDS_SHV_COLUMN_WORKGROUP "Workgroup" IDS_SHV_NETWORKLOCATION "Network Location" + IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_COMMENTS "Comments" + IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_MODEL "Model" /* special folders */ IDS_DESKTOP "Desktop" Modified: trunk/reactos/dll/win32/shell32/pidl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.c?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -1387,21 +1387,7 @@ LPITEMIDLIST _ILCreatePrinters(void) { - LPITEMIDLIST parent = _ILCreateGuid(PT_GUID, &CLSID_MyComputer), ret = NULL; - - TRACE("()\n"); - if (parent) - { - LPITEMIDLIST printers = _ILCreateGuid(PT_YAGUID, &CLSID_Printers); - - if (printers) - { - ret = ILCombine(parent, printers); - SHFree(printers); - } - SHFree(parent); - } - return ret; + return _ILCreateGuid(PT_YAGUID, &CLSID_Printers); } LPITEMIDLIST _ILCreateNetwork(void) Modified: trunk/reactos/dll/win32/shell32/pidl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.h?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/pidl.h [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -122,11 +122,18 @@ typedef struct tagPIDLFontStruct { - BYTE dummy; - WORD offsFile; - WCHAR szName[1]; /*10*/ /* terminated by 0x00, followed by display name and comment string */ + BYTE dummy; + WORD offsFile; + WCHAR szName[1]; } PIDLFontStruct; +typedef struct tagPIDLPrinterStruct +{ + BYTE dummy; + DWORD Attributes; + WORD offsServer; + WCHAR szName[1]; +}PIDLPrinterStruct; typedef struct tagGUIDStruct { @@ -190,6 +197,7 @@ struct tagPIDLCPanelStruct cpanel; struct tagValueW valueW; struct tagPIDLFontStruct cfont; + struct tagPIDLPrinterStruct cprinter; }u; } PIDLDATA, *LPPIDLDATA; #include "poppack.h" Modified: trunk/reactos/dll/win32/shell32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/regsvr.c… ============================================================================== --- trunk/reactos/dll/win32/shell32/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/regsvr.c [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -799,13 +799,11 @@ wszControlPanel, wszFonts }, -#if 0 { &CLSID_Printers, wszControlPanel, wszPrinters }, -#endif { NULL } }; Modified: trunk/reactos/dll/win32/shell32/shfldr_fonts.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_f… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_fonts.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_fonts.c [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -732,9 +732,7 @@ break; } - FIXME ("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd); - - return E_NOTIMPL; + return E_FAIL; } static HRESULT WINAPI ISF_Fonts_fnMapColumnToSCID (IShellFolder2 * iface, Modified: trunk/reactos/dll/win32/shell32/shfldr_printers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_p… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_printers.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_printers.c [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -71,6 +71,26 @@ #define _IExtractIconA_Offset ((int)(&(((IExtractIconWImpl*)0)->lpvtblExtractIconA))) #define _ICOM_THIS_From_IExtractIconA(class, name) class* This = (class*)(((char*)name)-_IExtractIconA_Offset); +static shvheader PrinterSFHeader[] = { + {IDS_SHV_COLUMN8, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, + {IDS_SHV_COLUMN_DOCUMENTS , SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, + {IDS_SHV_COLUMN_STATUS, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, + {IDS_SHV_COLUMN_COMMENTS, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, + {IDS_SHV_COLUMN_LOCATION, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, + {IDS_SHV_COLUMN_MODEL, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15} +}; + +#define COLUMN_NAME 0 +#define COLUMN_DOCUMENTS 1 +#define COLUMN_STATUS 2 +#define COLUMN_COMMENTS 3 +#define COLUMN_LOCATION 4 +#define COLUMN_MODEL 5 + + +#define PrinterSHELLVIEWCOLUMNS (6) + + /************************************************************************** * IExtractIconW_QueryInterface */ @@ -416,6 +436,61 @@ return E_NOTIMPL; } +static LPITEMIDLIST _ILCreatePrinterItem(PRINTER_INFO_4W *pi) +{ + PIDLDATA tmp; + LPITEMIDLIST pidl; + PIDLPrinterStruct * p; + int size0 = (char*)&tmp.u.cprinter.szName-(char*)&tmp.u.cprinter; + int size = size0; + + tmp.type = 0x00; + tmp.u.cprinter.dummy = 0xFF; + if (pi->pPrinterName) + tmp.u.cprinter.offsServer = wcslen(pi->pPrinterName) + 1; + else + tmp.u.cprinter.offsServer = 1; + + size += tmp.u.cprinter.offsServer * sizeof(WCHAR); + if (pi->pServerName) + size += ( + wcslen(pi->pServerName) + 1) * sizeof(WCHAR); + else + size += sizeof(WCHAR); + + pidl = (LPITEMIDLIST)SHAlloc(size + 4); + if (!pidl) + return pidl; + + pidl->mkid.cb = size+2; + memcpy(pidl->mkid.abID, &tmp, 2+size0); + + p = &((PIDLDATA*)pidl->mkid.abID)->u.cprinter; + + p->Attributes = pi->Attributes; + if (pi->pPrinterName) + wcscpy(p->szName, pi->pPrinterName); + else + p->szName[0] = L'\0'; + + if (pi->pServerName) + wcscpy(p->szName + p->offsServer, pi->pServerName); + else + p->szName[p->offsServer] = L'\0'; + + *(WORD*)((char*)pidl+(size+2)) = 0; + return pidl; +} + +static PIDLPrinterStruct * _ILGetPrinterStruct(LPCITEMIDLIST pidl) +{ + LPPIDLDATA pdata = _ILGetDataPointer(pidl); + + if (pdata && pdata->type==0x00) + return (PIDLPrinterStruct*)&(pdata->u.cfont); + + return NULL; +} + /************************************************************************** * CreatePrintersEnumList() */ @@ -428,10 +503,13 @@ /* enumerate the folders */ if (dwFlags & SHCONTF_NONFOLDERS) { - DWORD needed, num, i; + DWORD needed = 0, num = 0, i; PRINTER_INFO_4W *pi; EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, 4, NULL, 0, &needed, &num); + if (!needed) + return ret; + pi = HeapAlloc(GetProcessHeap(), 0, needed); if(!EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, 4, (LPBYTE)pi, needed, &needed, &num)) { HeapFree(GetProcessHeap(), 0, pi); @@ -439,13 +517,13 @@ } for(i = 0; i < num; i++) { - DWORD len = strlenW(pi[i].pPrinterName); - LPITEMIDLIST pidl = _ILAlloc(PT_VALUEW, (len + 1) * sizeof(WCHAR)); - LPPIDLDATA data = _ILGetDataPointer(pidl); - memcpy(data->u.valueW.name, pi[i].pPrinterName, (len + 1) * sizeof(WCHAR)); - AddToEnumList(list, pidl); + LPITEMIDLIST pidl = _ILCreatePrinterItem(&pi[i]); + if (pidl) + { + if (!AddToEnumList(list, pidl)) + SHFree(pidl); + } } - HeapFree(GetProcessHeap(), 0, pi); } return ret; @@ -480,10 +558,10 @@ { IGenericSFImpl *This = (IGenericSFImpl *)iface; - FIXME ("(%p)->(pidl=%p,%p,%s,%p)\n", - This, pidl, pbcReserved, shdebugstr_guid (riid), ppvOut); - - return E_NOTIMPL; + TRACE ("(%p)->(pidl=%p,%p,%s,%p)\n", This, + pidl, pbcReserved, shdebugstr_guid (riid), ppvOut); + + return SHELL32_BindToChild (This->pidlRoot, NULL, pidl, riid, ppvOut); } /************************************************************************** @@ -508,9 +586,12 @@ LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) { IGenericSFImpl *This = (IGenericSFImpl *)iface; - - FIXME ("(%p)->(0x%08lx,pidl1=%p,pidl2=%p): stub\n", This, lParam, pidl1, pidl2); - return E_NOTIMPL; + int nReturn; + + TRACE ("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); + nReturn = SHELL32_CompareIDs (_IShellFolder_ (This), lParam, pidl1, pidl2); + TRACE ("-- %i\n", nReturn); + return nReturn; } /************************************************************************** @@ -519,12 +600,40 @@ static HRESULT WINAPI ISF_Printers_fnCreateViewObject (IShellFolder2 * iface, HWND hwndOwner, REFIID riid, LPVOID * ppvOut) { - IGenericSFImpl *This = (IGenericSFImpl *)iface; - - FIXME ("(%p)->(hwnd=%p,%s,%p): stub\n", - This, hwndOwner, shdebugstr_guid (riid), ppvOut); - - return E_NOTIMPL; + + LPSHELLVIEW pShellView; + HRESULT hr = E_INVALIDARG; + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + TRACE ("(%p)->(hwnd=%p,%s,%p)\n", This, + hwndOwner, shdebugstr_guid (riid), ppvOut); + + if (!ppvOut) + return hr; + + *ppvOut = NULL; + + if (IsEqualIID (riid, &IID_IDropTarget)) + { + WARN ("IDropTarget not implemented\n"); + hr = E_NOTIMPL; + } + else if (IsEqualIID (riid, &IID_IContextMenu)) + { + WARN ("IContextMenu not implemented\n"); + hr = E_NOTIMPL; + } + else if (IsEqualIID (riid, &IID_IShellView)) + { + pShellView = IShellView_Constructor ((IShellFolder *) iface); + if (pShellView) + { + hr = IShellView_QueryInterface (pShellView, riid, ppvOut); + IShellView_Release (pShellView); + } + } + TRACE ("-- (%p)->(interface=%p)\n", This, ppvOut); + return hr; } /************************************************************************** @@ -594,8 +703,7 @@ LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet) { IGenericSFImpl *This = (IGenericSFImpl *)iface; - WCHAR *name; - DWORD len; + PIDLPrinterStruct * p; TRACE ("(%p)->(pidl=%p,0x%08lx,%p)\n", This, pidl, dwFlags, strRet); pdump (pidl); @@ -603,13 +711,15 @@ if (!strRet) return E_INVALIDARG; - name = _ILGetDataPointer(pidl)->u.valueW.name; - len = strlenW(name); - - strRet->uType = STRRET_WSTR; - strRet->u.pOleStr = SHAlloc((len + 1) * sizeof(WCHAR)); - memcpy(strRet->u.pOleStr, name, (len + 1) * sizeof(WCHAR)); - + p = _ILGetPrinterStruct(pidl); + if (!p) + return E_INVALIDARG; + + strRet->u.pOleStr = SHAlloc(p->offsServer * sizeof(WCHAR)); + if (!strRet->u.pOleStr) + return E_OUTOFMEMORY; + + memcpy((LPVOID)strRet->u.pOleStr, (LPVOID)p->szName, p->offsServer * sizeof(WCHAR)); TRACE("ret %s\n", debugstr_w(strRet->u.pOleStr)); return S_OK; @@ -659,20 +769,21 @@ static HRESULT WINAPI ISF_Printers_fnGetDefaultColumn (IShellFolder2 * iface, DWORD dwRes, ULONG * pSort, ULONG * pDisplay) { - IGenericSFImpl *This = (IGenericSFImpl *)iface; - - FIXME ("(%p): stub\n", This); - - return E_NOTIMPL; + if (pSort) + *pSort = 0; + if (pDisplay) + *pDisplay = 0; + + return S_OK; } static HRESULT WINAPI ISF_Printers_fnGetDefaultColumnState ( IShellFolder2 * iface, UINT iColumn, DWORD * pcsFlags) { - IGenericSFImpl *This = (IGenericSFImpl *)iface; - - FIXME ("(%p): stub\n", This); - - return E_NOTIMPL; + if (!pcsFlags || iColumn >= PrinterSHELLVIEWCOLUMNS) + return E_INVALIDARG; + *pcsFlags = PrinterSFHeader[iColumn].pcsFlags; + return S_OK; + } static HRESULT WINAPI ISF_Printers_fnGetDetailsEx (IShellFolder2 * iface, @@ -688,8 +799,33 @@ LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS * psd) { IGenericSFImpl *This = (IGenericSFImpl *)iface; - - FIXME ("(%p)->(%p %i %p): stub\n", This, pidl, iColumn, psd); + WCHAR buffer[MAX_PATH] = {0}; + HRESULT hr = E_FAIL; + + TRACE("(%p)->(%p %i %p): stub\n", This, pidl, iColumn, psd); + + if (iColumn >= PrinterSHELLVIEWCOLUMNS) + return E_FAIL; + + psd->fmt = PrinterSFHeader[iColumn].fmt; + psd->cxChar = PrinterSFHeader[iColumn].cxChar; + if (pidl == NULL) + { + psd->str.uType = STRRET_WSTR; + if (LoadStringW(shell32_hInstance, PrinterSFHeader[iColumn].colnameid, buffer, MAX_PATH)) + hr = SHStrDupW(buffer, &psd->str.u.pOleStr); + + return hr; + } + + if (iColumn == COLUMN_NAME) + { + psd->str.uType = STRRET_WSTR; + return IShellFolder2_GetDisplayNameOf(iface, pidl, SHGDN_NORMAL, &psd->str); + } + + psd->str.uType = STRRET_CSTR; + psd->str.u.cStr[0] = '\0'; return E_NOTIMPL; } Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Fri Aug 8 16:50:24 2008 @@ -153,6 +153,11 @@ #define IDS_COPY 315 #define IDS_DELETE 316 #define IDS_PROPERTIES 317 +#define IDS_SHV_COLUMN_DOCUMENTS 318 +#define IDS_SHV_COLUMN_STATUS 319 +#define IDS_SHV_COLUMN_COMMENTS 320 +#define IDS_SHV_COLUMN_LOCATION 321 +#define IDS_SHV_COLUMN_MODEL 322 /* Note: this string is referenced from the registry */ #define IDS_RECYCLEBIN_FOLDER_NAME 8964

1 0

[janderwald] 35200: * add missing return * implement context menu handling of font items for font shell folder
by janderwald＠svn.reactos.org 08 Aug '08

08 Aug '08

Author: janderwald Date: Fri Aug 8 15:26:52 2008 New Revision: 35200 URL: http://svn.reactos.org/svn/reactos?rev=35200&view=rev Log: * add missing return * implement context menu handling of font items for font shell folder Modified: trunk/reactos/dll/win32/shell32/shfldr_fonts.c trunk/reactos/dll/win32/shell32/shv_item_new.c Modified: trunk/reactos/dll/win32/shell32/shfldr_fonts.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_f… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_fonts.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_fonts.c [iso-8859-1] Fri Aug 8 15:26:52 2008 @@ -45,6 +45,7 @@ #include "shfldr.h" #include "shlwapi.h" + WINE_DEFAULT_DEBUG_CHANNEL (shell); /*********************************************************************** @@ -54,18 +55,22 @@ typedef struct { const IShellFolder2Vtbl *lpVtbl; LONG ref; + const IContextMenu2Vtbl *lpVtblContextMenuFontItem; const IPersistFolder2Vtbl *lpVtblPersistFolder2; /* both paths are parsible from the desktop */ LPITEMIDLIST pidlRoot; /* absolute pidl */ + LPCITEMIDLIST apidl; /* currently focused font item */ } IGenericSFImpl; static const IShellFolder2Vtbl vt_ShellFolder2; static const IPersistFolder2Vtbl vt_NP_PersistFolder2; - +static const IContextMenu2Vtbl vt_ContextMenu2FontItem; #define _IPersistFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2))) #define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset); +#define _IContextMenuFontItem_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblContextMenuFontItem))) +#define _ICOM_THIS_From_IContextMenu2FontItem(class, name) class* This = (class*)(((char*)name)-_IContextMenuFontItem_Offset); #define _IUnknown_(This) (IUnknown*)&(This->lpVtbl) #define _IShellFolder_(This) (IShellFolder*)&(This->lpVtbl) @@ -107,6 +112,7 @@ sf->ref = 0; sf->lpVtbl = &vt_ShellFolder2; sf->lpVtblPersistFolder2 = &vt_NP_PersistFolder2; + sf->lpVtblContextMenuFontItem = &vt_ContextMenu2FontItem; sf->pidlRoot = _ILCreateFont(); /* my qualified pidl */ if (!SUCCEEDED (IUnknown_QueryInterface (_IUnknown_ (sf), riid, ppv))) @@ -485,43 +491,45 @@ if (!ppvOut) return hr; - *ppvOut = NULL; - - if (IsEqualIID (riid, &IID_IContextMenu) && (cidl >= 1)) - { - pObj = (LPUNKNOWN) ISvItemCm_Constructor ((IShellFolder *) iface, This->pidlRoot, apidl, cidl); - hr = S_OK; - } + *ppvOut = NULL; + + if (IsEqualIID (riid, &IID_IContextMenu) && (cidl >= 1)) + { + pObj = (IUnknown*)(&This->lpVtblContextMenuFontItem); + This->apidl = apidl[0]; + IUnknown_AddRef(pObj); + hr = S_OK; + } else if (IsEqualIID (riid, &IID_IDataObject) && (cidl >= 1)) { - pObj = (LPUNKNOWN) IDataObject_Constructor (hwndOwner, This->pidlRoot, apidl, cidl); - hr = S_OK; - } + pObj = (LPUNKNOWN) IDataObject_Constructor (hwndOwner, This->pidlRoot, apidl, cidl); + hr = S_OK; + } else if (IsEqualIID (riid, &IID_IExtractIconA) && (cidl == 1)) { - pidl = ILCombine (This->pidlRoot, apidl[0]); - pObj = (LPUNKNOWN) IExtractIconA_Constructor (pidl); - SHFree (pidl); - hr = S_OK; - } + pidl = ILCombine (This->pidlRoot, apidl[0]); + pObj = (LPUNKNOWN) IExtractIconA_Constructor (pidl); + SHFree (pidl); + hr = S_OK; + } else if (IsEqualIID (riid, &IID_IExtractIconW) && (cidl == 1)) { - pidl = ILCombine (This->pidlRoot, apidl[0]); - pObj = (LPUNKNOWN) IExtractIconW_Constructor (pidl); - SHFree (pidl); - hr = S_OK; - } + pidl = ILCombine (This->pidlRoot, apidl[0]); + pObj = (LPUNKNOWN) IExtractIconW_Constructor (pidl); + SHFree (pidl); + hr = S_OK; + } else if (IsEqualIID (riid, &IID_IDropTarget) && (cidl >= 1)) { - hr = IShellFolder_QueryInterface (iface, &IID_IDropTarget, (LPVOID *) & pObj); - } + hr = IShellFolder_QueryInterface (iface, &IID_IDropTarget, (LPVOID *) & pObj); + } else - hr = E_NOINTERFACE; - - if (SUCCEEDED(hr) && !pObj) - hr = E_OUTOFMEMORY; - - *ppvOut = pObj; + hr = E_NOINTERFACE; + + if (SUCCEEDED(hr) && !pObj) + hr = E_OUTOFMEMORY; + + *ppvOut = pObj; TRACE ("(%p)->hr=0x%08x\n", This, hr); return hr; } @@ -860,3 +868,208 @@ INPFldr_PersistFolder2_Initialize, INPFldr_PersistFolder2_GetCurFolder }; + +/************************************************************************** +* IContextMenu2 Implementation +*/ + +/************************************************************************ + * ISF_Fonts_IContextMenu_QueryInterface + */ +static HRESULT WINAPI ISF_Fonts_IContextMenu2_QueryInterface(IContextMenu2 * iface, REFIID iid, LPVOID * ppvObject) +{ + _ICOM_THIS_From_IContextMenu2FontItem(IGenericSFImpl, iface); + + TRACE("(%p)\n", This); + + return IUnknown_QueryInterface(_IUnknown_(This), iid, ppvObject); +} + +/************************************************************************ + * ISF_Fonts_IContextMenu_AddRef + */ +static ULONG WINAPI ISF_Fonts_IContextMenu2_AddRef(IContextMenu2 * iface) +{ + _ICOM_THIS_From_IContextMenu2FontItem(IGenericSFImpl, iface); + + TRACE("(%p)->(count=%u)\n", This, This->ref); + + return IUnknown_AddRef(_IUnknown_(This)); +} + +/************************************************************************ + * ISF_Fonts_IContextMenu_Release + */ +static ULONG WINAPI ISF_Fonts_IContextMenu2_Release(IContextMenu2 * iface) +{ + _ICOM_THIS_From_IContextMenu2FontItem(IGenericSFImpl, iface); + + TRACE("(%p)->(count=%u)\n", This, This->ref); + + return IUnknown_Release(_IUnknown_(This)); +} + +/************************************************************************** +* ISF_Fonts_IContextMenu_QueryContextMenu() +*/ +static HRESULT WINAPI ISF_Fonts_IContextMenu2_QueryContextMenu( + IContextMenu2 *iface, + HMENU hMenu, + UINT indexMenu, + UINT idCmdFirst, + UINT idCmdLast, + UINT uFlags) +{ + char szBuffer[30] = {0}; + ULONG Count = 1; + + _ICOM_THIS_From_IContextMenu2FontItem(IGenericSFImpl, iface); + + TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n", + This, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); + + if (LoadStringA(shell32_hInstance, IDS_OPEN, szBuffer, sizeof(szBuffer)/sizeof(char))) + { + szBuffer[(sizeof(szBuffer)/sizeof(char))-1] = L'\0'; + _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_STRING, szBuffer, MFS_DEFAULT); + Count++; + } + + if (LoadStringA(shell32_hInstance, IDS_PRINT_VERB, szBuffer, sizeof(szBuffer)/sizeof(char))) + { + szBuffer[(sizeof(szBuffer)/sizeof(char))-1] = L'\0'; + _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_STRING, szBuffer, MFS_ENABLED); + } + + if (LoadStringA(shell32_hInstance, IDS_COPY, szBuffer, sizeof(szBuffer)/sizeof(char))) + { + szBuffer[(sizeof(szBuffer)/sizeof(char))-1] = L'\0'; + _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_SEPARATOR, NULL, MFS_ENABLED); + _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_STRING, szBuffer, MFS_ENABLED); + } + + if (LoadStringA(shell32_hInstance, IDS_DELETE, szBuffer, sizeof(szBuffer)/sizeof(char))) + { + szBuffer[(sizeof(szBuffer)/sizeof(char))-1] = L'\0'; + _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_SEPARATOR, NULL, MFS_ENABLED); + _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_STRING, szBuffer, MFS_ENABLED); + } + + if (LoadStringA(shell32_hInstance, IDS_PROPERTIES, szBuffer, sizeof(szBuffer)/sizeof(char))) + { + szBuffer[(sizeof(szBuffer)/sizeof(char))-1] = L'\0'; + _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_SEPARATOR, NULL, MFS_ENABLED); + _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_STRING, szBuffer, MFS_ENABLED); + } + + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, Count); +} + + +/************************************************************************** +* ISF_Fonts_IContextMenu_InvokeCommand() +*/ +static HRESULT WINAPI ISF_Fonts_IContextMenu2_InvokeCommand( + IContextMenu2 *iface, + LPCMINVOKECOMMANDINFO lpcmi) +{ + _ICOM_THIS_From_IContextMenu2FontItem(IGenericSFImpl, iface); + SHELLEXECUTEINFOW sei; + PIDLFontStruct * pfont; + SHFILEOPSTRUCTW op; + + TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n",This,lpcmi,lpcmi->lpVerb, lpcmi->hwnd); + + if (lpcmi->lpVerb == MAKEINTRESOURCE(1) || lpcmi->lpVerb == MAKEINTRESOURCE(2) || lpcmi->lpVerb == MAKEINTRESOURCE(7)) + { + ZeroMemory(&sei, sizeof(sei)); + sei.cbSize = sizeof(sei); + sei.hwnd = lpcmi->hwnd; + sei.nShow = SW_SHOWNORMAL; + if (lpcmi->lpVerb == MAKEINTRESOURCE(1)) + sei.lpVerb = L"open"; + else if (lpcmi->lpVerb == MAKEINTRESOURCE(2)) + sei.lpVerb = L"print"; + else if (lpcmi->lpVerb == MAKEINTRESOURCE(7)) + sei.lpVerb = L"properties"; + + pfont = _ILGetFontStruct(This->apidl); + sei.lpFile = pfont->szName + pfont->offsFile; + + ShellExecuteExW(&sei); + if (sei.hInstApp <= (HINSTANCE)32) + return E_FAIL; + } + else if (lpcmi->lpVerb == MAKEINTRESOURCE(4)) + { + FIXME("implement font copying\n"); + return E_NOTIMPL; + } + else if (lpcmi->lpVerb == MAKEINTRESOURCE(6)) + { + ZeroMemory(&op, sizeof(op)); + op.hwnd = lpcmi->hwnd; + op.wFunc = FO_DELETE; + op.fFlags = FOF_ALLOWUNDO; + pfont = _ILGetFontStruct(This->apidl); + op.pFrom = pfont->szName + pfont->offsFile; + SHFileOperationW(&op); + } + + return S_OK; +} + +/************************************************************************** + * ISF_Fonts_IContextMenu_GetCommandString() + * + */ +static HRESULT WINAPI ISF_Fonts_IContextMenu2_GetCommandString( + IContextMenu2 *iface, + UINT_PTR idCommand, + UINT uFlags, + UINT* lpReserved, + LPSTR lpszName, + UINT uMaxNameLen) +{ + _ICOM_THIS_From_IContextMenu2FontItem(IGenericSFImpl, iface); + + TRACE("(%p)->(idcom=%lx flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); + + + return E_FAIL; +} + + + +/************************************************************************** +* ISF_Fonts_IContextMenu_HandleMenuMsg() +*/ +static HRESULT WINAPI ISF_Fonts_IContextMenu2_HandleMenuMsg( + IContextMenu2 *iface, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + _ICOM_THIS_From_IContextMenu2FontItem(IGenericSFImpl, iface); + + TRACE("ISF_Fonts_IContextMenu_HandleMenuMsg (%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam); + + return E_NOTIMPL; +} + +static const IContextMenu2Vtbl vt_ContextMenu2FontItem = +{ + ISF_Fonts_IContextMenu2_QueryInterface, + ISF_Fonts_IContextMenu2_AddRef, + ISF_Fonts_IContextMenu2_Release, + ISF_Fonts_IContextMenu2_QueryContextMenu, + ISF_Fonts_IContextMenu2_InvokeCommand, + ISF_Fonts_IContextMenu2_GetCommandString, + ISF_Fonts_IContextMenu2_HandleMenuMsg +}; + + + + + + Modified: trunk/reactos/dll/win32/shell32/shv_item_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_new.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_item_new.c [iso-8859-1] Fri Aug 8 15:26:52 2008 @@ -84,7 +84,7 @@ dwError = RegGetValueW(hKey,NULL,NULL, RRF_RT_REG_SZ,NULL,szDesc,&dwDesc); if(dwError == ERROR_SUCCESS) { - if (wcsncmp(szDesc, szKeyName, dwDesc / sizeof(WCHAR))) + if (wcsncmp(szKeyName, szDesc, dwDesc / sizeof(WCHAR))) { /* recurse for to a linked key */ if (!GetKeyDescription(szDesc, szResult)) @@ -576,7 +576,7 @@ } #endif -static inline INewMenuImpl *impl_from_IContextMenu( IContextMenu2 *iface ) +static __inline INewMenuImpl * impl_from_IContextMenu( IContextMenu2 *iface ) { return (INewMenuImpl *)((char*)iface - FIELD_OFFSET(INewMenuImpl, lpVtblContextMenu)); } @@ -717,6 +717,7 @@ if (LOWORD(lpici->lpVerb) == 0) { DoNewFolder(This, lpSV); + return S_OK; } hr = DoShellNewCmd(This, lpici);

1 0

[dchapyshev] 35199: - Update Russian translation
by dchapyshev＠svn.reactos.org 08 Aug '08

08 Aug '08

Author: dchapyshev Date: Fri Aug 8 14:59:41 2008 New Revision: 35199 URL: http://svn.reactos.org/svn/reactos?rev=35199&view=rev Log: - Update Russian translation Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Fri Aug 8 14:59:41 2008 @@ -591,13 +591,13 @@ IDS_SHV_COLUMN9 "Êîììåíòàðèé" IDS_SHV_COLUMN10 "Âëàäåëåö" IDS_SHV_COLUMN11 "Ãðóïïà" - IDS_SHV_COLUMN12 "Filename" - IDS_SHV_COLUMN13 "Category" + IDS_SHV_COLUMN12 "Èìÿ ôàéëà" + IDS_SHV_COLUMN13 "Êàòåãîðèÿ" IDS_SHV_COLUMN_DELFROM "Èçíà÷àëüíîå ðàñïîëîæåíèå" IDS_SHV_COLUMN_DELDATE "Äàòà óäàëåíèÿ" - IDS_SHV_COLUMN_FONTTYPE "Fonttype" - IDS_SHV_COLUMN_WORKGROUP "Workgroup" - IDS_SHV_NETWORKLOCATION "Network Location" + IDS_SHV_COLUMN_FONTTYPE "Òèï øðèôòà" + IDS_SHV_COLUMN_WORKGROUP "Ðàáî÷àÿ ãðóïïà" + IDS_SHV_NETWORKLOCATION "Ñåòåâîå ðàñïîëîæåíèå" /* special folders */ IDS_DESKTOP "Ðàáî÷èé ñòîë" @@ -613,9 +613,9 @@ IDS_SELECT "&Âûáðàòü" IDS_OPEN "&Îòêðûòü" IDS_CREATELINK "Ñîçäàòü &ÿðëûê" - IDS_COPY "Copy" - IDS_DELETE "Delete" - IDS_PROPERTIES "Properties" + IDS_COPY "Êîïèðîâàòü" + IDS_DELETE "Óäàëèòü" + IDS_PROPERTIES "Ñâîéñòâà" IDS_CREATEFOLDER_DENIED "Íåâîçìîæíî ñîçäàòü ïàïêó - íåò ïîëíîìî÷èé." IDS_CREATEFOLDER_CAPTION "Îøèáêà âî âðåìÿ ñîçäàíèÿ ïàïêè" @@ -717,7 +717,7 @@ IDS_PREVIEW_VERB "Ïðåäïðîñìîòð" IDS_FILE_FOLDER "%u ôàéëîâ, %u ïàïîê" - IDS_PRINTERS "Printers" - IDS_FONTS "Fonts" - IDS_INSTALLNEWFONT "Install New Font..." -END + IDS_PRINTERS "Ïðèíòåðû" + IDS_FONTS "Øðèôòû" + IDS_INSTALLNEWFONT "Óñòàíîâèòü íîâûé øðèôò..." +END

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