Ros-diffs November 2017

ros-diffs@reactos.org

22 participants
186 discussions

[reactos] 01/01: [DBGHELP] [XDK] [ARM64] Fix magic constant

by Stas'M

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1eea9304e1713ee949419… commit 1eea9304e1713ee9494199df4ca05e8c84b0048b Author: Stas'M <x86corez(a)gmail.com> AuthorDate: Fri Nov 3 19:48:19 2017 +0300 [DBGHELP] [XDK] [ARM64] Fix magic constant --- dll/win32/dbghelp/compat.h | 2 +- sdk/include/xdk/winnt_old.h | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dll/win32/dbghelp/compat.h b/dll/win32/dbghelp/compat.h index 99cb40d996..46b07d18c6 100644 --- a/dll/win32/dbghelp/compat.h +++ b/dll/win32/dbghelp/compat.h @@ -115,7 +115,7 @@ INT __WideCharToMultiByte( UINT page, DWORD flags, LPCWSTR src, INT srclen, LPST // winnt.h #define IMAGE_FILE_MACHINE_ARMNT 0x1c4 #define IMAGE_FILE_MACHINE_POWERPC 0x1f0 -#define IMAGE_FILE_MACHINE_ARM64 0x1c5 +#define IMAGE_FILE_MACHINE_ARM64 0xaa64 #define DLL_PROCESS_DETACH 0 #define DLL_PROCESS_ATTACH 1 #define DLL_THREAD_ATTACH 2 diff --git a/sdk/include/xdk/winnt_old.h b/sdk/include/xdk/winnt_old.h index f994f6bc6a..415f332a82 100644 --- a/sdk/include/xdk/winnt_old.h +++ b/sdk/include/xdk/winnt_old.h @@ -639,9 +639,7 @@ #define IMAGE_FILE_MACHINE_CEE 0xC0EE #define IMAGE_FILE_MACHINE_TRICORE 0x0520 #define IMAGE_FILE_MACHINE_CEF 0x0CEF - -/* Wine extension */ -#define IMAGE_FILE_MACHINE_ARM64 0x1c5 +#define IMAGE_FILE_MACHINE_ARM64 0xAA64 #define IMAGE_FILE_EXPORT_DIRECTORY 0 #define IMAGE_FILE_IMPORT_DIRECTORY 1

6 years, 10 months

