Ros-diffs

ros-diffs@reactos.org

81390 discussions

[zguo] 31552: Finish editing all the documentation in ntddraw.
by zguo＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: zguo Date: Wed Jan 2 08:26:00 2008 New Revision: 31552 URL: http://svn.reactos.org/svn/reactos?rev=31552&view=rev Log: Finish editing all the documentation in ntddraw. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/d3d.c Wed Jan 2 08:26:00 2008 @@ -9,8 +9,8 @@ */ /* Comment - * NtGdiDdLock and NtGdiDdLockD3D at end calls to same api in the dxg.sys - * NtGdiDdUnlock and NtGdiDdUnlockD3D at end calls to same api in the dxg.sys + * NtGdiDdLock and NtGdiDdLockD3D ultimately call the same function in dxg.sys + * NtGdiDdUnlock and NtGdiDdUnlockD3D ultimately call the same function in dxg.sys */ #include <w32k.h> @@ -33,22 +33,22 @@ * * @return -* Depending on if the driver supports this API or not, DDHAL_DRIVER_HANDLED +* Depending on if the driver supports this function or not, DDHAL_DRIVER_HANDLED * or DDHAL_DRIVER_NOTHANDLED is returned. * To check if the function has been successful, do a full check. * A full check is done by checking if the return value is DDHAL_DRIVER_HANDLED * and puCanCreateSurfaceData->ddRVal is set to DD_OK. * * @remarks. -* dxg.sys NtGdiDdCanCreateD3DBuffer and NtGdiDdCanCreateSurface call are redirect to dxg.sys -* inside the dxg.sys they ar redirect to same functions. examine the driver list functions -* table, the memory address you will see they are pointed to same memory address. -* -* Before call to this api please set the puCanCreateSurfaceData->ddRVal to a error value example DDERR_NOTUSPORTED. -* for the ddRVal will other wise be unchange if some error happen inside the driver. -* puCanCreateSurfaceData->lpDD is pointer to DDRAWI_DIRECTDRAW_GBL, MSDN say it is PDD_DIRECTDRAW_GLOBAL it is not. -* puCanCreateSurfaceData->lpDD->hDD need also be fill in with the handle we got from NtGdiDdCreateDirectDrawObject -* puCreateSurfaceData->CanCreateSurface pointer to the real functions the HAL or HEL, that u need fill in +* dxg.sys NtGdiDdCanCreateD3DBuffer and NtGdiDdCanCreateSurface calls are redirected to dxg.sys. +* Inside the dxg.sys they are redirected to the same function. Examine the memory addresses on the driver list functions +* table and you will see they are pointed to the same memory address. +* +* Before calling this function please set the puCanCreateSurfaceData->ddRVal to an error value such as DDERR_NOTUSPORTED, +* for the ddRVal will otherwise be unchanged even if an error occurs inside the driver. +* puCanCreateSurfaceData->lpDD is a pointer to DDRAWI_DIRECTDRAW_GBL, not PDD_DIRECTDRAW_GLOBAL as MSDN claims. +* puCanCreateSurfaceData->lpDD->hDD also needs be filled in with the handle we got from NtGdiDdCreateDirectDrawObject. +* puCreateSurfaceData->CanCreateSurface is a pointer to the real functions in the HAL or HEL, that you need fill in. * *--*/ @@ -73,35 +73,33 @@ * @name NtGdiD3dContextCreate * @implemented * -* The Function NtGdiDdCanCreateD3DBuffer check if you can create a -* surface for directx it redirect the call to dxg.sys. +* The Function NtGdiDdCanCreateD3DBuffer checks if you can create a +* surface for Directx. It redirects the call to dxg.sys. * * @param HANDLE hDirectDrawLocal * The handle we got from NtGdiDdCreateDirectDrawObject * * @param HANDLE hSurfColor -* Handle to DD_SURFACE_LOCAL to be use as target rendring +* Handle to DD_SURFACE_LOCAL to be used for the rendering target * * @param HANDLE hSurfZ -* Handle to a DD_SURFACE_LOCAL it is the Z deep buffer, accdoing MSDN if it set to NULL nothing should happen. +* Handle to a DD_SURFACE_LOCAL. It is the Z deep buffer. According MSDN if it is set to NULL nothing should happen. * * @param D3DNTHAL_CONTEXTCREATEDATA* hSurfZ -* the buffer to create the context data +* The buffer to create the context data * * @return -* DDHAL_DRIVER_HANDLED or DDHAL_DRIVER_NOTHANDLED if the driver support this api. -* Todo full check if we sussess is to check the return value DDHAL_DRIVER_HANDLED -* puCanCreateSurfaceData->ddRVal are set to DD_OK. -* -* -* @remarks. -* dxg.sys NtGdiD3dContextCreate call are redirect to -* same functions in the dxg.sys. So they are working exacly same. everthing else is lying if they -* are diffent. -* -* Before call to this api please set the hSurfZ->ddRVal to a error value example DDERR_NOTUSPORTED. -* for the ddRVal will other wise be unchange if some error happen inside the driver. -* hSurfZ->dwhContext need also be fill in with the handle we got from NtGdiDdCreateDirectDrawObject +* DDHAL_DRIVER_HANDLED or DDHAL_DRIVER_NOTHANDLED if the driver supports this function. +* A full check is done by checking if the return value is DDHAL_DRIVER_HANDLED +* and puCanCreateSurfaceData->ddRVal is set to DD_OK. +* +* +* @remarks. +* dxg.sys NtGdiD3dContextCreate calls are redirected to the same function in the dxg.sys. As such they all work the same way. +* +* Before calling this function please set the hSurfZ->ddRVal to an error value such as DDERR_NOTUSPORTED, +* for the ddRVal will otherwise be unchanged even if an error occurs inside the driver. +* hSurfZ->dwhContext also needs to be filled in with the handle we got from NtGdiDdCreateDirectDrawObject * *--*/ BOOL @@ -127,19 +125,17 @@ * @name NtGdiD3dContextDestroy * @implemented * -* The Function NtGdiD3dContextDestroy Destory the context data we got from NtGdiD3dContextCreate +* The Function NtGdiD3dContextDestroy destorys the context data we got from NtGdiD3dContextCreate * * @param LPD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData -* The context data we want to destory -* -* @remarks. -* dxg.sys NtGdiD3dContextDestroy call are redirect to -* same functions in the dxg.sys. So they are working exacly same. everthing else is lying if they -* are diffent. -* -* Before call to this api please set the pContextDestroyData->ddRVal to a error value example DDERR_NOTUSPORTED. -* for the ddRVal will other wise be unchange if some error happen inside the driver. -* pContextDestroyData->dwhContext need also be fill in with the handle we got from NtGdiDdCreateDirectDrawObject +* The context data we want to destroy +* +* @remarks. +* dxg.sys NtGdiD3dContextDestroy calls are redirected to the same functions in the dxg.sys. As such they all work the same way. +* +* Before calling this function please set the pContextDestroyData->ddRVal to an error value such DDERR_NOTUSPORTED, +* for the ddRVal will otherwise be unchanged even if an error occurs inside the driver. +* pContextDestroyData->dwhContext also needs to be filled in with the handle we got from NtGdiDdCreateDirectDrawObject * *--*/ DWORD @@ -162,23 +158,21 @@ * @name NtGdiD3dContextDestroyAll * @implemented * -* The Function NtGdiD3dContextDestroyAll Destory the all context data we got in a process -* The data have been alloc with NtGdiD3dContextCreate +* The Function NtGdiD3dContextDestroyAll destroys all the context data in a process +* The data having been allocated with NtGdiD3dContextCreate * * @param LPD3DNTHAL_CONTEXTDESTROYALLDATA pdcad * The context data we want to destory * * @remarks. -* dxg.sys NtGdiD3dContextDestroyAll call are redirect to -* same functions in the dxg.sys. So they are working exacly same. everthing else is lying if they -* are diffent. -* -* Before call to this api please set the pdcad->ddRVal to a error value example DDERR_NOTUSPORTED. -* for the ddRVal will other wise be unchange if some error happen inside the driver. -* pdcad->dwPID need also be fill in with the Process ID we need destore the data for -* -* Waring MSDN is wrong about this api. it say it queare free memory and it does not accpect -* any parama, last time checked in msdn 19/10-2007 +* dxg.sys NtGdiD3dContextDestroy calls are redirected to the same function in the dxg.sys. As such they all work the same way. +* +* Before calling this function please set the pdcad->ddRVal to an error value such as DDERR_NOTUSPORTED, +* for the ddRVal will otherwise be unchanged even if an error occurs inside the driver. +* pdcad->dwPID also needs to be filled in with the ID of the process that needs its context data destroyed. +* +* Warning: MSDN is wrong about this function. It claims the function queries free memory and does not accept +* any parameters. Last time MSDN checked: 19/10-2007 *--*/ DWORD STDCALL @@ -200,51 +194,51 @@ * @name NtGdiDdCreateD3DBuffer * @implemented * -* The function NtGdiDdCreateD3DBuffer create a +* The function NtGdiDdCreateD3DBuffer creates a * surface for DirectX. It is redirected to dxg.sys. * * @param HANDLE hDirectDraw * The handle we got from NtGdiDdCreateDirectDrawObject * * @param HANDLE *hSurface -* <FILMEIN> +* <FILLMEIN> * * @param DDSURFACEDESC puSurfaceDescription -* surface desc what kind of surface it should be, example rgb, compress, deep, and more, -* see DDSURFACEDESC for more infomations +* Surface description: what kind of surface it should be. Examples: RGB, compress, deep, and etc +* See DDSURFACEDESC for more information * * @param DD_SURFACE_GLOBAL *puSurfaceGlobalData -* <FILMEIN> +* <FILLMEIN> * * @param DD_SURFACE_LOCAL *puSurfaceLocalData -* <FILMEIN> +* <FILLMEIN> * * @param DD_SURFACE_MORE *puSurfaceMoreData -* <FILMEIN> +* <FILLMEIN> * * @param PDD_CREATESURFACEDATA puCreateSurfaceData -* <FILMEIN> +* <FILLMEIN> * * @param HANDLE *puhSurface -* <FILMEIN> +* <FILLMEIN> * * @return -* Depending on if the driver supports this API or not, DDHAL_DRIVER_HANDLED +* Depending on if the driver supports this function or not, DDHAL_DRIVER_HANDLED * or DDHAL_DRIVER_NOTHANDLED is returned. -* To check if the function has been successful, do a full check. +* To check if the function was successful, do a full check. * A full check is done by checking if the return value is DDHAL_DRIVER_HANDLED * and puCanCreateSurfaceData->ddRVal is set to DD_OK. * * @remarks. -* dxg.sys NtGdiDdCreateD3DBuffer and NtGdiDdCreateSurface call are redirect to dxg.sys -* inside the dxg.sys they ar redirect to same functions. examine the driver list functions -* table, the memory address you will see they are pointed to same memory address. -* -* Before call to this api please set the puCreateSurfaceData->ddRVal to a error value example DDERR_NOTUSPORTED. -* for the ddRVal will other wise be unchange if some error happen inside the driver. -* puCreateSurfaceData->lpDD is pointer to DDRAWI_DIRECTDRAW_GBL, MSDN say it is PDD_DIRECTDRAW_GLOBAL it is not. -* puCreateSurfaceData->lpDD->hDD need also be fill in with the handle we got from NtGdiDdCreateDirectDrawObject -* puCreateSurfaceData->CreateSurface pointer to the real functions the HAL or HEL, that u need fill in +* dxg.sys NtGdiDdCreateD3DBuffer and NtGdiDdCreateSurface calls are redirected to dxg.sys. +* Inside the dxg.sys they are redirected to the same function. Examine the memory addresses on the driver list functions +* table and you will see they are pointed to the same memory address. +* +* Before calling this function please set the puCreateSurfaceData->ddRVal to an error value such as DDERR_NOTUSPORTED, +* for the ddRVal will otherwise be unchanged even if an error occurs inside the driver. +* puCreateSurfaceData->lpDD is a pointer to DDRAWI_DIRECTDRAW_GBL. MSDN claims it is PDD_DIRECTDRAW_GLOBAL but it is not. +* puCreateSurfaceData->lpDD->hDD also needs to be filled in with the handle we got from NtGdiDdCreateDirectDrawObject +* puCreateSurfaceData->CreateSurface is a pointer to the real functions in the HAL or HEL, that you need fill in * *--*/ DWORD Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Wed Jan 2 08:26:00 2008 @@ -157,11 +157,11 @@ * @name NtGdiDxgGenericThunk * @implemented * -* The function NtGdiDxgGenericThunk redirect dx call to other thing. -* from dxg.sys +* The function NtGdiDxgGenericThunk redirects DirectX calls to another function. +* Redirection is done in dxg.sys in XP or higher. If dxg.sys does not exist, redirection takes place in win32k.sys * * @param ULONG_PTR ulIndex -* The functions we want redirct +* The functions we want to redirect * * @param ULONG_PTR ulHandle * Unknown @@ -179,11 +179,11 @@ * Unknown * * @return -* always return DDHAL_DRIVER_NOTHANDLED +* Always returns DDHAL_DRIVER_NOTHANDLED * * @remarks. -* dxg.sys NtGdiDxgGenericThunk call are redirect to dxg.sys -* This api are not longer use in Windows NT 2000/XP/2003 +* dxg.sys NtGdiDxgGenericThunk calls are redirected to dxg.sys +* This function is no longer used but is still present in Windows NT 2000/XP/2003. * *--*/ DWORD Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/eng.c Wed Jan 2 08:26:00 2008 @@ -116,8 +116,8 @@ * @name EngDxIoctl * @implemented * -* The function EngDxIoctl is the ioctl call to diffent dx functions -* to the driver dxg.sys +* The function EngDxIoctl is the ioctl call to different DirectX functions +* in the driver dxg.sys * * @param ULONG ulIoctl * The ioctl code that we want call to @@ -129,11 +129,11 @@ * The buffer size in bytes * * @return -* always return DDERR_UNSUPPORTED +* Always returns DDERR_UNSUPPORTED * * @remarks. -* dxg.sys EngDxIoctl call are redirect to dxg.sys -* This api are not longer use in Windows NT 2000/XP/2003 +* dxg.sys EngDxIoctl call is redirected to dxg.sys +* This function is no longer used in Windows NT 2000/XP/2003 * *--*/ DWORD @@ -159,13 +159,13 @@ * @name EngLockDirectDrawSurface * @implemented * -* The function EngUnlockDirectDrawSurface locking the dx surface +* The function EngUnlockDirectDrawSurface locks the DirectX surface. * @param HANDLE hSurface * The handle of a surface * * @return -* This return vaild or NULL pointer to PDD_SURFACE_LOCAL object +* This return a vaild or NULL pointer to a PDD_SURFACE_LOCAL object * * @remarks. * None @@ -193,13 +193,13 @@ * @name EngUnlockDirectDrawSurface * @implemented * -* The function EngUnlockDirectDrawSurface locking the dx surface +* The function EngUnlockDirectDrawSurface unlocks the DirectX surface * @param PDD_SURFACE_LOCAL pSurface -* The Surface we whant lock +* The Surface we want to unlock * * @return -* This return FALSE or TRUE, FALSE for fail, TRUE for success +* This return TRUE for success, FALSE for failure * * @remarks. * None

1 0

