Ros-diffs March 2015

ros-diffs@reactos.org

18 participants
496 discussions

[akhaldi] 66683: [KERNEL32] Silence a DPRINT.
by akhaldi＠svn.reactos.org 14 Mar '15

14 Mar '15

Author: akhaldi Date: Sat Mar 14 10:59:40 2015 New Revision: 66683 URL: http://svn.reactos.org/svn/reactos?rev=66683&view=rev Log: [KERNEL32] Silence a DPRINT. Modified: trunk/reactos/dll/win32/kernel32/client/actctx.c Modified: trunk/reactos/dll/win32/kernel32/client/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/actctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/actctx.c [iso-8859-1] Sat Mar 14 10:59:40 2015 @@ -406,10 +406,10 @@ } /* Now call the native API */ - DPRINT1("SXS: %s() Calling Native API with Native Flags %lx for Win32 Flags %lx\n", - __FUNCTION__, - NativeFlags, - dwFlags); + DPRINT("SXS: %s() Calling Native API with Native Flags %lx for Win32 Flags %lx\n", + __FUNCTION__, + NativeFlags, + dwFlags); Status = RtlQueryInformationActivationContext(NativeFlags, hActCtx, pvSubInstance,

1 0

[akhaldi] 66682: [DDK] Bring nt_vdd.h up to DDK formatting standards and use annotations. NFC.
by akhaldi＠svn.reactos.org 14 Mar '15

14 Mar '15

Author: akhaldi Date: Sat Mar 14 10:50:52 2015 New Revision: 66682 URL: http://svn.reactos.org/svn/reactos?rev=66682&view=rev Log: [DDK] Bring nt_vdd.h up to DDK formatting standards and use annotations. NFC. Modified: trunk/reactos/include/ddk/nt_vdd.h Modified: trunk/reactos/include/ddk/nt_vdd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/nt_vdd.h?rev=6… ============================================================================== --- trunk/reactos/include/ddk/nt_vdd.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/nt_vdd.h [iso-8859-1] Sat Mar 14 10:50:52 2015 @@ -28,9 +28,7 @@ extern "C" { #endif -/* - * VDM Control - */ +/* VDM Control */ VOID WINAPI @@ -41,251 +39,236 @@ VDDTerminateVDM(VOID); -/* - * IRQ services - */ +/* IRQ services */ WORD WINAPI -VDDReserveIrqLine -( - IN HANDLE hVdd, - IN WORD IrqLine -); - -BOOL -WINAPI -VDDReleaseIrqLine -( - IN HANDLE hVdd, - IN WORD IrqLine -); - - -/* - * I/O Port services - */ - -typedef VOID (WINAPI *PFNVDD_INB) (WORD iport, PBYTE data); -typedef VOID (WINAPI *PFNVDD_INW) (WORD iport, PWORD data); -typedef VOID (WINAPI *PFNVDD_INSB) (WORD iport, PBYTE data, WORD count); -typedef VOID (WINAPI *PFNVDD_INSW) (WORD iport, PWORD data, WORD count); -typedef VOID (WINAPI *PFNVDD_OUTB) (WORD iport, BYTE data); -typedef VOID (WINAPI *PFNVDD_OUTW) (WORD iport, WORD data); -typedef VOID (WINAPI *PFNVDD_OUTSB) (WORD iport, PBYTE data, WORD count); -typedef VOID (WINAPI *PFNVDD_OUTSW) (WORD iport, PWORD data, WORD count); - -typedef struct _VDD_IO_HANDLERS -{ - PFNVDD_INB inb_handler; - PFNVDD_INW inw_handler; - PFNVDD_INSB insb_handler; - PFNVDD_INSW insw_handler; - PFNVDD_OUTB outb_handler; - PFNVDD_OUTW outw_handler; - PFNVDD_OUTSB outsb_handler; - PFNVDD_OUTSW outsw_handler; +VDDReserveIrqLine( + _In_ HANDLE hVdd, + _In_ WORD IrqLine); + +BOOL +WINAPI +VDDReleaseIrqLine( + _In_ HANDLE hVdd, + _In_ WORD IrqLine); + + +/* I/O Port services */ + +typedef VOID +(WINAPI *PFNVDD_INB)( + WORD iport, + PBYTE data); + +typedef VOID +(WINAPI *PFNVDD_INW)( + WORD iport, + PWORD data); + +typedef VOID +(WINAPI *PFNVDD_INSB)( + WORD iport, + PBYTE data, + WORD count); + +typedef VOID +(WINAPI *PFNVDD_INSW)( + WORD iport, + PWORD data, + WORD count); + +typedef VOID +(WINAPI *PFNVDD_OUTB)( + WORD iport, + BYTE data); + +typedef VOID +(WINAPI *PFNVDD_OUTW)( + WORD iport, + WORD data); + +typedef VOID +(WINAPI *PFNVDD_OUTSB)( + WORD iport, + PBYTE data, + WORD count); + +typedef VOID +(WINAPI *PFNVDD_OUTSW)( + WORD iport, + PWORD data, + WORD count); + +typedef struct _VDD_IO_HANDLERS { + PFNVDD_INB inb_handler; + PFNVDD_INW inw_handler; + PFNVDD_INSB insb_handler; + PFNVDD_INSW insw_handler; + PFNVDD_OUTB outb_handler; + PFNVDD_OUTW outw_handler; + PFNVDD_OUTSB outsb_handler; + PFNVDD_OUTSW outsw_handler; } VDD_IO_HANDLERS, *PVDD_IO_HANDLERS; -typedef struct _VDD_IO_PORTRANGE -{ - WORD First; - WORD Last; +typedef struct _VDD_IO_PORTRANGE { + WORD First; + WORD Last; } VDD_IO_PORTRANGE, *PVDD_IO_PORTRANGE; BOOL WINAPI -VDDInstallIOHook -( - IN HANDLE hVdd, - IN WORD cPortRange, - IN PVDD_IO_PORTRANGE pPortRange, - IN PVDD_IO_HANDLERS IOhandler -); +VDDInstallIOHook( + _In_ HANDLE hVdd, + _In_ WORD cPortRange, + _In_ PVDD_IO_PORTRANGE pPortRange, + _In_ PVDD_IO_HANDLERS IOhandler); VOID WINAPI -VDDDeInstallIOHook -( - IN HANDLE hVdd, - IN WORD cPortRange, - IN PVDD_IO_PORTRANGE pPortRange -); - - -/* - * DMA services - */ - -typedef struct _VDD_DMA_INFO -{ - WORD addr; - WORD count; - WORD page; - BYTE status; - BYTE mode; - BYTE mask; +VDDDeInstallIOHook( + _In_ HANDLE hVdd, + _In_ WORD cPortRange, + _In_ PVDD_IO_PORTRANGE pPortRange); + + +/* DMA services */ + +typedef struct _VDD_DMA_INFO { + WORD addr; + WORD count; + WORD page; + BYTE status; + BYTE mode; + BYTE mask; } VDD_DMA_INFO, *PVDD_DMA_INFO; -#define VDD_DMA_ADDR 0x01 -#define VDD_DMA_COUNT 0x02 -#define VDD_DMA_PAGE 0x04 -#define VDD_DMA_STATUS 0x08 -#define VDD_DMA_ALL (VDD_DMA_ADDR | VDD_DMA_COUNT | VDD_DMA_PAGE | VDD_DMA_STATUS) +#define VDD_DMA_ADDR 0x01 +#define VDD_DMA_COUNT 0x02 +#define VDD_DMA_PAGE 0x04 +#define VDD_DMA_STATUS 0x08 +#define VDD_DMA_ALL (VDD_DMA_ADDR | VDD_DMA_COUNT | VDD_DMA_PAGE | VDD_DMA_STATUS) DWORD WINAPI -VDDRequestDMA -( - IN HANDLE hVdd, - IN WORD iChannel, - IN OUT PVOID Buffer, - IN DWORD length -); - -BOOL -WINAPI -VDDQueryDMA -( - IN HANDLE hVdd, - IN WORD iChannel, - IN PVDD_DMA_INFO pDmaInfo -); - -BOOL -WINAPI -VDDSetDMA -( - IN HANDLE hVdd, - IN WORD iChannel, - IN WORD fDMA, - IN PVDD_DMA_INFO pDmaInfo -); - - -/* - * Memory services - */ - -typedef enum -{ - VDM_V86, - VDM_PM +VDDRequestDMA( + _In_ HANDLE hVdd, + _In_ WORD iChannel, + _Inout_ PVOID Buffer, + _In_ DWORD length); + +BOOL +WINAPI +VDDQueryDMA( + _In_ HANDLE hVdd, + _In_ WORD iChannel, + _In_ PVDD_DMA_INFO pDmaInfo); + +BOOL +WINAPI +VDDSetDMA( + _In_ HANDLE hVdd, + _In_ WORD iChannel, + _In_ WORD fDMA, + _In_ PVDD_DMA_INFO pDmaInfo); + + +/* Memory services */ + +typedef enum { + VDM_V86, + VDM_PM } VDM_MODE; #ifndef MSW_PE -#define MSW_PE 0x0001 +#define MSW_PE 0x0001 #endif #define getMODE() ((getMSW() & MSW_PE) ? VDM_PM : VDM_V86) typedef VOID -(WINAPI *PVDD_MEMORY_HANDLER) -( - PVOID FaultAddress, - ULONG RWMode -); +(WINAPI *PVDD_MEMORY_HANDLER)( + PVOID FaultAddress, + ULONG RWMode); PBYTE WINAPI -Sim32pGetVDMPointer -( - IN ULONG Address, - IN BOOLEAN ProtectedMode -); +Sim32pGetVDMPointer( + _In_ ULONG Address, + _In_ BOOLEAN ProtectedMode); PBYTE WINAPI -MGetVdmPointer -( - IN ULONG Address, - IN ULONG Size, - IN BOOLEAN ProtectedMode -); +MGetVdmPointer( + _In_ ULONG Address, + _In_ ULONG Size, + _In_ BOOLEAN ProtectedMode); PVOID WINAPI -VdmMapFlat -( - IN USHORT Segment, - IN ULONG Offset, - IN VDM_MODE Mode -); - -BOOL -WINAPI -VdmFlushCache -( - IN USHORT Segment, - IN ULONG Offset, - IN ULONG Size, - IN VDM_MODE Mode -); - -BOOL -WINAPI -VdmUnmapFlat -( - IN USHORT Segment, - IN ULONG Offset, - IN PVOID Buffer, - IN VDM_MODE Mode -); - -BOOL -WINAPI -VDDInstallMemoryHook -( - IN HANDLE hVdd, - IN PVOID pStart, - IN DWORD dwCount, - IN PVDD_MEMORY_HANDLER MemoryHandler -); - -BOOL -WINAPI -VDDDeInstallMemoryHook -( - IN HANDLE hVdd, - IN PVOID pStart, - IN DWORD dwCount -); - -BOOL -WINAPI -VDDAllocMem -( - IN HANDLE hVdd, - IN PVOID Address, - IN ULONG Size -); - -BOOL -WINAPI -VDDFreeMem -( - IN HANDLE hVdd, - IN PVOID Address, - IN ULONG Size -); - -BOOL -WINAPI -VDDIncludeMem -( - IN HANDLE hVdd, - IN PVOID Address, - IN ULONG Size -); - -BOOL -WINAPI -VDDExcludeMem -( - IN HANDLE hVdd, - IN PVOID Address, - IN ULONG Size -); +VdmMapFlat( + _In_ USHORT Segment, + _In_ ULONG Offset, + _In_ VDM_MODE Mode); + +BOOL +WINAPI +VdmFlushCache( + _In_ USHORT Segment, + _In_ ULONG Offset, + _In_ ULONG Size, + _In_ VDM_MODE Mode); + +BOOL +WINAPI +VdmUnmapFlat( + _In_ USHORT Segment, + _In_ ULONG Offset, + _In_ PVOID Buffer, + _In_ VDM_MODE Mode); + +BOOL +WINAPI +VDDInstallMemoryHook( + _In_ HANDLE hVdd, + _In_ PVOID pStart, + _In_ DWORD dwCount, + _In_ PVDD_MEMORY_HANDLER MemoryHandler); + +BOOL +WINAPI +VDDDeInstallMemoryHook( + _In_ HANDLE hVdd, + _In_ PVOID pStart, + _In_ DWORD dwCount); + +BOOL +WINAPI +VDDAllocMem( + _In_ HANDLE hVdd, + _In_ PVOID Address, + _In_ ULONG Size); + +BOOL +WINAPI +VDDFreeMem( + _In_ HANDLE hVdd, + _In_ PVOID Address, + _In_ ULONG Size); + +BOOL +WINAPI +VDDIncludeMem( + _In_ HANDLE hVdd, + _In_ PVOID Address, + _In_ ULONG Size); + +BOOL +WINAPI +VDDExcludeMem( + _In_ HANDLE hVdd, + _In_ PVOID Address, + _In_ ULONG Size); #ifdef __cplusplus }

1 0

[akhaldi] 66681: [DESK] Set the default value for the placement combobox and load the monitor bitmap before the registry is accessed. Lower the requested access rights for RegOpenKeyEx to HKEY_QUER...
by akhaldi＠svn.reactos.org 14 Mar '15

14 Mar '15

Author: akhaldi Date: Sat Mar 14 10:28:22 2015 New Revision: 66681 URL: http://svn.reactos.org/svn/reactos?rev=66681&view=rev Log: [DESK] Set the default value for the placement combobox and load the monitor bitmap before the registry is accessed. Lower the requested access rights for RegOpenKeyEx to HKEY_QUERY_VALUE. In case RegOpenKeyEx fails, simply return to the calling function. Remove result and varType variables. By Ricardo Hanke. CORE-9365 Modified: trunk/reactos/dll/cpl/desk/background.c Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] Sat Mar 14 10:28:22 2015 @@ -446,8 +446,6 @@ HKEY regKey; TCHAR szBuffer[2]; DWORD bufferSize = sizeof(szBuffer); - DWORD varType = REG_SZ; - LONG result; BITMAP bitmap; AddListViewItems(hwndDlg, pData); @@ -461,21 +459,25 @@ LoadString(hApplet, IDS_TILE, szString, sizeof(szString) / sizeof(TCHAR)); SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_INSERTSTRING, PLACEMENT_TILE, (LPARAM)szString); + SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_SETCURSEL, PLACEMENT_CENTER, 0); + pData->placementSelection = PLACEMENT_CENTER; + + pData->hBitmap = (HBITMAP) LoadImage(hApplet, MAKEINTRESOURCE(IDC_MONITOR), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + if (pData->hBitmap != NULL) + { + GetObject(pData->hBitmap, sizeof(BITMAP), &bitmap); + + pData->cxSource = bitmap.bmWidth; + pData->cySource = bitmap.bmHeight; + } + /* Load the default settings from the registry */ - result = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_ALL_ACCESS, &regKey); - if (result != ERROR_SUCCESS) - { - /* reg key open failed; maybe it does not exist? create it! */ - DWORD dwDisposition = 0; - result = RegCreateKeyEx( HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, NULL, 0, KEY_ALL_ACCESS, NULL, - &regKey, &dwDisposition ); - /* Now the key must be created & opened and regKey points to opened key */ - /* On error result will not contain ERROR_SUCCESS. I don't know how to handle */ - /* this case :( */ - } - - result = RegQueryValueEx(regKey, TEXT("WallpaperStyle"), 0, &varType, (LPBYTE)szBuffer, &bufferSize); - if (result == ERROR_SUCCESS) + if (RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_QUERY_VALUE, &regKey) != ERROR_SUCCESS) + { + return; + } + + if (RegQueryValueEx(regKey, TEXT("WallpaperStyle"), 0, NULL, (LPBYTE)szBuffer, &bufferSize) == ERROR_SUCCESS) { if (_ttoi(szBuffer) == 0) { @@ -489,14 +491,8 @@ pData->placementSelection = PLACEMENT_STRETCH; } } - else - { - SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_SETCURSEL, PLACEMENT_CENTER, 0); - pData->placementSelection = PLACEMENT_CENTER; - } - - result = RegQueryValueEx(regKey, TEXT("TileWallpaper"), 0, &varType, (LPBYTE)szBuffer, &bufferSize); - if (result == ERROR_SUCCESS) + + if (RegQueryValueEx(regKey, TEXT("TileWallpaper"), 0, NULL, (LPBYTE)szBuffer, &bufferSize) == ERROR_SUCCESS) { if (_ttoi(szBuffer) == 1) { @@ -506,15 +502,6 @@ } RegCloseKey(regKey); - - pData->hBitmap = (HBITMAP) LoadImage(hApplet, MAKEINTRESOURCE(IDC_MONITOR), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); - if (pData->hBitmap != NULL) - { - GetObject(pData->hBitmap, sizeof(BITMAP), &bitmap); - - pData->cxSource = bitmap.bmWidth; - pData->cySource = bitmap.bmHeight; - } }