[reactos] 01/01: [USETUP][ROSAPPS][EXT2LIB] NtReadFile() calls: Remove unused 'ByteOffset = 0', Use explicit NULL instead of ambiguous 0, Remove casts to same type. CORE-13910

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bcaa33e33b3edb88d035b… commit bcaa33e33b3edb88d035bae74345696377d59500 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Nov 1 13:20:14 2017 +0100 [USETUP][ROSAPPS][EXT2LIB] NtReadFile() calls: Remove unused 'ByteOffset = 0', Use explicit NULL instead of ambiguous 0, Remove casts to same type. CORE-13910 --- base/setup/usetup/bootsup.c | 1 - base/setup/usetup/native/utils/console.c | 4 ++-- modules/rosapps/applications/sysutils/utils/pice/module/utils.c | 4 ++-- sdk/lib/fslib/ext2lib/Disk.c | 6 +++--- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/base/setup/usetup/bootsup.c b/base/setup/usetup/bootsup.c index 7b4629bb5a..9c05e3e7eb 100644 --- a/base/setup/usetup/bootsup.c +++ b/base/setup/usetup/bootsup.c @@ -1001,7 +1001,6 @@ InstallFat32BootCodeToFile( return Status; } - FileOffset.QuadPart = 0ULL; Status = NtReadFile(FileHandle, NULL, NULL, diff --git a/base/setup/usetup/native/utils/console.c b/base/setup/usetup/native/utils/console.c index aa2a5661da..2ab380a0bc 100644 --- a/base/setup/usetup/native/utils/console.c +++ b/base/setup/usetup/native/utils/console.c @@ -170,7 +170,7 @@ FlushConsoleInputBuffer( &InputData, sizeof(KEYBOARD_INPUT_DATA), &Offset, - 0); + NULL); if (Status == STATUS_PENDING) { Timeout.QuadPart = -100; @@ -208,7 +208,7 @@ ReadConsoleInput( &InputData, sizeof(KEYBOARD_INPUT_DATA), &Offset, - 0); + NULL); if (Status == STATUS_PENDING) { Status = NtWaitForSingleObject(hConsoleInput, FALSE, NULL); diff --git a/modules/rosapps/applications/sysutils/utils/pice/module/utils.c b/modules/rosapps/applications/sysutils/utils/pice/module/utils.c index 64977a0fa5..c87e312256 100644 --- a/modules/rosapps/applications/sysutils/utils/pice/module/utils.c +++ b/modules/rosapps/applications/sysutils/utils/pice/module/utils.c @@ -2233,9 +2233,9 @@ long PICE_read(HANDLE hFile, LPVOID lpBuffer, long lBytes) ASSERT( lpBuffer ); if (!NT_SUCCESS(NtReadFile( - (HANDLE) hFile, + hFile, NULL, NULL, NULL, &iosb, - (LPVOID) lpBuffer, + lpBuffer, (DWORD) lBytes, NULL, NULL diff --git a/sdk/lib/fslib/ext2lib/Disk.c b/sdk/lib/fslib/ext2lib/Disk.c index 0180304fe3..84293219af 100644 --- a/sdk/lib/fslib/ext2lib/Disk.c +++ b/sdk/lib/fslib/ext2lib/Disk.c @@ -982,7 +982,7 @@ Ext2ReadDisk( PEXT2_FILESYS Ext2Sys, Address.QuadPart = Offset; Status = NtReadFile( Ext2Sys->MediaHandle, - 0, + NULL, NULL, NULL, &IoStatus, @@ -1009,7 +1009,7 @@ Ext2ReadDisk( PEXT2_FILESYS Ext2Sys, } Status = NtReadFile( Ext2Sys->MediaHandle, - 0, + NULL, NULL, NULL, &IoStatus, @@ -1106,7 +1106,7 @@ Ext2WriteDisk( PEXT2_FILESYS Ext2Sys, if ((AlignedLength != Length) || (Address.QuadPart != (LONGLONG)Offset)) { Status = NtReadFile( Ext2Sys->MediaHandle, - 0, + NULL, NULL, NULL, &IoStatus,

6 years, 10 months

[reactos] 01/01: [FREELDR] Additional safety checks for PcMemGetBiosMemoryMap. CORE-13332

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba9a1c3abba3b795a5518… commit ba9a1c3abba3b795a55186f289704ec8eeaf1cb9 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Tue Oct 10 03:39:44 2017 +0200 [FREELDR] Additional safety checks for PcMemGetBiosMemoryMap. CORE-13332 Cast MAX_BIOS_DESCRIPTORS to explicit ULONG from implicit int. Comment/Add checks for PcMemoryMap/PcBiosMemoryMap arrays being full and bare handling of error cases. --- boot/freeldr/freeldr/arch/i386/pcmem.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/boot/freeldr/freeldr/arch/i386/pcmem.c b/boot/freeldr/freeldr/arch/i386/pcmem.c index 2c615914f1..aa5b18d226 100644 --- a/boot/freeldr/freeldr/arch/i386/pcmem.c +++ b/boot/freeldr/freeldr/arch/i386/pcmem.c @@ -33,7 +33,7 @@ DBG_DEFAULT_CHANNEL(MEMORY); #define ULONGLONG_ALIGN_UP_BY(size, align) \ (ULONGLONG_ALIGN_DOWN_BY(((ULONGLONG)(size) + align - 1), align)) -#define MAX_BIOS_DESCRIPTORS 80 +#define MAX_BIOS_DESCRIPTORS 80ul BIOS_MEMORY_MAP PcBiosMemoryMap[MAX_BIOS_DESCRIPTORS]; ULONG PcBiosMapCount; @@ -368,6 +368,12 @@ PcMemGetBiosMemoryMap(PFREELDR_MEMORY_DESCRIPTOR MemoryMap, ULONG MaxMemoryMapSi { ERR("PcMemoryMap is already full! (PcBiosMapCount = %lu, PcMapCount = %lu (>= %lu))\n", PcBiosMapCount, PcMapCount, MaxMemoryMapSize); + // NotWantedForPublicBuilds: ASSERTMSG("PcMemoryMap is already full!", FALSE); + /* We keep previous entries, and half-retrieve current/next entries. + * We assume all these entries are good to use as is. If they are not, we are in trouble... + * + * FIXME: Safer = revert (half-)retrieved entries, Safest = increase MaxMemoryMapSize. + */ } else { @@ -390,6 +396,18 @@ nextRange: break; } } + /* Check whether there would be more entries to process. */ + if (PcBiosMapCount >= MAX_BIOS_DESCRIPTORS && Regs.x.ebx != 0x00000000) + { + ERR("PcBiosMapCount is already full! (PcBiosMapCount = %lu (>= %lu), PcMapCount = %lu)\n", + PcBiosMapCount, MAX_BIOS_DESCRIPTORS, PcMapCount); + // NotWantedForPublicBuilds: ASSERTMSG("PcBiosMapCount is already full!", FALSE); + /* We keep retrieved entries, but ignore next entries. + * We assume these entries are good to use as is. If they are not, we are in trouble... + * + * FIXME: Safer = revert retrieved entries, Safest = increase MAX_BIOS_DESCRIPTORS. + */ + } TRACE("PcMemGetBiosMemoryMap end: PcBiosMapCount = %lu\n", PcBiosMapCount); return PcBiosMapCount;

6 years, 10 months

[reactos] 02/02: [REACTOS][FDEBUG] Remove unnecessary DLGPROC casts.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fe3eb29287b8b5891c7fd… commit fe3eb29287b8b5891c7fd65a609fe167c2f7f5fc Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Oct 31 12:02:38 2017 +0100 [REACTOS][FDEBUG] Remove unnecessary DLGPROC casts. --- base/setup/reactos/drivepage.c | 4 ++-- boot/freeldr/fdebug/fdebug.c | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/base/setup/reactos/drivepage.c b/base/setup/reactos/drivepage.c index 8416305351..014a23ec9c 100644 --- a/base/setup/reactos/drivepage.c +++ b/base/setup/reactos/drivepage.c @@ -218,14 +218,14 @@ DriveDlgProc( DialogBoxParam(pSetupData->hInstance, MAKEINTRESOURCE(IDD_BOOTOPTIONS), hwndDlg, - (DLGPROC)MoreOptDlgProc, + MoreOptDlgProc, (LPARAM)pSetupData); break; case IDC_PARTCREATE: DialogBox(pSetupData->hInstance, MAKEINTRESOURCE(IDD_PARTITION), hwndDlg, - (DLGPROC) PartitionDlgProc); + PartitionDlgProc); break; case IDC_PARTDELETE: break; diff --git a/boot/freeldr/fdebug/fdebug.c b/boot/freeldr/fdebug/fdebug.c index f43582e377..25ecd406e0 100644 --- a/boot/freeldr/fdebug/fdebug.c +++ b/boot/freeldr/fdebug/fdebug.c @@ -34,9 +34,9 @@ DWORD dwThreadId = 0; // Thread id of RS23 ATOM MyRegisterClass(HINSTANCE hInstance); BOOL InitInstance(HINSTANCE, int); LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); -LRESULT CALLBACK About(HWND, UINT, WPARAM, LPARAM); -LRESULT CALLBACK ConnectionDialogProc(HWND, UINT, WPARAM, LPARAM); -LRESULT CALLBACK CaptureDialogProc(HWND, UINT, WPARAM, LPARAM); +INT_PTR CALLBACK About(HWND, UINT, WPARAM, LPARAM); +INT_PTR CALLBACK ConnectionDialogProc(HWND, UINT, WPARAM, LPARAM); +INT_PTR CALLBACK CaptureDialogProc(HWND, UINT, WPARAM, LPARAM); VOID EnableFileMenuItemByID(UINT Id, BOOL Enable); VOID CheckLocalEchoMenuItem(BOOL Checked); VOID __cdecl Rs232Thread(VOID* Parameter); @@ -212,7 +212,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) switch (wmId) { case IDM_ABOUT: - DialogBox(hInst, (LPCTSTR)IDD_ABOUTBOX, hWnd, (DLGPROC)About); + DialogBox(hInst, (LPCTSTR)IDD_ABOUTBOX, hWnd, About); break; case IDM_EXIT: DestroyWindow(hWnd); @@ -227,7 +227,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } else { - if (DialogBox(hInst, (LPCTSTR)IDD_CONNECTION, hWnd, (DLGPROC)ConnectionDialogProc) == IDOK) + if (DialogBox(hInst, (LPCTSTR)IDD_CONNECTION, hWnd, ConnectionDialogProc) == IDOK) { bConnected = TRUE; EnableFileMenuItemByID(IDM_FILE_DISCONNECT, TRUE); @@ -249,7 +249,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } break; case IDM_FILE_STARTCAPTURE: - if (DialogBox(hInst, (LPCTSTR)IDD_CAPTURE, hWnd, (DLGPROC)CaptureDialogProc) == IDOK) + if (DialogBox(hInst, (LPCTSTR)IDD_CAPTURE, hWnd, CaptureDialogProc) == IDOK) { bCapturing = TRUE; EnableFileMenuItemByID(IDM_FILE_STOPCAPTURE, TRUE); @@ -305,7 +305,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) return 0; } -LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { HWND hLicenseEditWnd; TCHAR strLicense[0x1000]; @@ -335,7 +335,7 @@ LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) return FALSE; } -LRESULT CALLBACK ConnectionDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK ConnectionDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { UNREFERENCED_PARAMETER(lParam); @@ -365,7 +365,7 @@ LRESULT CALLBACK ConnectionDialogProc(HWND hDlg, UINT message, WPARAM wParam, LP return FALSE; } -LRESULT CALLBACK CaptureDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK CaptureDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { OPENFILENAME ofn;

6 years, 10 months

[reactos] 01/02: [CPL] Remove unnecessary DLGPROC casts.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bcbe0dd8cd14109d726e8… commit bcbe0dd8cd14109d726e8b75d4d840bad191351d Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Oct 31 00:37:37 2017 +0100 [CPL] Remove unnecessary DLGPROC casts. --- dll/cpl/access/access.c | 10 +++++----- dll/cpl/access/display.c | 2 +- dll/cpl/access/general.c | 2 +- dll/cpl/access/keyboard.c | 10 +++++----- dll/cpl/access/mouse.c | 2 +- dll/cpl/powercfg/powercfg.c | 8 ++++---- dll/cpl/sysdm/advanced.c | 10 +++++----- dll/cpl/sysdm/hardprof.c | 4 ++-- dll/cpl/sysdm/hardware.c | 2 +- dll/cpl/sysdm/sysdm.c | 6 +++--- dll/cpl/timedate/timedate.c | 6 +++--- dll/cpl/usrmgr/groupprops.c | 2 +- dll/cpl/usrmgr/userprops.c | 6 +++--- dll/cpl/usrmgr/usrmgr.c | 6 +++--- 14 files changed, 38 insertions(+), 38 deletions(-) diff --git a/dll/cpl/access/access.c b/dll/cpl/access/access.c index efd61954df..9bd028c64f 100644 --- a/dll/cpl/access/access.c +++ b/dll/cpl/access/access.c @@ -200,11 +200,11 @@ SystemApplet(VOID) psh.nStartPage = 0; psh.ppsp = psp; - InitPropSheetPage(&psp[0], IDD_PROPPAGEKEYBOARD, (DLGPROC)KeyboardPageProc, pGlobalData); - InitPropSheetPage(&psp[1], IDD_PROPPAGESOUND, (DLGPROC)SoundPageProc, pGlobalData); - InitPropSheetPage(&psp[2], IDD_PROPPAGEDISPLAY, (DLGPROC)DisplayPageProc, pGlobalData); - InitPropSheetPage(&psp[3], IDD_PROPPAGEMOUSE, (DLGPROC)MousePageProc, pGlobalData); - InitPropSheetPage(&psp[4], IDD_PROPPAGEGENERAL, (DLGPROC)GeneralPageProc, pGlobalData); + InitPropSheetPage(&psp[0], IDD_PROPPAGEKEYBOARD, KeyboardPageProc, pGlobalData); + InitPropSheetPage(&psp[1], IDD_PROPPAGESOUND, SoundPageProc, pGlobalData); + InitPropSheetPage(&psp[2], IDD_PROPPAGEDISPLAY, DisplayPageProc, pGlobalData); + InitPropSheetPage(&psp[3], IDD_PROPPAGEMOUSE, MousePageProc, pGlobalData); + InitPropSheetPage(&psp[4], IDD_PROPPAGEGENERAL, GeneralPageProc, pGlobalData); ret = PropertySheet(&psh); diff --git a/dll/cpl/access/display.c b/dll/cpl/access/display.c index 4f8bc16fa0..05e88f1e69 100644 --- a/dll/cpl/access/display.c +++ b/dll/cpl/access/display.c @@ -179,7 +179,7 @@ DisplayPageProc(HWND hwndDlg, if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_CONTRASTOPTIONS), hwndDlg, - (DLGPROC)HighContrastDlgProc, + HighContrastDlgProc, (LPARAM)pGlobalData)) PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; diff --git a/dll/cpl/access/general.c b/dll/cpl/access/general.c index 8b1742a730..414b93016a 100644 --- a/dll/cpl/access/general.c +++ b/dll/cpl/access/general.c @@ -257,7 +257,7 @@ GeneralPageProc(HWND hwndDlg, if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_SERIALKEYSOPTIONS), hwndDlg, - (DLGPROC)SerialKeysDlgProc, + SerialKeysDlgProc, (LPARAM)pGlobalData)) PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; diff --git a/dll/cpl/access/keyboard.c b/dll/cpl/access/keyboard.c index f5953c4ca9..a79624293c 100644 --- a/dll/cpl/access/keyboard.c +++ b/dll/cpl/access/keyboard.c @@ -467,7 +467,7 @@ FilterKeysDlgProc(HWND hwndDlg, DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_BOUNCEKEYSOPTIONS), hwndDlg, - (DLGPROC)BounceKeysDlgProc, + BounceKeysDlgProc, (LPARAM)pGlobalData); break; @@ -492,7 +492,7 @@ FilterKeysDlgProc(HWND hwndDlg, DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_REPEATKEYSOPTIONS), hwndDlg, - (DLGPROC)RepeatKeysDlgProc, + RepeatKeysDlgProc, (LPARAM)pGlobalData); break; @@ -621,7 +621,7 @@ KeyboardPageProc(HWND hwndDlg, if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_STICKYKEYSOPTIONS), hwndDlg, - (DLGPROC)StickyKeysDlgProc, + StickyKeysDlgProc, (LPARAM)pGlobalData)) PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; @@ -635,7 +635,7 @@ KeyboardPageProc(HWND hwndDlg, if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_FILTERKEYSOPTIONS), hwndDlg, - (DLGPROC)FilterKeysDlgProc, + FilterKeysDlgProc, (LPARAM)pGlobalData)) PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; @@ -649,7 +649,7 @@ KeyboardPageProc(HWND hwndDlg, if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_TOGGLEKEYSOPTIONS), hwndDlg, - (DLGPROC)ToggleKeysDlgProc, + ToggleKeysDlgProc, (LPARAM)pGlobalData)) PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; diff --git a/dll/cpl/access/mouse.c b/dll/cpl/access/mouse.c index 81f1e3b324..a81d947d4e 100644 --- a/dll/cpl/access/mouse.c +++ b/dll/cpl/access/mouse.c @@ -177,7 +177,7 @@ MousePageProc(HWND hwndDlg, if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_MOUSEKEYSOPTIONS), hwndDlg, - (DLGPROC)MouseKeysDlgProc, + MouseKeysDlgProc, (LPARAM)pGlobalData)) PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; diff --git a/dll/cpl/powercfg/powercfg.c b/dll/cpl/powercfg/powercfg.c index 9952f84bee..fd820cc6d2 100644 --- a/dll/cpl/powercfg/powercfg.c +++ b/dll/cpl/powercfg/powercfg.c @@ -97,16 +97,16 @@ Applet1(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) psh.nStartPage = 0; psh.phpage = hpsp; - InitPropSheetPage(&psh, IDD_PROPPAGEPOWERSCHEMES, (DLGPROC)PowerSchemesDlgProc); + InitPropSheetPage(&psh, IDD_PROPPAGEPOWERSCHEMES, PowerSchemesDlgProc); if (GetPwrCapabilities(&spc)) { if (spc.SystemBatteriesPresent) { - InitPropSheetPage(&psh, IDD_PROPPAGEALARMS, (DLGPROC)AlarmsDlgProc); + InitPropSheetPage(&psh, IDD_PROPPAGEALARMS, AlarmsDlgProc); } } - InitPropSheetPage(&psh, IDD_PROPPAGEADVANCED, (DLGPROC)AdvancedDlgProc); - InitPropSheetPage(&psh, IDD_PROPPAGEHIBERNATE, (DLGPROC)HibernateDlgProc); + InitPropSheetPage(&psh, IDD_PROPPAGEADVANCED, AdvancedDlgProc); + InitPropSheetPage(&psh, IDD_PROPPAGEHIBERNATE, HibernateDlgProc); /* Load additional pages provided by shell extensions */ hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Power"), MAX_POWER_PAGES - psh.nPages); diff --git a/dll/cpl/sysdm/advanced.c b/dll/cpl/sysdm/advanced.c index 873667249d..ffa1e051ed 100644 --- a/dll/cpl/sysdm/advanced.c +++ b/dll/cpl/sysdm/advanced.c @@ -134,35 +134,35 @@ AdvancedPageProc(HWND hwndDlg, DialogBox(hApplet, MAKEINTRESOURCE(IDD_VIRTMEM), hwndDlg, - (DLGPROC)VirtMemDlgProc); + VirtMemDlgProc); break; case IDC_USERPROFILE: DialogBox(hApplet, MAKEINTRESOURCE(IDD_USERPROFILE), hwndDlg, - (DLGPROC)UserProfileDlgProc); + UserProfileDlgProc); break; case IDC_STAREC: DialogBox(hApplet, MAKEINTRESOURCE(IDD_STARTUPRECOVERY), hwndDlg, - (DLGPROC)StartRecDlgProc); + StartRecDlgProc); break; case IDC_SYSSETTINGS: DialogBox(hApplet, MAKEINTRESOURCE(IDD_SYSSETTINGS), hwndDlg, - (DLGPROC)SysSettingsDlgProc); + SysSettingsDlgProc); break; case IDC_ENVVAR: DialogBox(hApplet, MAKEINTRESOURCE(IDD_ENVIRONMENT_VARIABLES), hwndDlg, - (DLGPROC)EnvironmentDlgProc); + EnvironmentDlgProc); break; case IDC_ERRORREPORT: diff --git a/dll/cpl/sysdm/hardprof.c b/dll/cpl/sysdm/hardprof.c index 2a47ec3d24..7d8c6335f1 100644 --- a/dll/cpl/sysdm/hardprof.c +++ b/dll/cpl/sysdm/hardprof.c @@ -163,7 +163,7 @@ CopyHardwareProfile( if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_COPYPROFILE), hwndDlg, - (DLGPROC)CopyProfileDlgProc, + CopyProfileDlgProc, (LPARAM)&ProfileNames) != IDOK) return; @@ -280,7 +280,7 @@ RenameHardwareProfile( if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_RENAMEPROFILE), hwndDlg, - (DLGPROC)RenameProfileDlgProc, + RenameProfileDlgProc, (LPARAM)&ProfileNames) != IDOK) return; diff --git a/dll/cpl/sysdm/hardware.c b/dll/cpl/sysdm/hardware.c index 5e628e8b91..3211b4e63b 100644 --- a/dll/cpl/sysdm/hardware.c +++ b/dll/cpl/sysdm/hardware.c @@ -95,7 +95,7 @@ HardwarePageProc(HWND hwndDlg, DialogBox(hApplet, MAKEINTRESOURCE(IDD_HARDWAREPROFILES), hwndDlg, - (DLGPROC)HardProfDlgProc); + HardProfDlgProc); return TRUE; } break; diff --git a/dll/cpl/sysdm/sysdm.c b/dll/cpl/sysdm/sysdm.c index 64b489f7e2..36bd5f5114 100644 --- a/dll/cpl/sysdm/sysdm.c +++ b/dll/cpl/sysdm/sysdm.c @@ -147,10 +147,10 @@ SystemApplet(VOID) psh.phpage = hpsp; psh.pfnCallback = NULL; - InitPropSheetPage(&psh, IDD_PROPPAGEGENERAL, (DLGPROC) GeneralPageProc); + InitPropSheetPage(&psh, IDD_PROPPAGEGENERAL, GeneralPageProc); hNetIdDll = AddNetIdPage(&psh); - InitPropSheetPage(&psh, IDD_PROPPAGEHARDWARE, (DLGPROC) HardwarePageProc); - InitPropSheetPage(&psh, IDD_PROPPAGEADVANCED, (DLGPROC) AdvancedPageProc); + InitPropSheetPage(&psh, IDD_PROPPAGEHARDWARE, HardwarePageProc); + InitPropSheetPage(&psh, IDD_PROPPAGEADVANCED, AdvancedPageProc); /* Load additional pages provided by shell extensions */ hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\System"), MAX_SYSTEM_PAGES - psh.nPages); diff --git a/dll/cpl/timedate/timedate.c b/dll/cpl/timedate/timedate.c index f19882c86f..3bf0d7e57d 100644 --- a/dll/cpl/timedate/timedate.c +++ b/dll/cpl/timedate/timedate.c @@ -96,9 +96,9 @@ Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) psh.nStartPage = 0; psh.ppsp = psp; - InitPropSheetPage(&psp[0], IDD_DATETIMEPAGE, (DLGPROC) DateTimePageProc); - InitPropSheetPage(&psp[1], IDD_TIMEZONEPAGE, (DLGPROC) TimeZonePageProc); - InitPropSheetPage(&psp[2], IDD_INETTIMEPAGE, (DLGPROC) InetTimePageProc); + InitPropSheetPage(&psp[0], IDD_DATETIMEPAGE, DateTimePageProc); + InitPropSheetPage(&psp[1], IDD_TIMEZONEPAGE, TimeZonePageProc); + InitPropSheetPage(&psp[2], IDD_INETTIMEPAGE, InetTimePageProc); Ret = (LONG)(PropertySheetW(&psh) != -1); diff --git a/dll/cpl/usrmgr/groupprops.c b/dll/cpl/usrmgr/groupprops.c index dd9c19a1b3..e9be4f678d 100644 --- a/dll/cpl/usrmgr/groupprops.c +++ b/dll/cpl/usrmgr/groupprops.c @@ -638,7 +638,7 @@ GroupProperties(HWND hwndDlg) psh.nStartPage = 0; psh.ppsp = psp; - InitPropSheetPage(&psp[0], IDD_GROUP_GENERAL, (DLGPROC)GroupGeneralPageProc, szGroupName); + InitPropSheetPage(&psp[0], IDD_GROUP_GENERAL, GroupGeneralPageProc, szGroupName); return (PropertySheet(&psh) == IDOK); } diff --git a/dll/cpl/usrmgr/userprops.c b/dll/cpl/usrmgr/userprops.c index e49ea258d1..fd76a91767 100644 --- a/dll/cpl/usrmgr/userprops.c +++ b/dll/cpl/usrmgr/userprops.c @@ -928,9 +928,9 @@ UserProperties(HWND hwndDlg) psh.nStartPage = 0; psh.ppsp = psp; - InitPropSheetPage(&psp[0], IDD_USER_GENERAL, (DLGPROC)UserGeneralPageProc, szUserName); - InitPropSheetPage(&psp[1], IDD_USER_MEMBERSHIP, (DLGPROC)UserMembershipPageProc, szUserName); - InitPropSheetPage(&psp[2], IDD_USER_PROFILE, (DLGPROC)UserProfilePageProc, szUserName); + InitPropSheetPage(&psp[0], IDD_USER_GENERAL, UserGeneralPageProc, szUserName); + InitPropSheetPage(&psp[1], IDD_USER_MEMBERSHIP, UserMembershipPageProc, szUserName); + InitPropSheetPage(&psp[2], IDD_USER_PROFILE, UserProfilePageProc, szUserName); return (PropertySheet(&psh) == IDOK); } diff --git a/dll/cpl/usrmgr/usrmgr.c b/dll/cpl/usrmgr/usrmgr.c index 2668e18a5c..81b57df38c 100644 --- a/dll/cpl/usrmgr/usrmgr.c +++ b/dll/cpl/usrmgr/usrmgr.c @@ -64,9 +64,9 @@ UsrmgrApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) psh.nStartPage = 0; psh.ppsp = psp; - InitPropSheetPage(&psp[0], IDD_USERS, (DLGPROC)UsersPageProc); - InitPropSheetPage(&psp[1], IDD_GROUPS, (DLGPROC)GroupsPageProc); - InitPropSheetPage(&psp[2], IDD_EXTRA, (DLGPROC)ExtraPageProc); + InitPropSheetPage(&psp[0], IDD_USERS, UsersPageProc); + InitPropSheetPage(&psp[1], IDD_GROUPS, GroupsPageProc); + InitPropSheetPage(&psp[2], IDD_EXTRA, ExtraPageProc); return (LONG)(PropertySheet(&psh) != -1); }

