Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 29354: Simplify code. Spotted by Pablo Menichini, pablo at menichini dot com dot ar
by hpoussin＠svn.reactos.org 02 Oct '07

02 Oct '07

Author: hpoussin Date: Tue Oct 2 18:38:14 2007 New Revision: 29354 URL: http://svn.reactos.org/svn/reactos?rev=29354&view=rev Log: Simplify code. Spotted by Pablo Menichini, pablo at menichini dot com dot ar Modified: trunk/reactos/base/setup/usetup/drivesup.c Modified: trunk/reactos/base/setup/usetup/drivesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/drivesup… ============================================================================== --- trunk/reactos/base/setup/usetup/drivesup.c (original) +++ trunk/reactos/base/setup/usetup/drivesup.c Tue Oct 2 18:38:14 2007 @@ -79,12 +79,13 @@ /* strip trailing directory */ Ptr = wcsrchr(SourceName.Buffer, L'\\'); if (Ptr) + { RtlCreateUnicodeString(SourceRootDir, Ptr); + *Ptr = 0; + } else RtlCreateUnicodeString(SourceRootDir, L""); - if (Ptr != NULL) - *Ptr = 0; RtlCreateUnicodeString(SourceRootPath, SourceName.Buffer); }

1 0

[hpoussin] 29353: Support "i386" as an alternative name for cdrom directory
by hpoussin＠svn.reactos.org 02 Oct '07

02 Oct '07

Author: hpoussin Date: Tue Oct 2 16:23:40 2007 New Revision: 29353 URL: http://svn.reactos.org/svn/reactos?rev=29353&view=rev Log: Support "i386" as an alternative name for cdrom directory Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Tue Oct 2 16:23:40 2007 @@ -167,9 +167,20 @@ VOID RunLoader(VOID) { ULONG_PTR Base; - ULONG Size; + ULONG Size, i; const char *SourcePath; const char *LoadOptions = "", *DbgLoadOptions = ""; + const char *sourcePaths[] = { + "", /* Only for floppy boot */ +#if defined(_M_IX86) + "\\I386", +#elif defined(_M_MPPC) + "\\PPC", +#elif defined(_M_MRX000) + "\\MIPS", +#endif + "\\reactos", + NULL }; char szKernelName[256]; HINF InfHandle; @@ -246,13 +257,21 @@ } /* Open 'txtsetup.sif' */ - if (!InfOpenFile (&InfHandle, - MachDiskBootingFromFloppy() ? "\\txtsetup.sif" : "\\reactos\\txtsetup.sif", - &ErrorLine)) + for (i = MachDiskBootingFromFloppy() ? 0 : 1; ; i++) + { + SourcePath = sourcePaths[i]; + if (!SourcePath) { printf("Failed to open 'txtsetup.sif'\n"); return; } + strcpy(szKernelName, SourcePath); + strcat(szKernelName, "\\txtsetup.sif"); + if (InfOpenFile (&InfHandle, szKernelName, &ErrorLine)) + break; + } + if (!*SourcePath) + SourcePath = "\\"; #ifdef DBG /* Get load options */ @@ -284,17 +303,6 @@ #if 0 printf("LoadOptions: '%s'\n", LoadOptions); #endif - - if (MachDiskBootingFromFloppy()) - { - /* Boot from floppy disk */ - SourcePath = "\\"; - } - else - { - /* Boot from cdrom */ - SourcePath = "\\reactos"; - } /* Set kernel command line */ MachDiskGetBootPath(reactos_kernel_cmdline, sizeof(reactos_kernel_cmdline));

1 0

[hpoussin] 29352: Do not hardcode cdrom directory
by hpoussin＠svn.reactos.org 02 Oct '07

02 Oct '07