[zguo] 31551: Grammar and spelling corrections for the documentation and comments.
by zguo＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: zguo Date: Wed Jan 2 04:28:58 2008 New Revision: 31551 URL: http://svn.reactos.org/svn/reactos?rev=31551&view=rev Log: Grammar and spelling corrections for the documentation and comments. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Wed Jan 2 04:28:58 2008 @@ -99,7 +99,7 @@ return GdiHandleTable->flDeviceUniq; } -ULONG gulVisRgnUniqueness; // Inc count everytime client region is updated. +ULONG gulVisRgnUniqueness; // Increase count everytime client region is updated. /************************************************************************/ /* DxEngVisRgnUniq */ @@ -114,11 +114,11 @@ /************************************************************************/ /* DxEngEnumerateHdev */ /************************************************************************/ -/* Enumate all drivers in win32k */ +/* Enumerate all drivers in win32k */ HDEV * DxEngEnumerateHdev(HDEV *hdev) { - /* FIXME Enumate all drivers in win32k */ + /* FIXME Enumerate all drivers in win32k */ UNIMPLEMENTED; return FALSE; } @@ -133,13 +133,13 @@ * The hdev * * @param PGAMMARAMP Ramp -* to fill in our gama ramp +* to fill in our gamma ramp * * @return -* This return FALSE or TRUE, FALSE for fail, TRUE for success +*Returns TRUE for success, FALSE for failure * * @remarks. -* ReactOS does not loop it, only set the gamma once. +* ReactOS does not loop it, only sets the gamma once. * *--*/ BOOL @@ -153,13 +153,13 @@ * @name DxEngLockDC * @implemented * -* The function DxEngLockDC lock a hdc from dxg.sys +* The function DxEngLockDC locks a hdc from dxg.sys * * @param HDC hDC -* The handle we need want lock +* The handle we want to lock * * @return -* This api return PDC or NULL depns if it sussess lock the hdc or not +* Returns PDC if lock succeeded or NULL depns if it failed * * @remarks. * none @@ -176,13 +176,13 @@ * @name DxEngUnlockDC * @implemented * -* The function DxEngUnlockDC Unlock a pDC (hdc) from dxg.sys +* The function DxEngUnlockDC unlocks a pDC (hdc) from dxg.sys * @param PDC pDC -* The handle we need unlock +* The handle we want to unlock * * @return -* This api always return TRUE if it sussess or not +* This function returns TRUE no matter what * * @remarks. * none @@ -283,22 +283,22 @@ * @name DxEngSetDeviceGammaRamp * @implemented * -* The function DxEngSetDeviceGammaRamp Set Gamma ramp from from dxg.sys +* The function DxEngSetDeviceGammaRamp sets gamma ramp from dxg.sys * @param HDEV hPDev * The hdev * * @param PGAMMARAMP Ramp -* to set in our gama ramp +* Value to change gamma ramp to * * @param BOOL Test -* Testing the gama or not. FALSE for no test, TRUE for testing +* Whether gamma should be tested. TRUE to test, FALSE to not test * * @return -* This return FALSE or TRUE, FALSE for fail, TRUE for success +*Returns TRUE for success, FALSE for failure * * @remarks. -* ReactOS does not loop it, only set the gamma once. +* ReactOS does not loop and only sets the gamma once. * *--*/ BOOL @@ -405,23 +405,25 @@ * @name DxEngGetDCState * @implemented * -* The function DxEngGetDCState getting sate -* if it DC full screen / Get Complexity of visiable region or -* Get Driver hdev, which is pPDev +* The function DxEngGetDCState is capable of returning three +* DC states depending on what value is passed in its second parameter: +* 1. If the DC is full screen +* 2. Get Complexity of visible region +* 3. Get Driver hdev, which is pPDev * * @param HDC hdc -* The hdc +* The DC handle * * @param DWORD type -* value 1 = Is DC full screen -* value 2 = Get Complexity of visiable region. -* value 3 = Get Driver hdev, which is pPDev. +* value 1 = Is DC fullscreen +* value 2 = Get Complexity of visible region. +* value 3 = Get Driver hdev, which is a pPDev. * * @return -* return one of the type value +* Return one of the type values * * @remarks. -* we do not have type 2 implement yet +* We do not have type 2 implement yet * *--*/ DWORD @@ -443,13 +445,13 @@ break; case 3: { - /* Return HDEV of this DC. */ + /* Return the HDEV of this DC. */ retVal = (DWORD) pDC->pPDev; break; } default: - /* if it does not found a type it wanted we return 0 as value */ - DPRINT1("warning did not found type %d\n",type); + /* if a valid type is not found, zero is returned */ + DPRINT1("Warning did not find type %d\n",type); break; } DC_UnlockDc(pDC);

1 0

[akorotaev] 31550: Descrease number of link errors
by akorotaev＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: akorotaev Date: Wed Jan 2 04:01:57 2008 New Revision: 31550 URL: http://svn.reactos.org/svn/reactos?rev=31550&view=rev Log: Descrease number of link errors Modified: branches/cache_manager_rewrite/cc/mdl.c Modified: branches/cache_manager_rewrite/cc/mdl.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/cc/mdl.c?… ============================================================================== --- branches/cache_manager_rewrite/cc/mdl.c (original) +++ branches/cache_manager_rewrite/cc/mdl.c Wed Jan 2 04:01:57 2008 @@ -129,9 +129,19 @@ * @unimplemented */ VOID NTAPI -CcMdlWriteCompleteDev (IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN PMDL MdlChain) +CcMdlReadComplete2 (IN PMDL MemoryDescriptorList, + IN PFILE_OBJECT FileObject) +{ + UNIMPLEMENTED; +} + +/* + * @unimplemented + */ +VOID NTAPI +CcMdlWriteComplete2 (IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN PMDL MdlChain) { UNIMPLEMENTED; }

1 0

[janderwald] 31549: - fix button control size for german language
by janderwald＠svn.reactos.org 01 Jan '08

01 Jan '08

Author: janderwald Date: Wed Jan 2 02:57:59 2008 New Revision: 31549 URL: http://svn.reactos.org/svn/reactos?rev=31549&view=rev Log: - fix button control size for german language Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/de-DE.rc Wed Jan 2 02:57:59 2008 @@ -41,7 +41,7 @@ GROUPBOX "&Enerigespar Features des Monitors:", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 LTEXT "Um die Energieeinstellungen des Monitors zu editieren, wählen Sie Energieeinstellungen.", IDC_STATIC, 14, 166, 146 ,20 - PUSHBUTTON "Energieeinstell&ungen", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 + PUSHBUTTON "Energieeinstell&ungen", IDC_SCREENS_POWER_BUTTON, 162, 171, 70, 13 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228

1 0

[janderwald] 31548: - revert changes which shouldnt be in (yet)
by janderwald＠svn.reactos.org 01 Jan '08

01 Jan '08