6 years, 10 months

[reactos] 01/01: [SHELL32] SHBrowseForFolder: Fix creating a new folder (which was broken two years ago and was properly reported 3 days ago). CORE-13925

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dd4af777034d4abae0e46… commit dd4af777034d4abae0e461fe663d5479dbbe1715 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Fri Nov 3 12:09:30 2017 +0200 [SHELL32] SHBrowseForFolder: Fix creating a new folder (which was broken two years ago and was properly reported 3 days ago). CORE-13925 --- dll/win32/shell32/lang/bg-BG.rc | 2 +- dll/win32/shell32/lang/ca-ES.rc | 2 +- dll/win32/shell32/lang/cs-CZ.rc | 2 +- dll/win32/shell32/lang/da-DK.rc | 2 +- dll/win32/shell32/lang/de-DE.rc | 2 +- dll/win32/shell32/lang/el-GR.rc | 2 +- dll/win32/shell32/lang/en-GB.rc | 2 +- dll/win32/shell32/lang/en-US.rc | 2 +- dll/win32/shell32/lang/es-ES.rc | 2 +- dll/win32/shell32/lang/fi-FI.rc | 2 +- dll/win32/shell32/lang/fr-FR.rc | 2 +- dll/win32/shell32/lang/he-IL.rc | 2 +- dll/win32/shell32/lang/hu-HU.rc | 2 +- dll/win32/shell32/lang/it-IT.rc | 2 +- dll/win32/shell32/lang/ja-JP.rc | 2 +- dll/win32/shell32/lang/ko-KR.rc | 2 +- dll/win32/shell32/lang/nl-NL.rc | 2 +- dll/win32/shell32/lang/no-NO.rc | 2 +- dll/win32/shell32/lang/pl-PL.rc | 2 +- dll/win32/shell32/lang/pt-BR.rc | 2 +- dll/win32/shell32/lang/pt-PT.rc | 2 +- dll/win32/shell32/lang/ro-RO.rc | 2 +- dll/win32/shell32/lang/ru-RU.rc | 2 +- dll/win32/shell32/lang/sk-SK.rc | 2 +- dll/win32/shell32/lang/sl-SI.rc | 2 +- dll/win32/shell32/lang/sq-AL.rc | 2 +- dll/win32/shell32/lang/sv-SE.rc | 2 +- dll/win32/shell32/lang/tr-TR.rc | 2 +- dll/win32/shell32/lang/uk-UA.rc | 2 +- dll/win32/shell32/lang/zh-CN.rc | 2 +- dll/win32/shell32/lang/zh-TW.rc | 2 +- dll/win32/shell32/wine/brsfolder.c | 4 ++-- 32 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index b9c0e50568..642206abbb 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -95,7 +95,7 @@ BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 LTEXT "Папка:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 156, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Създаване на нова папка", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 10, 174, 92, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "Добре", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 0ad4880c24..02bf0bcae6 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -95,7 +95,7 @@ BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 5a178f694c..4e37b93e44 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -101,7 +101,7 @@ BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 LTEXT "Složka:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Vytvořit novou složku", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 50acc12ffc..34566694be 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -101,7 +101,7 @@ BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index a71d580caf..574e48e01a 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -95,7 +95,7 @@ BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 LTEXT "Ordner:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Neuen Ordner erstellen", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index fb643a2205..f49f1c2333 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -95,7 +95,7 @@ BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 LTEXT "Φάκελος:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 156, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Δημιουργία φακέλου", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index add54b8962..9ea6c41dc0 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -95,7 +95,7 @@ BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 37cf3c1f36..4bbc8ac521 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -96,7 +96,7 @@ BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 0dcf2f7ce6..9ef9bc00ff 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -97,7 +97,7 @@ BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 LTEXT "Carpeta:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Crear nueva carpeta", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "Aceptar", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 4f7f8224d0..3e97c26eaa 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -95,7 +95,7 @@ BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 57ecdd8eb3..16126e1686 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -95,7 +95,7 @@ BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 LTEXT "Dossier :", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "Créer un nouveau dossier", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index ba19acb969..73cef872b0 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -95,7 +95,7 @@ BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 LTEXT "תיקיה:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "צור תיקיה חדשה", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "אישור", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 4d6842d433..423519e25e 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -95,7 +95,7 @@ BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 827047ee24..e7feca35ea 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -95,7 +95,7 @@ BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 LTEXT "Cartella:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Crea una nuova cartella", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index fc3c366566..e0b9518f33 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -95,7 +95,7 @@ BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 LTEXT "フォルダ:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "新しいフォルダの作成(&M)", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 188, 85, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index c75233b824..bf9d287530 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -95,7 +95,7 @@ BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 90f1ad2c07..78a25cbb69 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -95,7 +95,7 @@ BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 9e6f4b2ee5..fedc83209f 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -95,7 +95,7 @@ BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 LTEXT "Mappe:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Lag en ny mappe", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index cb42d03837..7327fbae2e 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -99,7 +99,7 @@ BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 LTEXT "Katalog:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Utwórz katalog", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 2c894a3cad..363c7859c9 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -95,7 +95,7 @@ BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 LTEXT "Pasta:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Criar Nova Pasta", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 5ec0a0b08d..e3524050fb 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -95,7 +95,7 @@ BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 LTEXT "Pasta:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Criar Nova Pasta", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 031520c78b..aa794089a9 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -97,7 +97,7 @@ BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 LTEXT "Dosar:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Crează dosar nou", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "Con&firmă", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 678b8f793a..803ba702fd 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -86,7 +86,7 @@ BEGIN PUSHBUTTON "Отмена", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index a3485f397b..70894c80b0 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -84,7 +84,7 @@ BEGIN PUSHBUTTON "Zrušiť", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 65be36e0a9..f0a5b186a0 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -84,7 +84,7 @@ BEGIN PUSHBUTTON "Cancel", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index da1b8b60a8..c12d2611d8 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -88,7 +88,7 @@ BEGIN PUSHBUTTON "Anulo", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 449f75a8ec..e9c4590073 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -84,7 +84,7 @@ BEGIN PUSHBUTTON "Avbryt", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index c8c7bc3cb3..8d23faf0cd 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -86,7 +86,7 @@ BEGIN PUSHBUTTON "İptal", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 91da7e5713..434f55458c 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -84,7 +84,7 @@ BEGIN PUSHBUTTON "Скасувати", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index db6caa83f9..4d579987f6 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -93,7 +93,7 @@ BEGIN PUSHBUTTON "取消", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 217037a327..eecd735d4b 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -92,7 +92,7 @@ BEGIN PUSHBUTTON "Cancel", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 - CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 + CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 diff --git a/dll/win32/shell32/wine/brsfolder.c b/dll/win32/shell32/wine/brsfolder.c index b143f982ad..36608314e2 100644 --- a/dll/win32/shell32/wine/brsfolder.c +++ b/dll/win32/shell32/wine/brsfolder.c @@ -736,7 +736,7 @@ static HRESULT BrsFolder_NewFolder(browse_info *info) IShellFolder *desktop, *cur; #ifdef __REACTOS__ WCHAR wszNewFolder[25]; - WCHAR path[25]; + WCHAR path[MAX_PATH]; #else ISFHelper *sfhelper; #endif @@ -767,7 +767,7 @@ static HRESULT BrsFolder_NewFolder(browse_info *info) if(FAILED(hr)) return hr; - len = strlenW(name); + len = strlenW(path); if(len<MAX_PATH) len++;