Author: hpoussin Date: Tue Oct 2 16:16:45 2007 New Revision: 29352 URL: http://svn.reactos.org/svn/reactos?rev=29352&view=rev Log: Do not hardcode cdrom directory Modified: trunk/reactos/base/setup/usetup/drivesup.c trunk/reactos/base/setup/usetup/drivesup.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/usetup.h Modified: trunk/reactos/base/setup/usetup/drivesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/drivesup… ============================================================================== --- trunk/reactos/base/setup/usetup/drivesup.c (original) +++ trunk/reactos/base/setup/usetup/drivesup.c Tue Oct 2 16:16:45 2007 @@ -35,7 +35,8 @@ NTSTATUS GetSourcePaths(PUNICODE_STRING SourcePath, - PUNICODE_STRING SourceRootPath) + PUNICODE_STRING SourceRootPath, + PUNICODE_STRING SourceRootDir) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING LinkName; @@ -73,17 +74,19 @@ if (NT_SUCCESS(Status)) { RtlCreateUnicodeString(SourcePath, - SourceName.Buffer); + SourceName.Buffer); /* strip trailing directory */ Ptr = wcsrchr(SourceName.Buffer, L'\\'); -// if ((Ptr != NULL) && -// (wcsicmp(Ptr, L"\\reactos") == 0)) + if (Ptr) + RtlCreateUnicodeString(SourceRootDir, Ptr); + else + RtlCreateUnicodeString(SourceRootDir, L""); + if (Ptr != NULL) - *Ptr = 0; - + *Ptr = 0; RtlCreateUnicodeString(SourceRootPath, - SourceName.Buffer); + SourceName.Buffer); } NtClose(Handle); Modified: trunk/reactos/base/setup/usetup/drivesup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/drivesup… ============================================================================== --- trunk/reactos/base/setup/usetup/drivesup.h (original) +++ trunk/reactos/base/setup/usetup/drivesup.h Tue Oct 2 16:16:45 2007 @@ -29,7 +29,8 @@ NTSTATUS GetSourcePaths(PUNICODE_STRING SourcePath, - PUNICODE_STRING SourceRootPath); + PUNICODE_STRING SourceRootPath, + PUNICODE_STRING SourceRootDir); #endif /* __DRIVESUP_H__ */ Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Tue Oct 2 16:16:45 2007 @@ -74,6 +74,7 @@ HANDLE ProcessHeap; UNICODE_STRING SourceRootPath; +UNICODE_STRING SourceRootDir; UNICODE_STRING SourcePath; BOOLEAN IsUnattendedSetup = FALSE; LONG UnattendDestinationDiskNumber; @@ -635,7 +636,8 @@ /* Get the source path and source root path */ Status = GetSourcePaths(&SourcePath, - &SourceRootPath); + &SourceRootPath, + &SourceRootDir); if (!NT_SUCCESS(Status)) { CONSOLE_PrintTextXY(6, 15, "GetSourcePaths() failed (Status 0x%08lx)", Status); @@ -649,6 +651,7 @@ { CONSOLE_PrintTextXY(6, 15, "SourcePath: '%wZ'", &SourcePath); CONSOLE_PrintTextXY(6, 16, "SourceRootPath: '%wZ'", &SourceRootPath); + CONSOLE_PrintTextXY(6, 17, "SourceRootDir: '%wZ'", &SourceRootDir); } #endif @@ -2692,7 +2695,7 @@ if (!SetupQueueCopy(SetupFileQueue, SourceCabinet, SourceRootPath.Buffer, - L"\\reactos", + SourceRootDir.Buffer, FileKeyName, DirKeyValue, TargetFileName)) @@ -3562,6 +3565,7 @@ /* Initialize global unicode strings */ RtlInitUnicodeString(&SourcePath, NULL); RtlInitUnicodeString(&SourceRootPath, NULL); + RtlInitUnicodeString(&SourceRootDir, NULL); RtlInitUnicodeString(&InstallPath, NULL); RtlInitUnicodeString(&DestinationPath, NULL); RtlInitUnicodeString(&DestinationArcPath, NULL); Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h (original) +++ trunk/reactos/base/setup/usetup/usetup.h Tue Oct 2 16:16:45 2007 @@ -74,6 +74,7 @@ extern HANDLE ProcessHeap; extern UNICODE_STRING SourceRootPath; +extern UNICODE_STRING SourceRootDir; extern UNICODE_STRING SourcePath; extern BOOLEAN IsUnattendedSetup;

1 0

[hpoussin] 29351: Add a default debug channel
by hpoussin＠svn.reactos.org 02 Oct '07

02 Oct '07

Author: hpoussin Date: Tue Oct 2 14:57:00 2007 New Revision: 29351 URL: http://svn.reactos.org/svn/reactos?rev=29351&view=rev Log: Add a default debug channel Modified: trunk/reactos/dll/win32/shell32/drive.c trunk/reactos/dll/win32/shell32/fprop.c Modified: trunk/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/drive.c (original) +++ trunk/reactos/dll/win32/shell32/drive.c Tue Oct 2 14:57:00 2007 @@ -44,6 +44,8 @@ #include <devguid.h> #include <winioctl.h> +WINE_DEFAULT_DEBUG_CHANNEL(shell); + typedef enum { HWPD_STANDARDLIST = 0, Modified: trunk/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.c (original) +++ trunk/reactos/dll/win32/shell32/fprop.c Tue Oct 2 14:57:00 2007 @@ -40,6 +40,8 @@ #include "shresdef.h" #include "undocshell.h" #include <prsht.h> + +WINE_DEFAULT_DEBUG_CHANNEL(shell); typedef struct _LANGANDCODEPAGE_ {

1 0

[jimtabor] 29350: Fix NtUserGetIconSize prototype.
by jimtabor＠svn.reactos.org 02 Oct '07

02 Oct '07