Author: janderwald Date: Wed Jan 2 02:42:01 2008 New Revision: 31548 URL: http://svn.reactos.org/svn/reactos?rev=31548&view=rev Log: - revert changes which shouldnt be in (yet) Removed: trunk/reactos/dll/win32/shell32/shv_default_context_menu.c Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Removed: trunk/reactos/dll/win32/shell32/shv_default_context_menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_defa… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_default_context_menu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_default_context_menu.c (removed) @@ -1,1246 +1,0 @@ -/* - * PROJECT: shell32 - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/shell32/shv_item_new.c - * PURPOSE: provides default context menu implementation - * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) - */ - -#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#define YDEBUG -#include "winerror.h" -#include "wine/debug.h" - -#include "windef.h" -#include "wingdi.h" -#include "pidl.h" -#include "undocshell.h" -#include "shlobj.h" -#include "objbase.h" - -#include "shlwapi.h" -#include "shell32_main.h" -#include "shellfolder.h" -#include "debughlp.h" -#include "shresdef.h" -#include "shlguid.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dmenu); - -typedef struct _DynamicShellEntry_ -{ - UINT iIdCmdFirst; - UINT NumIds; - IContextMenu * CMenu; - struct _DynamicShellEntry_ * Next; -}DynamicShellEntry, *PDynamicShellEntry; - -typedef struct _StaticShellEntry_ -{ - LPWSTR szVerb; - LPWSTR szClass; - struct _StaticShellEntry_ * Next; -}StaticShellEntry, *PStaticShellEntry; - - -typedef struct -{ - const IContextMenu2Vtbl *lpVtbl; - LONG ref; - DEFCONTEXTMENU dcm; - IDataObject * pDataObj; - DWORD bGroupPolicyActive; - PDynamicShellEntry dhead; /* first dynamic shell extension entry */ - UINT iIdSHEFirst; /* first used id */ - UINT iIdSHELast; /* last used id */ - PStaticShellEntry shead; /* first static shell extension entry */ - UINT iIdSCMFirst; /* first static used id */ - UINT iIdSCMLast; /* last static used id */ -}IDefaultContextMenuImpl; - -static inline IDefaultContextMenuImpl *impl_from_IContextMenu( IContextMenu2 *iface ) -{ - return (IDefaultContextMenuImpl *)((char*)iface - FIELD_OFFSET(IDefaultContextMenuImpl, lpVtbl)); -} - -static -HRESULT -WINAPI -IDefaultContextMenu_fnQueryInterface( - IContextMenu2 *iface, - REFIID riid, - LPVOID *ppvObj) -{ - IDefaultContextMenuImpl *This = (IDefaultContextMenuImpl *)iface; - - TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); - - *ppvObj = NULL; - - if(IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IContextMenu) || - IsEqualIID(riid, &IID_IContextMenu2)) - { - *ppvObj = This; - } - - if(*ppvObj) - { - IUnknown_AddRef((IUnknown*)*ppvObj); - TRACE("-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj); - return S_OK; - } - TRACE("-- Interface: E_NOINTERFACE\n"); - return E_NOINTERFACE; -} - - -static -ULONG -WINAPI -IDefaultContextMenu_fnAddRef( - IContextMenu2 *iface) -{ - IDefaultContextMenuImpl *This = (IDefaultContextMenuImpl *)iface; - ULONG refCount = InterlockedIncrement(&This->ref); - - TRACE("(%p)->(count=%u)\n", This, refCount - 1); - - return refCount; -} - -static -ULONG -WINAPI -IDefaultContextMenu_fnRelease( - IContextMenu2 *iface) -{ - IDefaultContextMenuImpl *This = (IDefaultContextMenuImpl *)iface; - ULONG refCount = InterlockedDecrement(&This->ref); - - TRACE("(%p)->(count=%u)\n", This, refCount + 1); - if (!refCount) - { - TRACE(" destroying IContextMenu(%p)\n",This); - - HeapFree(GetProcessHeap(),0,This); - } - - return refCount; -} - -static -void -SH_AddStaticEntry(IDefaultContextMenuImpl * This, HKEY hKey, WCHAR *szVerb, WCHAR * szClass) -{ - PStaticShellEntry curEntry; - PStaticShellEntry lastEntry = NULL; - - curEntry = This->shead; - - while(curEntry) - { - if (!wcsicmp(curEntry->szVerb, szVerb)) - { - /* entry already exists */ - return; - } - lastEntry = curEntry; - curEntry = curEntry->Next; - } - - TRACE("adding verb %s szClass %s\n", debugstr_w(szVerb), debugstr_w(szClass)); - - curEntry = malloc(sizeof(StaticShellEntry)); - if (curEntry) - { - curEntry->Next = NULL; - curEntry->szVerb = wcsdup(szVerb); - curEntry->szClass = wcsdup(szClass); - } - - if (lastEntry) - { - lastEntry->Next = curEntry; - } - else - { - This->shead = curEntry; - } -} - -static -void -SH_AddStaticEntryForKey(IDefaultContextMenuImpl * This, HKEY hKey, WCHAR * szClass) -{ - LONG result; - DWORD dwIndex; - WCHAR szName[40]; - DWORD dwName; - - dwIndex = 0; - do - { - szName[0] = 0; - dwName = sizeof(szName) / sizeof(WCHAR); - result = RegEnumKeyExW(hKey, dwIndex, szName, &dwName, NULL, NULL, NULL, NULL); - szName[39] = 0; - if (result == ERROR_SUCCESS) - { - SH_AddStaticEntry(This, hKey, szName, szClass); - } - dwIndex++; - }while(result == ERROR_SUCCESS); -} - -static -void -SH_AddStaticEntryForFileClass(IDefaultContextMenuImpl * This, WCHAR * szExt) -{ - WCHAR szBuffer[100]; - HKEY hKey; - LONG result; - DWORD dwBuffer; - - TRACE("SH_AddStaticEntryForFileClass entered with %s\n", debugstr_w(szExt)); - - wcscpy(szBuffer, szExt); - wcscat(szBuffer, L"\\shell"); - result = RegOpenKeyExW(HKEY_CLASSES_ROOT, szBuffer, 0, KEY_READ | KEY_QUERY_VALUE, &hKey); - if (result == ERROR_SUCCESS) - { - SH_AddStaticEntryForKey(This, hKey, szExt); - RegCloseKey(hKey); - } - - dwBuffer = sizeof(szBuffer); - result = RegGetValueW(HKEY_CLASSES_ROOT, szExt, NULL, RRF_RT_REG_SZ, NULL, (LPBYTE)szBuffer, &dwBuffer); - if (result == ERROR_SUCCESS) - { - UINT length = strlenW(szBuffer); - wcscat(szBuffer, L"\\shell"); - TRACE("szBuffer %s\n", debugstr_w(szBuffer)); - - result = RegOpenKeyExW(HKEY_CLASSES_ROOT, szBuffer, 0, KEY_READ | KEY_QUERY_VALUE, &hKey); - if (result == ERROR_SUCCESS) - { - szBuffer[length] = 0; - SH_AddStaticEntryForKey(This, hKey, szBuffer); - RegCloseKey(hKey); - } - } - - strcpyW(szBuffer, "SystemFileAssociations\\"); - dwBuffer = sizeof(szBuffer) - strlenW(szBuffer) * sizeof(WCHAR); - result = RegGetValueW(HKEY_CLASSES_ROOT, szExt, L"PerceivedType", RRF_RT_REG_SZ, NULL, (LPBYTE)&szBuffer[23], &dwBuffer); - if (result == ERROR_SUCCESS) - { - UINT length = strlenW(szBuffer); - wcscat(szBuffer, L"\\shell"); - TRACE("szBuffer %s\n", debugstr_w(szBuffer)); - - result = RegOpenKeyExW(HKEY_CLASSES_ROOT, szBuffer, 0, KEY_READ | KEY_QUERY_VALUE, &hKey); - if (result == ERROR_SUCCESS) - { - szBuffer[length] = 0; - SH_AddStaticEntryForKey(This, hKey, szBuffer); - RegCloseKey(hKey); - } - } - RegCloseKey(hKey); -} - -static -BOOL -HasClipboardData() -{ - BOOL ret = FALSE; - IDataObject * pda; - - if(SUCCEEDED(OleGetClipboard(&pda))) - { - STGMEDIUM medium; - FORMATETC formatetc; - - TRACE("pda=%p\n", pda); - - /* Set the FORMATETC structure*/ - InitFormatEtc(formatetc, RegisterClipboardFormatA(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); - if(SUCCEEDED(IDataObject_GetData(pda,&formatetc,&medium))) - { - ret = TRUE; - } - - IDataObject_Release(pda); - ReleaseStgMedium(&medium); - } - - return ret; -} - -VOID -DisablePasteOptions(HMENU hMenu) -{ - MENUITEMINFOW mii; - - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_STATE; - mii.fState = MFS_DISABLED; - - TRACE("result %d\n", SetMenuItemInfoW(hMenu, FCIDM_SHVIEW_INSERT, FALSE, &mii)); - TRACE("result %d\n", SetMenuItemInfoW(hMenu, FCIDM_SHVIEW_INSERTLINK, FALSE, &mii)); -} - -static -HRESULT -SH_LoadDynamicContextMenuHandler(IDefaultContextMenuImpl * This, HKEY hKey, const CLSID * szClass, BOOL bExternalInit) -{ - HRESULT hr; - IContextMenu * cmobj; - IShellExtInit *shext; - PDynamicShellEntry curEntry; - TRACE("SH_LoadDynamicContextMenuHandler entered with This %p hKey %p szClass %s bExternalInit %u\n",This, hKey, wine_dbgstr_guid(szClass), bExternalInit); - - hr = SHCoCreateInstance(NULL, szClass, NULL, &IID_IContextMenu, (void**)&cmobj); - if (hr != S_OK) - { - TRACE("SHCoCreateInstance failed %x\n", GetLastError()); - return hr; - } - - if (bExternalInit) - { - hr = cmobj->lpVtbl->QueryInterface(cmobj, &IID_IShellExtInit, (void**)&shext); - if (hr != S_OK) - { - TRACE("Failed to query for interface IID_IShellExtInit\n"); - cmobj->lpVtbl->Release(cmobj); - return FALSE; - } - hr = shext->lpVtbl->Initialize(shext, NULL, This->pDataObj, hKey); - shext->lpVtbl->Release(shext); - if (hr != S_OK) - { - TRACE("Failed to initialize shell extension error %x\n", hr); - cmobj->lpVtbl->Release(cmobj); - return hr; - } - } - - curEntry = malloc(sizeof(DynamicShellEntry)); - if(!curEntry) - { - return E_OUTOFMEMORY; - } - - curEntry->iIdCmdFirst = 0; - curEntry->Next = NULL; - curEntry->NumIds = 0; - curEntry->CMenu = cmobj; - - if (This->dhead) - { - PDynamicShellEntry pEntry = This->dhead; - - while(pEntry->Next) - { - pEntry = pEntry->Next; - } - - pEntry->Next = curEntry; - } - else - { - This->dhead = curEntry; - } - - return hr; -} - -static -UINT -EnumerateDynamicContextHandlerForKey(IDefaultContextMenuImpl *This, HKEY hRootKey) -{ - WCHAR szKey[MAX_PATH] = {0}; - WCHAR szName[MAX_PATH] = {0}; - DWORD dwIndex, dwName; - LONG res; - HRESULT hResult; - UINT index; - CLSID clsid; - HKEY hKey; - - static const WCHAR szShellEx[] = { 's','h','e','l','l','e','x','\\','C','o','n','t','e','x','t','M','e','n','u','H','a','n','d','l','e','r','s',0 }; - - if (RegOpenKeyExW(hRootKey, szShellEx, 0, KEY_READ, &hKey) != ERROR_SUCCESS) - { - TRACE("RegOpenKeyExW failed for key %s\n", debugstr_w(szKey)); - return 0; - } - - dwIndex = 0; - index = 0; - do - { - dwName = MAX_PATH; - res = RegEnumKeyExW(hKey, dwIndex, szName, &dwName, NULL, NULL, NULL, NULL); - if (res == ERROR_SUCCESS) - { - hResult = CLSIDFromString(szName, &clsid); - if (hResult != S_OK) - { - dwName = MAX_PATH; - if (RegGetValueW(hKey, szName, NULL, RRF_RT_REG_SZ, NULL, szKey, &dwName) == ERROR_SUCCESS) - { - if (CLSIDFromString(szKey, &clsid) == S_OK) - { - if (This->bGroupPolicyActive) - { - if (RegGetValueW(HKEY_LOCAL_MACHINE, - L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", - szKey, - RRF_RT_REG_SZ, - NULL, - NULL, - &dwName) == ERROR_SUCCESS) - { - SH_LoadDynamicContextMenuHandler(This, hKey, &clsid, TRUE); - } - - } - else - { - SH_LoadDynamicContextMenuHandler(This, hKey, &clsid, TRUE); - } - } - } - } - if (hResult == S_OK) - { - if (This->bGroupPolicyActive) - { - if (RegGetValueW(HKEY_LOCAL_MACHINE, - L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", - szKey, - RRF_RT_REG_SZ, - NULL, - NULL, - &dwName) == ERROR_SUCCESS) - { - SH_LoadDynamicContextMenuHandler(This, hKey, &clsid, TRUE); - } - } - else - { - SH_LoadDynamicContextMenuHandler(This, hKey, &clsid, TRUE); - } - } - } - dwIndex++; - }while(res == ERROR_SUCCESS); - - RegCloseKey(hKey); - return index; -} - - -static -UINT -InsertMenuItemsOfDynamicContextMenuExtension(IDefaultContextMenuImpl * This, HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast) -{ - PDynamicShellEntry curEntry; - HRESULT hResult; - MENUITEMINFOW mii; - if (!This->dhead) - { - This->iIdSHEFirst = 0; - This->iIdSHELast = 0; - return indexMenu; - } - - curEntry = This->dhead; - This->iIdSHEFirst = idCmdFirst; - - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_FTYPE | MIIM_STATE; - mii.fType = MFT_SEPARATOR; - mii.fState = MFS_ENABLED; - InsertMenuItemW(hMenu, indexMenu++, TRUE, &mii); - - do - { - hResult = IContextMenu_QueryContextMenu(curEntry->CMenu, hMenu, indexMenu, idCmdFirst, idCmdLast, CMF_NORMAL); - if (SUCCEEDED(hResult)) - { - curEntry->iIdCmdFirst = idCmdFirst; - curEntry->NumIds = LOWORD(hResult); - indexMenu += curEntry->NumIds; - idCmdFirst += curEntry->NumIds + 0x10; - } - TRACE("curEntry %p hresult %x contextmenu %p cmdfirst %x num ids %x\n", curEntry, hResult, curEntry->CMenu, curEntry->iIdCmdFirst, curEntry->NumIds); - curEntry = curEntry->Next; - }while(curEntry); - - This->iIdSHELast = idCmdFirst; - TRACE("SH_LoadContextMenuHandlers first %x last %x\n", This->iIdSHEFirst, This->iIdSHELast); - return indexMenu; -} - -UINT -BuildBackgroundContextMenu( - IDefaultContextMenuImpl * This, - HMENU hMenu, - UINT iIdCmdFirst, - UINT iIdCmdLast, - UINT uFlags) -{ - MENUITEMINFOW mii; - WCHAR szBuffer[MAX_PATH]; - UINT indexMenu = 0; - HMENU hSubMenu; - HKEY hKey; - - ZeroMemory(&mii, sizeof(mii)); - - TRACE("BuildBackgroundContextMenu entered\n"); - - if (!_ILIsDesktop(This->dcm.pidlFolder)) - { - /* view option is only available in browsing mode */ - hSubMenu = LoadMenuA(shell32_hInstance, "MENU_001"); - if (hSubMenu) - { - szBuffer[0] = 0; - LoadStringW(shell32_hInstance, FCIDM_SHVIEW_VIEW, szBuffer, MAX_PATH); - szBuffer[MAX_PATH-1] = 0; - - TRACE("szBuffer %s\n", debugstr_w(szBuffer)); - - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_TYPE | MIIM_STATE | MIIM_SUBMENU | MIIM_ID; - mii.fType = MFT_STRING; - mii.wID = iIdCmdFirst++; - mii.dwTypeData = szBuffer; - mii.cch = strlenW( mii.dwTypeData ); - mii.fState = MFS_ENABLED; - mii.hSubMenu = hSubMenu; - InsertMenuItemW(hMenu, indexMenu++, TRUE, &mii); - DestroyMenu(hSubMenu); - } - } - hSubMenu = LoadMenuA(shell32_hInstance, "MENU_002"); - if (hSubMenu) - { - /* merge general background context menu in */ - iIdCmdFirst = Shell_MergeMenus(hMenu, hSubMenu, indexMenu, 0, iIdCmdLast, MM_DONTREMOVESEPS | MM_SUBMENUSHAVEIDS) + 1; - DestroyMenu(hSubMenu); - } - - if (!HasClipboardData()) - { - TRACE("disabling paste options\n"); - DisablePasteOptions(hMenu); - } - /* load extensions from HKCR\* key */ - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, - L"*", - 0, - KEY_READ, - &hKey) == ERROR_SUCCESS) - { - EnumerateDynamicContextHandlerForKey(This, hKey); - RegCloseKey(hKey); - } - - /* load create new shell extension */ - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, - L"CLSID\\{D969A300-E7FF-11d0-A93B-00A0C90F2719}", - 0, - KEY_READ, - &hKey) == ERROR_SUCCESS) - { - static const GUID dummy1 = {0xD969A300, 0xE7FF, 0x11d0, {0xA9, 0x3B, 0x00, 0xA0, 0xC9, 0x0F, 0x27, 0x19} }; - SH_LoadDynamicContextMenuHandler(This, hKey, &dummy1, FALSE); - RegCloseKey(hKey); - } - - InsertMenuItemsOfDynamicContextMenuExtension(This, hMenu, GetMenuItemCount(hMenu), iIdCmdFirst, iIdCmdLast); - return iIdCmdLast; -} - -static -UINT -AddStaticContextMenusToMenu( - HMENU hMenu, - UINT indexMenu, - IDefaultContextMenuImpl * This) -{ - MENUITEMINFOW mii; - PStaticShellEntry curEntry; - - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; - mii.fType = MFT_STRING; - mii.fState = MFS_ENABLED | MFS_DEFAULT; - mii.wID = 0x4000; - This->iIdSCMFirst = mii.wID; - - curEntry = This->shead; - - while(curEntry) - { - /* FIXME - * load localized verbs if its an open edit find print printto openas properties verb - */ - - mii.dwTypeData = curEntry->szVerb; - mii.cch = strlenW(mii.dwTypeData); - InsertMenuItemW(hMenu, indexMenu++, TRUE, &mii); - mii.fState = MFS_ENABLED; - mii.wID++; - curEntry = curEntry->Next; - } - This->iIdSCMLast = mii.wID - 1; - return indexMenu; -} - -static -const char * -GetLocalizedString( - HMENU hMenu, - UINT wID, - char * sResult) -{ - MENUITEMINFOA mii; - - sResult[0] = 0; - if (!hMenu) - { - return sResult; - } - - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_TYPE; - mii.fType = MFT_STRING; - mii.dwTypeData = sResult; - mii.cch = 100; - - GetMenuItemInfoA(hMenu, wID, FALSE, &mii); - return sResult; -} -#if 0 -UINT -BuildControlPanelContextMenu( - IDefaultContextMenuImpl * This, - HMENU hMenu, - UINT iIdCmdFirst, - UINT iIdCmdLast) -{ - GUID * guid; - SFGAOF attributes; - DWORD dwSize; - UINT indexMenu = 0; - LPOLESTR pwszCLSID; - WCHAR szClass[80]; - UINT length; - MENUITEMINFOW mii; - - - ZeroMemory(&mii, sizeof(MENUITEMINFOW)); - - mii.cbSize = sizeof(MENUITEMINFOW); - mii.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_ID; - mii.fType = MFT_STRING; - mii.fState = MFS_ENABLED; - - guid = _ILGetGUIDPointer(This->dcm.apidl[0]); - if (guid) - { - /* the cpl is registered as a namespace extension */ - dwSize = sizeof(SFGAOF); - wcscpy(szClass, L"CLSID\\"); - if (SUCCEEDED(StringFromCLSID(guid, &pwszCLSID))) - { - wcscpy(&szClass[6], pwszCLSID); - length = strlenW(szClass); - - CoTaskMemFree(pwszCLSID); - - /* check if the CLSID is a folder */ - wcscat(szClass, L"\\ShellFolder"); - - if (RegGetValueW(HKEY_CLASSES_ROOT, szClass, L"Attributes", RRF_RT_REG_BINARY, NULL, &attributes, &dwSize) == ERROR_SUCCESS) - { - if (attributes & SFGAO_FOLDER) - { - WCHAR szBuffer[100]; - /* insert explore string */ - LoadStringW(shell32_hInstance, FCIDM_SHVIEW_EXPLORE, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)); - szBuffer[99] = 0; - mii.wID = FCIDM_SHVIEW_EXPLORE; - mii.dwTypeData = szBuffer; - mii.fState |= MFS_DEFAULT; - InsertMenuItem(hMenu, indexMenu++, TRUE, &mii); - mii.fState = MFS_ENABLED; - } - } - - /* add static handlers*/ - szClass[length] = 0; - SH_AddStaticEntryForFileClass(This, szClass); - indexMenu = AddStaticContextMenusToMenu(hMenu, indexMenu, This); - } - } - else - { - /* cpl is registered with full path */ - SH_AddStaticEntryForFileClass(This, L".cpl"); - } - - if (AppendMenu(hMenu, MF_SEPARATOR, -1, NULL)) - { - LoadStringW(shell32_hInstance, FCIDM_SHVIEW_CREATELINK, szClass, sizeof(szClass) / sizeof(WCHAR)); - szClass[79] = 0; - InsertMenuItem(hMenu, indexMenu++, TRUE, &mii); - } -} -#endif - -UINT -BuildShellItemContextMenu( - IDefaultContextMenuImpl * This, - HMENU hMenu, - UINT iIdCmdFirst, - UINT iIdCmdLast, - UINT uFlags) -{ - WCHAR szExt[10]; - char sBuffer[100]; - HKEY hKey; - UINT indexMenu; - SFGAOF rfg; - HRESULT hr; - BOOL bAddSep; - HMENU hLocalMenu; - GUID * guid; - - TRACE("BuildShellItemContextMenu entered\n"); - - if (_ILGetExtension(This->dcm.apidl[0], &sBuffer[1], sizeof(sBuffer))) - { - sBuffer[9] = 0; - sBuffer[0] = '.'; - - if (MultiByteToWideChar( CP_ACP, 0, sBuffer, -1, (LPWSTR)szExt, 10)) - { - TRACE("szExt %d\n", debugstr_w(szExt)); - SH_AddStaticEntryForFileClass(This, szExt); - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, szExt, 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - EnumerateDynamicContextHandlerForKey(This, hKey); - RegCloseKey(hKey); - } - } - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"*", 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - /* load default extensions */ - EnumerateDynamicContextHandlerForKey(This, hKey); - RegCloseKey(hKey); - } - } - - if (!_ILIsPidlSimple(This->dcm.apidl[0])|| _ILIsFolder(This->dcm.apidl[0])) - { - /* add the default verbs open / explore */ - SH_AddStaticEntryForFileClass(This, L"Folder"); - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"Folder", 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - EnumerateDynamicContextHandlerForKey(This, hKey); - RegCloseKey(hKey); - } - } - - guid = _ILGetGUIDPointer(This->dcm.apidl[0]); - if (guid) - { - LPOLESTR pwszCLSID; - WCHAR buffer[60]; - - wcscpy(buffer, L"CLSID\\"); - hr = StringFromCLSID(guid, &pwszCLSID); - if (hr == S_OK) - { - wcscpy(&buffer[6], pwszCLSID); - TRACE("buffer %s\n", debugstr_w(buffer)); - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, buffer, 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - EnumerateDynamicContextHandlerForKey(This, hKey); - SH_AddStaticEntryForFileClass(This, buffer); - RegCloseKey(hKey); - } - CoTaskMemFree(pwszCLSID); - } - } - - - if (_ILIsDrive(This->dcm.apidl[0])) - { - SH_AddStaticEntryForFileClass(This, L"Drive"); - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"Drive", 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - EnumerateDynamicContextHandlerForKey(This, hKey); - RegCloseKey(hKey); - } - } - - - /* add static actions */ - rfg = SFGAO_BROWSABLE | SFGAO_CANCOPY | SFGAO_CANLINK | SFGAO_CANMOVE | SFGAO_CANDELETE | SFGAO_CANRENAME | SFGAO_HASPROPSHEET | SFGAO_FILESYSTEM; - hr = IShellFolder_GetAttributesOf(This->dcm.psf, This->dcm.cidl, This->dcm.apidl, &rfg); - if (!SUCCEEDED(hr)) - rfg = 0; - - if (rfg & SFGAO_FILESYSTEM) - { - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"AllFilesystemObjects", 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - /* sendto service is registered there */ - EnumerateDynamicContextHandlerForKey(This, hKey); - RegCloseKey(hKey); - } - } - - /* add static context menu handlers */ - indexMenu = AddStaticContextMenusToMenu(hMenu, 0, This); - /* now process dynamic context menu handlers */ - indexMenu = InsertMenuItemsOfDynamicContextMenuExtension(This, hMenu, indexMenu, iIdCmdFirst, iIdCmdLast); - TRACE("indexMenu %d\n", indexMenu); - - hLocalMenu = LoadMenuW(shell32_hInstance, L"MENU_SHV_FILE"); - if (!hLocalMenu) - { - return iIdCmdLast; - } - - if (rfg & (SFGAO_CANCOPY | SFGAO_CANMOVE)) - { - _InsertMenuItem(hMenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); - if (rfg & SFGAO_CANMOVE) - _InsertMenuItem(hMenu, indexMenu++, TRUE, FCIDM_SHVIEW_CUT, MFT_STRING, GetLocalizedString(hLocalMenu, FCIDM_SHVIEW_CUT, sBuffer), MFS_ENABLED); - if (rfg & SFGAO_CANCOPY) - _InsertMenuItem(hMenu, indexMenu++, TRUE, FCIDM_SHVIEW_COPY, MFT_STRING, GetLocalizedString(hLocalMenu, FCIDM_SHVIEW_COPY, sBuffer), MFS_ENABLED); - } - - bAddSep = TRUE; - if (rfg & SFGAO_CANLINK) - { - bAddSep = FALSE; - _InsertMenuItem(hMenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); - _InsertMenuItem(hMenu, indexMenu++, TRUE, FCIDM_SHVIEW_CREATELINK, MFT_STRING, GetLocalizedString(hLocalMenu, FCIDM_SHVIEW_CREATELINK, sBuffer), MFS_ENABLED); - } - - - if (rfg & SFGAO_CANDELETE) - { - if (bAddSep) - { - bAddSep = FALSE; - _InsertMenuItem(hMenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); - } - _InsertMenuItem(hMenu, indexMenu++, TRUE, FCIDM_SHVIEW_DELETE, MFT_STRING, GetLocalizedString(hLocalMenu, FCIDM_SHVIEW_DELETE, sBuffer), MFS_ENABLED); - } - - if (rfg & SFGAO_CANRENAME) - { - if (bAddSep) - { - bAddSep = FALSE; - _InsertMenuItem(hMenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); - } - _InsertMenuItem(hMenu, indexMenu++, TRUE, FCIDM_SHVIEW_RENAME, MFT_STRING, GetLocalizedString(hLocalMenu, FCIDM_SHVIEW_RENAME, sBuffer), MFS_ENABLED); - } - - _InsertMenuItem(hMenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); - _InsertMenuItem(hMenu, indexMenu++, TRUE, FCIDM_SHVIEW_PROPERTIES, MFT_STRING, GetLocalizedString(hLocalMenu, FCIDM_SHVIEW_PROPERTIES, sBuffer), MFS_ENABLED); - - DestroyMenu(hLocalMenu); - return iIdCmdLast; -} - -static -HRESULT -WINAPI -IDefaultContextMenu_fnQueryContextMenu( - IContextMenu2 *iface, - HMENU hmenu, - UINT indexMenu, - UINT idCmdFirst, - UINT idCmdLast, - UINT uFlags) -{ - IDefaultContextMenuImpl * This = impl_from_IContextMenu(iface); - - if (This->dcm.cidl) - { - idCmdFirst = BuildShellItemContextMenu(This, hmenu, idCmdFirst, idCmdLast, uFlags); - } - else - { - idCmdFirst = BuildBackgroundContextMenu(This, hmenu, idCmdFirst, idCmdLast, uFlags); - } - - return S_OK; -} - -static -HRESULT -NotifyShellViewWindow(LPCMINVOKECOMMANDINFO lpcmi) -{ - LPSHELLBROWSER lpSB; - LPSHELLVIEW lpSV = NULL; - HWND hwndSV = NULL; - - if((lpSB = (LPSHELLBROWSER)SendMessageA(lpcmi->hwnd, CWM_GETISHELLBROWSER,0,0))) - { - if(SUCCEEDED(IShellBrowser_QueryActiveShellView(lpSB, &lpSV))) - { - IShellView_GetWindow(lpSV, &hwndSV); - } - } - - if (LOWORD(lpcmi->lpVerb) == FCIDM_SHVIEW_REFRESH) - { - if (lpSV) - IShellView_Refresh(lpSV); - - return S_OK; - } - - SendMessageW(hwndSV, WM_COMMAND, MAKEWPARAM(LOWORD(lpcmi->lpVerb), 0), 0); - - return S_OK; -} - -static -HRESULT -DoPaste( - IDefaultContextMenuImpl *iface, - LPCMINVOKECOMMANDINFO lpcmi) -{ - - - return E_FAIL; -} - -static -HRESULT -DoOpenOrExplore( - IDefaultContextMenuImpl *iface, - LPCMINVOKECOMMANDINFO lpcmi) -{ - - - return E_FAIL; -} - -static -HRESULT -DoCopyOrCut( - IDefaultContextMenuImpl *iface, - LPCMINVOKECOMMANDINFO lpcmi) -{ - - - return E_FAIL; -} - -static -HRESULT -DoCreateLink( - IDefaultContextMenuImpl *iface) -{ - - - return E_FAIL; -} - -static -HRESULT -DoDelete( - IDefaultContextMenuImpl *iface) -{ - - - return E_FAIL; -} - -static -HRESULT -DoRename( - IDefaultContextMenuImpl *iface) -{ - - - return E_FAIL; -} - -static -HRESULT -DoProperties( - IDefaultContextMenuImpl *iface, - LPCMINVOKECOMMANDINFO lpcmi) -{ - - - return E_FAIL; -} - -static -HRESULT -DoDynamicShellExtensions( - IDefaultContextMenuImpl *iface, - LPCMINVOKECOMMANDINFO lpcmi) -{ - - - return E_FAIL; -} - - -static -HRESULT -DoStaticShellExtensions( - IDefaultContextMenuImpl *This, - LPCMINVOKECOMMANDINFO lpcmi) -{ - SHELLEXECUTEINFOW sei; - PStaticShellEntry pCurrent = This->shead; - int verb = LOWORD(lpcmi->lpVerb) - This->iIdSCMFirst; - - - while(pCurrent && verb-- > 0) - pCurrent = pCurrent->Next; - - if (verb > 0) - return E_FAIL; - - - ZeroMemory(&sei, sizeof(sei)); - sei.cbSize = sizeof(sei); - sei.fMask = SEE_MASK_CLASSNAME; - sei.lpClass = pCurrent->szClass; - sei.hwnd = lpcmi->hwnd; - sei.nShow = SW_SHOWNORMAL; - sei.lpVerb = pCurrent->szVerb; - ShellExecuteExW(&sei); - return S_OK; - - -} - -static -HRESULT -WINAPI -IDefaultContextMenu_fnInvokeCommand( - IContextMenu2 *iface, - LPCMINVOKECOMMANDINFO lpcmi) -{ - IDefaultContextMenuImpl * This = impl_from_IContextMenu(iface); - - switch(LOWORD(lpcmi->lpVerb)) - { - case FCIDM_SHVIEW_BIGICON: - case FCIDM_SHVIEW_SMALLICON: - case FCIDM_SHVIEW_LISTVIEW: - case FCIDM_SHVIEW_REPORTVIEW: - case 0x30: /* FIX IDS in resource files */ - case 0x31: - case 0x32: - case 0x33: - case FCIDM_SHVIEW_AUTOARRANGE: - case FCIDM_SHVIEW_SNAPTOGRID: - case FCIDM_SHVIEW_REFRESH: - return NotifyShellViewWindow(lpcmi); - case FCIDM_SHVIEW_INSERT: - case FCIDM_SHVIEW_INSERTLINK: - return DoPaste(This, lpcmi); - case FCIDM_SHVIEW_OPEN: - case FCIDM_SHVIEW_EXPLORE: - return DoOpenOrExplore(This, lpcmi); - case FCIDM_SHVIEW_COPY: - case FCIDM_SHVIEW_CUT: - return DoCopyOrCut(This, lpcmi); - case FCIDM_SHVIEW_CREATELINK: - return DoCreateLink(This); - case FCIDM_SHVIEW_DELETE: - return DoDelete(This); - case FCIDM_SHVIEW_RENAME: - return DoRename(This); - case FCIDM_SHVIEW_PROPERTIES: - return DoProperties(This, lpcmi); - } - - if (This->iIdSHEFirst && This->iIdSHELast) - { - if (LOWORD(lpcmi->lpVerb) >= This->iIdSHEFirst && LOWORD(lpcmi->lpVerb) <= This->iIdSHELast) - { - return DoDynamicShellExtensions(This, lpcmi); - } - } - - if (This->iIdSCMFirst && This->iIdSCMLast) - { - if (LOWORD(lpcmi->lpVerb) >= This->iIdSCMFirst && LOWORD(lpcmi->lpVerb) <= This->iIdSCMLast) - { - return DoStaticShellExtensions(This, lpcmi); - } - } - - FIXME("Unhandled Verb %xl\n",LOWORD(lpcmi->lpVerb)); - return E_UNEXPECTED; -} - -static -HRESULT -WINAPI -IDefaultContextMenu_fnGetCommandString( - IContextMenu2 *iface, - UINT_PTR idCommand, - UINT uFlags, - UINT* lpReserved, - LPSTR lpszName, - UINT uMaxNameLen) -{ - - return S_OK; -} - -static -HRESULT -WINAPI -IDefaultContextMenu_fnHandleMenuMsg( - IContextMenu2 *iface, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - - return S_OK; -} - -static const IContextMenu2Vtbl cmvt = -{ - IDefaultContextMenu_fnQueryInterface, - IDefaultContextMenu_fnAddRef, - IDefaultContextMenu_fnRelease, - IDefaultContextMenu_fnQueryContextMenu, - IDefaultContextMenu_fnInvokeCommand, - IDefaultContextMenu_fnGetCommandString, - IDefaultContextMenu_fnHandleMenuMsg -}; - -static -HRESULT -IDefaultContextMenu_Constructor( - const DEFCONTEXTMENU *pdcm, - REFIID riid, - void **ppv) -{ - IDefaultContextMenuImpl * This; - HRESULT hr = E_FAIL; - IDataObject * pDataObj; - - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDefaultContextMenuImpl)); - if (This) - { - This->lpVtbl = &cmvt; - This->ref = 1; - TRACE("cidl %u\n", This->dcm.cidl); - if (SUCCEEDED(SHCreateDataObject(pdcm->pidlFolder, pdcm->cidl, pdcm->apidl, NULL, &IID_IDataObject, (void**)&pDataObj))) - { - This->pDataObj = pDataObj; - } - CopyMemory(&This->dcm, pdcm, sizeof(DEFCONTEXTMENU)); - hr = IDefaultContextMenu_fnQueryInterface((IContextMenu2*)This, riid, ppv); - } - - TRACE("This(%p)(%x) cidl %u\n",This, hr, This->dcm.cidl); - return hr; -} - - -/************************************************************************* - * SHCreateDefaultContextMenu [SHELL32.325] Vista API - * - */ - -HRESULT -WINAPI -SHCreateDefaultContextMenu( - const DEFCONTEXTMENU *pdcm, - REFIID riid, - void **ppv) -{ -#if 1 - HRESULT hr = E_FAIL; - - *ppv = NULL; - hr = IDefaultContextMenu_Constructor( pdcm, riid, ppv ); - - TRACE("pcm %p hr %x\n", pdcm, hr); - return hr; -#else - HRESULT hr; - IContextMenu2 * pcm; - - if (pdcm->cidl > 0) - pcm = ISvItemCm_Constructor( pdcm->psf, pdcm->pidlFolder, pdcm->apidl, pdcm->cidl ); - else - pcm = ISvBgCm_Constructor( pdcm->psf, TRUE ); - - hr = S_OK; - *ppv = pcm; - - return hr; -#endif -} - -/************************************************************************* - * CDefFolderMenu_Create2 [SHELL32.701] - * - */ - -INT -WINAPI -CDefFolderMenu_Create2( - LPCITEMIDLIST pidlFolder, - HWND hwnd, - UINT cidl, - LPCITEMIDLIST *apidl, - IShellFolder *psf, - LPFNDFMCALLBACK lpfn, - UINT nKeys, - HKEY *ahkeyClsKeys, - IContextMenu **ppcm) -{ - DEFCONTEXTMENU pdcm; - HRESULT hr; - - pdcm.hwnd = hwnd; - pdcm.pcmcb = NULL; - pdcm.pidlFolder = pidlFolder; - pdcm.psf = psf; - pdcm.cidl = cidl; - pdcm.apidl = apidl; - pdcm.punkAssociationInfo = NULL; - pdcm.cKeys = nKeys; - pdcm.aKeys = ahkeyClsKeys; - - hr = SHCreateDefaultContextMenu(&pdcm, &IID_IContextMenu, (void**)ppcm); - return hr; -} - Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Wed Jan 2 02:42:01 2008 @@ -1262,3 +1262,62 @@ RegCloseKey(hKey); return index; } + +/************************************************************************* + * SHCreateDefaultContextMenu [SHELL32.325] Vista API + * + */ + +HRESULT WINAPI SHCreateDefaultContextMenu( + const DEFCONTEXTMENU *pdcm, + REFIID riid, + void **ppv) +{ + HRESULT hr; + IContextMenu2 * pcm; + + if (pdcm->cidl > 0) + pcm = ISvItemCm_Constructor( pdcm->psf, pdcm->pidlFolder, pdcm->apidl, pdcm->cidl ); + else + pcm = ISvBgCm_Constructor( pdcm->psf, TRUE ); + + hr = S_OK; + *ppv = pcm; + + return hr; +} + +/************************************************************************* + * CDefFolderMenu_Create2 [SHELL32.701] + * + */ + +INT +WINAPI +CDefFolderMenu_Create2( + LPCITEMIDLIST pidlFolder, + HWND hwnd, + UINT cidl, + LPCITEMIDLIST *apidl, + IShellFolder *psf, + LPFNDFMCALLBACK lpfn, + UINT nKeys, + HKEY *ahkeyClsKeys, + IContextMenu **ppcm) +{ + DEFCONTEXTMENU pdcm; + HRESULT hr; + + pdcm.hwnd = hwnd; + pdcm.pcmcb = NULL; //FIXME + pdcm.pidlFolder = pidlFolder; + pdcm.psf = psf; + pdcm.cidl = cidl; + pdcm.apidl = apidl; + pdcm.punkAssociationInfo = NULL; + pdcm.cKeys = nKeys; + pdcm.aKeys = ahkeyClsKeys; + + hr = SHCreateDefaultContextMenu(&pdcm, &IID_IContextMenu, (void**)ppcm); + return hr; +}