6 years, 10 months

[reactos] 01/01: [COMCTL32] comctl32/propsheet: Fix redrawing of the static text elements.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=11049bd6d8de6025bac9a… commit 11049bd6d8de6025bac9a51be2dd30c2779359d6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 2 23:52:33 2017 +0100 [COMCTL32] comctl32/propsheet: Fix redrawing of the static text elements. Partial revert of SVN r74136 (b1b4279): enforce the correct "color" for the background of the static text elements: indeed, using a "transparent" background kept instead the old window color, which was not correctly repainted, unless you enforced a repaint by, e.g. moving away then back the window, or moved something else on top of it. Tested and approved by 'reactosfanboy'. Was detected as a regression in the wizard of DVDWrite Now 1.5.12 Formatter GUI. CORE-13929 CORE-12912 --- dll/win32/comctl32/propsheet.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dll/win32/comctl32/propsheet.c b/dll/win32/comctl32/propsheet.c index 39e9d9a80e..e5f5d50d38 100644 --- a/dll/win32/comctl32/propsheet.c +++ b/dll/win32/comctl32/propsheet.c @@ -1176,13 +1176,8 @@ PROPSHEET_WizardSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, return TRUE; case WM_CTLCOLORSTATIC: -#ifdef __REACTOS__ - SetBkMode((HDC)wParam, TRANSPARENT); - return (INT_PTR)GetStockObject(HOLLOW_BRUSH); -#else SetBkColor((HDC)wParam, GetSysColor(COLOR_WINDOW)); return (INT_PTR)GetSysColorBrush(COLOR_WINDOW); -#endif } return DefSubclassProc(hwnd, uMsg, wParam, lParam);