Author: jimtabor Date: Tue Oct 2 04:56:04 2007 New Revision: 29350 URL: http://svn.reactos.org/svn/reactos?rev=29350&view=rev Log: Fix NtUserGetIconSize prototype. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Tue Oct 2 04:56:04 2007 @@ -1081,13 +1081,13 @@ DWORD dwUnknown5, DWORD dwUnknown6); -DWORD +BOOL NTAPI NtUserGetIconSize( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4); + HANDLE Handle, + DWORD Unknown, + LONG *plcx, + LONG *plcy); DWORD NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Tue Oct 2 04:56:04 2007 @@ -777,16 +777,16 @@ /* for hints how the prototype might be, see http://forum.grafika.cz/read.php?23,1816012,1816139,quote=1 http://www.cyber-ta.org/releases/malware-analysis/public/SOURCES/b47155634c… */ -DWORD +BOOL NTAPI NtUserGetIconSize( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4) -{ - UNIMPLEMENTED; - return 0; + HANDLE Handle, + DWORD dwUnknown2, // Most of the time Zero. + PLONG plcx, // &size.cx + PLONG plcy) // &size.cy +{ + UNIMPLEMENTED; + return FALSE; } DWORD

1 0

[janderwald] 29349: - improve drive property dialog a bit
by janderwald＠svn.reactos.org 02 Oct '07

02 Oct '07

Author: janderwald Date: Tue Oct 2 04:07:22 2007 New Revision: 29349 URL: http://svn.reactos.org/svn/reactos?rev=29349&view=rev Log: - improve drive property dialog a bit Modified: trunk/reactos/dll/win32/shell32/drive.c trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shell32_De.rc Modified: trunk/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/drive.c (original) +++ trunk/reactos/dll/win32/shell32/drive.c Tue Oct 2 04:07:22 2007 @@ -20,7 +20,7 @@ #include "config.h" #include "wine/port.h" - +#define YDEBUG #include <string.h> #include <stdarg.h> #include <stdio.h> @@ -40,8 +40,85 @@ #include "shresdef.h" #include "undocshell.h" #include <prsht.h> +#include <initguid.h> +#include <devguid.h> +#include <winioctl.h> + +typedef enum +{ + HWPD_STANDARDLIST = 0, + HWPD_LARGELIST, + HWPD_MAX = HWPD_LARGELIST +} HWPAGE_DISPLAYMODE, *PHWPAGE_DISPLAYMODE; + +HWND WINAPI +DeviceCreateHardwarePageEx(HWND hWndParent, + LPGUID lpGuids, + UINT uNumberOfGuids, + HWPAGE_DISPLAYMODE DisplayMode); #define DRIVE_PROPERTY_PAGES (3) + +static +void +InitializeGeneralDriveDialog(HWND hwndDlg, WCHAR * szDrive) +{ + WCHAR szVolumeName[MAX_PATH+1] = {0}; + DWORD MaxComponentLength = 0; + DWORD FileSystemFlags = 0; + WCHAR FileSystemName[MAX_PATH+1] = {0}; + BOOL ret; + UINT DriveType; + ULARGE_INTEGER FreeBytesAvailable; + ULARGE_INTEGER TotalNumberOfBytes; + ULARGE_INTEGER TotalNumberOfFreeBytes; + + ret = GetVolumeInformationW(szDrive, szVolumeName, MAX_PATH+1, NULL, &MaxComponentLength, &FileSystemFlags, FileSystemName, MAX_PATH+1); + if (ret) + { + /* set volume label */ + SendDlgItemMessageW(hwndDlg, 14001, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szVolumeName); + + /* set filesystem type */ + SendDlgItemMessageW(hwndDlg, 14003, WM_SETTEXT, (WPARAM)NULL, (LPARAM)FileSystemName); + + } + + DriveType = GetDriveTypeW(szDrive); + if (DriveType == DRIVE_FIXED) + { + if(GetDiskFreeSpaceExW(szDrive, &FreeBytesAvailable, &TotalNumberOfBytes, &TotalNumberOfFreeBytes)) + { + WCHAR szResult[128]; + HANDLE hVolume; + DWORD BytesReturned = 0; + GET_LENGTH_INFORMATION LengthInformation; + if (StrFormatByteSizeW(TotalNumberOfBytes.QuadPart - FreeBytesAvailable.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) + SendDlgItemMessageW(hwndDlg, 14004, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); + + if (StrFormatByteSizeW(FreeBytesAvailable.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) + SendDlgItemMessageW(hwndDlg, 14006, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); +#if 0 + sprintfW(szResult, L"\\\\.\\%c:", towupper(szDrive[0])); + hVolume = CreateFileW(szResult, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + if (hVolume != INVALID_HANDLE_VALUE) + { + RtlZeroMemory(&LengthInformation, sizeof(GET_LENGTH_INFORMATION)); + ret = DeviceIoControl(hVolume, IOCTL_DISK_GET_LENGTH_INFO, NULL, 0, (LPVOID)&LengthInformation, sizeof(GET_LENGTH_INFORMATION), &BytesReturned, NULL); + if (ret && StrFormatByteSizeW(LengthInformation.Length.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) + SendDlgItemMessageW(hwndDlg, 14008, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); + + CloseHandle(hVolume); + } + TRACE("szResult %s hVOlume %p ret %d LengthInformation %ul Bytesreturned %d\n", debugstr_w(szResult), hVolume, ret, LengthInformation.Length.QuadPart, BytesReturned); +#else + if (ret && StrFormatByteSizeW(TotalNumberOfBytes.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) + SendDlgItemMessageW(hwndDlg, 14008, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); +#endif + } + } +} + INT_PTR CALLBACK @@ -52,7 +129,21 @@ LPARAM lParam ) { - + LPPROPSHEETPAGEW ppsp; + + WCHAR * lpstr; + switch(uMsg) + { + case WM_INITDIALOG: + ppsp = (LPPROPSHEETPAGEW)lParam; + if (ppsp == NULL) + break; + TRACE("WM_INITDIALOG hwnd %p lParam %p ppsplParam %S\n",hwndDlg, lParam, ppsp->lParam); + + lpstr = (WCHAR *)ppsp->lParam; + InitializeGeneralDriveDialog(hwndDlg, lpstr); + return TRUE; + } return FALSE; @@ -80,9 +171,24 @@ LPARAM lParam ) { - - - return FALSE; + GUID Guids[1]; + Guids[0] = GUID_DEVCLASS_DISKDRIVE; + + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + + switch(uMsg) + { + case WM_INITDIALOG: + /* create the hardware page */ + DeviceCreateHardwarePageEx(hwndDlg, + Guids, + sizeof(Guids) / sizeof(Guids[0]), + 0); + break; + } + + return FALSE; } static Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild Tue Oct 2 04:07:22 2007 @@ -21,6 +21,7 @@ <library>shlwapi</library> <library>ole32</library> <library>version</library> + <library>devmgr</library> <file>authors.c</file> <file>autocomplete.c</file> <file>brsfolder.c</file> Modified: trunk/reactos/dll/win32/shell32/shell32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_De.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_De.rc Tue Oct 2 04:07:22 2007 @@ -225,18 +225,22 @@ EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP LTEXT "Typ:", -1, 15, 55, 40, 10 LTEXT "", 14002, 40, 55, 100, 10 - LTEXT "Dateisystem:",-1, 15, 70, 100, 10 - LTEXT "", 14003, 40, 70, 100, 10 + + LTEXT "Dateisystem:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 LTEXT "Belegter Speicher:", -1, 25, 90, 120, 10 LTEXT "", 14004, 110, 90, 120, 10 LTEXT "", 14005, 200, 90, 40, 10 + LTEXT "Freier Speicher:", -1, 25, 105, 70, 10 LTEXT "", 14006, 110, 105, 120, 10 LTEXT "", 14007, 200, 105, 40, 10 + LTEXT "Speicherkapazität:", -1, 25, 125, 80, 10 LTEXT "", 14008, 110, 125, 120, 10 LTEXT "", 14009, 200, 125, 40, 10 + LTEXT "", 14010, 150, 160, 40, 10 PUSHBUTTON "Bereinigen", 14011, 190, 145, 50, 15, WS_DISABLED CHECKBOX "Laufwerk komprimieren, um Speicherplatz zu sparen", 14012, 15, 205, 165, 10, WS_DISABLED