1 0

[akhaldi] 66680: [SYSDM] Add new icons to the Hardware tab of sysdm. Brought to you by Jared. CORE-9317
by akhaldi＠svn.reactos.org 14 Mar '15

14 Mar '15

Author: akhaldi Date: Sat Mar 14 10:15:13 2015 New Revision: 66680 URL: http://svn.reactos.org/svn/reactos?rev=66680&view=rev Log: [SYSDM] Add new icons to the Hardware tab of sysdm. Brought to you by Jared. CORE-9317 Added: trunk/reactos/dll/cpl/sysdm/resources/License.txt (with props) trunk/reactos/dll/cpl/sysdm/resources/addhw.ico (with props) trunk/reactos/dll/cpl/sysdm/resources/dev.ico (with props) trunk/reactos/dll/cpl/sysdm/resources/hwprofile.ico (with props) Modified: trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc trunk/reactos/dll/cpl/sysdm/lang/en-US.rc trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc trunk/reactos/dll/cpl/sysdm/resource.h trunk/reactos/dll/cpl/sysdm/sysdm.rc Modified: trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] Sat Mar 14 10:15:13 2015 @@ -31,7 +31,7 @@ LTEXT "Ð£Ð¿ÑÐ°Ð²Ð¸ÑÐµÐ»ÑÑ Ð½Ð° ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°ÑÐ° Ð¸Ð·Ð²ÐµÐ¶Ð´Ð° ÑÐ¿Ð¸ÑÑÐº Ð½Ð° Ð²ÑÐ¸ÑÐºÐ¸ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð² ÐºÐ¾Ð¼Ð¿ÑÑÑÑÐ° Ð²Ð¸. Ð§ÑÐµÐ· Ð½ÐµÐ³Ð¾ Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° ÑÐºÐ°Ð¶ÐµÑÐµ ÑÐ²Ð¾Ð¹ÑÑÐ²Ð°ÑÐ° Ð½Ð° Ð²ÑÑÐºÐ¾ Ð¾Ñ ÑÑÑ.", IDC_STATIC, 42, 18, 204, 24 PUSHBUTTON "Ð£Ð¿ÑÐ°Ð²Ð¸ÑÐµÐ» Ð½Ð° &ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°ÑÐ°...", IDC_HARDWARE_DEVICE_MANAGER, 134, 48, 110, 15 GROUPBOX "Ð¡ÑÐ²ÐµÑÐ½Ð¸Ðº Ð¿Ð¾ Ð¾Ð±Ð¾ÑÑÐ´Ð²Ð°Ð½ÐµÑÐ¾", IDC_STATIC, 6, 79, 244, 61 - ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + ICON IDI_ADDHW, IDC_STATIC, 12, 90, 23, 21, SS_ICON LTEXT "Ð¡ÑÐ²ÐµÑÐ½Ð¸ÐºÑÑ Ð¿Ð¾ Ð¾Ð±Ð¾ÑÑÐ´Ð²Ð°Ð½ÐµÑÐ¾ ÑÐµ Ð²Ð¸ Ð¿Ð¾Ð¼Ð¾Ð³Ð½Ðµ Ð´Ð° Ð¿Ð¾Ð´ÐºÐ°ÑÐ°ÑÐµ, Ð¼Ð°ÑÐ½ÐµÑÐµ, Ð¸Ð·Ð²Ð°Ð´Ð¸ÑÐµ, Ð¸Ð·ÑÐ¼ÑÐºÐ½ÐµÑÐµ Ð¸ Ð½Ð°ÑÑÑÐ¾Ð¸ÑÐµ Ð¾Ð±Ð¾ÑÑÐ´Ð²Ð°Ð½ÐµÑÐ¾ ÑÐ¸.", IDC_STATIC, 42, 90, 204, 24 PUSHBUTTON "Ð¡ÑÐ²ÐµÑÐ½Ð¸Ðº Ð¿Ð¾ &Ð¾Ð±Ð¾ÑÑÐ´Ð²Ð°Ð½ÐµÑÐ¾", IDC_HARDWARE_WIZARD, 134, 120, 110, 15 GROUPBOX "ÐÑÐ¾ÑÐ¸Ð»Ð¸ Ð·Ð° Ð¾Ð±Ð¾ÑÑÐ´Ð²Ð°Ð½ÐµÑÐ¾", IDC_STATIC, 6, 149, 244, 61 Modified: trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] Sat Mar 14 10:15:13 2015 @@ -36,7 +36,7 @@ LTEXT "SprÃ¡vce zaÅÃzenÃ zobrazuje seznam vÅ¡ech hardwarovÃ½ch zaÅÃzenÃ nainstalovanÃ½ch na tomto poÄÃtaÄi. Ve SprÃ¡vci zaÅÃzenÃ lze zmÄnit vlastnosti libovolnÃ©ho zaÅÃzenÃ.", IDC_STATIC, 42, 18, 204, 24 PUSHBUTTON "&SprÃ¡vce zaÅÃzenÃ...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 15 GROUPBOX "PrÅ¯vodce hardwarem", IDC_STATIC, 6, 79, 244, 61 - ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + ICON IDI_ADDHW, IDC_STATIC, 12, 90, 23, 21, SS_ICON LTEXT "PrÅ¯vodce hardwarem umoÅ¾Åuje pÅidÃ¡vat, odebÃrat, opravovat, odpojovat, vysouvat a konfigurovat hardware.", IDC_STATIC, 42, 90, 204, 24 PUSHBUTTON "&PrÅ¯vodce hardwarem...", IDC_HARDWARE_WIZARD, 154, 120, 90, 15 GROUPBOX "HardwarovÃ© profily", IDC_STATIC, 6, 149, 244, 61 Modified: trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/da-DK.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc [iso-8859-1] Sat Mar 14 10:15:13 2015 @@ -31,7 +31,7 @@ LTEXT "EnhedshÃ¥ntering viser alle dine hardware enheder installeret pÃ¥ din computer. Brug EnhedshÃ¥ntering til at skifte indstillinger for alle Hardware Enheder.", IDC_STATIC, 42, 18, 204, 24 PUSHBUTTON "&EnhedshÃ¥ntering...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 15 GROUPBOX "Hardware Guide", IDC_STATIC, 6, 79, 244, 61 - ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + ICON IDI_ADDHW, IDC_STATIC, 12, 90, 23, 21, SS_ICON LTEXT "Hardware Guiden hjÃ¦lper dig med at Installer, Afinstaller, Reparerer, Afmontere, Fjerne, og konfigurer din hardware.", IDC_STATIC, 42, 90, 204, 24 PUSHBUTTON "&Hardware Guide...", IDC_HARDWARE_WIZARD, 154, 120, 90, 15 GROUPBOX "Hardware Profiler", IDC_STATIC, 6, 149, 244, 61 Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] Sat Mar 14 10:15:13 2015 @@ -40,7 +40,7 @@ LTEXT "Der GerÃ¤te-Manager zeigt alle Hardware-GerÃ¤te ihres Computers an. Benutzen Sie den GerÃ¤te-Manager, um die Eigenschaften eines GerÃ¤tes zu Ã¤ndern.", IDC_STATIC, 42, 18, 204, 24 PUSHBUTTON "&GerÃ¤te-Manager...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 14 GROUPBOX "Hardware-Assistent", IDC_STATIC, 6, 79, 244, 61 - ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + ICON IDI_ADDHW, IDC_STATIC, 12, 90, 23, 21, SS_ICON LTEXT "Der Hardware-Assistent hilft ihnen, Hardware zu installieren, zu deinstallieren, zu reparieren und zu konfigurieren.", IDC_STATIC, 42, 90, 204, 24 PUSHBUTTON "&Hardware-Assistent...", IDC_HARDWARE_WIZARD, 154, 120, 90, 14 GROUPBOX "Hardware-Profile", IDC_STATIC, 6, 149, 244, 61 Modified: trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] Sat Mar 14 10:15:13 2015 @@ -31,7 +31,7 @@ LTEXT "Î ÎÎ¹Î±ÏÎµÎ¯ÏÎ¹ÏÎ· Î£ÏÏÎºÎµÏÏÎ½ ÏÏÎ¿Î²Î¬Î»Î»ÎµÎ¹ Î¼Î¹Î± Î»Î¯ÏÏÎ± Î¼Îµ ÏÎ»ÎµÏ ÏÎ¹Ï ÏÏÏÎºÎµÏÎÏ ÏÎ¿Ï ÎµÎ¯Î½Î±Î¹ ÎµÎ³ÎºÎ±ÏÎµÏÏÎ·Î¼ÎÎ½ÎµÏ ÏÏÎ¿Î½ ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÎ® ÏÎ±Ï. ÎÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ ÏÎ· ÎÎ¹Î±ÏÎµÎ¯ÏÎ¹ÏÎ· Î£ÏÏÎºÎµÏÏÎ½ Î³Î¹Î± Î½Î± Î±Î»Î»Î¬Î¾ÎµÏÎµ ÏÎ¹Ï Î¹Î´Î¹ÏÏÎ·ÏÎµÏ Î³Î¹Î± ÎºÎ¬Î¸Îµ ÏÏÏÎºÎµÏÎ®.", IDC_STATIC, 42, 16, 204, 33 PUSHBUTTON "&ÎÎ¹Î±ÏÎµÎ¯ÏÎ¹ÏÎ· Î£ÏÏÎºÎµÏÏÎ½...", IDC_HARDWARE_DEVICE_MANAGER, 148, 51, 98, 15 GROUPBOX "ÎÎ´Î·Î³ÏÏ ÏÏÎ¿ÏÎ¸Î®ÎºÎ·Ï ÏÎ»Î¹ÎºÎ¿Ï", IDC_STATIC, 6, 79, 244, 61 - ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + ICON IDI_ADDHW, IDC_STATIC, 12, 90, 23, 21, SS_ICON LTEXT "Î ÎÎ´Î·Î³ÏÏ ÏÏÎ¿ÏÎ¸Î®ÎºÎ·Ï ÏÎ»Î¹ÎºÎ¿Ï ÏÎ±Ï Î²Î¿Î·Î¸Î¬ Î½Î± ÎµÎ³ÎºÎ±ÏÎ±ÏÏÎ®ÏÎµÏÎµ, Î±ÏÎµÎ³ÎºÎ±ÏÎ±ÏÏÎ®ÏÎµÏÎµ, ÎµÏÎ¹Î´Î¹ÏÏÎ¸ÏÏÎµÏÎµ ÎºÎ±Î¹ Î½Î± ÏÏÎ¸Î¼Î¯ÏÎµÏÎµ ÏÎ»Î¹ÎºÏ.", IDC_STATIC, 42, 92, 204, 24 PUSHBUTTON "&ÎÎ´Î·Î³ÏÏ ÏÏÎ¿ÏÎ¸Î®ÎºÎ·Ï ÏÎ»Î¹ÎºÎ¿Ï...", IDC_HARDWARE_WIZARD, 148, 120, 98, 15 GROUPBOX "Î ÏÎ¿ÏÎ¯Î» ÏÎ»Î¹ÎºÎ¿Ï", IDC_STATIC, 6, 149, 244, 61 Modified: trunk/reactos/dll/cpl/sysdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] Sat Mar 14 10:15:13 2015 @@ -31,7 +31,7 @@ LTEXT "The Device Manager lists all the hardware devices installed on your computer. Use the Device Manager to change the properties of any device.", IDC_STATIC, 42, 18, 204, 24 PUSHBUTTON "&Device Manager...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 15 GROUPBOX "Hardware Wizard", IDC_STATIC, 6, 79, 244, 61 - ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + ICON IDI_ADDHW, IDC_STATIC, 12, 90, 23, 21, SS_ICON LTEXT "The Hardware wizard helps you install, uninstall, repair, unplug, eject, and configure your hardware.", IDC_STATIC, 42, 90, 204, 24 PUSHBUTTON "&Hardware Wizard...", IDC_HARDWARE_WIZARD, 154, 120, 90, 15 GROUPBOX "Hardware Profiles", IDC_STATIC, 6, 149, 244, 61 Modified: trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] Sat Mar 14 10:15:13 2015 @@ -33,7 +33,7 @@ LTEXT "El Administrador de dispositivos muestra una lista de todos los dispositivos de hardware instalados en su equipo. Puede usarlo para cambiar las propiedades de cualquier dispositivo.", IDC_STATIC, 42, 18, 204, 24 PUSHBUTTON "&Administrador de dispositivos...", IDC_HARDWARE_DEVICE_MANAGER, 138, 48, 106, 15 GROUPBOX "Asistente de instalaciÃ³n de hardware ", IDC_STATIC, 6, 79, 244, 61 - ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + ICON IDI_ADDHW, IDC_STATIC, 12, 90, 23, 21, SS_ICON LTEXT "El asistente de instalaciÃ³n de hardware ayuda instalar, desinstalar, reparar, desconectar, expulsar, y configurar dispositivos.", IDC_STATIC, 42, 90, 204, 24 PUSHBUTTON "&Asistente de hardware...", IDC_HARDWARE_WIZARD, 138, 120, 106, 15 GROUPBOX "Perfiles de hardware ", IDC_STATIC, 6, 149, 244, 61 Modified: trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] Sat Mar 14 10:15:13 2015 @@ -31,7 +31,7 @@ LTEXT "Le Gestionnaire de PÃ©riphÃ©riques liste tous les pÃ©riphÃ©riques matÃ©riels de votre ordinateur. Utiliser le Gestionnaire de pÃ©riphÃ©riques pour changer les propriÃ©tÃ©s d'un pÃ©riphÃ©rique.", IDC_STATIC, 42, 18, 204, 24 PUSHBUTTON "&Gestionnaire de PÃ©riphÃ©riques...", IDC_HARDWARE_DEVICE_MANAGER, 135, 48, 110, 14 GROUPBOX "Assistant MatÃ©riel", IDC_STATIC, 6, 79, 244, 61 - ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + ICON IDI_ADDHW, IDC_STATIC, 12, 90, 23, 21, SS_ICON LTEXT "L'Assistant MatÃ©riel vous aide Ã installer, dÃ©sinstaller, rÃ©parer, dÃ©brancher, Ã©jecter et configurer votre matÃ©riel.", IDC_STATIC, 42, 90, 204, 24 PUSHBUTTON "&Assistant MatÃ©riel...", IDC_HARDWARE_WIZARD, 135, 120, 110, 14 GROUPBOX "Profils MatÃ©riels", IDC_STATIC, 6, 149, 244, 61 Modified: trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/he-IL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc [iso-8859-1] Sat Mar 14 10:15:13 2015 @@ -33,7 +33,7 @@ LTEXT "×× ×× ×××ª×§× ×× ××¦×× ×× ×× ××ª×§× × ×××××¨× ××××ª×§× ×× ××××©× ×©××. ××©×ª××© ××× ×× ×××ª×§× ×× ××× ××©× ××ª ××ª ××××¤××× ×× ×©× ×× ××ª×§×.", IDC_STATIC, 42, 18, 204, 24 PUSHBUTTON "×× ×× ×××ª×§× ××...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 15 GROUPBOX "××©×£ ×××¡×¤×ª ××××¨×", IDC_STATIC, 6, 79, 244, 61 - ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + ICON IDI_ADDHW, IDC_STATIC, 12, 90, 23, 21, SS_ICON LTEXT "The Hardware wizard helps you install, uninstall, repair, unplug, eject, and configure your hardware.", IDC_STATIC, 42, 90, 204, 24 PUSHBUTTON "××©×£ ×××¡×¤×ª ××××¨×...", IDC_HARDWARE_WIZARD, 154, 120, 90, 15 GROUPBOX "×¤×¨××¤××× ××××¨×", IDC_STATIC, 6, 149, 244, 61 Modified: trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/hu-HU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc [iso-8859-1] Sat Mar 14 10:15:13 2015 @@ -33,7 +33,7 @@ LTEXT "Az EszkÃ¶zkezelÅ felsorolja az Ã¶sszes hardverelemet, amelyek telepÃtve vannak az Ãn szÃ¡mÃtÃ³gÃ©pÃ©n. Az EszkÃ¶zkezelÅben bÃ¡rmelyik eszkÃ¶z beÃ¡llÃtÃ¡sait megvÃ¡ltoztathatja.", IDC_STATIC, 42, 18, 204, 24 PUSHBUTTON "&EszkÃ¶zkezelÅ...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 15 GROUPBOX "Hardver varÃ¡zslÃ³", IDC_STATIC, 6, 79, 244, 61 - ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + ICON IDI_ADDHW, IDC_STATIC, 12, 90, 23, 21, SS_ICON LTEXT "A Hardver varÃ¡zslÃ³ segÃti Ãnt hardvereszkÃ¶zei telepÃtÃ©sÃ©nÃ©l, eltÃ¡volÃtÃ¡sÃ¡nÃ¡l, kijavÃtÃ¡sÃ¡nÃ¡l, levÃ¡lasztÃ¡sÃ¡nÃ¡l, kiadÃ¡sÃ¡nÃ¡l, beÃ¡llÃtÃ¡sÃ¡nÃ¡l.", IDC_STATIC, 42, 90, 204, 24 PUSHBUTTON "&Hardver varÃ¡zslÃ³...", IDC_HARDWARE_WIZARD, 154, 120, 90, 15 GROUPBOX "Hardver profilok", IDC_STATIC, 6, 149, 244, 61 Modified: trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/id-ID.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] Sat Mar 14 10:15:13 2015 @@ -31,7 +31,7 @@ LTEXT "Manajer Device mendaftar seluruh hardware device yang terinstalasi pada komputer anda. Gunakan Manajer Device untuk mengubah properti atas setiap device.", IDC_STATIC, 42, 18, 204, 24 PUSHBUTTON "Manajer &Device...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 14 GROUPBOX "Bimbingan Hardware", IDC_STATIC, 6, 79, 244, 61 - ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + ICON IDI_ADDHW, IDC_STATIC, 12, 90, 23, 21, SS_ICON LTEXT "Bimbingan hardware membantu anda menginstalasi, deinstalasi, reparasi, unplug, mengeluarkan, dan mengkonfigurasi hardware anda.", IDC_STATIC, 42, 90, 204, 24 PUSHBUTTON "Bimbingan &Hardware...", IDC_HARDWARE_WIZARD, 154, 120, 90, 14 GROUPBOX "Profil Hardware", IDC_STATIC, 6, 149, 244, 61 Modified: trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] Sat Mar 14 10:15:13 2015 @@ -31,7 +31,7 @@ LTEXT "Gestione dispositivi elenca tutti i dispositivi installati nel computer. Usate la gestione dispositivi per modificare le impostazioni di un dispositivo.", IDC_STATIC, 42, 18, 204, 24 PUSHBUTTON "&Gestione dispositivi...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 14 GROUPBOX "Hardware Wizard", IDC_STATIC, 6, 79, 244, 61 - ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + ICON IDI_ADDHW, IDC_STATIC, 12, 90, 23, 21, SS_ICON LTEXT "Hardware wizard aiuta ad installare, disinstallare, ripristinare, scollegare, estrarre e configurare l'hardware.", IDC_STATIC, 42, 90, 204, 24 PUSHBUTTON "&Hardware Wizard...", IDC_HARDWARE_WIZARD, 154, 120, 90, 14 GROUPBOX "Profili Hardware", IDC_STATIC, 6, 149, 244, 61 Modified: trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ja-JP.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] Sat Mar 14 10:15:13 2015 @@ -31,7 +31,7 @@ LTEXT "ããã¤ã¹ããã¼ã¸ã£ã¯ã³ã³ãã¥ã¼ã¿ã«è£çããã¦ãããã¹ã¦ã®ãã¼ãã¦ã§ã¢ãè¡¨ç¤º ãã¾ããåããã¤ã¹ã®ããããã£ãå¤æ´ããã«ã¯ããã¤ã¹ããã¼ã¸ã£ãä½¿ç¨ ãã¦ãã ããã", IDC_STATIC, 42, 18, 204, 24 PUSHBUTTON "ããã¤ã¹ ããã¼ã¸ã£(&D)...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 15 GROUPBOX "ãã¼ãã¦ã§ã¢ ã¦ã£ã¶ã¼ã", IDC_STATIC, 6, 79, 244, 61 - ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + ICON IDI_ADDHW, IDC_STATIC, 12, 90, 23, 21, SS_ICON LTEXT "ãã¼ãã¦ã§ã¢ã¦ã£ã¶ã¼ãã¯ãã¼ãã¦ã§ã¢ã®ã¤ã³ã¹ãã¼ã«ãã¢ã³ã¤ã³ã¹ãã¼ã«ãä¿®å¾©ã åãå¤ããåãåºããè¨å®ã®æå©ãããã¾ãã", IDC_STATIC, 42, 90, 204, 24 PUSHBUTTON "ãã¼ãã¦ã§ã¢ ã¦ã£ã¶ã¼ã(&H)...", IDC_HARDWARE_WIZARD, 154, 120, 90, 15 GROUPBOX "ãã¼ãã¦ã§ã¢ ãããã¡ã¤ã«", IDC_STATIC, 6, 149, 244, 61 Modified: trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/nl-NL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc [iso-8859-1] Sat Mar 14 10:15:13 2015 @@ -31,7 +31,7 @@ LTEXT "Apparaatbeheer geeft een overzicht van alle hardware die op de computer is geÃ¯nstalleerd. U kunt in Apparaatbeheer tevens de eigenschappen van elk apparaat wijzigen.", IDC_STATIC, 42, 18, 204, 24 PUSHBUTTON "&Apparaatbeheer...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 15 GROUPBOX "Wizard Hardware", IDC_STATIC, 6, 79, 244, 61 - ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + ICON IDI_ADDHW, IDC_STATIC, 12, 90, 23, 21, SS_ICON LTEXT "Met de wizard Hardware kunt u hardware installeren, verwijderen, repareren ontkoppelen, uitwerpen en configureren.", IDC_STATIC, 42, 90, 204, 24 PUSHBUTTON "Wizard &Hardware...", IDC_HARDWARE_WIZARD, 154, 120, 90, 15 GROUPBOX "Hardwareprofielen", IDC_STATIC, 6, 149, 244, 61 Modified: trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/no-NO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] Sat Mar 14 10:15:13 2015 @@ -31,7 +31,7 @@ LTEXT "Enhetsbehandler viser alt av maskinvare enheter som er innstallert pÃ¥ din datamaskin. Bruk enhetsbehandleren for Ã¥ endre egenskapene for alle enhetene.", IDC_STATIC, 42, 18, 204, 24 PUSHBUTTON "&Enhetsbehandler...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 15 GROUPBOX "Maskinvare veiviser", IDC_STATIC, 6, 79, 244, 61 - ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + ICON IDI_ADDHW, IDC_STATIC, 12, 90, 23, 21, SS_ICON LTEXT "Maskinvare veiviseren hjelper deg Ã¥ installere, avinnstallere, reparere, koble fra, utlÃ¸se, og konfigurere din maskinvare.", IDC_STATIC, 42, 90, 204, 24 PUSHBUTTON "&Maskinvare veiviser...", IDC_HARDWARE_WIZARD, 154, 120, 90, 15 GROUPBOX "Maskinvare profiler", IDC_STATIC, 6, 149, 244, 61 Modified: trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] Sat Mar 14 10:15:13 2015 @@ -40,7 +40,7 @@ LTEXT "MenedÅ¼er urzÄdzeÅ wyÅwietla wszystkie urzÄdzenia sprzÄtowe zainstalowane w komputerze. MoÅ¼esz uÅ¼yÄ MenedÅ¼era urzÄdzeÅ, aby zmieniÄ wÅaÅciwoÅci kaÅ¼dego urzÄdzenia.", IDC_STATIC, 42, 18, 204, 24 PUSHBUTTON "&MenedÅ¼er urzÄdzeÅ", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 14 GROUPBOX "Kreator sprzÄtu", IDC_STATIC, 6, 79, 244, 61 - ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + ICON IDI_ADDHW, IDC_STATIC, 12, 90, 23, 21, SS_ICON LTEXT "Kreator sprzÄtu pomaga w instalacji, deinstalacji, odÅÄczaniu, usuwaniu i konfiguracji sprzÄtu.", IDC_STATIC, 42, 90, 204, 24 PUSHBUTTON "&Kreator sprzÄtu", IDC_HARDWARE_WIZARD, 154, 120, 90, 14 GROUPBOX "Profile sprzÄtu", IDC_STATIC, 6, 149, 244, 61 Modified: trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] Sat Mar 14 10:15:13 2015 @@ -40,7 +40,7 @@ LTEXT "Instrumentul Gestionar de dispozitive enumerÄ toate componentele fizice instalate Ã®n calculator. UtilizaÈi acest Gestionar de dispozitive pentru configurea unui dispozitiv.", IDC_STATIC, 42, 18, 204, 24 PUSHBUTTON "Deschidere &Gestionarâ¦", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 15 GROUPBOX "Asistent de adÄugare a componentelor fizice", IDC_STATIC, 6, 79, 244, 61 - ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + ICON IDI_ADDHW, IDC_STATIC, 12, 90, 23, 21, SS_ICON LTEXT "Acest asistent vÄ permite instalarea Èi depanarea componentelor fizice ale calculatorului.", IDC_STATIC, 42, 90, 204, 24 PUSHBUTTON "Deschidere Asist&entâ¦", IDC_HARDWARE_WIZARD, 154, 120, 90, 15 GROUPBOX "Profiluri ale dispozitivelor", IDC_STATIC, 6, 149, 244, 61 Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] Sat Mar 14 10:15:13 2015 @@ -31,7 +31,7 @@ LTEXT "ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ² Ð¿ÑÐ¸Ð²Ð¾Ð´Ð¸Ñ ÑÐ¿Ð¸ÑÐ¾Ðº Ð²ÑÐµÐ³Ð¾ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½Ð° Ð´Ð°Ð½Ð½Ð¾Ð¼ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐµ Ð¸ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÐµÑ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ²Ð¾Ð¹ÑÑÐ²Ð° Ð»ÑÐ±Ð¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°.", IDC_STATIC, 42, 18, 204, 24 PUSHBUTTON "&ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ²...", IDC_HARDWARE_DEVICE_MANAGER, 144, 48, 100, 14 GROUPBOX "ÐÐ°ÑÑÐµÑ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ", IDC_STATIC, 6, 79, 244, 61 - ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + ICON IDI_ADDHW, IDC_STATIC, 12, 90, 23, 21, SS_ICON LTEXT "ÐÐ°ÑÑÐµÑ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð¼Ð¾Ð³Ð°ÐµÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ, Ð²Ð¾ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ, Ð¾ÑÐºÐ»ÑÑÐ¸ÑÑ Ð¸Ð»Ð¸ Ð¸Ð·Ð²Ð»ÐµÑÑ Ð»ÑÐ±Ð¾Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾, Ð° ÑÐ°ÐºÐ¶Ðµ Ð½Ð°ÑÑÑÐ¾Ð¸ÑÑ ÐµÐ³Ð¾.", IDC_STATIC, 42, 90, 204, 24 PUSHBUTTON "&ÐÐ°ÑÑÐµÑ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ...", IDC_HARDWARE_WIZARD, 144, 120, 100, 14 GROUPBOX "ÐÑÐ¾ÑÐ¸Ð»Ð¸ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ", IDC_STATIC, 6, 149, 244, 61 Modified: trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] Sat Mar 14 10:15:13 2015 @@ -39,7 +39,7 @@ LTEXT "SprÃ¡vca zariadenÃ zobrazÃ zoznam vÅ¡etkÃ½ch hardvÃ©rovÃ½ch zariadenÃ, ktorÃ© sÃº nainÅ¡talovanÃ© na poÄÃtaÄi. MÃ´Å¾ete ho pouÅ¾iÅ¥ na zmenu vlastnostÃ ktorÃ©hokoÄ¾vek zariadenia.", IDC_STATIC, 42, 18, 204, 24 PUSHBUTTON "SprÃ¡&vca zariadenÃ...", IDC_HARDWARE_DEVICE_MANAGER, 130, 48, 110, 14 GROUPBOX "Sprievodca pridanÃm hardvÃ©ru", IDC_STATIC, 6, 79, 244, 61 - ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + ICON IDI_ADDHW, IDC_STATIC, 12, 90, 23, 21, SS_ICON LTEXT "Sprievodca pridanÃm hardvÃ©ru pomÃ¡ha pri inÅ¡talÃ¡cii, odinÅ¡talovanÃ, oprave, odpojenÃ, vysunutÃ, a konfigurÃ¡ciÃ hardvÃ©ru.", IDC_STATIC, 42, 90, 204, 24 PUSHBUTTON "&Sprievodca pridanÃm hardvÃ©ru...", IDC_HARDWARE_WIZARD, 130, 120, 110, 14 GROUPBOX "HardvÃ©rovÃ© profily", IDC_STATIC, 6, 149, 244, 61 Modified: trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sq-AL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc [iso-8859-1] Sat Mar 14 10:15:13 2015 @@ -31,7 +31,7 @@ PUSHBUTTON "&Menagjues PjesÃ«ve...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 15 LTEXT "Menagjues PjesÃ«ve liston tÃ« gjitha pajisjet elektronike tÃ« instaluara nÃ« kompjuterin tuaj. PÃ«rdorimi managjuesit pjesÃ«ve pÃ«r tÃ« ndryshuar vetitÃ« e Ã§do pajisje.", IDC_STATIC, 42, 18, 204, 24 GROUPBOX "Megjistari PjesÃ«ve Elektronike", IDC_STATIC, 6, 79, 244, 61 - ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + ICON IDI_ADDHW, IDC_STATIC, 12, 90, 23, 21, SS_ICON LTEXT "Magjistari pjesÃ«ve elektronike ju ndihmon pÃ«r tÃ« instaluar, Ã'instaluar, Riparuar, Heq, Nxjerr, dhe konfiguruar pjesÃ«r elektronike tuaja.", IDC_STATIC, 42, 90, 204, 24 PUSHBUTTON "Magjistari PjesÃ«ve elektronike...", IDC_HARDWARE_WIZARD, 154, 120, 90, 15 GROUPBOX "Profile PjesÃ«ve Elektronike", IDC_STATIC, 6, 149, 244, 61 Modified: trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sv-SE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] Sat Mar 14 10:15:13 2015 @@ -33,7 +33,7 @@ LTEXT "Enhetshanteraren visar all hÃ¥rdvara i din dator. AnvÃ¤nd enhetshanteraren fÃ¶r att Ã¤ndra egenskaper pÃ¥ dina enheter.", IDC_STATIC, 42, 18, 204, 24 PUSHBUTTON "&Enhetshanteraren...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 15 GROUPBOX "Guiden anslut ny hÃ¥rdvara", IDC_STATIC, 6, 79, 244, 61 - ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + ICON IDI_ADDHW, IDC_STATIC, 12, 90, 23, 21, SS_ICON LTEXT "Guiden anslut ny hÃ¥rdvara hjÃ¤lper dig att installera, avinstallera, reparera, koppla ur, mata ut och konfigurera din hÃ¥rdvara.", IDC_STATIC, 42, 90, 204, 24 PUSHBUTTON "&Guiden anslut ny hÃ¥rdvara...", IDC_HARDWARE_WIZARD, 154, 120, 90, 15 GROUPBOX "HÃ¥rdvaruprofiler", IDC_STATIC, 6, 149, 244, 61 Modified: trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/tr-TR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc [iso-8859-1] Sat Mar 14 10:15:13 2015 @@ -33,7 +33,7 @@ LTEXT "AygÄ±t YÃ¶neticisi, bilgisayarÄ±nÄ±zdaki kurulu donanÄ±m aygÄ±tlarÄ±nÄ±n tÃ¼mÃ¼nÃ¼ dizelgeler. Bir aygÄ±tÄ±n husÃ»iyetlerini deÄiÅtirmek iÃ§in AygÄ±t YÃ¶neticisi'ni kullanÄ±nÄ±z.", IDC_STATIC, 42, 18, 204, 24 PUSHBUTTON "&AygÄ±t YÃ¶neticisi...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 15 GROUPBOX "DonanÄ±m YardÄ±mcÄ±sÄ±", IDC_STATIC, 6, 79, 244, 61 - ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + ICON IDI_ADDHW, IDC_STATIC, 12, 90, 23, 21, SS_ICON LTEXT "DonanÄ±m YardÄ±mcÄ±sÄ±; donanÄ±mÄ±nÄ±zÄ± kurmanÄ±za, kaldÄ±rmanÄ±za, onarmanÄ±za, Ã§Ä±karmanÄ±za ve yapÄ±landÄ±rmanÄ±za yardÄ±m eder.", IDC_STATIC, 42, 90, 204, 24 PUSHBUTTON "&DonanÄ±m YardÄ±mcÄ±sÄ±...", IDC_HARDWARE_WIZARD, 154, 120, 90, 15 GROUPBOX "DonanÄ±m Profilleri", IDC_STATIC, 6, 149, 244, 61 Modified: trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] Sat Mar 14 10:15:13 2015 @@ -39,7 +39,7 @@ LTEXT "ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ Ð¿ÑÐ¸ÑÑÑÐ¾ÑÐ² Ð¿ÐµÑÐµÐ»ÑÑÑÑ Ð²ÑÐµ Ð¾Ð±Ð»Ð°Ð´Ð½Ð°Ð½Ð½Ñ, ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ðµ Ð½Ð° ÑÑÐ¾Ð¼Ñ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑÑ. ÐÐ° Ð¹Ð¾Ð³Ð¾ Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¾Ñ Ð¼Ð¾Ð¶Ð½Ð° Ð·Ð¼ÑÐ½Ð¸ÑÐ¸ Ð²Ð»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÑ Ð±ÑÐ´Ñ-ÑÐºÐ¾Ð³Ð¾ Ð¿ÑÐ¸ÑÑÑÐ¾Ñ.", IDC_STATIC, 42, 18, 204, 24 PUSHBUTTON "&ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ Ð¿ÑÐ¸ÑÑÑÐ¾ÑÐ²...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 14 GROUPBOX "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° Ð¾Ð±Ð»Ð°Ð´Ð½Ð°Ð½Ð½Ñ", IDC_STATIC, 6, 79, 244, 61 - ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + ICON IDI_ADDHW, IDC_STATIC, 12, 90, 23, 21, SS_ICON LTEXT "ÐÐ°Ð¹ÑÑÐµÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ Ð¾Ð±Ð»Ð°Ð´Ð½Ð°Ð½Ð½Ñ Ð´Ð¾Ð¿Ð¾Ð¼Ð°Ð³Ð°Ñ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸, Ð²ÑÐ´ÐºÐ»ÑÑÐ¸ÑÐ¸, Ð²ÑÐ´Ð½Ð¾Ð²Ð¸ÑÐ¸, Ð²Ð¸ÑÑÐ³Ð½ÑÑÐ¸, ÑÐ° Ð½Ð°Ð»Ð°ÑÑÑÐ²Ð°ÑÐ¸ Ð²Ð°ÑÐµ Ð¾Ð±Ð»Ð°Ð´Ð½Ð°Ð½Ð½Ñ.", IDC_STATIC, 42, 90, 204, 24 PUSHBUTTON "&Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° Ð¾Ð±Ð»Ð°Ð´Ð½Ð°Ð½Ð½Ñ...", IDC_HARDWARE_WIZARD, 154, 120, 90, 14 GROUPBOX "ÐÑÐ¾ÑÑÐ»Ñ Ð¾Ð±Ð»Ð°Ð´Ð½Ð°Ð½Ð½Ñ", IDC_STATIC, 6, 149, 244, 61 Modified: trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/zh-CN.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] Sat Mar 14 10:15:13 2015 @@ -33,7 +33,7 @@ LTEXT "è®¾å¤ç®¡çå¨ååºææå®è£å¨è®¡ç®æºä¸çç¡¬ä»¶è®¾å¤ãè¯·ä½¿ç¨è®¾å¤ç®¡çå¨æ¥æ´æ¹è®¾å¤çå±æ§ã", IDC_STATIC, 42, 18, 204, 24 PUSHBUTTON "è®¾å¤ç®¡çå¨(&D)...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 15 GROUPBOX "æ·»å ç¡¬ä»¶åå¯¼", IDC_STATIC, 6, 79, 244, 61 - ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + ICON IDI_ADDHW, IDC_STATIC, 12, 90, 23, 21, SS_ICON LTEXT "âæ·»å ç¡¬ä»¶åå¯¼âå¸®å©æ¨å®è£æ°çç¡¬ä»¶ã", IDC_STATIC, 42, 90, 204, 24 PUSHBUTTON "æ·»å ç¡¬ä»¶åå¯¼(&H)", IDC_HARDWARE_WIZARD, 154, 120, 90, 15 GROUPBOX "ç¡¬ä»¶éç½®æä»¶", IDC_STATIC, 6, 149, 244, 61 Modified: trunk/reactos/dll/cpl/sysdm/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/resource.h [iso-8859-1] Sat Mar 14 10:15:13 2015 @@ -8,6 +8,7 @@ #define IDI_USERPROF 53 #define IDI_UP 2500 #define IDI_DOWN 2501 +#define IDI_ADDHW 2502 #define IDB_ROSBMP 55 #define IDB_ROSMASK 56 Added: trunk/reactos/dll/cpl/sysdm/resources/License.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resources/Li… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/resources/License.txt (added) +++ trunk/reactos/dll/cpl/sysdm/resources/License.txt [iso-8859-1] Sat Mar 14 10:15:13 2015 @@ -0,0 +1,3 @@ +The wizard hat icon was created by Yahir Vite and was downloaded from here: http://findicons.com/icon/208721/wizard# +The audio card icon is from the Gnome Icon project. +The rest of the icons are from ReactOS and the Tango project. Propchange: trunk/reactos/dll/cpl/sysdm/resources/License.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/sysdm/resources/addhw.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resources/ad… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/sysdm/resources/addhw.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/sysdm/resources/dev.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resources/de… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/sysdm/resources/dev.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/sysdm/resources/hwprofile.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resources/hw… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/sysdm/resources/hwprofile.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.rc [iso-8859-1] Sat Mar 14 10:15:13 2015 @@ -14,10 +14,11 @@ IDI_CPLSYSTEM ICON "resources/applet.ico" IDI_USERPROF ICON "resources/devmgr.ico" -IDI_HARDPROF ICON "resources/devmgr.ico" -IDI_DEVMGR ICON "resources/devmgr.ico" +IDI_HARDPROF ICON "resources/hwprofile.ico" +IDI_DEVMGR ICON "resources/dev.ico" IDI_UP ICON "resources/up.ico" IDI_DOWN ICON "resources/down.ico" +IDI_ADDHW ICON "resources/addhw.ico" IDB_ROSBMP BITMAP "resources/rosbitmap.bmp" IDB_ROSMASK BITMAP "resources/rosbitmap_mask.bmp"