6 years, 10 months

[reactos] 01/01: [RDBSS] Fix a bug in RxQueryNameInfo(): don't only return name length, but also the whole structure. Avoids corruption

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3c679fc6b4abd351a443d… commit 3c679fc6b4abd351a443d0affacd01554a96a044 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Nov 2 23:03:08 2017 +0100 [RDBSS] Fix a bug in RxQueryNameInfo(): don't only return name length, but also the whole structure. Avoids corruption --- sdk/lib/drivers/rdbsslib/rdbss.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/lib/drivers/rdbsslib/rdbss.c b/sdk/lib/drivers/rdbsslib/rdbss.c index 46c006d0a7..15e4a2d28c 100644 --- a/sdk/lib/drivers/rdbsslib/rdbss.c +++ b/sdk/lib/drivers/rdbsslib/rdbss.c @@ -8155,6 +8155,8 @@ RxQueryNameInfo( return STATUS_BUFFER_OVERFLOW; } + RxContext->Info.LengthRemaining -= FIELD_OFFSET(FILE_NAME_INFORMATION, FileName); + Fcb = (PFCB)RxContext->pFcb; Fobx = (PFOBX)RxContext->pFobx; /* Get the UNC name */

6 years, 10 months

[reactos] 01/01: [MSPAINT] Base dialog implementations on CDialogImpl