1 0

[jimtabor] 29348: Win32k/User32: - Moved NtUserGetCursorIconInfo to NtUserGetIconInfo, update header. - GetIconInfo is correctly called now.
by jimtabor＠svn.reactos.org 01 Oct '07

01 Oct '07

Author: jimtabor Date: Tue Oct 2 03:15:02 2007 New Revision: 29348 URL: http://svn.reactos.org/svn/reactos?rev=29348&view=rev Log: Win32k/User32: - Moved NtUserGetCursorIconInfo to NtUserGetIconInfo, update header. - GetIconInfo is correctly called now. Modified: trunk/reactos/dll/win32/user32/windows/cursor.c trunk/reactos/dll/win32/user32/windows/icon.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/user32/windows/cursor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/cursor.c (original) +++ trunk/reactos/dll/win32/user32/windows/cursor.c Tue Oct 2 03:15:02 2007 @@ -72,7 +72,7 @@ { ICONINFO IconInfo; - if(NtUserGetCursorIconInfo((HANDLE)pcur, &IconInfo)) + if(GetIconInfo((HANDLE)pcur, &IconInfo)) { return (HCURSOR)NtUserCreateCursorIconHandle(&IconInfo, FALSE); } Modified: trunk/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/icon.c (original) +++ trunk/reactos/dll/win32/user32/windows/icon.c Tue Oct 2 03:15:02 2007 @@ -152,7 +152,7 @@ { ICONINFO IconInfo; - if(NtUserGetCursorIconInfo((HANDLE)hIcon, &IconInfo)) + if(GetIconInfo((HANDLE)hIcon, &IconInfo)) { return NtUserCreateCursorIconHandle(&IconInfo, FALSE); } @@ -400,8 +400,7 @@ HICON hIcon, PICONINFO IconInfo) { - /* FIXME - copy bitmaps */ - return (BOOL)NtUserGetCursorIconInfo((HANDLE)hIcon, IconInfo); + return NtUserGetIconInfo((HANDLE)hIcon, IconInfo, 0, 0, 0, 0); } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Tue Oct 2 03:15:02 2007 @@ -1066,22 +1066,16 @@ BOOL NTAPI -NtUserGetCursorIconInfo( - HANDLE Handle, - PICONINFO IconInfo); - -BOOL -NTAPI NtUserGetCursorIconSize( HANDLE Handle, BOOL *fIcon, SIZE *Size); -DWORD +BOOL NTAPI NtUserGetIconInfo( - DWORD dwUnknown1, - DWORD dwUnknown2, + HANDLE Handle, + PICONINFO IconInfo, DWORD dwUnknown3, DWORD dwUnknown4, DWORD dwUnknown5, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Tue Oct 2 03:15:02 2007 @@ -621,9 +621,9 @@ */ BOOL STDCALL -NtUserGetCursorIconInfo( +NtUserGetIconInfo( HANDLE hCurIcon, - PICONINFO IconInfo) + PICONINFO IconInfo, DWORD UnkOne, DWORD UnkTwo, DWORD UnkThree, DWORD UnkFour ) { ICONINFO ii; PCURICON_OBJECT CurIcon; @@ -632,7 +632,7 @@ BOOL Ret = FALSE; DECLARE_RETURN(BOOL); - DPRINT("Enter NtUserGetCursorIconInfo\n"); + DPRINT("Enter NtUserGetIconInfo\n"); UserEnterExclusive(); if(!IconInfo) @@ -670,7 +670,7 @@ RETURN( Ret); CLEANUP: - DPRINT("Leave NtUserGetCursorIconInfo, ret=%i\n",_ret_); + DPRINT("Leave NtUserGetIconInfo, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Tue Oct 2 03:15:02 2007 @@ -774,20 +774,6 @@ return 0; } -DWORD -NTAPI -NtUserGetIconInfo( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4, - DWORD dwUnknown5, - DWORD dwUnknown6) -{ - UNIMPLEMENTED; - return 0; -} - /* for hints how the prototype might be, see http://forum.grafika.cz/read.php?23,1816012,1816139,quote=1 http://www.cyber-ta.org/releases/malware-analysis/public/SOURCES/b47155634c… */ Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Tue Oct 2 03:15:02 2007 @@ -711,7 +711,6 @@ NtUserGetClientOrigin 2 NtUserGetClientRect 2 NtUserGetMenuDefaultItem 3 -NtUserGetCursorIconInfo 2 NtUserGetCursorIconSize 3 NtUserGetLastInputInfo 1 NtUserGetMinMaxInfo 3