1 0

[janderwald] 31547: - scan HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\ClassicStartMenu key if a shellfolder should be hidden - also add items which should should not be hidden - network location shell folder now appears but isnt working
by janderwald＠svn.reactos.org 01 Jan '08

01 Jan '08

Author: janderwald Date: Wed Jan 2 02:34:28 2008 New Revision: 31547 URL: http://svn.reactos.org/svn/reactos?rev=31547&view=rev Log: - scan HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\ClassicStartMenu key if a shellfolder should be hidden - also add items which should should not be hidden - network location shell folder now appears but isnt working Added: trunk/reactos/dll/win32/shell32/shv_default_context_menu.c (with props) Modified: trunk/reactos/dll/win32/shell32/enumidlist.c trunk/reactos/dll/win32/shell32/enumidlist.h trunk/reactos/dll/win32/shell32/shfldr_desktop.c trunk/reactos/dll/win32/shell32/shlfldr_mydocuments.c trunk/reactos/dll/win32/shell32/shlfolder.c trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/enumidlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/enumidli… ============================================================================== --- trunk/reactos/dll/win32/shell32/enumidlist.c (original) +++ trunk/reactos/dll/win32/shell32/enumidlist.c Wed Jan 2 02:34:28 2008 @@ -98,6 +98,29 @@ } return FALSE; } +/************************************************************************** + * HasItemWithCLSID() + */ +BOOL HasItemWithCLSID(IEnumIDList *iface, LPITEMIDLIST pidl) +{ + IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + LPENUMLIST pCur; + REFIID refid = _ILGetGUIDPointer(pidl); + + pCur = This->mpFirst; + + while(pCur) + { + REFIID curid = _ILGetGUIDPointer(pCur->pidl); + if (IsEqualIID(curid, refid)) + { + return TRUE; + } + pCur = pCur->pNext; + } + return FALSE; +} + /************************************************************************** * CreateFolderEnumList() Modified: trunk/reactos/dll/win32/shell32/enumidlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/enumidli… ============================================================================== --- trunk/reactos/dll/win32/shell32/enumidlist.h (original) +++ trunk/reactos/dll/win32/shell32/enumidlist.h Wed Jan 2 02:34:28 2008 @@ -21,6 +21,7 @@ /* Creates an IEnumIDList; add LPITEMIDLISTs to it with AddToEnumList. */ LPENUMIDLIST IEnumIDList_Constructor(void); BOOL AddToEnumList(IEnumIDList *list, LPITEMIDLIST pidl); +BOOL HasItemWithCLSID(IEnumIDList *list, LPITEMIDLIST pidl); /* Enumerates the folders and/or files (depending on dwFlags) in lpszPath and * adds them to the already-created list. Modified: trunk/reactos/dll/win32/shell32/shfldr_desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_d… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_desktop.c (original) +++ trunk/reactos/dll/win32/shell32/shfldr_desktop.c Wed Jan 2 02:34:28 2008 @@ -239,6 +239,34 @@ return hr; } +static const WCHAR ClassicStartMenuW[] = {'S','O','F','T','W','A','R','E','\\', + 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r', + '\\','H','i','d','e','D','e','s','k','t','o','p','I','c','o','n','s','\\', + 'C','l','a','s','s','i','c','S','t','a','r','t','M','e','n','u','\0' }; + +INT +HideNamespaceExtension(WCHAR *iid) +{ + DWORD Result, dwResult; + dwResult = sizeof(DWORD); + + if (RegGetValueW(HKEY_CURRENT_USER, /* FIXME use NewStartPanel when activated */ + ClassicStartMenuW, + iid, + RRF_RT_DWORD, + NULL, + &Result, + &dwResult) != ERROR_SUCCESS) + { + return -1; + } + + return Result; +} + + + /************************************************************************** * CreateDesktopEnumList() */ @@ -252,6 +280,8 @@ { BOOL ret = TRUE; WCHAR szPath[MAX_PATH]; + static WCHAR MyDocumentsClassString[] = L"{450D8FBA-AD25-11D0-98A8-0800361B1103}"; + TRACE("(%p)->(flags=0x%08x)\n", list, dwFlags); @@ -260,14 +290,23 @@ { HKEY hkey; UINT i; + DWORD dwResult; /* create the pidl for This item */ - ret = AddToEnumList(list, _ILCreateMyDocuments()); + if (HideNamespaceExtension(MyDocumentsClassString) < 1) + { + ret = AddToEnumList(list, _ILCreateMyDocuments()); + } ret = AddToEnumList(list, _ILCreateMyComputer()); - for (i=0; i<2; i++) { - if (ret && !RegOpenKeyExW(i == 0 ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, - Desktop_NameSpaceW, 0, KEY_READ, &hkey)) + for (i = 0; i < 2; i++) + { + if (i == 0) + dwResult = RegOpenKeyExW(HKEY_LOCAL_MACHINE, Desktop_NameSpaceW, 0, KEY_READ, &hkey); + else + dwResult = RegOpenKeyExW(HKEY_CURRENT_USER, Desktop_NameSpaceW, 0, KEY_READ, &hkey); + + if (dwResult == ERROR_SUCCESS) { WCHAR iid[50]; LPITEMIDLIST pidl; @@ -282,24 +321,69 @@ r = RegEnumKeyExW(hkey, i, iid, &size, 0, NULL, NULL, NULL); if (ERROR_SUCCESS == r) { - pidl = _ILCreateGuidFromStrW(iid); - if (_ILIsMyDocuments(pidl)) + if (HideNamespaceExtension(iid) < 1) { - SHFree(pidl); + pidl = _ILCreateGuidFromStrW(iid); + if (!HasItemWithCLSID(list, pidl)) + { + ret = AddToEnumList(list, pidl); + } + else + { + SHFree(pidl); + } + } + } + else if (ERROR_NO_MORE_ITEMS == r) + break; + else + ret = FALSE; + i++; + } + RegCloseKey(hkey); + } + } + for (i = 0; i < 2; i++) + { + if (i == 0) + dwResult = RegOpenKeyExW(HKEY_LOCAL_MACHINE, ClassicStartMenuW, 0, KEY_READ, &hkey); + else + dwResult = RegOpenKeyExW(HKEY_CURRENT_USER, ClassicStartMenuW, 0, KEY_READ, &hkey); + + if (dwResult == ERROR_SUCCESS) + { + DWORD j = 0, dwVal, Val, dwType, dwIID; + LONG r; + WCHAR iid[50]; + + while(ret) + { + dwVal = sizeof(Val); + dwIID = sizeof(iid) / sizeof(WCHAR); + + r = RegEnumValueW(hkey, j++, iid, &dwIID, NULL, &dwType, (LPBYTE)&Val, &dwVal); + if (r == ERROR_SUCCESS) + { + if (Val == 0 && dwType == REG_DWORD) + { + LPITEMIDLIST pidl = _ILCreateGuidFromStrW(iid); + if (!HasItemWithCLSID(list, pidl)) + { + AddToEnumList(list, pidl); + } + else + { + SHFree(pidl); + } } - else - { - ret = AddToEnumList(list, pidl); - } - i++; } else if (ERROR_NO_MORE_ITEMS == r) break; else ret = FALSE; } - RegCloseKey(hkey); } + } } Modified: trunk/reactos/dll/win32/shell32/shlfldr_mydocuments.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfldr_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfldr_mydocuments.c (original) +++ trunk/reactos/dll/win32/shell32/shlfldr_mydocuments.c Wed Jan 2 02:34:28 2008 @@ -52,7 +52,7 @@ #include "debughlp.h" #include "shfldr.h" -WINE_DEFAULT_DEBUG_CHANNEL (shell); +WINE_DEFAULT_DEBUG_CHANNEL (mydocs); /*********************************************************************** * MyDocumentsfolder implementation @@ -500,13 +500,14 @@ if (!pszPath) return E_OUTOFMEMORY; - if (_ILIsMyDocuments (pidl) || _ILIsDesktop(pidl)) + if (_ILIsMyDocuments (pidl)) { if ((GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL) && (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING)) strcpyW(pszPath, This->sPathTarget); else HCR_GetClassNameW(&CLSID_MyDocuments, pszPath, MAX_PATH); + TRACE("CP\n"); } else if (_ILIsPidlSimple (pidl)) { @@ -563,6 +564,7 @@ hr = SHELL32_GetDisplayNameOfChild (iface, pidl, dwFlags, pszPath, MAX_PATH); + TRACE("CP\n"); } else { @@ -570,12 +572,14 @@ pszPath[0] = ':'; pszPath[1] = ':'; SHELL32_GUIDToStringW (clsid, &pszPath[2]); + TRACE("CP\n"); } } else { /* user friendly name */ HCR_GetClassNameW (clsid, pszPath, MAX_PATH); + TRACE("CP\n"); } } else @@ -587,14 +591,20 @@ (GET_SHGDN_RELATION(dwFlags) != SHGDN_INFOLDER)) { lstrcpynW(pszPath, This->sPathTarget, MAX_PATH - 1); + TRACE("CP %s\n", debugstr_w(pszPath)); + } + + if (!_ILIsDesktop(pidl)) + { PathAddBackslashW(pszPath); cLen = lstrlenW(pszPath); + _ILSimpleGetTextW(pidl, pszPath + cLen, MAX_PATH - cLen); + if (!_ILIsFolder(pidl)) + { + SHELL_FS_ProcessDisplayFilename(pszPath, dwFlags); + TRACE("CP\n"); + } } - - _ILSimpleGetTextW(pidl, pszPath + cLen, MAX_PATH - cLen); - - if (!_ILIsFolder(pidl)) - SHELL_FS_ProcessDisplayFilename(pszPath, dwFlags); } } else @@ -602,31 +612,18 @@ /* a complex pidl, let the subfolder do the work */ hr = SHELL32_GetDisplayNameOfChild (iface, pidl, dwFlags, pszPath, MAX_PATH); + TRACE("CP\n"); } if (SUCCEEDED(hr)) { - /* Win9x always returns ANSI strings, NT always returns Unicode strings */ - if (GetVersion() & 0x80000000) - { - strRet->uType = STRRET_CSTR; - if (!WideCharToMultiByte(CP_ACP, 0, pszPath, -1, strRet->u.cStr, MAX_PATH, - NULL, NULL)) - strRet->u.cStr[0] = '\0'; - CoTaskMemFree(pszPath); - } - else - { - strRet->uType = STRRET_WSTR; - strRet->u.pOleStr = pszPath; - } + strRet->uType = STRRET_WSTR; + strRet->u.pOleStr = pszPath; } else CoTaskMemFree(pszPath); - TRACE ("-- (%p)->(%s,0x%08x)\n", This, - strRet->uType == STRRET_CSTR ? strRet->u.cStr : - debugstr_w(strRet->u.pOleStr), hr); + TRACE ("-- (%p)->(%s,0x%08x)\n", This, debugstr_w(strRet->u.pOleStr), hr); return hr; } Modified: trunk/reactos/dll/win32/shell32/shlfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.c (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.c Wed Jan 2 02:34:28 2008 @@ -418,7 +418,7 @@ if (_ILIsDrive (pidl)) { *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FILESYSTEM|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR| - SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANLINK; + SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANLINK|SFGAO_CANRENAME; } else if (has_guid && HCR_GetFolderAttributes(pidl, &dwAttributes)) { *pdwAttributes = dwAttributes; } else if (_ILGetDataPointer (pidl)) { Added: trunk/reactos/dll/win32/shell32/shv_default_context_menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_defa… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_default_context_menu.c (added) +++ trunk/reactos/dll/win32/shell32/shv_default_context_menu.c Wed Jan 2 02:34:28 2008 @@ -1,0 +1,1246 @@ +/* + * PROJECT: shell32 + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/shell32/shv_item_new.c + * PURPOSE: provides default context menu implementation + * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) + */ + +#include <string.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT +#define YDEBUG +#include "winerror.h" +#include "wine/debug.h" + +#include "windef.h" +#include "wingdi.h" +#include "pidl.h" +#include "undocshell.h" +#include "shlobj.h" +#include "objbase.h" + +#include "shlwapi.h" +#include "shell32_main.h" +#include "shellfolder.h" +#include "debughlp.h" +#include "shresdef.h" +#include "shlguid.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dmenu); + +typedef struct _DynamicShellEntry_ +{ + UINT iIdCmdFirst; + UINT NumIds; + IContextMenu * CMenu; + struct _DynamicShellEntry_ * Next; +}DynamicShellEntry, *PDynamicShellEntry; + +typedef struct _StaticShellEntry_ +{ + LPWSTR szVerb; + LPWSTR szClass; + struct _StaticShellEntry_ * Next; +}StaticShellEntry, *PStaticShellEntry; + + +typedef struct +{ + const IContextMenu2Vtbl *lpVtbl; + LONG ref; + DEFCONTEXTMENU dcm; + IDataObject * pDataObj; + DWORD bGroupPolicyActive; + PDynamicShellEntry dhead; /* first dynamic shell extension entry */ + UINT iIdSHEFirst; /* first used id */ + UINT iIdSHELast; /* last used id */ + PStaticShellEntry shead; /* first static shell extension entry */ + UINT iIdSCMFirst; /* first static used id */ + UINT iIdSCMLast; /* last static used id */ +}IDefaultContextMenuImpl; + +static inline IDefaultContextMenuImpl *impl_from_IContextMenu( IContextMenu2 *iface ) +{ + return (IDefaultContextMenuImpl *)((char*)iface - FIELD_OFFSET(IDefaultContextMenuImpl, lpVtbl)); +} + +static +HRESULT +WINAPI +IDefaultContextMenu_fnQueryInterface( + IContextMenu2 *iface, + REFIID riid, + LPVOID *ppvObj) +{ + IDefaultContextMenuImpl *This = (IDefaultContextMenuImpl *)iface; + + TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); + + *ppvObj = NULL; + + if(IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IContextMenu) || + IsEqualIID(riid, &IID_IContextMenu2)) + { + *ppvObj = This; + } + + if(*ppvObj) + { + IUnknown_AddRef((IUnknown*)*ppvObj); + TRACE("-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj); + return S_OK; + } + TRACE("-- Interface: E_NOINTERFACE\n"); + return E_NOINTERFACE; +} + + +static +ULONG +WINAPI +IDefaultContextMenu_fnAddRef( + IContextMenu2 *iface) +{ + IDefaultContextMenuImpl *This = (IDefaultContextMenuImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(count=%u)\n", This, refCount - 1); + + return refCount; +} + +static +ULONG +WINAPI +IDefaultContextMenu_fnRelease( + IContextMenu2 *iface) +{ + IDefaultContextMenuImpl *This = (IDefaultContextMenuImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(count=%u)\n", This, refCount + 1); + if (!refCount) + { + TRACE(" destroying IContextMenu(%p)\n",This); + + HeapFree(GetProcessHeap(),0,This); + } + + return refCount; +} + +static +void +SH_AddStaticEntry(IDefaultContextMenuImpl * This, HKEY hKey, WCHAR *szVerb, WCHAR * szClass) +{ + PStaticShellEntry curEntry; + PStaticShellEntry lastEntry = NULL; + + curEntry = This->shead; + + while(curEntry) + { + if (!wcsicmp(curEntry->szVerb, szVerb)) + { + /* entry already exists */ + return; + } + lastEntry = curEntry; + curEntry = curEntry->Next; + } + + TRACE("adding verb %s szClass %s\n", debugstr_w(szVerb), debugstr_w(szClass)); + + curEntry = malloc(sizeof(StaticShellEntry)); + if (curEntry) + { + curEntry->Next = NULL; + curEntry->szVerb = wcsdup(szVerb); + curEntry->szClass = wcsdup(szClass); + } + + if (lastEntry) + { + lastEntry->Next = curEntry; + } + else + { + This->shead = curEntry; + } +} + +static +void +SH_AddStaticEntryForKey(IDefaultContextMenuImpl * This, HKEY hKey, WCHAR * szClass) +{ + LONG result; + DWORD dwIndex; + WCHAR szName[40]; + DWORD dwName; + + dwIndex = 0; + do + { + szName[0] = 0; + dwName = sizeof(szName) / sizeof(WCHAR); + result = RegEnumKeyExW(hKey, dwIndex, szName, &dwName, NULL, NULL, NULL, NULL); + szName[39] = 0; + if (result == ERROR_SUCCESS) + { + SH_AddStaticEntry(This, hKey, szName, szClass); + } + dwIndex++; + }while(result == ERROR_SUCCESS); +} + +static +void +SH_AddStaticEntryForFileClass(IDefaultContextMenuImpl * This, WCHAR * szExt) +{ + WCHAR szBuffer[100]; + HKEY hKey; + LONG result; + DWORD dwBuffer; + + TRACE("SH_AddStaticEntryForFileClass entered with %s\n", debugstr_w(szExt)); + + wcscpy(szBuffer, szExt); + wcscat(szBuffer, L"\\shell"); + result = RegOpenKeyExW(HKEY_CLASSES_ROOT, szBuffer, 0, KEY_READ | KEY_QUERY_VALUE, &hKey); + if (result == ERROR_SUCCESS) + { + SH_AddStaticEntryForKey(This, hKey, szExt); + RegCloseKey(hKey); + } + + dwBuffer = sizeof(szBuffer); + result = RegGetValueW(HKEY_CLASSES_ROOT, szExt, NULL, RRF_RT_REG_SZ, NULL, (LPBYTE)szBuffer, &dwBuffer); + if (result == ERROR_SUCCESS) + { + UINT length = strlenW(szBuffer); + wcscat(szBuffer, L"\\shell"); + TRACE("szBuffer %s\n", debugstr_w(szBuffer)); + + result = RegOpenKeyExW(HKEY_CLASSES_ROOT, szBuffer, 0, KEY_READ | KEY_QUERY_VALUE, &hKey); + if (result == ERROR_SUCCESS) + { + szBuffer[length] = 0; + SH_AddStaticEntryForKey(This, hKey, szBuffer); + RegCloseKey(hKey); + } + } + + strcpyW(szBuffer, "SystemFileAssociations\\"); + dwBuffer = sizeof(szBuffer) - strlenW(szBuffer) * sizeof(WCHAR); + result = RegGetValueW(HKEY_CLASSES_ROOT, szExt, L"PerceivedType", RRF_RT_REG_SZ, NULL, (LPBYTE)&szBuffer[23], &dwBuffer); + if (result == ERROR_SUCCESS) + { + UINT length = strlenW(szBuffer); + wcscat(szBuffer, L"\\shell"); + TRACE("szBuffer %s\n", debugstr_w(szBuffer)); + + result = RegOpenKeyExW(HKEY_CLASSES_ROOT, szBuffer, 0, KEY_READ | KEY_QUERY_VALUE, &hKey); + if (result == ERROR_SUCCESS) + { + szBuffer[length] = 0; + SH_AddStaticEntryForKey(This, hKey, szBuffer); + RegCloseKey(hKey); + } + } + RegCloseKey(hKey); +} + +static +BOOL +HasClipboardData() +{ + BOOL ret = FALSE; + IDataObject * pda; + + if(SUCCEEDED(OleGetClipboard(&pda))) + { + STGMEDIUM medium; + FORMATETC formatetc; + + TRACE("pda=%p\n", pda); + + /* Set the FORMATETC structure*/ + InitFormatEtc(formatetc, RegisterClipboardFormatA(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); + if(SUCCEEDED(IDataObject_GetData(pda,&formatetc,&medium))) + { + ret = TRUE; + } + + IDataObject_Release(pda); + ReleaseStgMedium(&medium); + } + + return ret; +} + +VOID +DisablePasteOptions(HMENU hMenu) +{ + MENUITEMINFOW mii; + + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_STATE; + mii.fState = MFS_DISABLED; + + TRACE("result %d\n", SetMenuItemInfoW(hMenu, FCIDM_SHVIEW_INSERT, FALSE, &mii)); + TRACE("result %d\n", SetMenuItemInfoW(hMenu, FCIDM_SHVIEW_INSERTLINK, FALSE, &mii)); +} + +static +HRESULT +SH_LoadDynamicContextMenuHandler(IDefaultContextMenuImpl * This, HKEY hKey, const CLSID * szClass, BOOL bExternalInit) +{ + HRESULT hr; + IContextMenu * cmobj; + IShellExtInit *shext; + PDynamicShellEntry curEntry; + TRACE("SH_LoadDynamicContextMenuHandler entered with This %p hKey %p szClass %s bExternalInit %u\n",This, hKey, wine_dbgstr_guid(szClass), bExternalInit); + + hr = SHCoCreateInstance(NULL, szClass, NULL, &IID_IContextMenu, (void**)&cmobj); + if (hr != S_OK) + { + TRACE("SHCoCreateInstance failed %x\n", GetLastError()); + return hr; + } + + if (bExternalInit) + { + hr = cmobj->lpVtbl->QueryInterface(cmobj, &IID_IShellExtInit, (void**)&shext); + if (hr != S_OK) + { + TRACE("Failed to query for interface IID_IShellExtInit\n"); + cmobj->lpVtbl->Release(cmobj); + return FALSE; + } + hr = shext->lpVtbl->Initialize(shext, NULL, This->pDataObj, hKey); + shext->lpVtbl->Release(shext); + if (hr != S_OK) + { + TRACE("Failed to initialize shell extension error %x\n", hr); + cmobj->lpVtbl->Release(cmobj); + return hr; + } + } + + curEntry = malloc(sizeof(DynamicShellEntry)); + if(!curEntry) + { + return E_OUTOFMEMORY; + } + + curEntry->iIdCmdFirst = 0; + curEntry->Next = NULL; + curEntry->NumIds = 0; + curEntry->CMenu = cmobj; + + if (This->dhead) + { + PDynamicShellEntry pEntry = This->dhead; + + while(pEntry->Next) + { + pEntry = pEntry->Next; + } + + pEntry->Next = curEntry; + } + else + { + This->dhead = curEntry; + } + + return hr; +} + +static +UINT +EnumerateDynamicContextHandlerForKey(IDefaultContextMenuImpl *This, HKEY hRootKey) +{ + WCHAR szKey[MAX_PATH] = {0}; + WCHAR szName[MAX_PATH] = {0}; + DWORD dwIndex, dwName; + LONG res; + HRESULT hResult; + UINT index; + CLSID clsid; + HKEY hKey; + + static const WCHAR szShellEx[] = { 's','h','e','l','l','e','x','\\','C','o','n','t','e','x','t','M','e','n','u','H','a','n','d','l','e','r','s',0 }; + + if (RegOpenKeyExW(hRootKey, szShellEx, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + { + TRACE("RegOpenKeyExW failed for key %s\n", debugstr_w(szKey)); + return 0; + } + + dwIndex = 0; + index = 0; + do + { + dwName = MAX_PATH; + res = RegEnumKeyExW(hKey, dwIndex, szName, &dwName, NULL, NULL, NULL, NULL); + if (res == ERROR_SUCCESS) + { + hResult = CLSIDFromString(szName, &clsid); + if (hResult != S_OK) + { + dwName = MAX_PATH; + if (RegGetValueW(hKey, szName, NULL, RRF_RT_REG_SZ, NULL, szKey, &dwName) == ERROR_SUCCESS) + { + if (CLSIDFromString(szKey, &clsid) == S_OK) + { + if (This->bGroupPolicyActive) + { + if (RegGetValueW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", + szKey, + RRF_RT_REG_SZ, + NULL, + NULL, + &dwName) == ERROR_SUCCESS) + { + SH_LoadDynamicContextMenuHandler(This, hKey, &clsid, TRUE); + } + + } + else + { + SH_LoadDynamicContextMenuHandler(This, hKey, &clsid, TRUE); + } + } + } + } + if (hResult == S_OK) + { + if (This->bGroupPolicyActive) + { + if (RegGetValueW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", + szKey, + RRF_RT_REG_SZ, + NULL, + NULL, + &dwName) == ERROR_SUCCESS) + { + SH_LoadDynamicContextMenuHandler(This, hKey, &clsid, TRUE); + } + } + else + { + SH_LoadDynamicContextMenuHandler(This, hKey, &clsid, TRUE); + } + } + } + dwIndex++; + }while(res == ERROR_SUCCESS); + + RegCloseKey(hKey); + return index; +} + + +static +UINT +InsertMenuItemsOfDynamicContextMenuExtension(IDefaultContextMenuImpl * This, HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast) +{ + PDynamicShellEntry curEntry; + HRESULT hResult; + MENUITEMINFOW mii; + if (!This->dhead) + { + This->iIdSHEFirst = 0; + This->iIdSHELast = 0; + return indexMenu; + } + + curEntry = This->dhead; + This->iIdSHEFirst = idCmdFirst; + + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_FTYPE | MIIM_STATE; + mii.fType = MFT_SEPARATOR; + mii.fState = MFS_ENABLED; + InsertMenuItemW(hMenu, indexMenu++, TRUE, &mii); + + do + { + hResult = IContextMenu_QueryContextMenu(curEntry->CMenu, hMenu, indexMenu, idCmdFirst, idCmdLast, CMF_NORMAL); + if (SUCCEEDED(hResult)) + { + curEntry->iIdCmdFirst = idCmdFirst; + curEntry->NumIds = LOWORD(hResult); + indexMenu += curEntry->NumIds; + idCmdFirst += curEntry->NumIds + 0x10; + } + TRACE("curEntry %p hresult %x contextmenu %p cmdfirst %x num ids %x\n", curEntry, hResult, curEntry->CMenu, curEntry->iIdCmdFirst, curEntry->NumIds); + curEntry = curEntry->Next; + }while(curEntry); + + This->iIdSHELast = idCmdFirst; + TRACE("SH_LoadContextMenuHandlers first %x last %x\n", This->iIdSHEFirst, This->iIdSHELast); + return indexMenu; +} + +UINT +BuildBackgroundContextMenu( + IDefaultContextMenuImpl * This, + HMENU hMenu, + UINT iIdCmdFirst, + UINT iIdCmdLast, + UINT uFlags) +{ + MENUITEMINFOW mii; + WCHAR szBuffer[MAX_PATH]; + UINT indexMenu = 0; + HMENU hSubMenu; + HKEY hKey; + + ZeroMemory(&mii, sizeof(mii)); + + TRACE("BuildBackgroundContextMenu entered\n"); + + if (!_ILIsDesktop(This->dcm.pidlFolder)) + { + /* view option is only available in browsing mode */ + hSubMenu = LoadMenuA(shell32_hInstance, "MENU_001"); + if (hSubMenu) + { + szBuffer[0] = 0; + LoadStringW(shell32_hInstance, FCIDM_SHVIEW_VIEW, szBuffer, MAX_PATH); + szBuffer[MAX_PATH-1] = 0; + + TRACE("szBuffer %s\n", debugstr_w(szBuffer)); + + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_TYPE | MIIM_STATE | MIIM_SUBMENU | MIIM_ID; + mii.fType = MFT_STRING; + mii.wID = iIdCmdFirst++; + mii.dwTypeData = szBuffer; + mii.cch = strlenW( mii.dwTypeData ); + mii.fState = MFS_ENABLED; + mii.hSubMenu = hSubMenu; + InsertMenuItemW(hMenu, indexMenu++, TRUE, &mii); + DestroyMenu(hSubMenu); + } + } + hSubMenu = LoadMenuA(shell32_hInstance, "MENU_002"); + if (hSubMenu) + { + /* merge general background context menu in */ + iIdCmdFirst = Shell_MergeMenus(hMenu, hSubMenu, indexMenu, 0, iIdCmdLast, MM_DONTREMOVESEPS | MM_SUBMENUSHAVEIDS) + 1; + DestroyMenu(hSubMenu); + } + + if (!HasClipboardData()) + { + TRACE("disabling paste options\n"); + DisablePasteOptions(hMenu); + } + /* load extensions from HKCR\* key */ + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, + L"*", + 0, + KEY_READ, + &hKey) == ERROR_SUCCESS) + { + EnumerateDynamicContextHandlerForKey(This, hKey); + RegCloseKey(hKey); + } + + /* load create new shell extension */ + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, + L"CLSID\\{D969A300-E7FF-11d0-A93B-00A0C90F2719}", + 0, + KEY_READ, + &hKey) == ERROR_SUCCESS) + { + static const GUID dummy1 = {0xD969A300, 0xE7FF, 0x11d0, {0xA9, 0x3B, 0x00, 0xA0, 0xC9, 0x0F, 0x27, 0x19} }; + SH_LoadDynamicContextMenuHandler(This, hKey, &dummy1, FALSE); + RegCloseKey(hKey); + } + + InsertMenuItemsOfDynamicContextMenuExtension(This, hMenu, GetMenuItemCount(hMenu), iIdCmdFirst, iIdCmdLast); + return iIdCmdLast; +} + +static +UINT +AddStaticContextMenusToMenu( + HMENU hMenu, + UINT indexMenu, + IDefaultContextMenuImpl * This) +{ + MENUITEMINFOW mii; + PStaticShellEntry curEntry; + + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; + mii.fType = MFT_STRING; + mii.fState = MFS_ENABLED | MFS_DEFAULT; + mii.wID = 0x4000; + This->iIdSCMFirst = mii.wID; + + curEntry = This->shead; + + while(curEntry) + { + /* FIXME + * load localized verbs if its an open edit find print printto openas properties verb + */ + + mii.dwTypeData = curEntry->szVerb; + mii.cch = strlenW(mii.dwTypeData); + InsertMenuItemW(hMenu, indexMenu++, TRUE, &mii); + mii.fState = MFS_ENABLED; + mii.wID++; + curEntry = curEntry->Next; + } + This->iIdSCMLast = mii.wID - 1; + return indexMenu; +} + +static +const char * +GetLocalizedString( + HMENU hMenu, + UINT wID, + char * sResult) +{ + MENUITEMINFOA mii; + + sResult[0] = 0; + if (!hMenu) + { + return sResult; + } + + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_TYPE; + mii.fType = MFT_STRING; + mii.dwTypeData = sResult; + mii.cch = 100; + + GetMenuItemInfoA(hMenu, wID, FALSE, &mii); + return sResult; +} +#if 0 +UINT +BuildControlPanelContextMenu( + IDefaultContextMenuImpl * This, + HMENU hMenu, + UINT iIdCmdFirst, + UINT iIdCmdLast) +{ + GUID * guid; + SFGAOF attributes; + DWORD dwSize; + UINT indexMenu = 0; + LPOLESTR pwszCLSID; + WCHAR szClass[80]; + UINT length; + MENUITEMINFOW mii; + + + ZeroMemory(&mii, sizeof(MENUITEMINFOW)); + + mii.cbSize = sizeof(MENUITEMINFOW); + mii.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_ID; + mii.fType = MFT_STRING; + mii.fState = MFS_ENABLED; + + guid = _ILGetGUIDPointer(This->dcm.apidl[0]); + if (guid) + { + /* the cpl is registered as a namespace extension */ + dwSize = sizeof(SFGAOF); + wcscpy(szClass, L"CLSID\\"); + if (SUCCEEDED(StringFromCLSID(guid, &pwszCLSID))) + { + wcscpy(&szClass[6], pwszCLSID); + length = strlenW(szClass); + + CoTaskMemFree(pwszCLSID); + + /* check if the CLSID is a folder */ + wcscat(szClass, L"\\ShellFolder"); + + if (RegGetValueW(HKEY_CLASSES_ROOT, szClass, L"Attributes", RRF_RT_REG_BINARY, NULL, &attributes, &dwSize) == ERROR_SUCCESS) + { + if (attributes & SFGAO_FOLDER) + { + WCHAR szBuffer[100]; + /* insert explore string */ + LoadStringW(shell32_hInstance, FCIDM_SHVIEW_EXPLORE, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)); + szBuffer[99] = 0; + mii.wID = FCIDM_SHVIEW_EXPLORE; + mii.dwTypeData = szBuffer; + mii.fState |= MFS_DEFAULT; + InsertMenuItem(hMenu, indexMenu++, TRUE, &mii); + mii.fState = MFS_ENABLED; + } + } + + /* add static handlers*/ + szClass[length] = 0; + SH_AddStaticEntryForFileClass(This, szClass); + indexMenu = AddStaticContextMenusToMenu(hMenu, indexMenu, This); + } + } + else + { + /* cpl is registered with full path */ + SH_AddStaticEntryForFileClass(This, L".cpl"); + } + + if (AppendMenu(hMenu, MF_SEPARATOR, -1, NULL)) + { + LoadStringW(shell32_hInstance, FCIDM_SHVIEW_CREATELINK, szClass, sizeof(szClass) / sizeof(WCHAR)); + szClass[79] = 0; + InsertMenuItem(hMenu, indexMenu++, TRUE, &mii); + } +} +#endif + +UINT +BuildShellItemContextMenu( + IDefaultContextMenuImpl * This, + HMENU hMenu, + UINT iIdCmdFirst, + UINT iIdCmdLast, + UINT uFlags) +{ + WCHAR szExt[10]; + char sBuffer[100]; + HKEY hKey; + UINT indexMenu; + SFGAOF rfg; + HRESULT hr; + BOOL bAddSep; + HMENU hLocalMenu; + GUID * guid; + + TRACE("BuildShellItemContextMenu entered\n"); + + if (_ILGetExtension(This->dcm.apidl[0], &sBuffer[1], sizeof(sBuffer))) + { + sBuffer[9] = 0; + sBuffer[0] = '.'; + + if (MultiByteToWideChar( CP_ACP, 0, sBuffer, -1, (LPWSTR)szExt, 10)) + { + TRACE("szExt %d\n", debugstr_w(szExt)); + SH_AddStaticEntryForFileClass(This, szExt); + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, szExt, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + EnumerateDynamicContextHandlerForKey(This, hKey); + RegCloseKey(hKey); + } + } + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"*", 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + /* load default extensions */ + EnumerateDynamicContextHandlerForKey(This, hKey); + RegCloseKey(hKey); + } + } + + if (!_ILIsPidlSimple(This->dcm.apidl[0])|| _ILIsFolder(This->dcm.apidl[0])) + { + /* add the default verbs open / explore */ + SH_AddStaticEntryForFileClass(This, L"Folder"); + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"Folder", 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + EnumerateDynamicContextHandlerForKey(This, hKey); + RegCloseKey(hKey); + } + } + + guid = _ILGetGUIDPointer(This->dcm.apidl[0]); + if (guid) + { + LPOLESTR pwszCLSID; + WCHAR buffer[60]; + + wcscpy(buffer, L"CLSID\\"); + hr = StringFromCLSID(guid, &pwszCLSID); + if (hr == S_OK) + { + wcscpy(&buffer[6], pwszCLSID); + TRACE("buffer %s\n", debugstr_w(buffer)); + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, buffer, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + EnumerateDynamicContextHandlerForKey(This, hKey); + SH_AddStaticEntryForFileClass(This, buffer); + RegCloseKey(hKey); + } + CoTaskMemFree(pwszCLSID); + } + } + + + if (_ILIsDrive(This->dcm.apidl[0])) + { + SH_AddStaticEntryForFileClass(This, L"Drive"); + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"Drive", 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + EnumerateDynamicContextHandlerForKey(This, hKey); + RegCloseKey(hKey); + } + } + + + /* add static actions */ + rfg = SFGAO_BROWSABLE | SFGAO_CANCOPY | SFGAO_CANLINK | SFGAO_CANMOVE | SFGAO_CANDELETE | SFGAO_CANRENAME | SFGAO_HASPROPSHEET | SFGAO_FILESYSTEM; + hr = IShellFolder_GetAttributesOf(This->dcm.psf, This->dcm.cidl, This->dcm.apidl, &rfg); + if (!SUCCEEDED(hr)) + rfg = 0; + + if (rfg & SFGAO_FILESYSTEM) + { + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"AllFilesystemObjects", 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + /* sendto service is registered there */ + EnumerateDynamicContextHandlerForKey(This, hKey); + RegCloseKey(hKey); + } + } + + /* add static context menu handlers */ + indexMenu = AddStaticContextMenusToMenu(hMenu, 0, This); + /* now process dynamic context menu handlers */ + indexMenu = InsertMenuItemsOfDynamicContextMenuExtension(This, hMenu, indexMenu, iIdCmdFirst, iIdCmdLast); + TRACE("indexMenu %d\n", indexMenu); + + hLocalMenu = LoadMenuW(shell32_hInstance, L"MENU_SHV_FILE"); + if (!hLocalMenu) + { + return iIdCmdLast; + } + + if (rfg & (SFGAO_CANCOPY | SFGAO_CANMOVE)) + { + _InsertMenuItem(hMenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); + if (rfg & SFGAO_CANMOVE) + _InsertMenuItem(hMenu, indexMenu++, TRUE, FCIDM_SHVIEW_CUT, MFT_STRING, GetLocalizedString(hLocalMenu, FCIDM_SHVIEW_CUT, sBuffer), MFS_ENABLED); + if (rfg & SFGAO_CANCOPY) + _InsertMenuItem(hMenu, indexMenu++, TRUE, FCIDM_SHVIEW_COPY, MFT_STRING, GetLocalizedString(hLocalMenu, FCIDM_SHVIEW_COPY, sBuffer), MFS_ENABLED); + } + + bAddSep = TRUE; + if (rfg & SFGAO_CANLINK) + { + bAddSep = FALSE; + _InsertMenuItem(hMenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); + _InsertMenuItem(hMenu, indexMenu++, TRUE, FCIDM_SHVIEW_CREATELINK, MFT_STRING, GetLocalizedString(hLocalMenu, FCIDM_SHVIEW_CREATELINK, sBuffer), MFS_ENABLED); + } + + + if (rfg & SFGAO_CANDELETE) + { + if (bAddSep) + { + bAddSep = FALSE; + _InsertMenuItem(hMenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); + } + _InsertMenuItem(hMenu, indexMenu++, TRUE, FCIDM_SHVIEW_DELETE, MFT_STRING, GetLocalizedString(hLocalMenu, FCIDM_SHVIEW_DELETE, sBuffer), MFS_ENABLED); + } + + if (rfg & SFGAO_CANRENAME) + { + if (bAddSep) + { + bAddSep = FALSE; + _InsertMenuItem(hMenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); + } + _InsertMenuItem(hMenu, indexMenu++, TRUE, FCIDM_SHVIEW_RENAME, MFT_STRING, GetLocalizedString(hLocalMenu, FCIDM_SHVIEW_RENAME, sBuffer), MFS_ENABLED); + } + + _InsertMenuItem(hMenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); + _InsertMenuItem(hMenu, indexMenu++, TRUE, FCIDM_SHVIEW_PROPERTIES, MFT_STRING, GetLocalizedString(hLocalMenu, FCIDM_SHVIEW_PROPERTIES, sBuffer), MFS_ENABLED); + + DestroyMenu(hLocalMenu); + return iIdCmdLast; +} + +static +HRESULT +WINAPI +IDefaultContextMenu_fnQueryContextMenu( + IContextMenu2 *iface, + HMENU hmenu, + UINT indexMenu, + UINT idCmdFirst, + UINT idCmdLast, + UINT uFlags) +{ + IDefaultContextMenuImpl * This = impl_from_IContextMenu(iface); + + if (This->dcm.cidl) + { + idCmdFirst = BuildShellItemContextMenu(This, hmenu, idCmdFirst, idCmdLast, uFlags); + } + else + { + idCmdFirst = BuildBackgroundContextMenu(This, hmenu, idCmdFirst, idCmdLast, uFlags); + } + + return S_OK; +} + +static +HRESULT +NotifyShellViewWindow(LPCMINVOKECOMMANDINFO lpcmi) +{ + LPSHELLBROWSER lpSB; + LPSHELLVIEW lpSV = NULL; + HWND hwndSV = NULL; + + if((lpSB = (LPSHELLBROWSER)SendMessageA(lpcmi->hwnd, CWM_GETISHELLBROWSER,0,0))) + { + if(SUCCEEDED(IShellBrowser_QueryActiveShellView(lpSB, &lpSV))) + { + IShellView_GetWindow(lpSV, &hwndSV); + } + } + + if (LOWORD(lpcmi->lpVerb) == FCIDM_SHVIEW_REFRESH) + { + if (lpSV) + IShellView_Refresh(lpSV); + + return S_OK; + } + + SendMessageW(hwndSV, WM_COMMAND, MAKEWPARAM(LOWORD(lpcmi->lpVerb), 0), 0); + + return S_OK; +} + +static +HRESULT +DoPaste( + IDefaultContextMenuImpl *iface, + LPCMINVOKECOMMANDINFO lpcmi) +{ + + + return E_FAIL; +} + +static +HRESULT +DoOpenOrExplore( + IDefaultContextMenuImpl *iface, + LPCMINVOKECOMMANDINFO lpcmi) +{ + + + return E_FAIL; +} + +static +HRESULT +DoCopyOrCut( + IDefaultContextMenuImpl *iface, + LPCMINVOKECOMMANDINFO lpcmi) +{ + + + return E_FAIL; +} + +static +HRESULT +DoCreateLink( + IDefaultContextMenuImpl *iface) +{ + + + return E_FAIL; +} + +static +HRESULT +DoDelete( + IDefaultContextMenuImpl *iface) +{ + + + return E_FAIL; +} + +static +HRESULT +DoRename( + IDefaultContextMenuImpl *iface) +{ + + + return E_FAIL; +} + +static +HRESULT +DoProperties( + IDefaultContextMenuImpl *iface, + LPCMINVOKECOMMANDINFO lpcmi) +{ + + + return E_FAIL; +} + +static +HRESULT +DoDynamicShellExtensions( + IDefaultContextMenuImpl *iface, + LPCMINVOKECOMMANDINFO lpcmi) +{ + + + return E_FAIL; +} + + +static +HRESULT +DoStaticShellExtensions( + IDefaultContextMenuImpl *This, + LPCMINVOKECOMMANDINFO lpcmi) +{ + SHELLEXECUTEINFOW sei; + PStaticShellEntry pCurrent = This->shead; + int verb = LOWORD(lpcmi->lpVerb) - This->iIdSCMFirst; + + + while(pCurrent && verb-- > 0) + pCurrent = pCurrent->Next; + + if (verb > 0) + return E_FAIL; + + + ZeroMemory(&sei, sizeof(sei)); + sei.cbSize = sizeof(sei); + sei.fMask = SEE_MASK_CLASSNAME; + sei.lpClass = pCurrent->szClass; + sei.hwnd = lpcmi->hwnd; + sei.nShow = SW_SHOWNORMAL; + sei.lpVerb = pCurrent->szVerb; + ShellExecuteExW(&sei); + return S_OK; + + +} + +static +HRESULT +WINAPI +IDefaultContextMenu_fnInvokeCommand( + IContextMenu2 *iface, + LPCMINVOKECOMMANDINFO lpcmi) +{ + IDefaultContextMenuImpl * This = impl_from_IContextMenu(iface); + + switch(LOWORD(lpcmi->lpVerb)) + { + case FCIDM_SHVIEW_BIGICON: + case FCIDM_SHVIEW_SMALLICON: + case FCIDM_SHVIEW_LISTVIEW: + case FCIDM_SHVIEW_REPORTVIEW: + case 0x30: /* FIX IDS in resource files */ + case 0x31: + case 0x32: + case 0x33: + case FCIDM_SHVIEW_AUTOARRANGE: + case FCIDM_SHVIEW_SNAPTOGRID: + case FCIDM_SHVIEW_REFRESH: + return NotifyShellViewWindow(lpcmi); + case FCIDM_SHVIEW_INSERT: + case FCIDM_SHVIEW_INSERTLINK: + return DoPaste(This, lpcmi); + case FCIDM_SHVIEW_OPEN: + case FCIDM_SHVIEW_EXPLORE: + return DoOpenOrExplore(This, lpcmi); + case FCIDM_SHVIEW_COPY: + case FCIDM_SHVIEW_CUT: + return DoCopyOrCut(This, lpcmi); + case FCIDM_SHVIEW_CREATELINK: + return DoCreateLink(This); + case FCIDM_SHVIEW_DELETE: + return DoDelete(This); + case FCIDM_SHVIEW_RENAME: + return DoRename(This); + case FCIDM_SHVIEW_PROPERTIES: + return DoProperties(This, lpcmi); + } + + if (This->iIdSHEFirst && This->iIdSHELast) + { + if (LOWORD(lpcmi->lpVerb) >= This->iIdSHEFirst && LOWORD(lpcmi->lpVerb) <= This->iIdSHELast) + { + return DoDynamicShellExtensions(This, lpcmi); + } + } + + if (This->iIdSCMFirst && This->iIdSCMLast) + { + if (LOWORD(lpcmi->lpVerb) >= This->iIdSCMFirst && LOWORD(lpcmi->lpVerb) <= This->iIdSCMLast) + { + return DoStaticShellExtensions(This, lpcmi); + } + } + + FIXME("Unhandled Verb %xl\n",LOWORD(lpcmi->lpVerb)); + return E_UNEXPECTED; +} + +static +HRESULT +WINAPI +IDefaultContextMenu_fnGetCommandString( + IContextMenu2 *iface, + UINT_PTR idCommand, + UINT uFlags, + UINT* lpReserved, + LPSTR lpszName, + UINT uMaxNameLen) +{ + + return S_OK; +} + +static +HRESULT +WINAPI +IDefaultContextMenu_fnHandleMenuMsg( + IContextMenu2 *iface, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + + return S_OK; +} + +static const IContextMenu2Vtbl cmvt = +{ + IDefaultContextMenu_fnQueryInterface, + IDefaultContextMenu_fnAddRef, + IDefaultContextMenu_fnRelease, + IDefaultContextMenu_fnQueryContextMenu, + IDefaultContextMenu_fnInvokeCommand, + IDefaultContextMenu_fnGetCommandString, + IDefaultContextMenu_fnHandleMenuMsg +}; + +static +HRESULT +IDefaultContextMenu_Constructor( + const DEFCONTEXTMENU *pdcm, + REFIID riid, + void **ppv) +{ + IDefaultContextMenuImpl * This; + HRESULT hr = E_FAIL; + IDataObject * pDataObj; + + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDefaultContextMenuImpl)); + if (This) + { + This->lpVtbl = &cmvt; + This->ref = 1; + TRACE("cidl %u\n", This->dcm.cidl); + if (SUCCEEDED(SHCreateDataObject(pdcm->pidlFolder, pdcm->cidl, pdcm->apidl, NULL, &IID_IDataObject, (void**)&pDataObj))) + { + This->pDataObj = pDataObj; + } + CopyMemory(&This->dcm, pdcm, sizeof(DEFCONTEXTMENU)); + hr = IDefaultContextMenu_fnQueryInterface((IContextMenu2*)This, riid, ppv); + } + + TRACE("This(%p)(%x) cidl %u\n",This, hr, This->dcm.cidl); + return hr; +} + + +/************************************************************************* + * SHCreateDefaultContextMenu [SHELL32.325] Vista API + * + */ + +HRESULT +WINAPI +SHCreateDefaultContextMenu( + const DEFCONTEXTMENU *pdcm, + REFIID riid, + void **ppv) +{ +#if 1 + HRESULT hr = E_FAIL; + + *ppv = NULL; + hr = IDefaultContextMenu_Constructor( pdcm, riid, ppv ); + + TRACE("pcm %p hr %x\n", pdcm, hr); + return hr; +#else + HRESULT hr; + IContextMenu2 * pcm; + + if (pdcm->cidl > 0) + pcm = ISvItemCm_Constructor( pdcm->psf, pdcm->pidlFolder, pdcm->apidl, pdcm->cidl ); + else + pcm = ISvBgCm_Constructor( pdcm->psf, TRUE ); + + hr = S_OK; + *ppv = pcm; + + return hr; +#endif +} + +/************************************************************************* + * CDefFolderMenu_Create2 [SHELL32.701] + * + */ + +INT +WINAPI +CDefFolderMenu_Create2( + LPCITEMIDLIST pidlFolder, + HWND hwnd, + UINT cidl, + LPCITEMIDLIST *apidl, + IShellFolder *psf, + LPFNDFMCALLBACK lpfn, + UINT nKeys, + HKEY *ahkeyClsKeys, + IContextMenu **ppcm) +{ + DEFCONTEXTMENU pdcm; + HRESULT hr; + + pdcm.hwnd = hwnd; + pdcm.pcmcb = NULL; + pdcm.pidlFolder = pidlFolder; + pdcm.psf = psf; + pdcm.cidl = cidl; + pdcm.apidl = apidl; + pdcm.punkAssociationInfo = NULL; + pdcm.cKeys = nKeys; + pdcm.aKeys = ahkeyClsKeys; + + hr = SHCreateDefaultContextMenu(&pdcm, &IID_IContextMenu, (void**)ppcm); + return hr; +} + Propchange: trunk/reactos/dll/win32/shell32/shv_default_context_menu.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Wed Jan 2 02:34:28 2008 @@ -1262,62 +1262,3 @@ RegCloseKey(hKey); return index; } - -/************************************************************************* - * SHCreateDefaultContextMenu [SHELL32.325] Vista API - * - */ - -HRESULT WINAPI SHCreateDefaultContextMenu( - const DEFCONTEXTMENU *pdcm, - REFIID riid, - void **ppv) -{ - HRESULT hr; - IContextMenu2 * pcm; - - if (pdcm->cidl > 0) - pcm = ISvItemCm_Constructor( pdcm->psf, pdcm->pidlFolder, pdcm->apidl, pdcm->cidl ); - else - pcm = ISvBgCm_Constructor( pdcm->psf, TRUE ); - - hr = S_OK; - *ppv = pcm; - - return hr; -} - -/************************************************************************* - * CDefFolderMenu_Create2 [SHELL32.701] - * - */ - -INT -WINAPI -CDefFolderMenu_Create2( - LPCITEMIDLIST pidlFolder, - HWND hwnd, - UINT cidl, - LPCITEMIDLIST *apidl, - IShellFolder *psf, - LPFNDFMCALLBACK lpfn, - UINT nKeys, - HKEY *ahkeyClsKeys, - IContextMenu **ppcm) -{ - DEFCONTEXTMENU pdcm; - HRESULT hr; - - pdcm.hwnd = hwnd; - pdcm.pcmcb = NULL; //FIXME - pdcm.pidlFolder = pidlFolder; - pdcm.psf = psf; - pdcm.cidl = cidl; - pdcm.apidl = apidl; - pdcm.punkAssociationInfo = NULL; - pdcm.cKeys = nKeys; - pdcm.aKeys = ahkeyClsKeys; - - hr = SHCreateDefaultContextMenu(&pdcm, &IID_IContextMenu, (void**)ppcm); - return hr; -}