by Benedikt Freisen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ef056230ed50c6cb227c… commit 0ef056230ed50c6cb227cd52ea4b55a3db5f60cb Author: Benedikt Freisen <b.freisen(a)gmx.net> AuthorDate: Wed Nov 1 14:59:01 2017 +0100 [MSPAINT] Base dialog implementations on CDialogImpl - Wrap implementation of Mirror/Rotate, Stretch/Skew and Attributes dialog in subclasses of CDialogImpl - Turn global variables from code that was moved into member functions into member variables - Add global instances of all three dialog classes - Use <global instance>.DoModal(...) instead of one-line wrappers - Replace some TCHAR arrays with CStrings --- base/applications/mspaint/dialogs.cpp | 448 +++++++++++++++++----------------- base/applications/mspaint/dialogs.h | 79 +++++- base/applications/mspaint/globalvar.h | 26 +- base/applications/mspaint/main.cpp | 5 - base/applications/mspaint/winproc.cpp | 12 +- 5 files changed, 315 insertions(+), 255 deletions(-) diff --git a/base/applications/mspaint/dialogs.cpp b/base/applications/mspaint/dialogs.cpp index dd1887be8d..144b5ed735 100644 --- a/base/applications/mspaint/dialogs.cpp +++ b/base/applications/mspaint/dialogs.cpp @@ -10,257 +10,251 @@ #include "precomp.h" +#include "dialogs.h" + #include <winnls.h> +/* GLOBALS **********************************************************/ + +CMirrorRotateDialog mirrorRotateDialog; +CAttributesDialog attributesDialog; +CStretchSkewDialog stretchSkewDialog; + /* FUNCTIONS ********************************************************/ -INT_PTR CALLBACK -MRDlgWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +LRESULT CMirrorRotateDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + CheckDlgButton(IDD_MIRRORROTATERB1, BST_CHECKED); + CheckDlgButton(IDD_MIRRORROTATERB4, BST_CHECKED); + return 0; +} + +LRESULT CMirrorRotateDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + EndDialog(0); + return 0; +} + +LRESULT CMirrorRotateDialog::OnOk(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) +{ + if (IsDlgButtonChecked(IDD_MIRRORROTATERB1)) + EndDialog(1); + else if (IsDlgButtonChecked(IDD_MIRRORROTATERB2)) + EndDialog(2); + else if (IsDlgButtonChecked(IDD_MIRRORROTATERB4)) + EndDialog(3); + else if (IsDlgButtonChecked(IDD_MIRRORROTATERB5)) + EndDialog(4); + else if (IsDlgButtonChecked(IDD_MIRRORROTATERB6)) + EndDialog(5); + return 0; +} + +LRESULT CMirrorRotateDialog::OnCancel(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) +{ + EndDialog(0); + return 0; +} + +LRESULT CMirrorRotateDialog::OnRadioButton3(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) +{ + ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB4), TRUE); + ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB5), TRUE); + ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB6), TRUE); + return 0; +} + +LRESULT CMirrorRotateDialog::OnRadioButton12(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { - switch (message) + ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB4), FALSE); + ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB5), FALSE); + ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB6), FALSE); + return 0; +} + + + +LRESULT CAttributesDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + newWidth = imageModel.GetWidth(); + newHeight = imageModel.GetHeight(); + + CheckDlgButton(IDD_ATTRIBUTESRB3, BST_CHECKED); + CheckDlgButton(IDD_ATTRIBUTESRB5, BST_CHECKED); + SetDlgItemInt(IDD_ATTRIBUTESEDIT1, newWidth, FALSE); + SetDlgItemInt(IDD_ATTRIBUTESEDIT2, newHeight, FALSE); + + if (isAFile) { - case WM_INITDIALOG: - CheckDlgButton(hwnd, IDD_MIRRORROTATERB1, BST_CHECKED); - CheckDlgButton(hwnd, IDD_MIRRORROTATERB4, BST_CHECKED); - return TRUE; - case WM_CLOSE: - EndDialog(hwnd, 0); - break; - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDOK: - if (IsDlgButtonChecked(hwnd, IDD_MIRRORROTATERB1)) - EndDialog(hwnd, 1); - else if (IsDlgButtonChecked(hwnd, IDD_MIRRORROTATERB2)) - EndDialog(hwnd, 2); - else if (IsDlgButtonChecked(hwnd, IDD_MIRRORROTATERB4)) - EndDialog(hwnd, 3); - else if (IsDlgButtonChecked(hwnd, IDD_MIRRORROTATERB5)) - EndDialog(hwnd, 4); - else if (IsDlgButtonChecked(hwnd, IDD_MIRRORROTATERB6)) - EndDialog(hwnd, 5); - break; - case IDCANCEL: - EndDialog(hwnd, 0); - break; - case IDD_MIRRORROTATERB3: - EnableWindow(GetDlgItem(hwnd, IDD_MIRRORROTATERB4), TRUE); - EnableWindow(GetDlgItem(hwnd, IDD_MIRRORROTATERB5), TRUE); - EnableWindow(GetDlgItem(hwnd, IDD_MIRRORROTATERB6), TRUE); - break; - case IDD_MIRRORROTATERB1: - case IDD_MIRRORROTATERB2: - EnableWindow(GetDlgItem(hwnd, IDD_MIRRORROTATERB4), FALSE); - EnableWindow(GetDlgItem(hwnd, IDD_MIRRORROTATERB5), FALSE); - EnableWindow(GetDlgItem(hwnd, IDD_MIRRORROTATERB6), FALSE); - break; - } - break; - default: - return FALSE; + TCHAR date[100]; + TCHAR temp[100]; + GetDateFormat(LOCALE_USER_DEFAULT, 0, &fileTime, NULL, date, SIZEOF(date)); + GetTimeFormat(LOCALE_USER_DEFAULT, 0, &fileTime, NULL, temp, SIZEOF(temp)); + _tcscat(date, _T(" ")); + _tcscat(date, temp); + CString strSize; + strSize.Format(IDS_FILESIZE, fileSize); + SetDlgItemText(IDD_ATTRIBUTESTEXT6, date); + SetDlgItemText(IDD_ATTRIBUTESTEXT7, strSize); } - return TRUE; + CString strRes; + strRes.Format(IDS_PRINTRES, fileHPPM, fileVPPM); + SetDlgItemText(IDD_ATTRIBUTESTEXT8, strRes); + return 0; +} + +LRESULT CAttributesDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + EndDialog(0); + return 0; +} + +LRESULT CAttributesDialog::OnOk(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) +{ + EndDialog(1); + return 0; +} + +LRESULT CAttributesDialog::OnCancel(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) +{ + EndDialog(0); + return 0; } -int -mirrorRotateDlg() +LRESULT CAttributesDialog::OnDefault(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { - return DialogBox(hProgInstance, MAKEINTRESOURCE(IDD_MIRRORROTATE), mainWindow.m_hWnd, MRDlgWinProc); + newWidth = imageModel.GetWidth(); + newHeight = imageModel.GetHeight(); + CheckDlgButton(IDD_ATTRIBUTESRB3, BST_CHECKED); + CheckDlgButton(IDD_ATTRIBUTESRB5, BST_CHECKED); + SetDlgItemInt(IDD_ATTRIBUTESEDIT1, newWidth, FALSE); + SetDlgItemInt(IDD_ATTRIBUTESEDIT2, newHeight, FALSE); + return 0; } -INT_PTR CALLBACK -ATTDlgWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +LRESULT CAttributesDialog::OnRadioButton1(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { - switch (message) + CString strNum; + strNum.Format(_T("%.3lf"), newWidth / (0.0254 * fileHPPM)); + SetDlgItemText(IDD_ATTRIBUTESEDIT1, strNum); + strNum.Format(_T("%.3lf"), newHeight / (0.0254 * fileVPPM)); + SetDlgItemText(IDD_ATTRIBUTESEDIT2, strNum); + return 0; +} + +LRESULT CAttributesDialog::OnRadioButton2(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) +{ + CString strNum; + strNum.Format(_T("%.3lf"), newWidth * 100.0 / fileHPPM); + SetDlgItemText(IDD_ATTRIBUTESEDIT1, strNum); + strNum.Format(_T("%.3lf"), newHeight * 100.0 / fileVPPM); + SetDlgItemText(IDD_ATTRIBUTESEDIT2, strNum); + return 0; +} + +LRESULT CAttributesDialog::OnRadioButton3(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) +{ + SetDlgItemInt(IDD_ATTRIBUTESEDIT1, newWidth, FALSE); + SetDlgItemInt(IDD_ATTRIBUTESEDIT2, newHeight, FALSE); + return 0; +} + +LRESULT CAttributesDialog::OnEdit1(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) +{ + if (Edit_GetModify(hWndCtl)) + { + TCHAR tempS[100]; + if (IsDlgButtonChecked(IDD_ATTRIBUTESRB1)) + { + GetDlgItemText(IDD_ATTRIBUTESEDIT1, tempS, SIZEOF(tempS)); + newWidth = max(1, (int) (_tcstod(tempS, NULL) * fileHPPM * 0.0254)); + } + else if (IsDlgButtonChecked(IDD_ATTRIBUTESRB2)) + { + GetDlgItemText(IDD_ATTRIBUTESEDIT1, tempS, SIZEOF(tempS)); + newWidth = max(1, (int) (_tcstod(tempS, NULL) * fileHPPM / 100)); + } + else if (IsDlgButtonChecked(IDD_ATTRIBUTESRB3)) + { + GetDlgItemText(IDD_ATTRIBUTESEDIT1, tempS, SIZEOF(tempS)); + newWidth = max(1, _tstoi(tempS)); + } + Edit_SetModify(hWndCtl, FALSE); + } + return 0; +} + +LRESULT CAttributesDialog::OnEdit2(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) +{ + if (Edit_GetModify(hWndCtl)) { - case WM_INITDIALOG: + TCHAR tempS[100]; + if (IsDlgButtonChecked(IDD_ATTRIBUTESRB1)) + { + GetDlgItemText(IDD_ATTRIBUTESEDIT2, tempS, SIZEOF(tempS)); + newHeight = max(1, (int) (_tcstod(tempS, NULL) * fileVPPM * 0.0254)); + } + else if (IsDlgButtonChecked(IDD_ATTRIBUTESRB2)) { - widthSetInDlg = imageModel.GetWidth(); - heightSetInDlg = imageModel.GetHeight(); - - CheckDlgButton(hwnd, IDD_ATTRIBUTESRB3, BST_CHECKED); - CheckDlgButton(hwnd, IDD_ATTRIBUTESRB5, BST_CHECKED); - SetDlgItemInt(hwnd, IDD_ATTRIBUTESEDIT1, widthSetInDlg, FALSE); - SetDlgItemInt(hwnd, IDD_ATTRIBUTESEDIT2, heightSetInDlg, FALSE); - - if (isAFile) - { - TCHAR date[100]; - TCHAR temp[100]; - GetDateFormat(LOCALE_USER_DEFAULT, 0, &fileTime, NULL, date, SIZEOF(date)); - GetTimeFormat(LOCALE_USER_DEFAULT, 0, &fileTime, NULL, temp, SIZEOF(temp)); - _tcscat(date, _T(" ")); - _tcscat(date, temp); - CString strSize; - strSize.Format(IDS_FILESIZE, fileSize); - SetDlgItemText(hwnd, IDD_ATTRIBUTESTEXT6, date); - SetDlgItemText(hwnd, IDD_ATTRIBUTESTEXT7, strSize); - } - CString strRes; - strRes.Format(IDS_PRINTRES, fileHPPM, fileVPPM); - SetDlgItemText(hwnd, IDD_ATTRIBUTESTEXT8, strRes); - return TRUE; + GetDlgItemText(IDD_ATTRIBUTESEDIT2, tempS, SIZEOF(tempS)); + newHeight = max(1, (int) (_tcstod(tempS, NULL) * fileVPPM / 100)); } - case WM_CLOSE: - EndDialog(hwnd, 0); - break; - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDOK: - EndDialog(hwnd, 1); - break; - case IDCANCEL: - EndDialog(hwnd, 0); - break; - case IDD_ATTRIBUTESSTANDARD: - widthSetInDlg = imageModel.GetWidth(); - heightSetInDlg = imageModel.GetHeight(); - CheckDlgButton(hwnd, IDD_ATTRIBUTESRB3, BST_CHECKED); - CheckDlgButton(hwnd, IDD_ATTRIBUTESRB5, BST_CHECKED); - SetDlgItemInt(hwnd, IDD_ATTRIBUTESEDIT1, widthSetInDlg, FALSE); - SetDlgItemInt(hwnd, IDD_ATTRIBUTESEDIT2, heightSetInDlg, FALSE); - break; - case IDD_ATTRIBUTESRB1: - { - CString strNum; - strNum.Format(_T("%.3lf"), widthSetInDlg / (0.0254 * fileHPPM)); - SetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT1, strNum); - strNum.Format(_T("%.3lf"), heightSetInDlg / (0.0254 * fileVPPM)); - SetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT2, strNum); - break; - } - case IDD_ATTRIBUTESRB2: - { - CString strNum; - strNum.Format(_T("%.3lf"), widthSetInDlg * 100.0 / fileHPPM); - SetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT1, strNum); - strNum.Format(_T("%.3lf"), heightSetInDlg * 100.0 / fileVPPM); - SetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT2, strNum); - break; - } - case IDD_ATTRIBUTESRB3: - SetDlgItemInt(hwnd, IDD_ATTRIBUTESEDIT1, widthSetInDlg, FALSE); - SetDlgItemInt(hwnd, IDD_ATTRIBUTESEDIT2, heightSetInDlg, FALSE); - break; - case IDD_ATTRIBUTESEDIT1: - if (Edit_GetModify((HWND)lParam)) - { - TCHAR tempS[100]; - if (IsDlgButtonChecked(hwnd, IDD_ATTRIBUTESRB1)) - { - GetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT1, tempS, SIZEOF(tempS)); - widthSetInDlg = max(1, (int) (_tcstod(tempS, NULL) * fileHPPM * 0.0254)); - } - else if (IsDlgButtonChecked(hwnd, IDD_ATTRIBUTESRB2)) - { - GetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT1, tempS, SIZEOF(tempS)); - widthSetInDlg = max(1, (int) (_tcstod(tempS, NULL) * fileHPPM / 100)); - } - else if (IsDlgButtonChecked(hwnd, IDD_ATTRIBUTESRB3)) - { - GetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT1, tempS, SIZEOF(tempS)); - widthSetInDlg = max(1, _tstoi(tempS)); - } - Edit_SetModify((HWND)lParam, FALSE); - } - break; - case IDD_ATTRIBUTESEDIT2: - if (Edit_GetModify((HWND)lParam)) - { - TCHAR tempS[100]; - if (IsDlgButtonChecked(hwnd, IDD_ATTRIBUTESRB1)) - { - GetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT2, tempS, SIZEOF(tempS)); - heightSetInDlg = max(1, (int) (_tcstod(tempS, NULL) * fileVPPM * 0.0254)); - } - else if (IsDlgButtonChecked(hwnd, IDD_ATTRIBUTESRB2)) - { - GetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT2, tempS, SIZEOF(tempS)); - heightSetInDlg = max(1, (int) (_tcstod(tempS, NULL) * fileVPPM / 100)); - } - else if (IsDlgButtonChecked(hwnd, IDD_ATTRIBUTESRB3)) - { - GetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT2, tempS, SIZEOF(tempS)); - heightSetInDlg = max(1, _tstoi(tempS)); - } - Edit_SetModify((HWND)lParam, FALSE); - } - break; - } - break; - default: - return FALSE; + else if (IsDlgButtonChecked(IDD_ATTRIBUTESRB3)) + { + GetDlgItemText(IDD_ATTRIBUTESEDIT2, tempS, SIZEOF(tempS)); + newHeight = max(1, _tstoi(tempS)); + } + Edit_SetModify(hWndCtl, FALSE); } - return TRUE; + return 0; } -int -attributesDlg() + + +LRESULT CStretchSkewDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - return DialogBox(hProgInstance, MAKEINTRESOURCE(IDD_ATTRIBUTES), mainWindow.m_hWnd, ATTDlgWinProc); + SetDlgItemInt(IDD_STRETCHSKEWEDITHSTRETCH, 100, FALSE); + SetDlgItemInt(IDD_STRETCHSKEWEDITVSTRETCH, 100, FALSE); + SetDlgItemInt(IDD_STRETCHSKEWEDITHSKEW, 0, FALSE); + SetDlgItemInt(IDD_STRETCHSKEWEDITVSKEW, 0, FALSE); + return 0; } -INT_PTR CALLBACK -CHSIZEDlgWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +LRESULT CStretchSkewDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - switch (message) - { - case WM_INITDIALOG: - SetDlgItemInt(hwnd, IDD_STRETCHSKEWEDITHSTRETCH, 100, FALSE); - SetDlgItemInt(hwnd, IDD_STRETCHSKEWEDITVSTRETCH, 100, FALSE); - SetDlgItemInt(hwnd, IDD_STRETCHSKEWEDITHSKEW, 0, FALSE); - SetDlgItemInt(hwnd, IDD_STRETCHSKEWEDITVSKEW, 0, FALSE); - return TRUE; - case WM_CLOSE: - EndDialog(hwnd, 0); - break; - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDOK: - { - TCHAR strrcIntNumbers[100]; - TCHAR strrcPercentage[100]; - TCHAR strrcAngle[100]; - BOOL tr1, tr2, tr3, tr4; - - LoadString(hProgInstance, IDS_INTNUMBERS, strrcIntNumbers, SIZEOF(strrcIntNumbers)); - LoadString(hProgInstance, IDS_PERCENTAGE, strrcPercentage, SIZEOF(strrcPercentage)); - LoadString(hProgInstance, IDS_ANGLE, strrcAngle, SIZEOF(strrcAngle)); - - stretchSkew.percentage.x = GetDlgItemInt(hwnd, IDD_STRETCHSKEWEDITHSTRETCH, &tr1, FALSE); - stretchSkew.percentage.y = GetDlgItemInt(hwnd, IDD_STRETCHSKEWEDITVSTRETCH, &tr2, FALSE); - stretchSkew.angle.x = GetDlgItemInt(hwnd, IDD_STRETCHSKEWEDITHSKEW, &tr3, TRUE); - stretchSkew.angle.y = GetDlgItemInt(hwnd, IDD_STRETCHSKEWEDITVSKEW, &tr4, TRUE); - - if (!(tr1 && tr2 && tr3 && tr4)) - MessageBox(hwnd, strrcIntNumbers, NULL, MB_ICONEXCLAMATION); - else if (stretchSkew.percentage.x < 1 || stretchSkew.percentage.x > 500 - || stretchSkew.percentage.y < 1 || stretchSkew.percentage.y > 500) - MessageBox(hwnd, strrcPercentage, NULL, MB_ICONEXCLAMATION); - else if (stretchSkew.angle.x < -89 || stretchSkew.angle.x > 89 - || stretchSkew.angle.y < -89 || stretchSkew.angle.y > 89) - MessageBox(hwnd, strrcAngle, NULL, MB_ICONEXCLAMATION); - else - EndDialog(hwnd, 1); - - break; - } - case IDCANCEL: - EndDialog(hwnd, 0); - break; - } - break; - default: - return FALSE; - } - return TRUE; + EndDialog(0); + return 0; +} + +LRESULT CStretchSkewDialog::OnOk(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) +{ + CString strrcIntNumbers; + CString strrcPercentage; + CString strrcAngle; + BOOL tr1, tr2, tr3, tr4; + + strrcIntNumbers.LoadString(hProgInstance, IDS_INTNUMBERS); + strrcPercentage.LoadString(hProgInstance, IDS_PERCENTAGE); + strrcAngle.LoadString(hProgInstance, IDS_ANGLE); + + percentage.x = GetDlgItemInt(IDD_STRETCHSKEWEDITHSTRETCH, &tr1, FALSE); + percentage.y = GetDlgItemInt(IDD_STRETCHSKEWEDITVSTRETCH, &tr2, FALSE); + angle.x = GetDlgItemInt(IDD_STRETCHSKEWEDITHSKEW, &tr3, TRUE); + angle.y = GetDlgItemInt(IDD_STRETCHSKEWEDITVSKEW, &tr4, TRUE); + + if (!(tr1 && tr2 && tr3 && tr4)) + MessageBox(strrcIntNumbers, NULL, MB_ICONEXCLAMATION); + else if (percentage.x < 1 || percentage.x > 500 || percentage.y < 1 || percentage.y > 500) + MessageBox(strrcPercentage, NULL, MB_ICONEXCLAMATION); + else if (angle.x < -89 || angle.x > 89 || angle.y < -89 || angle.y > 89) + MessageBox(strrcAngle, NULL, MB_ICONEXCLAMATION); + else + EndDialog(1); + return 0; } -int -changeSizeDlg() +LRESULT CStretchSkewDialog::OnCancel(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { - return DialogBox(hProgInstance, MAKEINTRESOURCE(IDD_STRETCHSKEW), mainWindow.m_hWnd, CHSIZEDlgWinProc); + EndDialog(0); + return 0; } diff --git a/base/applications/mspaint/dialogs.h b/base/applications/mspaint/dialogs.h index 55a313d72d..7c85652601 100644 --- a/base/applications/mspaint/dialogs.h +++ b/base/applications/mspaint/dialogs.h @@ -6,8 +6,81 @@ * PROGRAMMERS: Benedikt Freisen */ -int mirrorRotateDlg(void); +class CMirrorRotateDialog : public CDialogImpl<CMirrorRotateDialog> +{ +public: + enum { IDD = IDD_MIRRORROTATE }; -int attributesDlg(void); + BEGIN_MSG_MAP(CMirrorRotateDialog) + MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog) + MESSAGE_HANDLER(WM_CLOSE, OnClose) + COMMAND_ID_HANDLER(IDOK, OnOk) + COMMAND_ID_HANDLER(IDCANCEL, OnCancel) + COMMAND_ID_HANDLER(IDD_MIRRORROTATERB3, OnRadioButton3) + COMMAND_ID_HANDLER(IDD_MIRRORROTATERB1, OnRadioButton12) + COMMAND_ID_HANDLER(IDD_MIRRORROTATERB2, OnRadioButton12) + END_MSG_MAP() -int changeSizeDlg(void); + LRESULT OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnOk(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + LRESULT OnCancel(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + LRESULT OnRadioButton3(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + LRESULT OnRadioButton12(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); +}; + +class CAttributesDialog : public CDialogImpl<CAttributesDialog> +{ +public: + enum { IDD = IDD_ATTRIBUTES }; + + BEGIN_MSG_MAP(CAttributesDialog) + MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog) + MESSAGE_HANDLER(WM_CLOSE, OnClose) + COMMAND_ID_HANDLER(IDOK, OnOk) + COMMAND_ID_HANDLER(IDCANCEL, OnCancel) + COMMAND_ID_HANDLER(IDD_ATTRIBUTESSTANDARD, OnDefault) + COMMAND_ID_HANDLER(IDD_ATTRIBUTESRB1, OnRadioButton1) + COMMAND_ID_HANDLER(IDD_ATTRIBUTESRB1, OnRadioButton2) + COMMAND_ID_HANDLER(IDD_ATTRIBUTESRB1, OnRadioButton3) + COMMAND_ID_HANDLER(IDD_ATTRIBUTESEDIT1, OnEdit1) + COMMAND_ID_HANDLER(IDD_ATTRIBUTESEDIT1, OnEdit2) + END_MSG_MAP() + + LRESULT OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnOk(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + LRESULT OnCancel(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + LRESULT OnDefault(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + LRESULT OnRadioButton1(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + LRESULT OnRadioButton2(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + LRESULT OnRadioButton3(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + LRESULT OnEdit1(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + LRESULT OnEdit2(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + +public: + int newWidth; + int newHeight; +}; + +class CStretchSkewDialog : public CDialogImpl<CStretchSkewDialog> +{ +public: + enum { IDD = IDD_STRETCHSKEW }; + + BEGIN_MSG_MAP(CStretchSkewDialog) + MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog) + MESSAGE_HANDLER(WM_CLOSE, OnClose) + COMMAND_ID_HANDLER(IDOK, OnOk) + COMMAND_ID_HANDLER(IDCANCEL, OnCancel) + END_MSG_MAP() + + LRESULT OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnOk(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + LRESULT OnCancel(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + +public: + POINT percentage; + POINT angle; +}; diff --git a/base/applications/mspaint/globalvar.h b/base/applications/mspaint/globalvar.h index 8bc6029558..d584eb6375 100644 --- a/base/applications/mspaint/globalvar.h +++ b/base/applications/mspaint/globalvar.h @@ -6,19 +6,7 @@ * PROGRAMMERS: Benedikt Freisen */ -/* TYPES ************************************************************/ - -typedef struct tagSTRETCHSKEW { - POINT percentage; - POINT angle; -} STRETCHSKEW; - -/* VARIABLES declared in main.c *************************************/ - -extern int widthSetInDlg; -extern int heightSetInDlg; - -extern STRETCHSKEW stretchSkew; +/* VARIABLES declared in main.cpp ***********************************/ class RegistrySettings; extern RegistrySettings registrySettings; @@ -103,7 +91,17 @@ extern CSizeboxWindow sizeboxCenterBottom; extern CSizeboxWindow sizeboxRightBottom; extern CTextEditWindow textEditWindow; -/* VARIABLES declared in mouse.c ************************************/ +/* VARIABLES declared in dialogs.cpp ********************************/ + +class CMirrorRotateDialog; +class CAttributesDialog; +class CStretchSkewDialog; + +extern CMirrorRotateDialog mirrorRotateDialog; +extern CAttributesDialog attributesDialog; +extern CStretchSkewDialog stretchSkewDialog; + +/* VARIABLES declared in mouse.cpp **********************************/ extern POINT pointStack[256]; extern short pointSP; diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 5d1248262b..510688ea98 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -12,11 +12,6 @@ /* FUNCTIONS ********************************************************/ -int widthSetInDlg; -int heightSetInDlg; - -STRETCHSKEW stretchSkew; - POINT start; POINT last; diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index ace8c960fa..f0b64c69a3 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -605,7 +605,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH imageArea.Invalidate(FALSE); break; case IDM_IMAGEROTATEMIRROR: - switch (mirrorRotateDlg()) + switch (mirrorRotateDialog.DoModal(mainWindow.m_hWnd)) { case 1: /* flip horizontally */ if (selectionWindow.IsWindowVisible()) @@ -633,18 +633,18 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; case IDM_IMAGEATTRIBUTES: { - if (attributesDlg()) + if (attributesDialog.DoModal(mainWindow.m_hWnd)) { - imageModel.Crop(widthSetInDlg, heightSetInDlg, 0, 0); + imageModel.Crop(attributesDialog.newWidth, attributesDialog.newHeight, 0, 0); } break; } case IDM_IMAGESTRETCHSKEW: { - if (changeSizeDlg()) + if (stretchSkewDialog.DoModal(mainWindow.m_hWnd)) { - imageModel.StretchSkew(stretchSkew.percentage.x, stretchSkew.percentage.y, - stretchSkew.angle.x, stretchSkew.angle.y); + imageModel.StretchSkew(stretchSkewDialog.percentage.x, stretchSkewDialog.percentage.y, + stretchSkewDialog.angle.x, stretchSkewDialog.angle.y); } break; }