1 0

[gedmurphy] 29347: remove the bitmap stuff, we won't be using this for now
by gedmurphy＠svn.reactos.org 01 Oct '07

01 Oct '07

Author: gedmurphy Date: Tue Oct 2 02:53:09 2007 New Revision: 29347 URL: http://svn.reactos.org/svn/reactos?rev=29347&view=rev Log: remove the bitmap stuff, we won't be using this for now Modified: trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c (original) +++ trunk/reactos/dll/cpl/desk/settings.c Tue Oct 2 02:53:09 2007 @@ -15,9 +15,6 @@ { PDISPLAY_DEVICE_ENTRY DisplayDeviceList; PDISPLAY_DEVICE_ENTRY CurrentDisplayDevice; - HBITMAP hBitmap; - int cxSource; - int cySource; } GLOBAL_DATA, *PGLOBAL_DATA; static VOID @@ -284,7 +281,6 @@ DWORD Result = 0; DWORD iDevNum = 0; DISPLAY_DEVICE displayDevice; - BITMAP bitmap; PGLOBAL_DATA pGlobalData; pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); @@ -359,15 +355,6 @@ HeapFree(GetProcessHeap(), 0, pMonitors); } - } - - pGlobalData->hBitmap = LoadImage(hApplet, MAKEINTRESOURCE(IDC_MONITOR), IMAGE_BITMAP, 0, 0, LR_LOADTRANSPARENT); - if (pGlobalData->hBitmap != NULL) - { - GetObject(pGlobalData->hBitmap, sizeof(BITMAP), &bitmap); - - pGlobalData->cxSource = bitmap.bmWidth; - pGlobalData->cySource = bitmap.bmHeight; } } @@ -657,28 +644,6 @@ break; } - case WM_PAINT: - { - PAINTSTRUCT ps; - HDC hdc, hdcMem; - - hdc = BeginPaint(hwndDlg, &ps); - - hdcMem = CreateCompatibleDC(hdc); - SelectObject(hdcMem, pGlobalData->hBitmap); -/* - TransparentBlt(hdc, 98, 0, - pGlobalData->cxSource, - pGlobalData->cySource, hdcMem, 0, 0, - pGlobalData->cxSource, - pGlobalData->cySource, 0xFF80FF); -*/ - DeleteDC(hdcMem); - EndPaint(hwndDlg, &ps); - - break; - } - case WM_DESTROY: { PDISPLAY_DEVICE_ENTRY Current = pGlobalData->DisplayDeviceList; @@ -696,8 +661,6 @@ Current = Next; } - DeleteObject(pGlobalData->hBitmap); - HeapFree(GetProcessHeap(), 0, pGlobalData); } }