1 0

[akorotaev] 31546: One more try to fix branch build
by akorotaev＠svn.reactos.org 01 Jan '08

01 Jan '08

Author: akorotaev Date: Wed Jan 2 02:32:34 2008 New Revision: 31546 URL: http://svn.reactos.org/svn/reactos?rev=31546&view=rev Log: One more try to fix branch build Modified: branches/cache_manager_rewrite/cc/mdl.c branches/cache_manager_rewrite/headers.patch Modified: branches/cache_manager_rewrite/cc/mdl.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/cc/mdl.c?… ============================================================================== --- branches/cache_manager_rewrite/cc/mdl.c (original) +++ branches/cache_manager_rewrite/cc/mdl.c Wed Jan 2 02:32:34 2008 @@ -96,7 +96,7 @@ } /* Use slow path */ - CcMdlReadCompleteDev (MdlChain, FileObject); + CcMdlReadComplete2 (MdlChain, FileObject); } /* @@ -122,7 +122,7 @@ } /* Use slow path */ - CcMdlWriteCompleteDev (FileObject, FileOffset, MdlChain); + CcMdlWriteComplete2 (FileObject, FileOffset, MdlChain); } /* Modified: branches/cache_manager_rewrite/headers.patch URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/headers.p… ============================================================================== --- branches/cache_manager_rewrite/headers.patch (original) +++ branches/cache_manager_rewrite/headers.patch Wed Jan 2 02:32:34 2008 @@ -1,3 +1,15 @@ +Index: include/reactos/exeformat.h +=================================================================== +--- include/reactos/exeformat.h (revision 31533) ++++ include/reactos/exeformat.h (working copy) +@@ -35,6 +35,7 @@ + typedef NTSTATUS (NTAPI * PEXEFMT_CB_READ_FILE) + ( + IN PVOID File, ++ ULONG SectorSize, + IN PLARGE_INTEGER Offset, + IN ULONG Length, + OUT PVOID * Data, Index: ntoskrnl/include/internal/mm.h =================================================================== --- ntoskrnl/include/internal/mm.h (revision 31533) @@ -126,6 +138,19 @@ CcCanIWrite@16 CcCopyRead@24 CcCopyWrite@20 +Index: drivers/filesystems/cdfs/cdfs.h +=================================================================== +--- drivers/filesystems/cdfs/cdfs.h (revision 31533) ++++ drivers/filesystems/cdfs/cdfs.h (working copy) +@@ -6,7 +6,7 @@ + #include <ntddcdrm.h> + #include <ccros.h> + +-#define USE_ROS_CC_AND_FS ++//#define USE_ROS_CC_AND_FS + + #define CDFS_BASIC_SECTOR 2048 + #define CDFS_PRIMARY_DESCRIPTOR_LOCATION 16 Index: drivers/filesystems/vfat/vfat.h =================================================================== --- drivers/filesystems/vfat/vfat.h (revision 31533)

1 0

[janderwald] 31545: - register the network folder location shell folder
by janderwald＠svn.reactos.org 01 Jan '08

01 Jan '08

Author: janderwald Date: Wed Jan 2 02:30:18 2008 New Revision: 31545 URL: http://svn.reactos.org/svn/reactos?rev=31545&view=rev Log: - register the network folder location shell folder Modified: trunk/reactos/boot/bootdata/hivedef.inf trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf (original) +++ trunk/reactos/boot/bootdata/hivedef.inf Wed Jan 2 02:30:18 2008 @@ -49,6 +49,9 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\FileExts",,0x00000012 +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\CLSID\{20D04FE0-3AEA-1069-A2D8-08002B30309D}",,0x00000012 Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf (original) +++ trunk/reactos/boot/bootdata/hivesft.inf Wed Jan 2 02:30:18 2008 @@ -7,6 +7,9 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce",,0x00000012 +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 ; CMD Settings HKLM,"SOFTWARE\Microsoft\Command Processor","AutoRun",0x00020000,""

1 0

[ekohl] 31544: - Rotate the text around its center.
by ekohl＠svn.reactos.org 01 Jan '08

01 Jan '08

Author: ekohl Date: Wed Jan 2 01:59:06 2008 New Revision: 31544 URL: http://svn.reactos.org/svn/reactos?rev=31544&view=rev Log: - Rotate the text around its center. Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.c Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/3dtext.c (original) +++ trunk/reactos/base/applications/screensavers/3dtext/3dtext.c Wed Jan 2 01:59:06 2008 @@ -32,6 +32,8 @@ GLuint base; // Base Display List For The Font Set GLfloat rot; // Used To Rotate The Text +GLfloat extentX = 0.0f; +GLfloat extentY = 0.0f; #define APPNAME _T("3DText") @@ -45,6 +47,12 @@ GLYPHMETRICSFLOAT gmf[256]; // Windows Font Handle HFONT font; + int i; + TCHAR c; + GLfloat cellOriginX = 0.0f; + GLfloat stringOriginX; + GLfloat stringExtentX = 0.0f; + GLfloat stringExtentY = 0.0f; // Storage For 256 Characters base = glGenLists(256); @@ -75,6 +83,23 @@ 0.2f, // Font Thickness In The Z Direction WGL_FONT_POLYGONS, // Use Polygons, Not Lines gmf); // Address Of Buffer To Recieve Data + + // Calculate the string extent + for (i = 0; i < _tcslen(m_Text); i++) + { + c = m_Text[i]; + + stringOriginX = cellOriginX + gmf[c].gmfptGlyphOrigin.x; + + stringExtentX = stringOriginX + gmf[c].gmfBlackBoxX; + if (gmf[c].gmfBlackBoxY > stringExtentY) + stringExtentY = gmf[c].gmfBlackBoxY; + + cellOriginX = cellOriginX + gmf[c].gmfCellIncX; + } + + extentX = stringExtentX; + extentY = stringExtentY; } // Delete The Font @@ -201,7 +226,9 @@ glRotatef(rot * 1.4f, 0.0f, 0.0f, 1.0f); // Move to the Left and Down before drawing - glTranslatef(-3.5f, 0.0f, 0.0f); + glTranslatef(-(extentX / 2.0f), + -(extentY / 2.0f), + 0.0f); // Pulsing Colors Based On The Rotation glColor3f((1.0f * (cos(rot / 20.0f))),

1 0

[akorotaev] 31543: Update headers patch
by akorotaev＠svn.reactos.org 01 Jan '08

01 Jan '08

Author: akorotaev Date: Wed Jan 2 01:25:57 2008 New Revision: 31543 URL: http://svn.reactos.org/svn/reactos?rev=31543&view=rev Log: Update headers patch Modified: branches/cache_manager_rewrite/headers.patch Modified: branches/cache_manager_rewrite/headers.patch URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/headers.p… ============================================================================== --- branches/cache_manager_rewrite/headers.patch (original) +++ branches/cache_manager_rewrite/headers.patch Wed Jan 2 01:25:57 2008 @@ -1,61 +1,71 @@ -Index: drivers/filesystems/cdfs/cdfs.h -=================================================================== ---- drivers/filesystems/cdfs/cdfs.h (revision 22988) -+++ drivers/filesystems/cdfs/cdfs.h (working copy) -@@ -6,7 +6,7 @@ - #include <ntddcdrm.h> - #include <ccros.h> +Index: ntoskrnl/include/internal/mm.h +=================================================================== +--- ntoskrnl/include/internal/mm.h (revision 31533) ++++ ntoskrnl/include/internal/mm.h (working copy) +@@ -176,6 +176,9 @@ + ULONG Flags; + ULONG Characteristics; + BOOLEAN WriteCopy; ++ LIST_ENTRY ListEntry; ++ ULONG BytesPerSector; ++ PFILE_OBJECT FileObject; + } MM_SECTION_SEGMENT, *PMM_SECTION_SEGMENT; --#define USE_ROS_CC_AND_FS -+//#define USE_ROS_CC_AND_FS + typedef struct _MM_IMAGE_SECTION_OBJECT +@@ -192,6 +195,10 @@ + BOOLEAN Executable; + ULONG NrSegments; + ULONG ImageSize; ++ ULONG RefCount; ++ LIST_ENTRY ListEntry; ++ PFILE_OBJECT FileObject; ++ ULONG BytesPerSector; + PMM_SECTION_SEGMENT Segments; + } MM_IMAGE_SECTION_OBJECT, *PMM_IMAGE_SECTION_OBJECT; - #define CDFS_BASIC_SECTOR 2048 - #define CDFS_PRIMARY_DESCRIPTOR_LOCATION 16 -Index: drivers/filesystems/ntfs/ntfs.h -=================================================================== ---- drivers/filesystems/ntfs/ntfs.h (revision 22988) -+++ drivers/filesystems/ntfs/ntfs.h (working copy) -@@ -6,7 +6,7 @@ - #include <ntdddisk.h> - #include <ccros.h> +@@ -210,6 +217,16 @@ + }; + } ROS_SECTION_OBJECT, *PROS_SECTION_OBJECT; --#define USE_ROS_CC_AND_FS -+//#define USE_ROS_CC_AND_FS - - - #define CACHEPAGESIZE(pDeviceExt) \ -Index: drivers/filesystems/vfat/vfat.h -=================================================================== ---- drivers/filesystems/vfat/vfat.h (revision 25241) -+++ drivers/filesystems/vfat/vfat.h (working copy) -@@ -6,7 +6,7 @@ - #ifdef __GNUC__ - #include <ccros.h> - --#define USE_ROS_CC_AND_FS -+//#define USE_ROS_CC_AND_FS - #else - #define KEBUGCHECK KeBugCheck - #define KEBUGCHECKEX KeBugCheckEx -Index: include/reactos/exeformat.h -=================================================================== ---- include/reactos/exeformat.h (revision 22988) -+++ include/reactos/exeformat.h (working copy) -@@ -35,6 +35,7 @@ - typedef NTSTATUS (NTAPI * PEXEFMT_CB_READ_FILE) - ( - IN PVOID File, -+ ULONG SectorSize, - IN PLARGE_INTEGER Offset, - IN ULONG Length, - OUT PVOID * Data, -Index: ntoskrnl/include/internal/cc.h -=================================================================== ---- ntoskrnl/include/internal/cc.h (revision 22988) -+++ ntoskrnl/include/internal/cc.h (working copy) -@@ -1,17 +1,29 @@ - #ifndef __INCLUDE_INTERNAL_CC_H - #define __INCLUDE_INTERNAL_CC_H ++typedef struct ++{ ++ ROS_SECTION_OBJECT* Section; ++ ULONG ViewOffset; ++ LIST_ENTRY ViewListEntry; ++ PMM_SECTION_SEGMENT Segment; ++// BOOLEAN WriteCopyView; ++ LIST_ENTRY RegionListHead; ++} SECTION_DATA, *PSECTION_DATA; ++ + typedef struct _MEMORY_AREA + { + PVOID StartingAddress; +@@ -224,17 +241,10 @@ + ULONG PageOpCount; + union + { ++ SECTION_DATA SectionData; + struct + { +- ROS_SECTION_OBJECT* Section; +- ULONG ViewOffset; +- PMM_SECTION_SEGMENT Segment; +- BOOLEAN WriteCopyView; + LIST_ENTRY RegionListHead; +- } SectionData; +- struct +- { +- LIST_ENTRY RegionListHead; + } VirtualMemoryData; + } Data; + } MEMORY_AREA, *PMEMORY_AREA; +Index: ntoskrnl/include/internal/cc.h +=================================================================== +--- ntoskrnl/include/internal/cc.h (revision 31533) ++++ ntoskrnl/include/internal/cc.h (working copy) +@@ -102,17 +102,29 @@ + LONG ActivePrefetches; + } PFSN_PREFETCHER_GLOBALS, *PPFSN_PREFETCHER_GLOBALS; +#define CACHE_VIEW_SIZE (128 * 1024) // 128kB + @@ -91,7 +101,7 @@ ULONG RefCount; #if defined(DBG) || defined(KDBG) BOOLEAN Trace; /* enable extra trace output for this BCB and it's cache segments */ -@@ -56,8 +68,8 @@ +@@ -157,8 +169,8 @@ typedef struct _INTERNAL_BCB { PUBLIC_BCB PFCB; @@ -102,72 +112,11 @@ CSHORT RefCount; /* (At offset 0x34 on WinNT4) */ } INTERNAL_BCB, *PINTERNAL_BCB; -Index: ntoskrnl/include/internal/mm.h -=================================================================== ---- ntoskrnl/include/internal/mm.h (revision 22988) -+++ ntoskrnl/include/internal/mm.h (working copy) -@@ -176,6 +176,9 @@ - ULONG Flags; - ULONG Characteristics; - BOOLEAN WriteCopy; -+ LIST_ENTRY ListEntry; -+ ULONG BytesPerSector; -+ PFILE_OBJECT FileObject; - } MM_SECTION_SEGMENT, *PMM_SECTION_SEGMENT; - - typedef struct _MM_IMAGE_SECTION_OBJECT -@@ -191,6 +194,10 @@ - USHORT Machine; - BOOLEAN Executable; - ULONG NrSegments; -+ ULONG RefCount; -+ LIST_ENTRY ListEntry; -+ PFILE_OBJECT FileObject; -+ ULONG BytesPerSector; - PMM_SECTION_SEGMENT Segments; - } MM_IMAGE_SECTION_OBJECT, *PMM_IMAGE_SECTION_OBJECT; - -@@ -209,6 +216,16 @@ - }; - } ROS_SECTION_OBJECT, *PROS_SECTION_OBJECT; - -+typedef struct -+{ -+ ROS_SECTION_OBJECT* Section; -+ ULONG ViewOffset; -+ LIST_ENTRY ViewListEntry; -+ PMM_SECTION_SEGMENT Segment; -+// BOOLEAN WriteCopyView; -+ LIST_ENTRY RegionListHead; -+} SECTION_DATA, *PSECTION_DATA; -+ - typedef struct _MEMORY_AREA - { - PVOID StartingAddress; -@@ -223,17 +240,10 @@ - ULONG PageOpCount; - union - { -+ SECTION_DATA SectionData; - struct - { -- ROS_SECTION_OBJECT* Section; -- ULONG ViewOffset; -- PMM_SECTION_SEGMENT Segment; -- BOOLEAN WriteCopyView; - LIST_ENTRY RegionListHead; -- } SectionData; -- struct -- { -- LIST_ENTRY RegionListHead; - } VirtualMemoryData; - } Data; - } MEMORY_AREA, *PMEMORY_AREA; -Index: ntoskrnl/ntoskrnl.def -=================================================================== ---- ntoskrnl/ntoskrnl.def (revision 22988) -+++ ntoskrnl/ntoskrnl.def (working copy) -@@ -5,9 +5,6 @@ +Index: ntoskrnl/ntoskrnl.def +=================================================================== +--- ntoskrnl/ntoskrnl.def (revision 31533) ++++ ntoskrnl/ntoskrnl.def (working copy) +@@ -5,9 +5,6 @@ ; ReactOS Operating System ; EXPORTS @@ -177,3 +126,29 @@ CcCanIWrite@16 CcCopyRead@24 CcCopyWrite@20 +Index: drivers/filesystems/vfat/vfat.h +=================================================================== +--- drivers/filesystems/vfat/vfat.h (revision 31533) ++++ drivers/filesystems/vfat/vfat.h (working copy) +@@ -6,7 +6,7 @@ + #ifdef __GNUC__ + #include <ccros.h> + +-#define USE_ROS_CC_AND_FS ++//#define USE_ROS_CC_AND_FS + #else + #define KEBUGCHECK KeBugCheck + #define KEBUGCHECKEX KeBugCheckEx +Index: drivers/filesystems/ntfs/ntfs.h +=================================================================== +--- drivers/filesystems/ntfs/ntfs.h (revision 31533) ++++ drivers/filesystems/ntfs/ntfs.h (working copy) +@@ -6,7 +6,7 @@ + #include <ntdddisk.h> + #include <ccros.h> + +-#define USE_ROS_CC_AND_FS ++//#define USE_ROS_CC_AND_FS + + + #define CACHEPAGESIZE(pDeviceExt) \

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