1 0

[akhaldi] 66679: [DESK] Fix a freeze caused by changing screensaver settings. By Peter Hater. CORE-5718
by akhaldi＠svn.reactos.org 14 Mar '15

14 Mar '15

Author: akhaldi Date: Sat Mar 14 10:10:06 2015 New Revision: 66679 URL: http://svn.reactos.org/svn/reactos?rev=66679&view=rev Log: [DESK] Fix a freeze caused by changing screensaver settings. By Peter Hater. CORE-5718 Modified: trunk/reactos/dll/cpl/desk/screensaver.c Modified: trunk/reactos/dll/cpl/desk/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/screensaver.c… ============================================================================== --- trunk/reactos/dll/cpl/desk/screensaver.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/screensaver.c [iso-8859-1] Sat Mar 14 10:10:06 2015 @@ -175,10 +175,18 @@ DispatchMessage(&msg); } } + else + { + return FALSE; + } + } + else if (dwResult == WAIT_OBJECT_0) + { + return TRUE; } else { - return TRUE; + return FALSE; } } }

1 0

[akhaldi] 66678: [PSDK] Add missing ulFileCount field in the ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION structure. Fixes a kernel32:actctx test failure.
by akhaldi＠svn.reactos.org 14 Mar '15

14 Mar '15