1 0

[janderwald] 29346: - add GUID_DEVCLASS_DISKDRIVE
by janderwald＠svn.reactos.org 01 Oct '07

01 Oct '07

Author: janderwald Date: Tue Oct 2 02:40:15 2007 New Revision: 29346 URL: http://svn.reactos.org/svn/reactos?rev=29346&view=rev Log: - add GUID_DEVCLASS_DISKDRIVE Modified: trunk/reactos/include/psdk/devguid.h Modified: trunk/reactos/include/psdk/devguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/devguid.h?rev… ============================================================================== --- trunk/reactos/include/psdk/devguid.h (original) +++ trunk/reactos/include/psdk/devguid.h Tue Oct 2 02:40:15 2007 @@ -23,3 +23,4 @@ DEFINE_GUID(GUID_DEVCLASS_NETCLIENT, 0x4D36E973, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); DEFINE_GUID(GUID_DEVCLASS_NETSERVICE, 0x4D36E974, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); DEFINE_GUID(GUID_DEVCLASS_NETTRANS, 0x4D36E975, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); +DEFINE_GUID(GUID_DEVCLASS_DISKDRIVE, 0x4d36e967L, 0xe325, 0x11ce, 0xbf, 0xc1, 0x08, 0x00, 0x2b, 0xe1, 0x03, 0x18);

1 0

[janderwald] 29345: - remove previously added DRIVE_SHARE_DLG and DRIVE_CONTINGENT_DLG - the drive share dialog is implemented in rshx32.dll - the contigent dialog is implemented in dskquoui.dll - start implementing german general drive dialog
by janderwald＠svn.reactos.org 01 Oct '07

01 Oct '07