6 years, 10 months

[reactos] 01/01: [SHELL32] Fix multiple selection of desktop icons

by Manuel Bachmann

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9192d39f6e177683ad40d… commit 9192d39f6e177683ad40d85bdcb70c443e40a13a Author: Manuel Bachmann <tarnyko(a)tarnyko.net> AuthorDate: Thu Nov 2 19:55:03 2017 +0100 [SHELL32] Fix multiple selection of desktop icons This fixes the following issue : when selecting multiple icons on the desktop, and then right-clicking; the Properties sheet would immediately be displayed, conflicting with the context menu. --- dll/win32/shell32/folders/CDesktopFolder.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dll/win32/shell32/folders/CDesktopFolder.cpp b/dll/win32/shell32/folders/CDesktopFolder.cpp index 98e5c4fb6c..6d9b66eb72 100644 --- a/dll/win32/shell32/folders/CDesktopFolder.cpp +++ b/dll/win32/shell32/folders/CDesktopFolder.cpp @@ -858,6 +858,9 @@ HRESULT WINAPI CDesktopFolder::CallBack(IShellFolder *psf, HWND hwndOwner, IData return S_OK; } + if (uMsg != DFM_INVOKECOMMAND || wParam != DFM_CMD_PROPERTIES) + return S_OK; + PIDLIST_ABSOLUTE pidlFolder; PUITEMID_CHILD *apidl; UINT cidl;

6 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2017