Author: akhaldi Date: Sat Mar 14 10:06:04 2015 New Revision: 66678 URL: http://svn.reactos.org/svn/reactos?rev=66678&view=rev Log: [PSDK] Add missing ulFileCount field in the ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION structure. Fixes a kernel32:actctx test failure. Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Mar 14 10:06:04 2015 @@ -5705,6 +5705,7 @@ PCWSTR lpAssemblyManifestPath; PCWSTR lpAssemblyPolicyPath; PCWSTR lpAssemblyDirectoryName; + DWORD ulFileCount; } ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION, *PACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION; typedef const ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *PCACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION;

1 0

[akhaldi] 66677: [NTDLL_WINETEST] Fix test failures on systems with broken RtlDecompressBuffer(). By Sebastian Lackner.
by akhaldi＠svn.reactos.org 14 Mar '15

14 Mar '15

Author: akhaldi Date: Sat Mar 14 10:03:10 2015 New Revision: 66677 URL: http://svn.reactos.org/svn/reactos?rev=66677&view=rev Log: [NTDLL_WINETEST] Fix test failures on systems with broken RtlDecompressBuffer(). By Sebastian Lackner. Modified: trunk/rostests/winetests/ntdll/rtl.c Modified: trunk/rostests/winetests/ntdll/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/rtl.c?rev… ============================================================================== --- trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] Sat Mar 14 10:03:10 2015 @@ -1798,9 +1798,7 @@ } #define DECOMPRESS_BROKEN_TRUNCATED 1 -#define DECOMPRESS_BROKEN_FRAGMENT0 2 -#define DECOMPRESS_BROKEN_FRAGMENT1 4 -#define DECOMPRESS_BROKEN_FRAGMENT4095 8 +#define DECOMPRESS_BROKEN_FRAGMENT 2 static void test_RtlDecompressBuffer(void) { @@ -1824,9 +1822,7 @@ STATUS_SUCCESS, "Wine", 4, - DECOMPRESS_BROKEN_FRAGMENT4095 | - DECOMPRESS_BROKEN_FRAGMENT1 | - DECOMPRESS_BROKEN_FRAGMENT0 + DECOMPRESS_BROKEN_FRAGMENT }, /* 8 byte uncompressed chunk */ { @@ -1835,9 +1831,7 @@ STATUS_SUCCESS, "WineWine", 8, - DECOMPRESS_BROKEN_FRAGMENT4095 | - DECOMPRESS_BROKEN_FRAGMENT1 | - DECOMPRESS_BROKEN_FRAGMENT0 + DECOMPRESS_BROKEN_FRAGMENT }, /* 4 byte compressed chunk */ { @@ -1897,9 +1891,7 @@ STATUS_SUCCESS, "Wine", 4, - DECOMPRESS_BROKEN_FRAGMENT4095 | - DECOMPRESS_BROKEN_FRAGMENT1 | - DECOMPRESS_BROKEN_FRAGMENT0 + DECOMPRESS_BROKEN_FRAGMENT }, /* compressed chunk using backwards reference with 4 bit offset, 12 bit length */ { @@ -1930,9 +1922,7 @@ STATUS_SUCCESS, "Wine", 4, - DECOMPRESS_BROKEN_FRAGMENT4095 | - DECOMPRESS_BROKEN_FRAGMENT1 | - DECOMPRESS_BROKEN_FRAGMENT0 + DECOMPRESS_BROKEN_FRAGMENT }, /* compressed chunk with invalid magic */ { @@ -2057,7 +2047,8 @@ memset(buf, 0x11, sizeof(buf)); status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_lznt[i].compressed, test_lznt[i].compressed_size, &final_size); - ok(status == test_lznt[i].status, "%d: got wrong status 0x%08x\n", i, status); + ok(status == test_lznt[i].status || broken(status == STATUS_BAD_COMPRESSION_BUFFER && + (test_lznt[i].broken_flags & DECOMPRESS_BROKEN_FRAGMENT)), "%d: got wrong status 0x%08x\n", i, status); if (!status) { ok(final_size == test_lznt[i].uncompressed_size, @@ -2073,7 +2064,8 @@ memset(buf, 0x11, sizeof(buf)); status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1 | COMPRESSION_ENGINE_MAXIMUM, buf, sizeof(buf), test_lznt[i].compressed, test_lznt[i].compressed_size, &final_size); - ok(status == test_lznt[i].status, "%d: got wrong status 0x%08x\n", i, status); + ok(status == test_lznt[i].status || broken(status == STATUS_BAD_COMPRESSION_BUFFER && + (test_lznt[i].broken_flags & DECOMPRESS_BROKEN_FRAGMENT)), "%d: got wrong status 0x%08x\n", i, status); if (!status) { ok(final_size == test_lznt[i].uncompressed_size, @@ -2145,7 +2137,7 @@ status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_lznt[i].compressed, test_lznt[i].compressed_size, 0, &final_size, workspace); ok(status == test_lznt[i].status || broken(status == STATUS_BAD_COMPRESSION_BUFFER && - (test_lznt[i].broken_flags & DECOMPRESS_BROKEN_FRAGMENT0)), "%d: got wrong status 0x%08x\n", i, status); + (test_lznt[i].broken_flags & DECOMPRESS_BROKEN_FRAGMENT)), "%d: got wrong status 0x%08x\n", i, status); if (!status) { ok(final_size == test_lznt[i].uncompressed_size, @@ -2162,7 +2154,7 @@ status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_lznt[i].compressed, test_lznt[i].compressed_size, 1, &final_size, workspace); ok(status == test_lznt[i].status || broken(status == STATUS_BAD_COMPRESSION_BUFFER && - (test_lznt[i].broken_flags & DECOMPRESS_BROKEN_FRAGMENT1)), "%d: got wrong status 0x%08x\n", i, status); + (test_lznt[i].broken_flags & DECOMPRESS_BROKEN_FRAGMENT)), "%d: got wrong status 0x%08x\n", i, status); if (!status) { if (test_lznt[i].uncompressed_size == 0) @@ -2191,7 +2183,7 @@ status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_lznt[i].compressed, test_lznt[i].compressed_size, 4095, &final_size, workspace); ok(status == test_lznt[i].status || broken(status == STATUS_BAD_COMPRESSION_BUFFER && - (test_lznt[i].broken_flags & DECOMPRESS_BROKEN_FRAGMENT4095)), "%d: got wrong status 0x%08x\n", i, status); + (test_lznt[i].broken_flags & DECOMPRESS_BROKEN_FRAGMENT)), "%d: got wrong status 0x%08x\n", i, status); if (!status) { todo_wine @@ -2226,7 +2218,8 @@ memset(buf, 0x11, sizeof(buf)); status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_multiple_chunks, sizeof(test_multiple_chunks), &final_size); - ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); + ok(status == STATUS_SUCCESS || broken(status == STATUS_BAD_COMPRESSION_BUFFER), + "got wrong status 0x%08x\n", status); if (!status) { ok(final_size == 4100, "got wrong final_size %d\n", final_size); @@ -2240,7 +2233,8 @@ memset(buf, 0x11, sizeof(buf)); status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf, 4097, test_multiple_chunks, sizeof(test_multiple_chunks), &final_size); - ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); + ok(status == STATUS_SUCCESS || broken(status == STATUS_BAD_COMPRESSION_BUFFER), + "got wrong status 0x%08x\n", status); if (!status) { ok(final_size == 4097, "got wrong final_size %d\n", final_size); @@ -2254,7 +2248,8 @@ memset(buf, 0x11, sizeof(buf)); status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf, 4096, test_multiple_chunks, sizeof(test_multiple_chunks), &final_size); - ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); + ok(status == STATUS_SUCCESS || broken(status == STATUS_BAD_COMPRESSION_BUFFER), + "got wrong status 0x%08x\n", status); if (!status) { ok(final_size == 4, "got wrong final_size %d\n", final_size);

1 0

[dquintana] 66676: [NTOBJSHEX] * Fix content type column to represent the correct type, or "Key". This column would contain the custom class name if it was ever assigned (I have not seen such a cas...
by dquintana＠svn.reactos.org 14 Mar '15

14 Mar '15

Author: dquintana Date: Sat Mar 14 04:04:27 2015 New Revision: 66676 URL: http://svn.reactos.org/svn/reactos?rev=66676&view=rev Log: [NTOBJSHEX] * Fix content type column to represent the correct type, or "Key". This column would contain the custom class name if it was ever assigned (I have not seen such a case). * Implement reading registry values when enumerating details. Now the registry browsing is semi-useful, albeit read-only. Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjutil.cpp trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjutil.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjutil.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjutil.cpp [iso-8859-1] Sat Mar 14 04:04:27 2015 @@ -372,6 +372,7 @@ entry->cb = FIELD_OFFSET(RegPidlEntry, entryName); entry->magic = REGISTRY_PIDL_MAGIC; entry->entryType = otype; + entry->contentType = type; if (cchName > 0) { @@ -415,3 +416,50 @@ return S_OK; } + +HRESULT ReadRegistryValue(HKEY root, PCWSTR path, PCWSTR valueName, PVOID * valueData, PDWORD valueLength) +{ + HKEY hkey; + + DWORD res; + if (root) + { + res = RegOpenKeyExW(root, *path == '\\' ? path + 1 : path, 0, STANDARD_RIGHTS_READ | KEY_QUERY_VALUE, &hkey); + } + else + { + res = NtOpenObject(KEY_OBJECT, (PHANDLE) &hkey, STANDARD_RIGHTS_READ | KEY_QUERY_VALUE, path); + } + if (!NT_SUCCESS(res)) + { + ERR("RegOpenKeyExW failed for path %S with status=%x\n", path, res); + return HRESULT_FROM_NT(res); + } + + res = RegQueryValueExW(hkey, valueName, NULL, NULL, NULL, valueLength); + + if (*valueLength > 0) + { + *valueData = (PBYTE) CoTaskMemAlloc(*valueLength); + + res = RegQueryValueExW(hkey, valueName, NULL, NULL, (PBYTE) *valueData, valueLength); + if (!NT_SUCCESS(res)) + { + CoTaskMemFree(*valueData); + *valueData = NULL; + + RegCloseKey(hkey); + + ERR("RegOpenKeyExW failed for path %S with status=%x\n", path, res); + return HRESULT_FROM_NT(res); + } + } + else + { + *valueData = NULL; + } + + RegCloseKey(hkey); + + return S_OK; +} Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h [iso-8859-1] Sat Mar 14 04:04:27 2015 @@ -101,4 +101,6 @@ #include <poppack.h> HRESULT EnumerateNtDirectory(HDPA hdpa, PCWSTR path, UINT * hdpaCount); -HRESULT EnumerateRegistryKey(HDPA hdpa, PCWSTR path, HKEY root, UINT * hdpaCount); +HRESULT EnumerateRegistryKey(HDPA hdpa, PCWSTR path, HKEY root, UINT * hdpaCount); + +HRESULT ReadRegistryValue(HKEY root, PCWSTR path, PCWSTR valueName, PVOID * valueData, PDWORD valueLength); Modified: trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] Sat Mar 14 04:04:27 2015 @@ -362,66 +362,88 @@ return (entry->entryType == REG_ENTRY_KEY); } + HRESULT FormatValueData(DWORD contentType, PVOID td, DWORD contentsLength, PCWSTR * strContents) + { + switch (contentType) + { + case 0: + { + PCWSTR strTodo = L""; + DWORD bufferLength = (wcslen(strTodo) + 1) * sizeof(WCHAR); + PWSTR strValue = (PWSTR) CoTaskMemAlloc(bufferLength); + StringCbCopyW(strValue, bufferLength, strTodo); + *strContents = strValue; + return S_OK; + } + case REG_SZ: + case REG_EXPAND_SZ: + { + PWSTR strValue = (PWSTR) CoTaskMemAlloc(contentsLength + sizeof(WCHAR)); + StringCbCopyNW(strValue, contentsLength + sizeof(WCHAR), (LPCWSTR) td, contentsLength); + *strContents = strValue; + return S_OK; + } + case REG_DWORD: + { + DWORD bufferLength = 64 * sizeof(WCHAR); + PWSTR strValue = (PWSTR) CoTaskMemAlloc(bufferLength); + StringCbPrintfW(strValue, bufferLength, L"0x%08x (%d)", + *(DWORD*) td, *(DWORD*) td); + *strContents = strValue; + return S_OK; + } + case REG_QWORD: + { + DWORD bufferLength = 64 * sizeof(WCHAR); + PWSTR strValue = (PWSTR) CoTaskMemAlloc(bufferLength); + StringCbPrintfW(strValue, bufferLength, L"0x%016llx (%d)", + *(LARGE_INTEGER*) td, ((LARGE_INTEGER*) td)->QuadPart); + *strContents = strValue; + return S_OK; + } + default: + { + PCWSTR strTodo = L"<TODO: Convert value for display>"; + DWORD bufferLength = (wcslen(strTodo) + 1) * sizeof(WCHAR); + PWSTR strValue = (PWSTR) CoTaskMemAlloc(bufferLength); + StringCbCopyW(strValue, bufferLength, strTodo); + *strContents = strValue; + return S_OK; + } + } + } + HRESULT FormatContentsForDisplay(RegPidlEntry * info, PCWSTR * strContents) { PVOID td = (((PBYTE) info) + FIELD_OFFSET(RegPidlEntry, entryName) + info->entryNameLength + sizeof(WCHAR)); - if (info->contentsLength > 0) - { - if (info->entryType == REG_ENTRY_VALUE_WITH_CONTENT) + if (info->entryType == REG_ENTRY_VALUE_WITH_CONTENT) + { + if (info->contentsLength > 0) { - switch (info->contentType) - { - case REG_SZ: - case REG_EXPAND_SZ: - { - PWSTR strValue = (PWSTR) CoTaskMemAlloc(info->contentsLength + sizeof(WCHAR)); - StringCbCopyNW(strValue, info->contentsLength + sizeof(WCHAR), (LPCWSTR) td, info->contentsLength); - *strContents = strValue; - return S_OK; - } - case REG_DWORD: - { - DWORD bufferLength = 64 * sizeof(WCHAR); - PWSTR strValue = (PWSTR) CoTaskMemAlloc(bufferLength); - StringCbPrintfW(strValue, bufferLength, L"0x%08x (%d)", - *(DWORD*) td, *(DWORD*) td); - *strContents = strValue; - return S_OK; - } - case REG_QWORD: - { - DWORD bufferLength = 64 * sizeof(WCHAR); - PWSTR strValue = (PWSTR) CoTaskMemAlloc(bufferLength); - StringCbPrintfW(strValue, bufferLength, L"0x%016llx (%d)", - *(LARGE_INTEGER*) td, ((LARGE_INTEGER*) td)->QuadPart); - *strContents = strValue; - return S_OK; - } - default: - { - PCWSTR strTodo = L"<TODO: Convert value for display>"; - DWORD bufferLength = (wcslen(strTodo) + 1) * sizeof(WCHAR); - PWSTR strValue = (PWSTR) CoTaskMemAlloc(bufferLength); - StringCbCopyW(strValue, bufferLength, strTodo); - *strContents = strValue; - return S_OK; - } - } + return FormatValueData(info->contentType, td, info->contentsLength, strContents); } - else + } + else if (info->entryType == REG_ENTRY_VALUE) + { + PVOID valueData; + DWORD valueLength; + HRESULT hr = ReadRegistryValue(NULL, m_ntPath, info->entryName, &valueData, &valueLength); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if (valueLength > 0) { - PCWSTR strTodo = L"<TODO: Query non-embedded value>"; - DWORD bufferLength = (wcslen(strTodo) + 1) * sizeof(WCHAR); - PWSTR strValue = (PWSTR) CoTaskMemAlloc(bufferLength); - StringCbCopyW(strValue, bufferLength, strTodo); - *strContents = strValue; - return S_OK; + hr = FormatValueData(info->contentType, valueData, valueLength, strContents); + + CoTaskMemFree(valueData); + + return hr; } } else { - PCWSTR strEmpty = L"(Empty)"; + PCWSTR strEmpty = L""; DWORD bufferLength = (wcslen(strEmpty) + 1) * sizeof(WCHAR); PWSTR strValue = (PWSTR) CoTaskMemAlloc(bufferLength); StringCbCopyW(strValue, bufferLength, strEmpty); @@ -429,6 +451,12 @@ return S_OK; } + PCWSTR strEmpty = L"(Empty)"; + DWORD bufferLength = (wcslen(strEmpty) + 1) * sizeof(WCHAR); + PWSTR strValue = (PWSTR) CoTaskMemAlloc(bufferLength); + StringCbCopyW(strValue, bufferLength, strEmpty); + *strContents = strValue; + return S_OK; } }; @@ -1003,11 +1031,26 @@ { if (pscid->pid == PID_STG_NAME) { - return MakeVariantString(pv, info->entryName); + if (info->entryNameLength > 0) + { + return MakeVariantString(pv, info->entryName); + } + return MakeVariantString(pv, L"(Default)"); } else if (pscid->pid == PID_STG_STORAGETYPE) { - return MakeVariantString(pv, RegistryTypeNames[info->entryType]); + if (info->entryType == REG_ENTRY_KEY) + { + if (info->contentsLength > 0) + { + PWSTR td = (PWSTR)(((PBYTE) info) + FIELD_OFFSET(RegPidlEntry, entryName) + info->entryNameLength + sizeof(WCHAR)); + + return MakeVariantString(pv, td); + } + return MakeVariantString(pv, L"Key"); + } + + return MakeVariantString(pv, RegistryTypeNames[info->contentType]); } else if (pscid->pid == PID_STG_CONTENTS) { @@ -1065,6 +1108,18 @@ case REGISTRY_COLUMN_TYPE: psd->fmt = LVCFMT_LEFT; + + if (info->entryType == REG_ENTRY_KEY) + { + if (info->contentsLength > 0) + { + PWSTR td = (PWSTR) (((PBYTE) info) + FIELD_OFFSET(RegPidlEntry, entryName) + info->entryNameLength + sizeof(WCHAR)); + + return MakeStrRetFromString(td, info->contentsLength, &(psd->str)); + } + + return MakeStrRetFromString(L"Key", &(psd->str)); + } return MakeStrRetFromString(RegistryTypeNames[info->entryType], &(psd->str));

1 0

[hbelusca] 66675: [NTVDM]: Move EMS support as a BIOS module (and initialize it after the BIOS has finished its initialization, including resetting the INT handlers).
by hbelusca＠svn.reactos.org 14 Mar '15

14 Mar '15

Author: hbelusca Date: Sat Mar 14 03:37:54 2015 New Revision: 66675 URL: http://svn.reactos.org/svn/reactos?rev=66675&view=rev Log: [NTVDM]: Move EMS support as a BIOS module (and initialize it after the BIOS has finished its initialization, including resetting the INT handlers). Added: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/ems.c - copied, changed from r66673, trunk/reactos/subsystems/mvdm/ntvdm/ems.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/ems.h - copied, changed from r66673, trunk/reactos/subsystems/mvdm/ntvdm/ems.h Removed: trunk/reactos/subsystems/mvdm/ntvdm/ems.c trunk/reactos/subsystems/mvdm/ntvdm/ems.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/mvdm/ntvdm/emulator.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/CMak… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt [iso-8859-1] Sat Mar 14 03:37:54 2015 @@ -10,6 +10,7 @@ bios/bios32/kbdbios32.c bios/bios32/vidbios32.c bios/bios32/moubios32.c + bios/bios32/ems.c bios/bios.c bios/kbdbios.c bios/rom.c @@ -33,7 +34,6 @@ dos/mouse32.c dos/dem.c clock.c - ems.c emulator.c int32.c io.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] Sat Mar 14 03:37:54 2015 @@ -25,6 +25,8 @@ #include "kbdbios32.h" #include "vidbios32.h" #include "moubios32.h" + +#include "ems.h" #include "io.h" #include "hardware/cmos.h" @@ -665,6 +667,9 @@ SearchAndInitRoms(&BiosContext); + /* Initialize EMS */ + EmsInitialize(); + /* * End of the 32-bit POST portion. We then fall back into 16-bit where * the rest of the POST code is executed, typically calling INT 19h @@ -726,6 +731,7 @@ VOID Bios32Cleanup(VOID) { + EmsCleanup(); MouseBios32Cleanup(); VidBios32Cleanup(); KbdBios32Cleanup(); Copied: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/ems.c (from r66673, trunk/reactos/subsystems/mvdm/ntvdm/ems.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ems.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/ems.c [iso-8859-1] Sat Mar 14 03:37:54 2015 @@ -195,6 +195,14 @@ break; } + /* Get EMM Version */ + case 0x46: + { + setAH(EMS_STATUS_OK); + setAL(EMS_VERSION_NUM); + break; + } + /* Move/Exchange Memory */ case 0x57: { Copied: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/ems.h (from r66673, trunk/reactos/subsystems/mvdm/ntvdm/ems.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ems.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/ems.h [iso-8859-1] Sat Mar 14 03:37:54 2015 @@ -11,6 +11,7 @@ /* DEFINITIONS ****************************************************************/ +#define EMS_VERSION_NUM 0x04 #define EMS_INTERRUPT_NUM 0x67 #define EMS_SEGMENT 0xD000 #define EMS_MAX_HANDLES 16 Removed: trunk/reactos/subsystems/mvdm/ntvdm/ems.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ems.… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ems.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ems.c (removed) @@ -1,368 +0,0 @@ -/* - * COPYRIGHT: GPLv2+ - See COPYING in the top level directory - * PROJECT: ReactOS Virtual DOS Machine - * FILE: ems.c - * PURPOSE: Expanded Memory Support - * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> - */ - -/* INCLUDES *******************************************************************/ - -#define NDEBUG - -#include "emulator.h" -#include "bios/bios32/bios32p.h" -#include <ndk/rtltypes.h> -#include <ndk/rtlfuncs.h> -#include "ems.h" -#include "memory.h" - -/* PRIVATE VARIABLES **********************************************************/ - -static RTL_BITMAP AllocBitmap; -static ULONG BitmapBuffer[(EMS_TOTAL_PAGES + sizeof(ULONG) - 1) / sizeof(ULONG)]; -static EMS_PAGE PageTable[EMS_TOTAL_PAGES]; -static EMS_HANDLE HandleTable[EMS_MAX_HANDLES]; -static PVOID Mapping[EMS_PHYSICAL_PAGES] = { NULL }; - -/* PRIVATE FUNCTIONS **********************************************************/ - -static USHORT EmsFree(USHORT Handle) -{ - PLIST_ENTRY Entry; - PEMS_HANDLE HandleEntry = &HandleTable[Handle]; - - if (Handle >= EMS_MAX_HANDLES || !HandleEntry->Allocated) - { - return EMS_STATUS_INVALID_HANDLE; - } - - for (Entry = HandleEntry->PageList.Flink; - Entry != &HandleEntry->PageList; - Entry = Entry->Flink) - { - PEMS_PAGE PageEntry = (PEMS_PAGE)CONTAINING_RECORD(Entry, EMS_PAGE, Entry); - ULONG PageNumber = ARRAY_INDEX(PageEntry, PageTable); - - /* Free the page */ - RtlClearBits(&AllocBitmap, PageNumber, 1); - } - - HandleEntry->Allocated = FALSE; - HandleEntry->PageCount = 0; - InitializeListHead(&HandleEntry->PageList); - - return EMS_STATUS_OK; -} - -static UCHAR EmsAlloc(USHORT NumPages, PUSHORT Handle) -{ - ULONG i, CurrentIndex = 0; - PEMS_HANDLE HandleEntry; - - if (NumPages == 0) return EMS_STATUS_ZERO_PAGES; - - for (i = 0; i < EMS_MAX_HANDLES; i++) - { - HandleEntry = &HandleTable[i]; - if (!HandleEntry->Allocated) - { - *Handle = i; - break; - } - } - - if (i == EMS_MAX_HANDLES) return EMS_STATUS_NO_MORE_HANDLES; - HandleEntry->Allocated = TRUE; - - while (HandleEntry->PageCount < NumPages) - { - ULONG RunStart; - ULONG RunSize = RtlFindNextForwardRunClear(&AllocBitmap, CurrentIndex, &RunStart); - - if (RunSize == 0) - { - /* Free what's been allocated already and report failure */ - EmsFree(*Handle); - return EMS_STATUS_INSUFFICIENT_PAGES; - } - else if ((HandleEntry->PageCount + RunSize) > NumPages) - { - /* We don't need the entire run */ - RunSize = NumPages - HandleEntry->PageCount; - } - - CurrentIndex = RunStart + RunSize; - HandleEntry->PageCount += RunSize; - RtlSetBits(&AllocBitmap, RunStart, RunSize); - - for (i = 0; i < RunSize; i++) - { - PageTable[RunStart + i].Handle = *Handle; - InsertTailList(&HandleEntry->PageList, &PageTable[RunStart + i].Entry); - } - } - - return EMS_STATUS_OK; -} - -static PEMS_PAGE GetLogicalPage(PEMS_HANDLE Handle, USHORT LogicalPage) -{ - PLIST_ENTRY Entry = Handle->PageList.Flink; - - while (LogicalPage) - { - if (Entry == &Handle->PageList) return NULL; - LogicalPage--; - Entry = Entry->Flink; - } - - return (PEMS_PAGE)CONTAINING_RECORD(Entry, EMS_PAGE, Entry); -} - -static USHORT EmsMap(USHORT Handle, UCHAR PhysicalPage, USHORT LogicalPage) -{ - PEMS_PAGE PageEntry; - PEMS_HANDLE HandleEntry = &HandleTable[Handle]; - - if (PhysicalPage >= EMS_PHYSICAL_PAGES) return EMS_STATUS_INV_PHYSICAL_PAGE; - if (LogicalPage == 0xFFFF) - { - /* Unmap */ - Mapping[PhysicalPage] = NULL; - return EMS_STATUS_OK; - } - - if (Handle >= EMS_MAX_HANDLES || !HandleEntry->Allocated) return EMS_STATUS_INVALID_HANDLE; - - PageEntry = GetLogicalPage(HandleEntry, LogicalPage); - if (!PageEntry) return EMS_STATUS_INV_LOGICAL_PAGE; - - Mapping[PhysicalPage] = (PVOID)(EMS_ADDRESS + ARRAY_INDEX(PageEntry, PageTable) * EMS_PAGE_SIZE); - return EMS_STATUS_OK; -} - -static VOID WINAPI EmsIntHandler(LPWORD Stack) -{ - switch (getAH()) - { - /* Get Manager Status */ - case 0x40: - { - setAH(EMS_STATUS_OK); - break; - } - - /* Get Page Frame Segment */ - case 0x41: - { - setAH(EMS_STATUS_OK); - setBX(EMS_SEGMENT); - break; - } - - /* Get Number Of Pages */ - case 0x42: - { - setAH(EMS_STATUS_OK); - setBX(RtlNumberOfClearBits(&AllocBitmap)); - setDX(EMS_TOTAL_PAGES); - break; - } - - /* Get Handle And Allocate Memory */ - case 0x43: - { - USHORT Handle; - UCHAR Status = EmsAlloc(getBX(), &Handle); - - setAH(Status); - if (Status == EMS_STATUS_OK) setDX(Handle); - break; - } - - /* Map Memory */ - case 0x44: - { - setAH(EmsMap(getDX(), getAL(), getBX())); - break; - } - - /* Release Handle And Memory */ - case 0x45: - { - setAH(EmsFree(getDX())); - break; - } - - /* Move/Exchange Memory */ - case 0x57: - { - PUCHAR SourcePtr, DestPtr; - PEMS_HANDLE HandleEntry; - PEMS_PAGE PageEntry; - BOOLEAN Exchange = getAL(); - PEMS_COPY_DATA Data = (PEMS_COPY_DATA)SEG_OFF_TO_PTR(getDS(), getSI()); - - if (Data->SourceType) - { - /* Expanded memory */ - HandleEntry = &HandleTable[Data->SourceHandle]; - - if (Data->SourceHandle >= EMS_MAX_HANDLES || !HandleEntry->Allocated) - { - setAL(EMS_STATUS_INVALID_HANDLE); - break; - } - - PageEntry = GetLogicalPage(HandleEntry, Data->SourceSegment); - - if (!PageEntry) - { - setAL(EMS_STATUS_INV_LOGICAL_PAGE); - break; - } - - SourcePtr = (PUCHAR)REAL_TO_PHYS(EMS_ADDRESS - + ARRAY_INDEX(PageEntry, PageTable) - * EMS_PAGE_SIZE - + Data->SourceOffset); - } - else - { - /* Conventional memory */ - SourcePtr = (PUCHAR)SEG_OFF_TO_PTR(Data->SourceSegment, Data->SourceOffset); - } - - if (Data->DestType) - { - /* Expanded memory */ - HandleEntry = &HandleTable[Data->DestHandle]; - - if (Data->SourceHandle >= EMS_MAX_HANDLES || !HandleEntry->Allocated) - { - setAL(EMS_STATUS_INVALID_HANDLE); - break; - } - - PageEntry = GetLogicalPage(HandleEntry, Data->DestSegment); - - if (!PageEntry) - { - setAL(EMS_STATUS_INV_LOGICAL_PAGE); - break; - } - - DestPtr = (PUCHAR)REAL_TO_PHYS(EMS_ADDRESS - + ARRAY_INDEX(PageEntry, PageTable) - * EMS_PAGE_SIZE - + Data->DestOffset); - } - else - { - /* Conventional memory */ - DestPtr = (PUCHAR)SEG_OFF_TO_PTR(Data->DestSegment, Data->DestOffset); - } - - if (Exchange) - { - ULONG i; - - /* Exchange */ - for (i = 0; i < Data->RegionLength; i++) - { - UCHAR Temp = DestPtr[i]; - DestPtr[i] = SourcePtr[i]; - SourcePtr[i] = Temp; - } - } - else - { - /* Move */ - RtlMoveMemory(DestPtr, SourcePtr, Data->RegionLength); - } - - setAL(EMS_STATUS_OK); - break; - } - - default: - { - DPRINT1("EMS function AH = %02X NOT IMPLEMENTED\n", getAH()); - setAH(EMS_STATUS_UNKNOWN_FUNCTION); - break; - } - } -} - -static VOID NTAPI EmsReadMemory(ULONG Address, PVOID Buffer, ULONG Size) -{ - ULONG i; - ULONG RelativeAddress = Address - TO_LINEAR(EMS_SEGMENT, 0); - ULONG FirstPage = RelativeAddress / EMS_PAGE_SIZE; - ULONG LastPage = (RelativeAddress + Size - 1) / EMS_PAGE_SIZE; - ULONG Offset, Length; - - for (i = FirstPage; i <= LastPage; i++) - { - Offset = (i == FirstPage) ? Address & (EMS_PAGE_SIZE - 1) : 0; - Length = ((i == LastPage) - ? (Address + Size - (LastPage << EMS_PAGE_BITS)) - : EMS_PAGE_SIZE) - Offset; - - if (Mapping[i]) RtlCopyMemory(Buffer, (PVOID)((ULONG_PTR)Mapping[i] + Offset), Length); - Buffer = (PVOID)((ULONG_PTR)Buffer + Length); - } -} - -static BOOLEAN NTAPI EmsWriteMemory(ULONG Address, PVOID Buffer, ULONG Size) -{ - ULONG i; - ULONG RelativeAddress = Address - TO_LINEAR(EMS_SEGMENT, 0); - ULONG FirstPage = RelativeAddress / EMS_PAGE_SIZE; - ULONG LastPage = (RelativeAddress + Size - 1) / EMS_PAGE_SIZE; - ULONG Offset, Length; - - for (i = FirstPage; i <= LastPage; i++) - { - Offset = (i == FirstPage) ? Address & (EMS_PAGE_SIZE - 1) : 0; - Length = ((i == LastPage) - ? (Address + Size - (LastPage << EMS_PAGE_BITS)) - : EMS_PAGE_SIZE) - Offset; - - if (Mapping[i]) RtlCopyMemory((PVOID)((ULONG_PTR)Mapping[i] + Offset), Buffer, Length); - Buffer = (PVOID)((ULONG_PTR)Buffer + Length); - } - - return TRUE; -} - -/* PUBLIC FUNCTIONS ***********************************************************/ - -VOID EmsInitialize(VOID) -{ - ULONG i; - - RtlZeroMemory(BitmapBuffer, sizeof(BitmapBuffer)); - RtlInitializeBitMap(&AllocBitmap, BitmapBuffer, EMS_TOTAL_PAGES); - - for (i = 0; i < EMS_MAX_HANDLES; i++) - { - HandleTable[i].Allocated = FALSE; - HandleTable[i].PageCount = 0; - InitializeListHead(&HandleTable[i].PageList); - } - - MemInstallFastMemoryHook((PVOID)TO_LINEAR(EMS_SEGMENT, 0), - EMS_PHYSICAL_PAGES * EMS_PAGE_SIZE, - EmsReadMemory, - EmsWriteMemory); - - RegisterBiosInt32(EMS_INTERRUPT_NUM, EmsIntHandler); -} - -VOID EmsCleanup(VOID) -{ - MemRemoveFastMemoryHook((PVOID)TO_LINEAR(EMS_SEGMENT, 0), - EMS_PHYSICAL_PAGES * EMS_PAGE_SIZE); -} Removed: trunk/reactos/subsystems/mvdm/ntvdm/ems.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ems.… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ems.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ems.h (removed) @@ -1,72 +0,0 @@ -/* - * COPYRIGHT: GPLv2+ - See COPYING in the top level directory - * PROJECT: ReactOS Virtual DOS Machine - * FILE: ems.h - * PURPOSE: Expanded Memory Support - * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> - */ - -#ifndef _EMS_H_ -#define _EMS_H_ - -/* DEFINITIONS ****************************************************************/ - -#define EMS_INTERRUPT_NUM 0x67 -#define EMS_SEGMENT 0xD000 -#define EMS_MAX_HANDLES 16 -#define EMS_TOTAL_PAGES 256 -#define EMS_PAGE_BITS 14 -#define EMS_PAGE_SIZE (1 << EMS_PAGE_BITS) -#define EMS_ADDRESS 0xA00000 -#define EMS_PHYSICAL_PAGES 4 - -#define EMS_STATUS_OK 0x00 -#define EMS_STATUS_INTERNAL_ERROR 0x80 -#define EMS_STATUS_INVALID_HANDLE 0x83 -#define EMS_STATUS_NO_MORE_HANDLES 0x85 -#define EMS_STATUS_INSUFFICIENT_PAGES 0x88 -#define EMS_STATUS_ZERO_PAGES 0x89 -#define EMS_STATUS_INV_LOGICAL_PAGE 0x8A -#define EMS_STATUS_INV_PHYSICAL_PAGE 0x8B -#define EMS_STATUS_UNKNOWN_FUNCTION 0x8F - -#define ARRAY_INDEX(ptr, array) ((ULONG)(((ULONG_PTR)(ptr) - (ULONG_PTR)(array)) / sizeof(*array))) - -typedef struct _EMS_HANDLE -{ - BOOLEAN Allocated; - USHORT PageCount; - LIST_ENTRY PageList; -} EMS_HANDLE, *PEMS_HANDLE; - -typedef struct _EMS_PAGE -{ - LIST_ENTRY Entry; - USHORT Handle; -} EMS_PAGE, *PEMS_PAGE; - -#pragma pack(push, 1) - -typedef struct _EMS_COPY_DATA -{ - ULONG RegionLength; - UCHAR SourceType; - USHORT SourceHandle; - USHORT SourceOffset; - USHORT SourceSegment; - UCHAR DestType; - USHORT DestHandle; - USHORT DestOffset; - USHORT DestSegment; -} EMS_COPY_DATA, *PEMS_COPY_DATA; - -#pragma pack(pop) - -/* FUNCTIONS ******************************************************************/ - -VOID EmsInitialize(VOID); -VOID EmsCleanup(VOID); - -#endif // _EMS_H_ - -/* EOF */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] Sat Mar 14 03:37:54 2015 @@ -31,7 +31,6 @@ #include "hardware/sound/speaker.h" #include "hardware/pit.h" #include "hardware/video/vga.h" -#include "ems.h" #include "vddsup.h" #include "io.h" @@ -469,9 +468,6 @@ /* Initialize I/O ports */ /* Initialize RAM */ - /* Initialize EMS */ - EmsInitialize(); - /* Initialize the CPU */ /* Initialize the internal clock */ @@ -557,7 +553,6 @@ PS2Cleanup(); - EmsCleanup(); SpeakerCleanup(); CmosCleanup(); // PitCleanup();

1 0

[dquintana] 66674: [NTOBJSHEX] * Replace the custom context menu classes with the default implementation from shell32. As a side-effect, navigation now works in ReactOS. * Make use of the default i...
by dquintana＠svn.reactos.org 14 Mar '15

14 Mar '15

Author: dquintana Date: Sat Mar 14 03:15:36 2015 New Revision: 66674 URL: http://svn.reactos.org/svn/reactos?rev=66674&view=rev Log: [NTOBJSHEX] * Replace the custom context menu classes with the default implementation from shell32. As a side-effect, navigation now works in ReactOS. * Make use of the default implementations of IDataObject and IQueryAssociations from shell32 (required by the IContextMenu implementation of Win2003). * Fix initialization of the NT Object Folder's pidl. * Make CompareIDs recursive. * Fix the recursivity in GetDisplayNameOf, when called with FORPARSING. NOTE: There is still some issue with GetDisplayNameOf, where the address shown in the addressbar seems to skip path components. Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp trunk/reactos/dll/shellext/ntobjshex/ntobjns.h trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp trunk/reactos/dll/shellext/ntobjshex/regfolder.h trunk/reactos/dll/shellext/ntobjshex/resources/rgs/ntobjectfolder.rgs Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp [iso-8859-1] Sat Mar 14 03:15:36 2015 @@ -11,6 +11,11 @@ #include <ntquery.h> #include "util.h" +#define DFM_MERGECONTEXTMENU 1 // uFlags LPQCMINFO +#define DFM_INVOKECOMMAND 2 // idCmd pszArgs +#define DFM_INVOKECOMMANDEX 12 // idCmd PDFMICS +#define DFM_GETDEFSTATICID 14 // idCmd * 0 + #define SHCIDS_ALLFIELDS 0x80000000L #define SHCIDS_CANONICALONLY 0x10000000L @@ -31,158 +36,6 @@ NTOBJECT_COLUMN_TYPE = 1, NTOBJECT_COLUMN_CREATEDATE = 2, NTOBJECT_COLUMN_LINKTARGET = 3, -}; - -class CNtObjectFolderContextMenu : - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IContextMenu -{ - PCIDLIST_ABSOLUTE m_pcidlFolder; - PCITEMID_CHILD m_pcidlChild; - UINT m_idFirst; - - enum ItemOffsets - { - ITEM_Open = 0, - ITEM_OpenNewWindow - }; - -public: - CNtObjectFolderContextMenu() : - m_pcidlFolder(NULL), - m_pcidlChild(NULL), - m_idFirst(0) - { - - } - - virtual ~CNtObjectFolderContextMenu() - { - if (m_pcidlFolder) - ILFree((LPITEMIDLIST) m_pcidlFolder); - if (m_pcidlChild) - ILFree((LPITEMIDLIST) m_pcidlChild); - } - - HRESULT Initialize(PCIDLIST_ABSOLUTE parent, UINT cidl, PCUITEMID_CHILD_ARRAY apidl) - { - m_pcidlFolder = ILClone(parent); - if (cidl != 1) - return E_INVALIDARG; - m_pcidlChild = ILClone(apidl[0]); - return S_OK; - } - - // IContextMenu - virtual HRESULT WINAPI QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) - { - MENUITEMINFOW mii; - - m_idFirst = idCmdFirst; - - const NtPidlEntry * entry = (NtPidlEntry *) m_pcidlChild; - - static WCHAR open [] = L"Open"; - static WCHAR opennewwindow [] = L"Open in new window"; - - if ((entry->objectType == DIRECTORY_OBJECT) || - (entry->objectType == SYMBOLICLINK_OBJECT) || - (entry->objectType == KEY_OBJECT)) - { - ZeroMemory(&mii, sizeof(mii)); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_TYPE | MIIM_STATE | MIIM_SUBMENU | MIIM_ID; - mii.fType = MFT_STRING; - mii.wID = (idCmdFirst = m_idFirst + ITEM_Open); - mii.dwTypeData = open; - mii.cch = _countof(open); - mii.fState = MFS_ENABLED | MFS_DEFAULT; - mii.hSubMenu = NULL; - InsertMenuItemW(hmenu, idCmdFirst, TRUE, &mii); - - if (!(uFlags & CMF_DEFAULTONLY) && idCmdFirst <= idCmdLast) - { - ZeroMemory(&mii, sizeof(mii)); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_TYPE | MIIM_STATE | MIIM_SUBMENU | MIIM_ID; - mii.fType = MFT_STRING; - mii.wID = (idCmdFirst = m_idFirst + ITEM_OpenNewWindow); - mii.dwTypeData = opennewwindow; - mii.cch = _countof(opennewwindow); - mii.fState = MFS_ENABLED; - mii.hSubMenu = NULL; - InsertMenuItemW(hmenu, idCmdFirst, FALSE, &mii); - } - } - - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdFirst - m_idFirst); - } - - virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpici) - { - LPITEMIDLIST fullPidl = ILCombine(m_pcidlFolder, m_pcidlChild); - - if (LOWORD(lpici->lpVerb) == (m_idFirst + ITEM_Open) || !lpici->lpVerb) - { - SHELLEXECUTEINFO sei = { 0 }; - sei.cbSize = sizeof(sei); - sei.fMask = SEE_MASK_IDLIST | SEE_MASK_CLASSNAME; - sei.lpIDList = fullPidl; - sei.lpClass = L"folder"; - sei.hwnd = lpici->hwnd; - sei.nShow = lpici->nShow; - sei.lpVerb = L"open"; - BOOL bRes = ::ShellExecuteEx(&sei); - - ILFree(fullPidl); - - return bRes ? S_OK : HRESULT_FROM_WIN32(GetLastError()); - } - else if (LOWORD(lpici->lpVerb) == (m_idFirst + ITEM_OpenNewWindow)) - { - SHELLEXECUTEINFO sei = { 0 }; - sei.cbSize = sizeof(sei); - sei.fMask = SEE_MASK_IDLIST | SEE_MASK_CLASSNAME; - sei.lpIDList = fullPidl; - sei.lpClass = L"folder"; - sei.hwnd = lpici->hwnd; - sei.nShow = lpici->nShow; - sei.lpVerb = L"opennewwindow"; - BOOL bRes = ::ShellExecuteEx(&sei); - - ILFree(fullPidl); - - return bRes ? S_OK : HRESULT_FROM_WIN32(GetLastError()); - } - return E_NOTIMPL; - } - - virtual HRESULT WINAPI GetCommandString(UINT_PTR idCmd, UINT uType, UINT *pwReserved, LPSTR pszName, UINT cchMax) - { - if (idCmd == m_idFirst) - { - if (uType == GCS_VERBW) - { - return StringCchCopyW((LPWSTR) pszName, cchMax, L"open"); - } - } - else if (idCmd == (m_idFirst + 1)) - { - if (uType == GCS_VERBW) - { - return StringCchCopyW((LPWSTR) pszName, cchMax, L"opennewwindow"); - } - } - return E_NOTIMPL; - } - - DECLARE_NOT_AGGREGATABLE(CNtObjectFolderContextMenu) - DECLARE_PROTECT_FINAL_CONSTRUCT() - - BEGIN_COM_MAP(CNtObjectFolderContextMenu) - COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) - END_COM_MAP() - }; class CNtObjectFolderExtractIcon : @@ -517,6 +370,17 @@ return flags & mask; } + BOOL IsFolder(LPCITEMIDLIST pcidl) + { + NtPidlEntry * entry; + HRESULT hr = FindPidlInList(pcidl, &entry); + if (FAILED_UNEXPECTEDLY(hr)) + return FALSE; + + return (entry->objectType == DIRECTORY_OBJECT) || + (entry->objectType == SYMBOLICLINK_OBJECT) || + (entry->objectType == KEY_OBJECT); + } }; class CNtObjectFolderEnum : @@ -716,7 +580,9 @@ return E_ACCESSDENIED; WCHAR path[MAX_PATH]; + StringCbCopyW(path, _countof(path), m_NtPath); + PathAppendW(path, info->entryName); LPITEMIDLIST first = ILCloneFirst(pidl); @@ -795,7 +661,36 @@ LPCITEMIDLIST pidl2) { TRACE("CompareIDs\n"); - return m_PidlManager->CompareIDs(lParam, pidl1, pidl2); + + HRESULT hr = m_PidlManager->CompareIDs(lParam, pidl1, pidl2); + if (hr != S_OK) + return hr; + + LPCITEMIDLIST rest1 = ILGetNext(pidl1); + LPCITEMIDLIST rest2 = ILGetNext(pidl2); + + bool hasNext1 = (rest1->mkid.cb > 0); + bool hasNext2 = (rest2->mkid.cb > 0); + + if (hasNext1 || hasNext2) + { + if (hasNext1 && !hasNext2) + return MAKE_HRESULT(0, 0, (USHORT) -1); + + if (hasNext2 && !hasNext1) + return MAKE_HRESULT(0, 0, (USHORT) 1); + + LPCITEMIDLIST first1 = ILCloneFirst(pidl1); + + CComPtr<IShellFolder> psfNext; + hr = BindToObject(first1, NULL, IID_PPV_ARG(IShellFolder, &psfNext)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return psfNext->CompareIDs(lParam, rest1, rest2); + } + + return S_OK; } HRESULT STDMETHODCALLTYPE CNtObjectFolder::CreateViewObject( @@ -856,15 +751,56 @@ { TRACE("GetUIObjectOf\n"); - if (IsEqualIID(riid, IID_IContextMenu)) - { - return ShellObjectCreatorInit<CNtObjectFolderContextMenu>(m_shellPidl, cidl, apidl, riid, ppvOut); - //return CDefFolderMenu_Create2(m_shellPidl, hwndOwner, cidl, apidl, this, ContextMenuCallback, 0, NULL, (IContextMenu**) ppvOut); + if (IsEqualIID(riid, IID_IContextMenu) || + IsEqualIID(riid, IID_IContextMenu2) || + IsEqualIID(riid, IID_IContextMenu3)) + { + CComPtr<IContextMenu> pcm; + + HKEY keys [1]; + + int nkeys = _countof(keys); + if (cidl == 1 && m_PidlManager->IsFolder(apidl[0])) + { + RegOpenKey(HKEY_CLASSES_ROOT, L"Folder", keys + 0); + } + else + { + nkeys = 0; + } + + HRESULT hr = CDefFolderMenu_Create2(m_shellPidl, hwndOwner, cidl, apidl, this, DefCtxMenuCallback, nkeys, keys, &pcm); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return pcm->QueryInterface(riid, ppvOut); } if (IsEqualIID(riid, IID_IExtractIconW)) { return ShellObjectCreatorInit<CNtObjectFolderExtractIcon>(m_shellPidl, cidl, apidl, riid, ppvOut); + } + + if (IsEqualIID(riid, IID_IDataObject)) + { + return CIDLData_CreateFromIDArray(m_shellPidl, cidl, apidl, (IDataObject**)ppvOut); + } + + if (IsEqualIID(riid, IID_IQueryAssociations)) + { + if (cidl == 1 && m_PidlManager->IsFolder(apidl[0])) + { + CComPtr<IQueryAssociations> pqa; + HRESULT hr = AssocCreate(CLSID_QueryAssociations, IID_PPV_ARG(IQueryAssociations, &pqa)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pqa->Init(ASSOCF_INIT_DEFAULTTOFOLDER, L"NTObjShEx.NTDirectory", NULL, hwndOwner); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return pqa->QueryInterface(riid, ppvOut); + } } return E_NOTIMPL; @@ -899,12 +835,13 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; + LPCITEMIDLIST pidlFirst = ILCloneFirst(pidl); LPCITEMIDLIST pidlNext = ILGetNext(pidl); if (pidlNext && pidlNext->mkid.cb > 0) { CComPtr<IShellFolder> psfChild; - hr = BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &psfChild)); + hr = BindToObject(pidlFirst, NULL, IID_PPV_ARG(IShellFolder, &psfChild)); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -921,6 +858,8 @@ PathAppendW(path, temp); } + + ILFree((LPITEMIDLIST)pidlFirst); } else { @@ -971,7 +910,7 @@ // Internal HRESULT STDMETHODCALLTYPE CNtObjectFolder::Initialize(LPCITEMIDLIST pidl, PCWSTR ntPath) { - TRACE("INITIALIZE %p CNtObjectFolder with ntPath %S\n", this, ntPath); + m_shellPidl = ILClone(pidl); if (!m_PidlManager) m_PidlManager = new CNtObjectPidlManager(); @@ -1273,3 +1212,17 @@ } return E_NOTIMPL; } + +HRESULT CNtObjectFolder::DefCtxMenuCallback(IShellFolder * /*psf*/, HWND /*hwnd*/, IDataObject * /*pdtobj*/, UINT uMsg, WPARAM /*wParam*/, LPARAM /*lParam*/) +{ + switch (uMsg) + { + case DFM_MERGECONTEXTMENU: + return S_OK; + case DFM_INVOKECOMMAND: + case DFM_INVOKECOMMANDEX: + case DFM_GETDEFSTATICID: // Required for Windows 7 to pick a default + return S_FALSE; + } + return E_NOTIMPL; +} Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjns.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjns.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjns.h [iso-8859-1] Sat Mar 14 03:15:36 2015 @@ -137,6 +137,8 @@ // Internal HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl, PCWSTR ntPath); + static HRESULT CALLBACK DefCtxMenuCallback(IShellFolder *, HWND, IDataObject *, UINT, WPARAM, LPARAM); + DECLARE_REGISTRY_RESOURCEID(IDR_NTOBJECTFOLDER) DECLARE_NOT_AGGREGATABLE(CNtObjectFolder) DECLARE_PROTECT_FINAL_CONSTRUCT() Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h [iso-8859-1] Sat Mar 14 03:15:36 2015 @@ -93,7 +93,7 @@ DWORD contentType; USHORT contentsLength; - WCHAR entryName[0]; + WCHAR entryName[ANYSIZE_ARRAY]; }; Modified: trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] Sat Mar 14 03:15:36 2015 @@ -1,16 +1,21 @@ /* -* PROJECT: ReactOS shell extensions -* LICENSE: GPL - See COPYING in the top level directory -* FILE: dll\shellext\ntobjshex\ntobjns.cpp -* PURPOSE: NT Object Namespace shell extension -* PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> -*/ + * PROJECT: ReactOS shell extensions + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll\shellext\ntobjshex\ntobjns.cpp + * PURPOSE: NT Object Namespace shell extension + * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> + */ #include "precomp.h" #include "ntobjutil.h" #include <ntquery.h> #include "util.h" +#define DFM_MERGECONTEXTMENU 1 // uFlags LPQCMINFO +#define DFM_INVOKECOMMAND 2 // idCmd pszArgs +#define DFM_INVOKECOMMANDEX 12 // idCmd PDFMICS +#define DFM_GETDEFSTATICID 14 // idCmd * 0 + #define SHCIDS_ALLFIELDS 0x80000000L #define SHCIDS_CANONICALONLY 0x10000000L @@ -30,156 +35,6 @@ REGISTRY_COLUMN_NAME = 0, REGISTRY_COLUMN_TYPE = 1, REGISTRY_COLUMN_VALUE = 2, -}; - -class CRegistryFolderContextMenu : - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IContextMenu -{ - PCIDLIST_ABSOLUTE m_pcidlFolder; - PCITEMID_CHILD m_pcidlChild; - UINT m_idFirst; - - enum ItemOffsets - { - ITEM_Open = 0, - ITEM_OpenNewWindow - }; - -public: - CRegistryFolderContextMenu() : - m_pcidlFolder(NULL), - m_pcidlChild(NULL), - m_idFirst(0) - { - - } - - virtual ~CRegistryFolderContextMenu() - { - if (m_pcidlFolder) - ILFree((LPITEMIDLIST) m_pcidlFolder); - if (m_pcidlChild) - ILFree((LPITEMIDLIST) m_pcidlChild); - } - - HRESULT Initialize(PCIDLIST_ABSOLUTE parent, UINT cidl, PCUITEMID_CHILD_ARRAY apidl) - { - m_pcidlFolder = ILClone(parent); - if (cidl != 1) - return E_INVALIDARG; - m_pcidlChild = ILClone(apidl[0]); - return S_OK; - } - - // IContextMenu - virtual HRESULT WINAPI QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) - { - MENUITEMINFOW mii; - - m_idFirst = idCmdFirst; - - const RegPidlEntry * entry = (RegPidlEntry *) m_pcidlChild; - - static WCHAR open [] = L"Open"; - static WCHAR opennewwindow [] = L"Open in new window"; - - if (entry->entryType == REG_ENTRY_KEY) - { - ZeroMemory(&mii, sizeof(mii)); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_TYPE | MIIM_STATE | MIIM_SUBMENU | MIIM_ID; - mii.fType = MFT_STRING; - mii.wID = (idCmdFirst = m_idFirst + ITEM_Open); - mii.dwTypeData = open; - mii.cch = _countof(open); - mii.fState = MFS_ENABLED | MFS_DEFAULT; - mii.hSubMenu = NULL; - InsertMenuItemW(hmenu, idCmdFirst, TRUE, &mii); - - if (!(uFlags & CMF_DEFAULTONLY) && idCmdFirst <= idCmdLast) - { - ZeroMemory(&mii, sizeof(mii)); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_TYPE | MIIM_STATE | MIIM_SUBMENU | MIIM_ID; - mii.fType = MFT_STRING; - mii.wID = (idCmdFirst = m_idFirst + ITEM_OpenNewWindow); - mii.dwTypeData = opennewwindow; - mii.cch = _countof(opennewwindow); - mii.fState = MFS_ENABLED; - mii.hSubMenu = NULL; - InsertMenuItemW(hmenu, idCmdFirst, FALSE, &mii); - } - } - - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdFirst - m_idFirst); - } - - virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpici) - { - LPITEMIDLIST fullPidl = ILCombine(m_pcidlFolder, m_pcidlChild); - - if (LOWORD(lpici->lpVerb) == (m_idFirst + ITEM_Open) || !lpici->lpVerb) - { - SHELLEXECUTEINFO sei = { 0 }; - sei.cbSize = sizeof(sei); - sei.fMask = SEE_MASK_IDLIST | SEE_MASK_CLASSNAME; - sei.lpIDList = fullPidl; - sei.lpClass = L"folder"; - sei.hwnd = lpici->hwnd; - sei.nShow = lpici->nShow; - sei.lpVerb = L"open"; - BOOL bRes = ::ShellExecuteEx(&sei); - - ILFree(fullPidl); - - return bRes ? S_OK : HRESULT_FROM_WIN32(GetLastError()); - } - else if (LOWORD(lpici->lpVerb) == (m_idFirst + ITEM_OpenNewWindow)) - { - SHELLEXECUTEINFO sei = { 0 }; - sei.cbSize = sizeof(sei); - sei.fMask = SEE_MASK_IDLIST | SEE_MASK_CLASSNAME; - sei.lpIDList = fullPidl; - sei.lpClass = L"folder"; - sei.hwnd = lpici->hwnd; - sei.nShow = lpici->nShow; - sei.lpVerb = L"opennewwindow"; - BOOL bRes = ::ShellExecuteEx(&sei); - - ILFree(fullPidl); - - return bRes ? S_OK : HRESULT_FROM_WIN32(GetLastError()); - } - return E_NOTIMPL; - } - - virtual HRESULT WINAPI GetCommandString(UINT_PTR idCmd, UINT uType, UINT *pwReserved, LPSTR pszName, UINT cchMax) - { - if (idCmd == m_idFirst) - { - if (uType == GCS_VERBW) - { - return StringCchCopyW((LPWSTR) pszName, cchMax, L"open"); - } - } - else if (idCmd == (m_idFirst + 1)) - { - if (uType == GCS_VERBW) - { - return StringCchCopyW((LPWSTR) pszName, cchMax, L"opennewwindow"); - } - } - return E_NOTIMPL; - } - - DECLARE_NOT_AGGREGATABLE(CRegistryFolderContextMenu) - DECLARE_PROTECT_FINAL_CONSTRUCT() - - BEGIN_COM_MAP(CRegistryFolderContextMenu) - COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) - END_COM_MAP() - }; class CRegistryFolderExtractIcon : @@ -495,6 +350,16 @@ flags |= SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_BROWSABLE; return flags & mask; + } + + BOOL IsFolder(LPCITEMIDLIST pcidl) + { + RegPidlEntry * entry; + HRESULT hr = FindPidlInList(pcidl, &entry); + if (FAILED_UNEXPECTEDLY(hr)) + return FALSE; + + return (entry->entryType == REG_ENTRY_KEY); } HRESULT FormatContentsForDisplay(RegPidlEntry * info, PCWSTR * strContents) @@ -565,7 +430,6 @@ } } - }; class CRegistryFolderEnum : @@ -803,7 +667,36 @@ LPCITEMIDLIST pidl2) { TRACE("CompareIDs\n"); - return m_PidlManager->CompareIDs(lParam, pidl1, pidl2); + + HRESULT hr = m_PidlManager->CompareIDs(lParam, pidl1, pidl2); + if (hr != S_OK) + return hr; + + LPCITEMIDLIST rest1 = ILGetNext(pidl1); + LPCITEMIDLIST rest2 = ILGetNext(pidl2); + + bool hasNext1 = (rest1->mkid.cb > 0); + bool hasNext2 = (rest2->mkid.cb > 0); + + if (hasNext1 || hasNext2) + { + if (hasNext1 && !hasNext2) + return MAKE_HRESULT(0, 0, (USHORT) -1); + + if (hasNext2 && !hasNext1) + return MAKE_HRESULT(0, 0, (USHORT) 1); + + LPCITEMIDLIST first1 = ILCloneFirst(pidl1); + + CComPtr<IShellFolder> psfNext; + hr = BindToObject(first1, NULL, IID_PPV_ARG(IShellFolder, &psfNext)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return psfNext->CompareIDs(lParam, rest1, rest2); + } + + return S_OK; } HRESULT STDMETHODCALLTYPE CRegistryFolder::CreateViewObject( @@ -864,15 +757,56 @@ { TRACE("GetUIObjectOf\n"); - if (IsEqualIID(riid, IID_IContextMenu)) - { - return ShellObjectCreatorInit<CRegistryFolderContextMenu>(m_shellPidl, cidl, apidl, riid, ppvOut); - //return CDefFolderMenu_Create2(m_shellPidl, hwndOwner, cidl, apidl, this, ContextMenuCallback, 0, NULL, (IContextMenu**) ppvOut); + if (IsEqualIID(riid, IID_IContextMenu) || + IsEqualIID(riid, IID_IContextMenu2) || + IsEqualIID(riid, IID_IContextMenu3)) + { + CComPtr<IContextMenu> pcm; + + HKEY keys [1]; + + int nkeys = _countof(keys); + if (cidl == 1 && m_PidlManager->IsFolder(apidl[0])) + { + RegOpenKey(HKEY_CLASSES_ROOT, L"Folder", keys + 0); + } + else + { + nkeys = 0; + } + + HRESULT hr = CDefFolderMenu_Create2(m_shellPidl, hwndOwner, cidl, apidl, this, DefCtxMenuCallback, nkeys, keys, &pcm); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return pcm->QueryInterface(riid, ppvOut); } if (IsEqualIID(riid, IID_IExtractIconW)) { return ShellObjectCreatorInit<CRegistryFolderExtractIcon>(m_shellPidl, cidl, apidl, riid, ppvOut); + } + + if (IsEqualIID(riid, IID_IDataObject)) + { + return CIDLData_CreateFromIDArray(m_shellPidl, cidl, apidl, (IDataObject**) ppvOut); + } + + if (IsEqualIID(riid, IID_IQueryAssociations)) + { + if (cidl == 1 && m_PidlManager->IsFolder(apidl[0])) + { + CComPtr<IQueryAssociations> pqa; + HRESULT hr = AssocCreate(CLSID_QueryAssociations, IID_PPV_ARG(IQueryAssociations, &pqa)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pqa->Init(ASSOCF_INIT_DEFAULTTOFOLDER, L"NTObjShEx.RegFolder", NULL, hwndOwner); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return pqa->QueryInterface(riid, ppvOut); + } } return E_NOTIMPL; @@ -907,12 +841,13 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; + LPCITEMIDLIST pidlFirst = ILCloneFirst(pidl); LPCITEMIDLIST pidlNext = ILGetNext(pidl); if (pidlNext && pidlNext->mkid.cb > 0) { CComPtr<IShellFolder> psfChild; - hr = BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &psfChild)); + hr = BindToObject(pidlFirst, NULL, IID_PPV_ARG(IShellFolder, &psfChild)); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -929,6 +864,8 @@ PathAppendW(path, temp); } + + ILFree((LPITEMIDLIST) pidlFirst); } else { @@ -1219,3 +1156,17 @@ } return E_NOTIMPL; } + +HRESULT CRegistryFolder::DefCtxMenuCallback(IShellFolder * /*psf*/, HWND /*hwnd*/, IDataObject * /*pdtobj*/, UINT uMsg, WPARAM /*wParam*/, LPARAM /*lParam*/) +{ + switch (uMsg) + { + case DFM_MERGECONTEXTMENU: + return S_OK; + case DFM_INVOKECOMMAND: + case DFM_INVOKECOMMANDEX: + case DFM_GETDEFSTATICID: // Required for Windows 7 to pick a default + return S_FALSE; + } + return E_NOTIMPL; +} Modified: trunk/reactos/dll/shellext/ntobjshex/regfolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/regfolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/regfolder.h [iso-8859-1] Sat Mar 14 03:15:36 2015 @@ -138,6 +138,8 @@ // Internal HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl, PCWSTR ntPath); + static HRESULT CALLBACK DefCtxMenuCallback(IShellFolder *, HWND, IDataObject *, UINT, WPARAM, LPARAM); + DECLARE_REGISTRY_RESOURCEID(IDR_NTOBJECTFOLDER) DECLARE_NOT_AGGREGATABLE(CRegistryFolder) DECLARE_PROTECT_FINAL_CONSTRUCT() Modified: trunk/reactos/dll/shellext/ntobjshex/resources/rgs/ntobjectfolder.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/res… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/resources/rgs/ntobjectfolder.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/resources/rgs/ntobjectfolder.rgs [iso-8859-1] Sat Mar 14 03:15:36 2015 @@ -1,22 +1,33 @@ HKCR { - NoRemove CLSID - { - ForceRemove {845B0FB2-66E0-416B-8F91-314E23F7C12D} = s 'NT Object Namespace Extension' - { - InprocServer32 = s '%MODULE%' - { - val ThreadingModel = s 'Both' - } - val InfoTip = s 'Allows browsing of the NT Object Namespace' - DefaultIcon = s '%MODULE%,0' - ShellFolder - { - val Attributes = d '0xA8000000' - val BrowserFlags = d '0x22' - } - } - } + NTObjShEx.NTDirectory.1 = s 'NT Namespace Directory Class' + { + CLSID = s '{845B0FB2-66E0-416B-8F91-314E23F7C12D}' + } + NTObjShEx.NTDirectory = s 'NT Namespace Directory Class' + { + CLSID = s '{845B0FB2-66E0-416B-8F91-314E23F7C12D}' + CurVer = s 'WMIFldr.CWMIFldr.1' + } + NoRemove CLSID + { + ForceRemove {845B0FB2-66E0-416B-8F91-314E23F7C12D} = s 'NT Object Namespace Extension' + { + ProgID = s 'NTObjShEx.NTDirectory.1' + VersionIndependentProgID = s 'NTObjShEx.NTDirectory' + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Both' + } + val InfoTip = s 'Allows browsing of the NT Object Namespace' + DefaultIcon = s '%MODULE%,0' + ShellFolder + { + val Attributes = d '0xA8000000' + val BrowserFlags = d '0x22' + } + } + } } HKLM {

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2015