Author: janderwald Date: Tue Oct 2 01:53:41 2007 New Revision: 29345 URL: http://svn.reactos.org/svn/reactos?rev=29345&view=rev Log: - remove previously added DRIVE_SHARE_DLG and DRIVE_CONTINGENT_DLG - the drive share dialog is implemented in rshx32.dll - the contigent dialog is implemented in dskquoui.dll - start implementing german general drive dialog Modified: trunk/reactos/dll/win32/shell32/drive.c trunk/reactos/dll/win32/shell32/shell32_Bg.rc trunk/reactos/dll/win32/shell32/shell32_Ca.rc trunk/reactos/dll/win32/shell32/shell32_Cn.rc trunk/reactos/dll/win32/shell32/shell32_Cs.rc trunk/reactos/dll/win32/shell32/shell32_Da.rc trunk/reactos/dll/win32/shell32/shell32_De.rc trunk/reactos/dll/win32/shell32/shell32_En.rc trunk/reactos/dll/win32/shell32/shell32_Eo.rc trunk/reactos/dll/win32/shell32/shell32_Es.rc trunk/reactos/dll/win32/shell32/shell32_Fi.rc trunk/reactos/dll/win32/shell32/shell32_Fr.rc trunk/reactos/dll/win32/shell32/shell32_Hu.rc trunk/reactos/dll/win32/shell32/shell32_It.rc trunk/reactos/dll/win32/shell32/shell32_Ja.rc trunk/reactos/dll/win32/shell32/shell32_Ko.rc trunk/reactos/dll/win32/shell32/shell32_Nl.rc trunk/reactos/dll/win32/shell32/shell32_No.rc trunk/reactos/dll/win32/shell32/shell32_Pl.rc trunk/reactos/dll/win32/shell32/shell32_Pt.rc trunk/reactos/dll/win32/shell32/shell32_Ru.rc trunk/reactos/dll/win32/shell32/shell32_Si.rc trunk/reactos/dll/win32/shell32/shell32_Sk.rc trunk/reactos/dll/win32/shell32/shell32_Sv.rc trunk/reactos/dll/win32/shell32/shell32_Uk.rc trunk/reactos/dll/win32/shell32/shell32_Wa.rc trunk/reactos/dll/win32/shell32/shell32_Zh.rc Modified: trunk/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/drive.c (original) +++ trunk/reactos/dll/win32/shell32/drive.c Tue Oct 2 01:53:41 2007 @@ -41,7 +41,7 @@ #include "undocshell.h" #include <prsht.h> -#define DRIVE_PROPERTY_PAGES (5) +#define DRIVE_PROPERTY_PAGES (3) INT_PTR CALLBACK @@ -85,33 +85,6 @@ return FALSE; } -INT_PTR -CALLBACK -DriveShareDlg( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - - - return FALSE; -} - -INT_PTR -CALLBACK -DriveContingentDlg( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - - return FALSE; -} - static const struct @@ -123,8 +96,6 @@ { "DRIVE_GENERAL_DLG", DriveGeneralDlg }, { "DRIVE_EXTRA_DLG", DriveExtraDlg }, { "DRIVE_HARDWARE_DLG", DriveHardwareDlg }, - { "DRIVE_SHARE_DLG", DriveShareDlg }, - { "DRIVE_CONTINGENT_DLG", DriveContingentDlg } }; BOOL Modified: trunk/reactos/dll/win32/shell32/shell32_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Bg.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Bg.rc Tue Oct 2 01:53:41 2007 @@ -224,21 +224,6 @@ { } - -DRIVE_SHARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_CONTINGENT_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} STRINGTABLE DISCARDABLE { Modified: trunk/reactos/dll/win32/shell32/shell32_Ca.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Ca.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Ca.rc Tue Oct 2 01:53:41 2007 @@ -138,19 +138,3 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 { } - - -DRIVE_SHARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_CONTINGENT_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} Modified: trunk/reactos/dll/win32/shell32/shell32_Cn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Cn.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Cn.rc Tue Oct 2 01:53:41 2007 @@ -140,22 +140,6 @@ { } - -DRIVE_SHARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_CONTINGENT_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - /* columns in the shellview */ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED BEGIN Modified: trunk/reactos/dll/win32/shell32/shell32_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Cs.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Cs.rc Tue Oct 2 01:53:41 2007 @@ -227,21 +227,6 @@ } -DRIVE_SHARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_CONTINGENT_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - /* special folders */ Modified: trunk/reactos/dll/win32/shell32/shell32_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Da.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Da.rc Tue Oct 2 01:53:41 2007 @@ -139,18 +139,3 @@ { } - -DRIVE_SHARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_CONTINGENT_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} Modified: trunk/reactos/dll/win32/shell32/shell32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_De.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_De.rc Tue Oct 2 01:53:41 2007 @@ -216,16 +216,36 @@ } -DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ +DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + //ICON + EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Typ:", -1, 15, 55, 40, 10 + LTEXT "", 14002, 40, 55, 100, 10 + LTEXT "Dateisystem:",-1, 15, 70, 100, 10 + LTEXT "", 14003, 40, 70, 100, 10 + + LTEXT "Belegter Speicher:", -1, 25, 90, 120, 10 + LTEXT "", 14004, 110, 90, 120, 10 + LTEXT "", 14005, 200, 90, 40, 10 + LTEXT "Freier Speicher:", -1, 25, 105, 70, 10 + LTEXT "", 14006, 110, 105, 120, 10 + LTEXT "", 14007, 200, 105, 40, 10 + LTEXT "Speicherkapazität:", -1, 25, 125, 80, 10 + LTEXT "", 14008, 110, 125, 120, 10 + LTEXT "", 14009, 200, 125, 40, 10 + LTEXT "", 14010, 150, 160, 40, 10 + PUSHBUTTON "Bereinigen", 14011, 190, 145, 50, 15, WS_DISABLED + CHECKBOX "Laufwerk komprimieren, um Speicherplatz zu sparen", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Laufwerk für schnelle Dateisuche indizieren", 14012, 15, 205, 165, 10, WS_DISABLED } DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "Extras" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { } @@ -233,23 +253,7 @@ DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 130 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_SHARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_CONTINGENT_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "Hardware" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { } Modified: trunk/reactos/dll/win32/shell32/shell32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_En.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_En.rc Tue Oct 2 01:53:41 2007 @@ -237,21 +237,6 @@ { } - -DRIVE_SHARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_CONTINGENT_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} STRINGTABLE DISCARDABLE { Modified: trunk/reactos/dll/win32/shell32/shell32_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Eo.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Eo.rc Tue Oct 2 01:53:41 2007 @@ -138,19 +138,3 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 { } - - -DRIVE_SHARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_CONTINGENT_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} Modified: trunk/reactos/dll/win32/shell32/shell32_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Es.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Es.rc Tue Oct 2 01:53:41 2007 @@ -226,21 +226,6 @@ { } - -DRIVE_SHARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_CONTINGENT_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} /* special folders Modified: trunk/reactos/dll/win32/shell32/shell32_Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Fi.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Fi.rc Tue Oct 2 01:53:41 2007 @@ -225,21 +225,6 @@ { } - -DRIVE_SHARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_CONTINGENT_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} STRINGTABLE DISCARDABLE { Modified: trunk/reactos/dll/win32/shell32/shell32_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Fr.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Fr.rc Tue Oct 2 01:53:41 2007 @@ -222,22 +222,6 @@ DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_SHARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_CONTINGENT_DLG DIALOGEX 0, 0, 240, 130 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Version" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/win32/shell32/shell32_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Hu.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Hu.rc Tue Oct 2 01:53:41 2007 @@ -228,21 +228,6 @@ { } - -DRIVE_SHARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_CONTINGENT_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} STRINGTABLE DISCARDABLE { Modified: trunk/reactos/dll/win32/shell32/shell32_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_It.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_It.rc Tue Oct 2 01:53:41 2007 @@ -226,22 +226,6 @@ { } - -DRIVE_SHARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_CONTINGENT_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - /* special folders */ Modified: trunk/reactos/dll/win32/shell32/shell32_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Ja.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Ja.rc Tue Oct 2 01:53:41 2007 @@ -225,21 +225,6 @@ { } - -DRIVE_SHARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_CONTINGENT_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} STRINGTABLE DISCARDABLE { Modified: trunk/reactos/dll/win32/shell32/shell32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Ko.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Ko.rc Tue Oct 2 01:53:41 2007 @@ -138,19 +138,3 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 { } - - -DRIVE_SHARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_CONTINGENT_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} Modified: trunk/reactos/dll/win32/shell32/shell32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Nl.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Nl.rc Tue Oct 2 01:53:41 2007 @@ -138,19 +138,3 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 { } - - -DRIVE_SHARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_CONTINGENT_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} Modified: trunk/reactos/dll/win32/shell32/shell32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_No.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_No.rc Tue Oct 2 01:53:41 2007 @@ -225,21 +225,6 @@ { } - -DRIVE_SHARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_CONTINGENT_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} STRINGTABLE DISCARDABLE { Modified: trunk/reactos/dll/win32/shell32/shell32_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Pl.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Pl.rc Tue Oct 2 01:53:41 2007 @@ -228,21 +228,6 @@ } -DRIVE_SHARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_CONTINGENT_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - /* special folders */ Modified: trunk/reactos/dll/win32/shell32/shell32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Pt.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Pt.rc Tue Oct 2 01:53:41 2007 @@ -220,22 +220,6 @@ DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_SHARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_CONTINGENT_DLG DIALOGEX 0, 0, 240, 130 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Version" FONT 8, "MS Shell Dlg", 0, 0, 0x0 Modified: trunk/reactos/dll/win32/shell32/shell32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Ru.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Ru.rc Tue Oct 2 01:53:41 2007 @@ -226,21 +226,6 @@ { } - -DRIVE_SHARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_CONTINGENT_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} STRINGTABLE DISCARDABLE { Modified: trunk/reactos/dll/win32/shell32/shell32_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Si.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Si.rc Tue Oct 2 01:53:41 2007 @@ -139,22 +139,6 @@ { } - -DRIVE_SHARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_CONTINGENT_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - /* columns in the shellview */ STRINGTABLE LANGUAGE LANG_SLOVENIAN, SUBLANG_NEUTRAL BEGIN Modified: trunk/reactos/dll/win32/shell32/shell32_Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Sk.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Sk.rc Tue Oct 2 01:53:41 2007 @@ -139,22 +139,6 @@ { } - -DRIVE_SHARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_CONTINGENT_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - /* columns in the shellview */ STRINGTABLE LANGUAGE LANG_SLOVAK, SUBLANG_NEUTRAL BEGIN Modified: trunk/reactos/dll/win32/shell32/shell32_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Sv.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Sv.rc Tue Oct 2 01:53:41 2007 @@ -224,23 +224,6 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 { } - - -DRIVE_SHARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_CONTINGENT_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - /* special folders Modified: trunk/reactos/dll/win32/shell32/shell32_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Uk.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Uk.rc Tue Oct 2 01:53:41 2007 @@ -225,23 +225,6 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 { } - - -DRIVE_SHARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_CONTINGENT_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - STRINGTABLE DISCARDABLE { Modified: trunk/reactos/dll/win32/shell32/shell32_Wa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Wa.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Wa.rc Tue Oct 2 01:53:41 2007 @@ -143,20 +143,3 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 { } - - -DRIVE_SHARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_CONTINGENT_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - Modified: trunk/reactos/dll/win32/shell32/shell32_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Zh.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Zh.rc Tue Oct 2 01:53:41 2007 @@ -139,22 +139,6 @@ { } - -DRIVE_SHARE_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - - -DRIVE_CONTINGENT_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - /* columns in the shellview */ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL BEGIN

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs