Ros-diffs July 2017

ros-diffs@reactos.org

19 participants
213 discussions

[dquintana] 75394: [EXPLORER] [RSHELL] [NTOBJSHEX] [BROWSEUI] [SHELL32] Get rid of the unused "placement new" operators.

by dquintana＠svn.reactos.org

Author: dquintana Date: Mon Jul 24 10:40:55 2017 New Revision: 75394 URL: http://svn.reactos.org/svn/reactos?rev=75394&view=rev Log: [EXPLORER] [RSHELL] [NTOBJSHEX] [BROWSEUI] [SHELL32] Get rid of the unused "placement new" operators. Modified: trunk/reactos/base/shell/explorer/explorer.cpp trunk/reactos/base/shell/rshell/misc.cpp trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp trunk/reactos/dll/shellext/stobject/stobject.cpp trunk/reactos/dll/win32/browseui/browseui.cpp trunk/reactos/dll/win32/shell32/shell32.cpp Modified: trunk/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] Mon Jul 24 10:40:55 2017 @@ -35,11 +35,6 @@ CExplorerModule gModule; CAtlWinModule gWinModule; - -void *operator new (size_t, void *buf) -{ - return buf; -} static VOID InitializeAtlModule(HINSTANCE hInstance, BOOL bInitialize) { Modified: trunk/reactos/base/shell/rshell/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/misc.cpp… ============================================================================== --- trunk/reactos/base/shell/rshell/misc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/misc.cpp [iso-8859-1] Mon Jul 24 10:40:55 2017 @@ -69,11 +69,6 @@ return 0; } -void *operator new (size_t, void *buf) -{ - return buf; -} - class CRShellModule : public CComModule { public: Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp [iso-8859-1] Mon Jul 24 10:40:55 2017 @@ -17,11 +17,6 @@ HINSTANCE g_hInstance; CComModule g_Module; - -void *operator new (size_t, void *buf) -{ - return buf; -} STDAPI_(BOOL) DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) Modified: trunk/reactos/dll/shellext/stobject/stobject.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/stob… ============================================================================== --- trunk/reactos/dll/shellext/stobject/stobject.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/stobject.cpp [iso-8859-1] Mon Jul 24 10:40:55 2017 @@ -20,11 +20,6 @@ HINSTANCE g_hInstance; CComModule g_Module; - -void *operator new (size_t, void *buf) -{ - return buf; -} STDAPI_(BOOL) DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) Modified: trunk/reactos/dll/win32/browseui/browseui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui.cpp [iso-8859-1] Mon Jul 24 10:40:55 2017 @@ -147,11 +147,6 @@ CBrowseUIModule gModule; CAtlWinModule gWinModule; -void *operator new (size_t, void *buf) -{ - return buf; -} - /************************************************************************* * BROWSEUI DllMain */ Modified: trunk/reactos/dll/win32/shell32/shell32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] Mon Jul 24 10:40:55 2017 @@ -313,11 +313,6 @@ */ HINSTANCE shell32_hInstance; -void *operator new (size_t, void *buf) -{ - return buf; -} - /************************************************************************* * SHELL32 DllMain *

7 years, 5 months

[dquintana] 75393: [USBPORT] Oops, brainfart (Fixes 32bit build).

by dquintana＠svn.reactos.org

Author: dquintana Date: Mon Jul 24 10:37:53 2017 New Revision: 75393 URL: http://svn.reactos.org/svn/reactos?rev=75393&view=rev Log: [USBPORT] Oops, brainfart (Fixes 32bit build). Modified: trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h Modified: trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/driver… ============================================================================== --- trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h [iso-8859-1] Mon Jul 24 10:37:53 2017 @@ -578,7 +578,7 @@ USBPORT_REGISTRATION_PACKET Packet; } USBPORT_MINIPORT_INTERFACE, *PUSBPORT_MINIPORT_INTERFACE; -C_ASSERT(sizeof(USBPORT_MINIPORT_INTERFACE) == 332 + 3 * sizeof(PVOID)); +C_ASSERT(sizeof(USBPORT_MINIPORT_INTERFACE) == 328 + 2 * sizeof(PVOID)); #define USBPORT_TRANSFER_DIRECTION_OUT 1 // From host to device typedef struct _USBPORT_ENDPOINT_PROPERTIES {

7 years, 5 months

[dquintana] 75392: [MSPAINT] Correct callback return type (Fixes X64 build). [USETUP] Correct definition of the struct (fixes X64 build). [USBPORT] Improve struct size checks so they are X64-compat...

by dquintana＠svn.reactos.org

Author: dquintana Date: Mon Jul 24 10:34:06 2017 New Revision: 75392 URL: http://svn.reactos.org/svn/reactos?rev=75392&view=rev Log: [MSPAINT] Correct callback return type (Fixes X64 build). [USETUP] Correct definition of the struct (fixes X64 build). [USBPORT] Improve struct size checks so they are X64-compatible (fixes X64 build). The build as a whole still fails due to bootlib, but implementing those is beyond my expertise. Modified: trunk/reactos/base/applications/mspaint/main.cpp trunk/reactos/base/setup/usetup/inffile.h trunk/reactos/drivers/usb/usbport/usbport.h trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h Modified: trunk/reactos/base/applications/mspaint/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/main.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/main.cpp [iso-8859-1] Mon Jul 24 10:34:06 2017 @@ -111,7 +111,7 @@ } // Hook procedure for OPENFILENAME to change the file name extension -static UINT APIENTRY +static UINT_PTR APIENTRY OFNHookProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { HWND hParent; Modified: trunk/reactos/base/setup/usetup/inffile.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inffile.… ============================================================================== --- trunk/reactos/base/setup/usetup/inffile.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/inffile.h [iso-8859-1] Mon Jul 24 10:34:06 2017 @@ -45,10 +45,10 @@ * Delete it once we don't use inflib anymore */ typedef struct _INFCONTEXT { - PVOID Inf; - PVOID CurrentInf; - PVOID Section; - PVOID Line; + HINF Inf; + HINF CurrentInf; + UINT Section; + UINT Line; } INFCONTEXT; C_ASSERT(sizeof(INFCONTEXT) == 2 * sizeof(PVOID) + 2 * sizeof(UINT)); Modified: trunk/reactos/drivers/usb/usbport/usbport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/usbpor… ============================================================================== --- trunk/reactos/drivers/usb/usbport/usbport.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/usbport.h [iso-8859-1] Mon Jul 24 10:34:06 2017 @@ -355,7 +355,12 @@ KSPIN_LOCK SetPowerD0SpinLock; KDPC WorkerRequestDpc; KDPC HcWakeDpc; - ULONG Padded[34]; // Miniport extension should be aligned on 0x100 + + /* Miniport extension should be aligned on 0x100 */ +#if !defined(_M_X64) + ULONG Padded[34]; +#endif + } USBPORT_DEVICE_EXTENSION, *PUSBPORT_DEVICE_EXTENSION; C_ASSERT(sizeof(USBPORT_DEVICE_EXTENSION) == 0x400); @@ -392,7 +397,7 @@ ULONG CallbackContext; } USBPORT_ASYNC_CALLBACK_DATA, *PUSBPORT_ASYNC_CALLBACK_DATA; -C_ASSERT(sizeof(USBPORT_ASYNC_CALLBACK_DATA) == 88); +C_ASSERT(sizeof(USBPORT_ASYNC_CALLBACK_DATA) == 84 + sizeof(PVOID)); typedef struct _TIMER_WORK_QUEUE_ITEM { WORK_QUEUE_ITEM WqItem; Modified: trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/driver… ============================================================================== --- trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h [iso-8859-1] Mon Jul 24 10:34:06 2017 @@ -62,7 +62,7 @@ UCHAR Reserved3; } USBPORT_RESOURCES, *PUSBPORT_RESOURCES; -C_ASSERT(sizeof(USBPORT_RESOURCES) == 52); +C_ASSERT(sizeof(USBPORT_RESOURCES) == 40 + 3 * sizeof(PVOID)); typedef ULONG MPSTATUS; // Miniport status typedef ULONG RHSTATUS; // Roothub status @@ -578,7 +578,7 @@ USBPORT_REGISTRATION_PACKET Packet; } USBPORT_MINIPORT_INTERFACE, *PUSBPORT_MINIPORT_INTERFACE; -C_ASSERT(sizeof(USBPORT_MINIPORT_INTERFACE) == 336); +C_ASSERT(sizeof(USBPORT_MINIPORT_INTERFACE) == 332 + 3 * sizeof(PVOID)); #define USBPORT_TRANSFER_DIRECTION_OUT 1 // From host to device typedef struct _USBPORT_ENDPOINT_PROPERTIES { @@ -617,7 +617,7 @@ ULONG Reserved2; } USBPORT_SCATTER_GATHER_ELEMENT, *PUSBPORT_SCATTER_GATHER_ELEMENT; -C_ASSERT(sizeof(USBPORT_SCATTER_GATHER_ELEMENT) == 24); +C_ASSERT(sizeof(USBPORT_SCATTER_GATHER_ELEMENT) == 20 + sizeof(PVOID)); typedef struct _USBPORT_SCATTER_GATHER_LIST { ULONG Flags; @@ -627,7 +627,7 @@ USBPORT_SCATTER_GATHER_ELEMENT SgElement[1]; } USBPORT_SCATTER_GATHER_LIST, *PUSBPORT_SCATTER_GATHER_LIST; -C_ASSERT(sizeof(USBPORT_SCATTER_GATHER_LIST) == 40); +C_ASSERT(sizeof(USBPORT_SCATTER_GATHER_LIST) == 36 + sizeof(PVOID)); typedef struct _USBPORT_TRANSFER_PARAMETERS { ULONG TransferFlags;

7 years, 5 months

[mjansen] 75391: [SHORTCUTS.INF] Move the shortcut creation for screenshot.exe to the new rosapps_shortcuts.inf. Patch by Joachim Henze (reactosfanboy) CORE-13426 #resolve #comment Thanks!

by mjansen＠svn.reactos.org

Author: mjansen Date: Sat Jul 22 20:23:33 2017 New Revision: 75391 URL: http://svn.reactos.org/svn/reactos?rev=75391&view=rev Log: [SHORTCUTS.INF] Move the shortcut creation for screenshot.exe to the new rosapps_shortcuts.inf. Patch by Joachim Henze (reactosfanboy) CORE-13426 #resolve #comment Thanks! Modified: trunk/reactos/media/inf/shortcuts.inf trunk/rosapps/rosapps_shortcuts.inf Modified: trunk/reactos/media/inf/shortcuts.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/shortcuts.inf?re… ============================================================================== --- trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] Sat Jul 22 20:23:33 2017 @@ -35,7 +35,6 @@ %SystemRoot%\system32\calc.exe, %CALC_TITLE%, %CALC_DESC%, 0, %HOMEDRIVE%%HOMEPATH% %SystemRoot%\system32\cmd.exe, %CMD_TITLE%, %CMD_DESC%, 0, %HOMEDRIVE%%HOMEPATH% %SystemRoot%\system32\notepad.exe, %NOTEPAD_TITLE%, %NOTEPAD_DESC%, 0, %HOMEDRIVE%%HOMEPATH% -%SystemRoot%\system32\screenshot.exe, %SCREENSHOT_TITLE%, %SCREENSHOT_DESC%, 0, %HOMEDRIVE%%HOMEPATH% %SystemRoot%\system32\wordpad.exe, %WORDPAD_TITLE%, %WORDPAD_DESC%, 0, %HOMEDRIVE%%HOMEPATH% %SystemRoot%\system32\mspaint.exe, %MSPAINT_TITLE%, %MSPAINT_DESC%, 0, %HOMEDRIVE%%HOMEPATH% @@ -96,8 +95,6 @@ NOTEPAD_DESC=Launch Text Editor MSTSC_TITLE=Remote Desktop Connection MSTSC_DESC=Launch Remote Desktop Connection -SCREENSHOT_TITLE=SnapShot -SCREENSHOT_DESC=Take screenshot WORDPAD_TITLE=WordPad WORDPAD_DESC=Launch Document Editor MSPAINT_TITLE=Paint @@ -161,8 +158,6 @@ NOTEPAD_DESC=ÐÑÑÐºÐ°Ð½Ðµ Ð½Ð° ÑÐµÐºÑÑÐ¾Ð¾Ð±ÑÐ°ÑÐ²Ð°ÑÐ°ÑÐ° MSTSC_TITLE=ÐÐ°Ð»ÐµÑÐ½Ð° ÑÐ°Ð±Ð¾ÑÐ½Ð° Ð¿Ð»Ð¾Ñ MSTSC_DESC=Launch Remote Desktop Connection -SCREENSHOT_TITLE=Ð¡Ð½Ð¸Ð¼ÐºÐ° -SCREENSHOT_DESC=ÐÐ°ÑÐ½ÐµÐ¼Ð°Ð½Ðµ Ð½Ð° ÐµÐºÑÐ°Ð½Ð° WORDPAD_TITLE=Ð¢ÐµÑÑÐ°Ð´ÐºÐ° WORDPAD_DESC=ÐÑÑÐºÐ°Ð½Ðµ Ð½Ð° Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ½Ð°ÑÐ° Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐ²Ð°ÑÐ° MSPAINT_TITLE=Ð Ð¸ÑÑÐ½ÑÐº @@ -224,8 +219,6 @@ NOTEPAD_DESC=Spustit PoznÃ¡mkovÃ½ blok MSTSC_TITLE=VzdÃ¡lenÃ¡ plocha MSTSC_DESC=Spustit VzdÃ¡lenou plochu -SCREENSHOT_TITLE=Sejmout obrazovku -SCREENSHOT_DESC=Sejmout obrazovku WORDPAD_TITLE=WordPad WORDPAD_DESC=Spustit WordPad MSPAINT_TITLE=MalovÃ¡nÃ @@ -290,8 +283,6 @@ NOTEPAD_DESC=Starte Texteditor MSTSC_TITLE=Remote Desktop MSTSC_DESC=Remote Desktop Verbindung starten -SCREENSHOT_TITLE=SnapShot -SCREENSHOT_DESC=Screenshot erstellen WORDPAD_TITLE=WordPad WORDPAD_DESC=Starte Dokumenteneditor MSPAINT_TITLE=Paint @@ -353,8 +344,6 @@ NOTEPAD_DESC=Î£Î·Î¼ÎµÎ¹ÏÎ¼Î±ÏÎ¬ÏÎ¹Î¿ MSTSC_TITLE=Î£ÏÎ½Î´ÎµÏÎ· Î±ÏÎ¿Î¼Î±ÎºÏÏÏÎ¼ÎÎ½Î·Ï ÎµÏÎ¹ÏÎ¬Î½ÎµÎ¹Î±Ï ÎµÏÎ³Î±ÏÎ¯Î±Ï MSTSC_DESC=Launch Remote Desktop Connection -SCREENSHOT_TITLE=SnapShot -SCREENSHOT_DESC=Take screenshot WORDPAD_TITLE=WordPad WORDPAD_DESC=Launch Document Editor MSPAINT_TITLE=Paint @@ -419,8 +408,6 @@ NOTEPAD_DESC=Ejecuta un editor de texto simple. MSTSC_TITLE=Escritorio remoto MSTSC_DESC=Ejecuta una conexiÃ³n de escritorio remoto. -SCREENSHOT_TITLE=Captura de pantalla -SCREENSHOT_DESC=Guarda secciones de la pantalla como un archivo de imagen. WORDPAD_TITLE=WordPad WORDPAD_DESC=Ejecuta un editor de documentos de texto enriquecido. MSPAINT_TITLE=Paint @@ -482,8 +469,6 @@ NOTEPAD_DESC=Ava Tekstiredaktor MSTSC_TITLE=Remote Desktop MSTSC_DESC=Launch Remote Desktop Connection -SCREENSHOT_TITLE=SnapShot -SCREENSHOT_DESC=Tee ekraanitÃµmmis WORDPAD_TITLE=WordPad WORDPAD_DESC=Ava Dokumendiredaktor MSPAINT_TITLE=Paint @@ -548,8 +533,6 @@ NOTEPAD_DESC=Lancer l'Ãditeur de Texte MSTSC_TITLE=Bureau Distant MSTSC_DESC=Launch Remote Desktop Connection -SCREENSHOT_TITLE=Capture d'Ã©cran -SCREENSHOT_DESC=Faire une capture d'Ã©cran WORDPAD_TITLE=WordPad WORDPAD_DESC=Lancer l'Ãditeur de Documents MSPAINT_TITLE=Paint @@ -613,8 +596,6 @@ NOTEPAD_DESC=×¢××¨× ××§×¡× MSTSC_TITLE=×©×××× ×¢×××× ××¨×××§ MSTSC_DESC=Launch Remote Desktop Connection -SCREENSHOT_TITLE=SnapShot -SCREENSHOT_DESC=×¦×××× ××¡× WORDPAD_TITLE=××ª×× WORDPAD_DESC=×¢××¨× ×××¡×××× MSPAINT_TITLE=×¦×××¨ @@ -676,8 +657,6 @@ NOTEPAD_DESC=Launch Text Editor MSTSC_TITLE=Remote Desktop MSTSC_DESC=Launch Remote Desktop Connection -SCREENSHOT_TITLE=SnapShot -SCREENSHOT_DESC=Take screenshot WORDPAD_TITLE=WordPad WORDPAD_DESC=Launch Document Editor MSPAINT_TITLE=Paint @@ -739,8 +718,6 @@ NOTEPAD_DESC=Jalankan Editor Teks MSTSC_TITLE=Remote Desktop MSTSC_DESC=Launch Remote Desktop Connection -SCREENSHOT_TITLE=SnapShot -SCREENSHOT_DESC=Ambil foto layar WORDPAD_TITLE=WordPad WORDPAD_DESC=Jalankan Editor Dokumen MSPAINT_TITLE=Paint @@ -805,8 +782,6 @@ NOTEPAD_DESC=Lancia l'editor dei testi MSTSC_TITLE=Connessione desktop remoto MSTSC_DESC=Avva la connessione a desktop remoto -SCREENSHOT_TITLE=SnapShot -SCREENSHOT_DESC=Salva una schermata WORDPAD_TITLE=WordPad WORDPAD_DESC=Lancia l'editor dei documenti MSPAINT_TITLE=Paint @@ -868,8 +843,6 @@ NOTEPAD_DESC=ããã¹ãã¨ãã£ã¿ãèµ·åãã¾ã MSTSC_TITLE=ãªã¢ã¼ã ãã¹ã¯ãããæ¥ç¶ MSTSC_DESC=Launch Remote Desktop Connection -SCREENSHOT_TITLE=ã¹ãããã·ã§ãã -SCREENSHOT_DESC=ã¹ã¯ãªã¼ã³ã·ã§ãããæ®ãã¾ã WORDPAD_TITLE=ã¯ã¼ãããã WORDPAD_DESC=ããã¥ã¡ã³ãã¨ãã£ã¿ãèµ·åãã¾ã MSPAINT_TITLE=ãã¤ã³ã @@ -934,8 +907,6 @@ NOTEPAD_DESC=Launch Text Editor MSTSC_TITLE=Remote Desktop MSTSC_DESC=Launch Remote Desktop Connection -SCREENSHOT_TITLE=SnapShot -SCREENSHOT_DESC=Take screenshot WORDPAD_TITLE=WordPad WORDPAD_DESC=Launch Document Editor MSPAINT_TITLE=Paint @@ -997,8 +968,6 @@ NOTEPAD_DESC=Start Tekstredigering MSTSC_TITLE=Remote Desktop MSTSC_DESC=Launch Remote Desktop Connection -SCREENSHOT_TITLE=SnapShot -SCREENSHOT_DESC=Ta skjermbilde WORDPAD_TITLE=WordPad WORDPAD_DESC=Start Dokument redigering MSPAINT_TITLE=Paint @@ -1060,8 +1029,6 @@ NOTEPAD_DESC=Uruchom Edytor tekstu MSTSC_TITLE=DostÄp zdalny MSTSC_DESC=Uruchom DostÄp zdalny -SCREENSHOT_TITLE=Zrzut ekranu -SCREENSHOT_DESC=ZrÃ³b zrzut ekranu WORDPAD_TITLE=WordPad WORDPAD_DESC=Uruchom WordPada MSPAINT_TITLE=MSPaint @@ -1126,8 +1093,6 @@ NOTEPAD_DESC=Iniciar Editor de Texto MSTSC_TITLE=Remote Desktop MSTSC_DESC=Launch Remote Desktop Connection -SCREENSHOT_TITLE=SnapShot -SCREENSHOT_DESC=Capturar Tela WORDPAD_TITLE=WordPad WORDPAD_DESC=Iniciar Editor de Documentos MSPAINT_TITLE=Paint @@ -1192,8 +1157,6 @@ NOTEPAD_DESC=Editorul de text simplu. MSTSC_TITLE=Birou la distanÈÄ MSTSC_DESC=Program pentru conectarea Èi autentificarea la un alt birou. -SCREENSHOT_TITLE=CapturÄ de ecran -SCREENSHOT_DESC=Program pentru executarea de capturi de ecran. WORDPAD_TITLE=WordPad WORDPAD_DESC=Editor de documente. MSPAINT_TITLE=Pictare @@ -1260,8 +1223,6 @@ NOTEPAD_DESC=ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¸ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ ÑÐµÐºÑÑÐ¾Ð²ÑÑ ÑÐ°Ð¹Ð»Ð¾Ð² Ð¿ÑÐ¾ÑÑÐ¾Ð³Ð¾ ÑÐ¾ÑÐ¼Ð°ÑÐ°. MSTSC_TITLE=ÐÐ¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ Ðº ÑÐ´Ð°Ð»ÐµÐ½Ð½Ð¾Ð¼Ñ ÑÐ°Ð±Ð¾ÑÐµÐ¼Ñ ÑÑÐ¾Ð»Ñ MSTSC_DESC=ÐÑÐ¾Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ Ðº Ð´ÑÑÐ³Ð¾Ð¼Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÑ, ÑÑÐ¾Ð±Ñ Ð·Ð°Ð¿ÑÑÐºÐ°ÑÑ Ð½Ð° Ð½ÐµÐ¼ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð¸ Ð¿Ð¾Ð»ÑÑÐ°ÑÑ Ð´Ð¾ÑÑÑÐ¿ Ðº ÑÐ°Ð¹Ð»Ð°Ð¼. -SCREENSHOT_TITLE=Ð¡ÐºÑÐ¸Ð½ÑÐ¾Ñ -SCREENSHOT_DESC=Ð¡Ð´ÐµÐ»Ð°ÑÑ ÑÐ½Ð¸Ð¼Ð¾Ðº ÑÐºÑÐ°Ð½Ð° WORDPAD_TITLE=WordPad WORDPAD_DESC=ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¸ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ ÑÐµÐºÑÑÐ¾Ð²ÑÑ ÑÐ°Ð¹Ð»Ð¾Ð² ÑÐ¾ ÑÐ»Ð¾Ð¶Ð½ÑÐ¼ ÑÐ¾ÑÐ¼Ð°ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸ÐµÐ¼. MSPAINT_TITLE=Paint @@ -1325,8 +1286,6 @@ NOTEPAD_DESC=SpustiÅ¥ TextovÃ½ editor MSTSC_TITLE=VzdialenÃ¡ pracovnÃ¡ plocha MSTSC_DESC=Launch Remote Desktop Connection -SCREENSHOT_TITLE=Momentka //SnapShot -SCREENSHOT_DESC=UloÅ¾iÅ¥ obrazovku WORDPAD_TITLE=WordPad WORDPAD_DESC=SpustiÅ¥ Editor dokumentov MSPAINT_TITLE=SkicÃ¡r @@ -1391,8 +1350,6 @@ NOTEPAD_DESC=Metin DÃ¼zenleyicisi'ni baÅlat MSTSC_TITLE=Uzak MasaÃ¼stÃ¼ BaÄlantÄ±sÄ± MSTSC_DESC=Uzak MasaÃ¼stÃ¼ BaÄlantÄ±sÄ±'nÄ± baÅlat -SCREENSHOT_TITLE=Ekran GÃ¶rÃ¼ntÃ¼sÃ¼ -SCREENSHOT_DESC=Ekran gÃ¶rÃ¼ntÃ¼sÃ¼ al WORDPAD_TITLE=WordPad WORDPAD_DESC=Belge DÃ¼zenleyicisi'ni baÅlat MSPAINT_TITLE=Paint @@ -1457,8 +1414,6 @@ NOTEPAD_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÐ¸ Ð¢ÐµÐºÑÑÐ¾Ð²Ð¸Ð¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ MSTSC_TITLE=ÐÑÐ´Ð´Ð°Ð»ÐµÐ½Ðµ ÐºÐµÑÑÐ²Ð°Ð½Ð½Ñ ÑÐ¾Ð±Ð¾ÑÐ¸Ð¼ ÑÑÐ¾Ð»Ð¾Ð¼ MSTSC_DESC=Launch Remote Desktop Connection -SCREENSHOT_TITLE=ÐÐ½ÑÐ¼Ð¾Ðº ÐµÐºÑÐ°Ð½Ñ -SCREENSHOT_DESC=ÐÑÐ¾Ð±Ð¸ÑÐ¸ Ð·Ð½ÑÐ¼Ð¾Ðº ÐµÐºÑÐ°Ð½Ð° WORDPAD_TITLE=WordPad WORDPAD_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÐ¸ Ð ÐµÐ´Ð°ÐºÑÐ¾Ñ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑÐ² MSPAINT_TITLE=Paint @@ -1520,8 +1475,6 @@ NOTEPAD_DESC=è®°äºæ¬ MSTSC_TITLE=è¿ç¨æ¡é¢è¿æ¥ MSTSC_DESC=å¯å¨è¿ç¨æ¡é¢è¿æ¥ -SCREENSHOT_TITLE=å±å¹æªå¾ -SCREENSHOT_DESC=å±å¹æªå¾ WORDPAD_TITLE=ååæ¿ WORDPAD_DESC=ååæ¿ MSPAINT_TITLE=å°ç»å®¶ Modified: trunk/rosapps/rosapps_shortcuts.inf URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/rosapps_shortcuts.inf?rev=… ============================================================================== --- trunk/rosapps/rosapps_shortcuts.inf [iso-8859-1] (original) +++ trunk/rosapps/rosapps_shortcuts.inf [iso-8859-1] Sat Jul 22 20:23:33 2017 @@ -15,6 +15,7 @@ [SystemToolsShortcuts] %SystemRoot%\system32\fontsub.exe, %FONTSUB_TITLE%, %FONTSUB_DESC%, 0 +%SystemRoot%\system32\screenshot.exe, %SCREENSHOT_TITLE%, %SCREENSHOT_DESC%, 0, %HOMEDRIVE%%HOMEPATH% ;-------------------------------- STRINGS ------------------------------- @@ -28,6 +29,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor +SCREENSHOT_TITLE=SnapShot +SCREENSHOT_DESC=Take screenshot ; Bulgarian [Strings.0402] @@ -40,6 +43,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor +SCREENSHOT_TITLE=Ð¡Ð½Ð¸Ð¼ÐºÐ° +SCREENSHOT_DESC=ÐÐ°ÑÐ½ÐµÐ¼Ð°Ð½Ðµ Ð½Ð° ÐµÐºÑÐ°Ð½Ð° ; Czech [Strings.0405] @@ -52,6 +57,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor +SCREENSHOT_TITLE=Sejmout obrazovku +SCREENSHOT_DESC=Sejmout obrazovku ; German [Strings.0407] @@ -64,6 +71,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor +SCREENSHOT_TITLE=SnapShot +SCREENSHOT_DESC=Screenshot erstellen ; Greek [Strings.0408] @@ -76,6 +85,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor +SCREENSHOT_TITLE=SnapShot +SCREENSHOT_DESC=Take screenshot ; Spanish [Strings.0a] @@ -88,6 +99,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor +SCREENSHOT_TITLE=Captura de pantalla +SCREENSHOT_DESC=Guarda secciones de la pantalla como un archivo de imagen. ; Estonian [Strings.0425] @@ -100,6 +113,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor +SCREENSHOT_TITLE=SnapShot +SCREENSHOT_DESC=Tee ekraanitÃµmmis ; French [Strings.040C] @@ -112,6 +127,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor +SCREENSHOT_TITLE=Capture d'Ã©cran +SCREENSHOT_DESC=Faire une capture d'Ã©cran ; Hebrew [Strings.040D] @@ -124,6 +141,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor +SCREENSHOT_TITLE=SnapShot +SCREENSHOT_DESC=×¦×××× ××¡× ; Hungarian [Strings.040E] @@ -136,6 +155,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor +SCREENSHOT_TITLE=SnapShot +SCREENSHOT_DESC=Take screenshot ; Indonesian [Strings.0421] @@ -148,6 +169,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor +SCREENSHOT_TITLE=SnapShot +SCREENSHOT_DESC=Ambil foto layar ; Italian [Strings.0410] @@ -160,6 +183,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor +SCREENSHOT_TITLE=SnapShot +SCREENSHOT_DESC=Salva una schermata ; Japanese [Strings.0411] @@ -172,6 +197,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=ãã©ã³ãä»£æ¿ã¨ãã£ã¿ +SCREENSHOT_TITLE=ã¹ãããã·ã§ãã +SCREENSHOT_DESC=ã¹ã¯ãªã¼ã³ã·ã§ãããæ®ãã¾ã ; Dutch [Strings.0413] @@ -184,6 +211,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor +SCREENSHOT_TITLE=SnapShot +SCREENSHOT_DESC=Take screenshot ; Norwegian [Strings.0414] @@ -196,6 +225,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor +SCREENSHOT_TITLE=SnapShot +SCREENSHOT_DESC=Ta skjermbilde ; Polish [Strings.0415] @@ -208,6 +239,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor +SCREENSHOT_TITLE=Zrzut ekranu +SCREENSHOT_DESC=ZrÃ³b zrzut ekranu ; Portuguese - Brazil [Strings.0416] @@ -220,6 +253,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor +SCREENSHOT_TITLE=SnapShot +SCREENSHOT_DESC=Capturar Tela ; Romanian [Strings.0418] @@ -232,6 +267,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor +SCREENSHOT_TITLE=CapturÄ de ecran +SCREENSHOT_DESC=Program pentru executarea de capturi de ecran. ; Russian [Strings.0419] @@ -244,6 +281,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor +SCREENSHOT_TITLE=Ð¡ÐºÑÐ¸Ð½ÑÐ¾Ñ +SCREENSHOT_DESC=Ð¡Ð´ÐµÐ»Ð°ÑÑ ÑÐ½Ð¸Ð¼Ð¾Ðº ÑÐºÑÐ°Ð½Ð° ; Slovak [Strings.041B] @@ -256,6 +295,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor +SCREENSHOT_TITLE=Momentka //SnapShot +SCREENSHOT_DESC=UloÅ¾iÅ¥ obrazovku ; Turkish [Strings.041f] @@ -268,6 +309,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor +SCREENSHOT_TITLE=Ekran GÃ¶rÃ¼ntÃ¼sÃ¼ +SCREENSHOT_DESC=Ekran gÃ¶rÃ¼ntÃ¼sÃ¼ al ; Ukrainian [Strings.0422] @@ -280,6 +323,8 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor +SCREENSHOT_TITLE=ÐÐ½ÑÐ¼Ð¾Ðº ÐµÐºÑÐ°Ð½Ñ +SCREENSHOT_DESC=ÐÑÐ¾Ð±Ð¸ÑÐ¸ Ð·Ð½ÑÐ¼Ð¾Ðº ÐµÐºÑÐ°Ð½Ð° ; Chinese [Strings.0804] @@ -292,3 +337,5 @@ FONTSUB_TITLE=FontSub FONTSUB_DESC=Font Substitutes Editor +SCREENSHOT_TITLE=å±å¹æªå¾ +SCREENSHOT_DESC=å±å¹æªå¾

7 years, 5 months

[mjansen] 75390: [WIN32SS][SHELL32] Fix the location and repaint of the version info shown on the desktop. Patch by Katayama Hirofumi MZ. CORE-13567 #resolve #comment Thanks!

by mjansen＠svn.reactos.org

Author: mjansen Date: Sat Jul 22 18:27:32 2017 New Revision: 75390 URL: http://svn.reactos.org/svn/reactos?rev=75390&view=rev Log: [WIN32SS][SHELL32] Fix the location and repaint of the version info shown on the desktop. Patch by Katayama Hirofumi MZ. CORE-13567 #resolve #comment Thanks! Modified: trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp trunk/reactos/win32ss/user/ntuser/desktop.c Modified: trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelldes… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] Sat Jul 22 18:27:32 2017 @@ -383,6 +383,8 @@ ::ShowWindow(m_hWnd, SW_RESTORE); } + ::InvalidateRect(m_hWndShellView, NULL, TRUE); + return 0; } Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Sat Jul 22 18:27:32 2017 @@ -1346,8 +1346,13 @@ if (!UserSystemParametersInfo(SPI_GETWORKAREA, 0, &Rect, 0)) { + Rect.left = Rect.top = 0; Rect.right = UserGetSystemMetrics(SM_CXSCREEN); Rect.bottom = UserGetSystemMetrics(SM_CYSCREEN); + } + else + { + RECTL_vOffsetRect(&Rect, -Rect.left, -Rect.top); } /*

7 years, 5 months

[gadamopoulos] 75389: [EXPLORER] -Restore a call to RegLoadSettings while handling WM_DISPLAYCHANGE which was removed in r74221. This is not really correct since it resets the size and position of ...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Jul 22 17:13:06 2017 New Revision: 75389 URL: http://svn.reactos.org/svn/reactos?rev=75389&view=rev Log: [EXPLORER] -Restore a call to RegLoadSettings while handling WM_DISPLAYCHANGE which was removed in r74221. This is not really correct since it resets the size and position of the taskbar but I add it back since it updates the cached rects for all four positions. Modified: trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Sat Jul 22 17:13:06 2017 @@ -2265,6 +2265,9 @@ LRESULT OnDisplayChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + /* Load the saved tray window settings */ + RegLoadSettings(); + /* Move the tray window to the right position and resize it if necessary */ CheckTrayWndPosition();

7 years, 5 months

[mjansen] 75388: [SYSSETUP][SHORTCUTS.INF] Add FontSub program shortcut to Start Menu. Patch by Katayama Hirofumi MZ. CORE-13428 #resolve #comment Thanks!

by mjansen＠svn.reactos.org

Author: mjansen Date: Sat Jul 22 16:55:08 2017 New Revision: 75388 URL: http://svn.reactos.org/svn/reactos?rev=75388&view=rev Log: [SYSSETUP][SHORTCUTS.INF] Add FontSub program shortcut to Start Menu. Patch by Katayama Hirofumi MZ. CORE-13428 #resolve #comment Thanks! Added: trunk/rosapps/rosapps_shortcuts.inf Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/rosapps/CMakeLists.txt Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Sat Jul 22 16:55:08 2017 @@ -1273,6 +1273,20 @@ SetupCloseInfFile(hShortcutsInf); + hShortcutsInf = SetupOpenInfFileW(L"rosapps_shortcuts.inf", + NULL, + INF_STYLE_WIN4, + NULL); + if (hShortcutsInf != INVALID_HANDLE_VALUE) + { + if (!CreateShortcuts(hShortcutsInf, L"ShortcutFolders")) + { + FatalError("CreateShortcuts(rosapps) failed"); + return 0; + } + SetupCloseInfFile(hShortcutsInf); + } + SetupCloseInfFile(hSysSetupInf); SetSetupType(0); Modified: trunk/rosapps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/CMakeLists.txt?rev=75388&r… ============================================================================== --- trunk/rosapps/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/CMakeLists.txt [iso-8859-1] Sat Jul 22 16:55:08 2017 @@ -3,3 +3,16 @@ add_subdirectory(drivers) add_subdirectory(lib) add_subdirectory(templates) + +list(APPEND ROSAPPS_INF_FILES rosapps_shortcuts.inf) + +foreach(item ${ROSAPPS_INF_FILES}) + set(_rosapps_converted_item ${CMAKE_CURRENT_BINARY_DIR}/${item}) + set(_rosapps_source_item ${CMAKE_CURRENT_SOURCE_DIR}/${item}) + add_custom_command(OUTPUT "${_rosapps_converted_item}" + COMMAND native-utf16le "${_rosapps_source_item}" "${_rosapps_converted_item}" + DEPENDS native-utf16le "${_rosapps_source_item}") + add_cd_file(TARGET converted_inf_files2 FILE ${_rosapps_converted_item} DESTINATION reactos/inf FOR all) + list(APPEND rosapps_converted_item ${_rosapps_converted_item}) +endforeach(item) +add_custom_target(converted_inf_files2 DEPENDS ${rosapps_converted_item}) Added: trunk/rosapps/rosapps_shortcuts.inf URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/rosapps_shortcuts.inf?rev=… ============================================================================== --- trunk/rosapps/rosapps_shortcuts.inf (added) +++ trunk/rosapps/rosapps_shortcuts.inf [iso-8859-1] Sat Jul 22 16:55:08 2017 @@ -0,0 +1,294 @@ +[Version] +Signature = $Windows NT$ +ClassGUID = {00000000-0000-0000-0000-000000000000} + +[ShortcutFolders] +DesktopShortcuts=0, +ProgramShortcuts=2, +AdminToolsShortcuts=47, +AccessoriesShortcuts=2, %ACCESSORIES% +SystemToolsShortcuts=2, %ACCESSORIES%\%SYSTOOLS% +AccessibilityShortcuts=2, %ACCESSORIES%\%ACCESSIBILITY% +EntertainmentShortcuts=2, %ACCESSORIES%\%ENTERTAINMENT% +CommunicationsShortcuts=2, %ACCESSORIES%\%COMMUNICATIONS% +GamesShortcuts=2, %GAMES% + +[SystemToolsShortcuts] +%SystemRoot%\system32\fontsub.exe, %FONTSUB_TITLE%, %FONTSUB_DESC%, 0 + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +ACCESSORIES=Accessories +SYSTOOLS=System Tools +ACCESSIBILITY=Accessibility +ENTERTAINMENT=Entertainment +COMMUNICATIONS=Communications +GAMES=Games + +FONTSUB_TITLE=FontSub +FONTSUB_DESC=Font Substitutes Editor + +; Bulgarian +[Strings.0402] +ACCESSORIES=ÐÑÐ¸Ð½Ð°Ð´Ð»ÐµÐ¶Ð½Ð¾ÑÑÐ¸ +SYSTOOLS=Ð¡Ð¸ÑÑÐµÐ¼Ð½Ð¸ ÑÑÐµÐ´ÑÑÐ²Ð° +ACCESSIBILITY=ÐÐ¾ÑÑÑÐ¿Ð½Ð¾ÑÑ +ENTERTAINMENT=ÐÐ°Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ +COMMUNICATIONS=Communications +GAMES=ÐÐ³ÑÐ¸ + +FONTSUB_TITLE=FontSub +FONTSUB_DESC=Font Substitutes Editor + +; Czech +[Strings.0405] +ACCESSORIES=PÅÃsluÅ¡enstvÃ +SYSTOOLS=SystÃ©movÃ© nÃ¡stroje +ACCESSIBILITY=UsnadnÄnÃ +ENTERTAINMENT=ZÃ¡bava +COMMUNICATIONS=Communications +GAMES=Hry + +FONTSUB_TITLE=FontSub +FONTSUB_DESC=Font Substitutes Editor + +; German +[Strings.0407] +ACCESSORIES=ZubehÃ¶r +SYSTOOLS=Systemprogramme +ACCESSIBILITY=Eingabehilfen +ENTERTAINMENT=Unterhaltung +COMMUNICATIONS=Kommunikation +GAMES=Spiele + +FONTSUB_TITLE=FontSub +FONTSUB_DESC=Font Substitutes Editor + +; Greek +[Strings.0408] +ACCESSORIES=ÎÎ¿Î·Î¸Î®Î¼Î±ÏÎ± +SYSTOOLS=ÎÏÎ³Î±Î»ÎµÎ¯Î± Î£ÏÏÏÎ®Î¼Î±ÏÎ¿Ï +ACCESSIBILITY=ÎÎ¹Î± Î¬ÏÎ¿Î¼Î± Î¼Îµ ÎµÎ¹Î´Î¹ÎºÎÏ Î±Î½Î¬Î³ÎºÎµÏ +ENTERTAINMENT=ÎÎ¹Î±ÏÎºÎÎ´Î±ÏÎ· +COMMUNICATIONS=Communications +GAMES=Î Î±Î¹ÏÎ½Î¯Î´Î¹Î± + +FONTSUB_TITLE=FontSub +FONTSUB_DESC=Font Substitutes Editor + +; Spanish +[Strings.0a] +ACCESSORIES=Accesorios +SYSTOOLS=Herramientas del sistema +ACCESSIBILITY=Accesibilidad +ENTERTAINMENT=Entretenimiento +COMMUNICATIONS=Comunicaciones +GAMES=Juegos + +FONTSUB_TITLE=FontSub +FONTSUB_DESC=Font Substitutes Editor + +; Estonian +[Strings.0425] +ACCESSORIES=Tarvikud +SYSTOOLS=SÃ¼steemi tÃ¶Ã¶riistad +ACCESSIBILITY=LigipÃ¤Ã¤setavus +ENTERTAINMENT=Meelelahutus +COMMUNICATIONS=Communications +GAMES=MÃ¤ngud + +FONTSUB_TITLE=FontSub +FONTSUB_DESC=Font Substitutes Editor + +; French +[Strings.040C] +ACCESSORIES=Accessoires +SYSTOOLS=Outils systÃ¨me +ACCESSIBILITY=AccessibilitÃ© +ENTERTAINMENT=Divertissement +COMMUNICATIONS=Communications +GAMES=Jeux + +FONTSUB_TITLE=FontSub +FONTSUB_DESC=Font Substitutes Editor + +; Hebrew +[Strings.040D] +ACCESSORIES=×¢××¨×× +SYSTOOLS=××× ××¢×¨××ª +ACCESSIBILITY=× ×××©××ª +ENTERTAINMENT=×××××¨ +COMMUNICATIONS=Communications +GAMES=××©××§×× + +FONTSUB_TITLE=FontSub +FONTSUB_DESC=Font Substitutes Editor + +; Hungarian +[Strings.040E] +ACCESSORIES=Accessories +SYSTOOLS=System Tools +ACCESSIBILITY=Accessibility +ENTERTAINMENT=Entertainment +COMMUNICATIONS=Communications +GAMES=JÃ¡tÃ©kok + +FONTSUB_TITLE=FontSub +FONTSUB_DESC=Font Substitutes Editor + +; Indonesian +[Strings.0421] +ACCESSORIES=Aksesoris +SYSTOOLS=System Tools +ACCESSIBILITY=Accessibility +ENTERTAINMENT=Entertainment +COMMUNICATIONS=Communications +GAMES=Games + +FONTSUB_TITLE=FontSub +FONTSUB_DESC=Font Substitutes Editor + +; Italian +[Strings.0410] +ACCESSORIES=Accessori +SYSTOOLS=Strumenti di sistema +ACCESSIBILITY=AccessibilitÃ +ENTERTAINMENT=Divertimento +COMMUNICATIONS=Comunicazioni +GAMES=Giochi + +FONTSUB_TITLE=FontSub +FONTSUB_DESC=Font Substitutes Editor + +; Japanese +[Strings.0411] +ACCESSORIES=ã¢ã¯ã»ãµãª +SYSTOOLS=ã·ã¹ãã ãã¼ã« +ACCESSIBILITY=ã¢ã¯ã»ã·ããªãã£ +ENTERTAINMENT=ã¨ã³ã¿ã¼ãã¤ã¡ã³ã +COMMUNICATIONS=Communications +GAMES=ã²ã¼ã + +FONTSUB_TITLE=FontSub +FONTSUB_DESC=ãã©ã³ãä»£æ¿ã¨ãã£ã¿ + +; Dutch +[Strings.0413] +ACCESSORIES=Accessories +SYSTOOLS=System Tools +ACCESSIBILITY=Accessibility +ENTERTAINMENT=Entertainment +COMMUNICATIONS=Communications +GAMES=Games + +FONTSUB_TITLE=FontSub +FONTSUB_DESC=Font Substitutes Editor + +; Norwegian +[Strings.0414] +ACCESSORIES=TilbehÃ¸r +SYSTOOLS=SystemverktÃ¸y +ACCESSIBILITY=Tilgjengelighet +ENTERTAINMENT=Underholdning +COMMUNICATIONS=Communications +GAMES=Spill + +FONTSUB_TITLE=FontSub +FONTSUB_DESC=Font Substitutes Editor + +; Polish +[Strings.0415] +ACCESSORIES=Akcesoria +SYSTOOLS=NarzÄdzia systemowe +ACCESSIBILITY=UÅatwienia dostÄpu +ENTERTAINMENT=Rozrywka +COMMUNICATIONS=Komunikacja +GAMES=Gry + +FONTSUB_TITLE=FontSub +FONTSUB_DESC=Font Substitutes Editor + +; Portuguese - Brazil +[Strings.0416] +ACCESSORIES=AcessÃ³rios +SYSTOOLS=Ferramentas de Sistema +ACCESSIBILITY=Acessibilidade +ENTERTAINMENT=Entretenimento +COMMUNICATIONS=Communications +GAMES=Jogos + +FONTSUB_TITLE=FontSub +FONTSUB_DESC=Font Substitutes Editor + +; Romanian +[Strings.0418] +ACCESSORIES=Accesorii +SYSTOOLS=Instrumente de sistem +ACCESSIBILITY=Accesibilitate +ENTERTAINMENT=Divertisment +COMMUNICATIONS=CommunicaÈii +GAMES=Jocuri + +FONTSUB_TITLE=FontSub +FONTSUB_DESC=Font Substitutes Editor + +; Russian +[Strings.0419] +ACCESSORIES=Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½ÑÐµ +SYSTOOLS=Ð¡Ð»ÑÐ¶ÐµÐ±Ð½ÑÐµ +ACCESSIBILITY=Ð¡Ð¿ÐµÑÐ¸Ð°Ð»ÑÐ½ÑÐµ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÐ¸ +ENTERTAINMENT=Ð Ð°Ð·Ð²Ð»ÐµÑÐµÐ½Ð¸Ñ +COMMUNICATIONS=Ð¡Ð²ÑÐ·Ñ +GAMES=ÐÐ³ÑÑ + +FONTSUB_TITLE=FontSub +FONTSUB_DESC=Font Substitutes Editor + +; Slovak +[Strings.041B] +ACCESSORIES=PrÃsluÅ¡enstvo +SYSTOOLS=SystÃ©movÃ© nÃ¡stroje +ACCESSIBILITY=ZjednoduÅ¡enie ovlÃ¡dania +ENTERTAINMENT=ZÃ¡bava +COMMUNICATIONS=Communications +GAMES=Hry + +FONTSUB_TITLE=FontSub +FONTSUB_DESC=Font Substitutes Editor + +; Turkish +[Strings.041f] +ACCESSORIES=DonatÄ±lar +SYSTOOLS=Dizge AraÃ§larÄ± +ACCESSIBILITY=EriÅilebilirlik +ENTERTAINMENT=EÄlence +COMMUNICATIONS=Ä°letiÅim +GAMES=Oyunlar + +FONTSUB_TITLE=FontSub +FONTSUB_DESC=Font Substitutes Editor + +; Ukrainian +[Strings.0422] +ACCESSORIES=ÐÐ¾Ð¿Ð¾Ð¼ÑÐ¶Ð½Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¸ +SYSTOOLS=Ð¡Ð»ÑÐ¶Ð±Ð¾Ð²Ñ +ACCESSIBILITY=Ð¡Ð¿ÐµÑÑÐ°Ð»ÑÐ½Ñ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑÑ +ENTERTAINMENT=Ð Ð¾Ð·Ð²Ð°Ð³Ð¸ +COMMUNICATIONS=Communications +GAMES=ÐÐ³ÑÐ¸ + +FONTSUB_TITLE=FontSub +FONTSUB_DESC=Font Substitutes Editor + +; Chinese +[Strings.0804] +ACCESSORIES=éä»¶ +SYSTOOLS=ç³»ç»å·¥å· +ACCESSIBILITY=è¾å©åè½ +ENTERTAINMENT=å¨±ä¹ +COMMUNICATIONS=éä¿¡ +GAMES=æ¸¸æ + +FONTSUB_TITLE=FontSub +FONTSUB_DESC=Font Substitutes Editor

7 years, 5 months

[hbelusca] 75387: [UNATTEND]: Move a comment sign '; ' to a better place.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jul 22 15:54:40 2017 New Revision: 75387 URL: http://svn.reactos.org/svn/reactos?rev=75387&view=rev Log: [UNATTEND]: Move a comment sign ';' to a better place. Modified: trunk/reactos/boot/bootdata/bootcd/unattend.inf trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf Modified: trunk/reactos/boot/bootdata/bootcd/unattend.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcd/unatt… ============================================================================== --- trunk/reactos/boot/bootdata/bootcd/unattend.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcd/unattend.inf [iso-8859-1] Sat Jul 22 15:54:40 2017 @@ -19,8 +19,8 @@ FullName="MyName" ;OrgName="MyOrg" -ComputerName="MYCOMPUTERNAME"; -AdminPassword="MyPassword" +ComputerName="MYCOMPUTERNAME" +;AdminPassword="MyPassword" ; TimeZone is set GMT as default TimeZoneIndex=85 @@ -49,7 +49,6 @@ ; see hivesys.inf for available languages LocaleID = 409 - ; enable this section to automatically launch programs ; after 3rd boot ; Modified: trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcdregtes… ============================================================================== --- trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf [iso-8859-1] Sat Jul 22 15:54:40 2017 @@ -19,8 +19,8 @@ FullName="MyName" ;OrgName="MyOrg" -ComputerName="MYCOMPUTERNAME"; -AdminPassword="MyPassword" +ComputerName="MYCOMPUTERNAME" +;AdminPassword="MyPassword" ; TimeZone is set GMT as default TimeZoneIndex=85

7 years, 5 months

[gadamopoulos] 75386: [EXPLORER] -Implement the minimum taskbar size for the vertical position.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Jul 22 09:13:33 2017 New Revision: 75386 URL: http://svn.reactos.org/svn/reactos?rev=75386&view=rev Log: [EXPLORER] -Implement the minimum taskbar size for the vertical position. Modified: trunk/reactos/base/shell/explorer/taskband.cpp trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/taskband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskband.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskband.cpp [iso-8859-1] Sat Jul 22 09:13:33 2017 @@ -40,15 +40,11 @@ CComPtr<IUnknown> m_Site; HWND m_hWnd; - HWND m_hWndStartButton; - DWORD m_BandID; public: CTaskBand() : - m_hWnd(NULL), - m_BandID(0) - { - + m_hWnd(NULL) + { } virtual ~CTaskBand() { } @@ -117,32 +113,30 @@ /* FIXME: What about DBIMF_NOGRIPPER and DBIMF_ALWAYSGRIPPER */ pdbi->dwModeFlags = DBIMF_VARIABLEHEIGHT; + /* Obtain the button size, to be used as the minimum size */ + DWORD size = SendMessageW(hwndToolbar, TB_GETBUTTONSIZE, 0, 0); + pdbi->ptMinSize.x = 0; + pdbi->ptMinSize.y = GET_Y_LPARAM(size); + if (dwViewMode & DBIF_VIEWMODE_VERTICAL) { + pdbi->ptIntegral.x = 0; pdbi->ptIntegral.y = 1; - pdbi->ptMinSize.y = 1; - /* FIXME: Get the button metrics from the task bar object!!! */ - pdbi->ptMinSize.x = (3 * GetSystemMetrics(SM_CXEDGE) / 2) + /* FIXME: Might be wrong if only one column! */ - GetSystemMetrics(SM_CXSIZE) + (2 * GetSystemMetrics(SM_CXEDGE)); /* FIXME: Min button size, query!!! */ } else { - /* Obtain the button size, to be used as the integral size */ - DWORD size = SendMessageW(hwndToolbar, TB_GETBUTTONSIZE, 0, 0); pdbi->ptIntegral.x = 0; pdbi->ptIntegral.y = GET_Y_LPARAM(size); - pdbi->ptMinSize = pdbi->ptIntegral; } /* Ignored: pdbi->ptMaxSize.x */ pdbi->ptMaxSize.y = -1; + RECT rcToolbar; + ::GetWindowRect(hwndToolbar, &rcToolbar); /* FIXME: We should query the height from the task bar object!!! */ - pdbi->ptActual.y = GetSystemMetrics(SM_CYSIZE) + (2 * GetSystemMetrics(SM_CYEDGE)); - - /* Save the band ID for future use in case we need to check whether a given band - is the task band */ - m_BandID = dwBandID; + pdbi->ptActual.x = rcToolbar.right - rcToolbar.left; + pdbi->ptActual.y = rcToolbar.bottom - rcToolbar.top; TRACE("H: %d, Min: %d,%d, Integral.y: %d Actual: %d,%d\n", (dwViewMode & DBIF_VIEWMODE_VERTICAL) == 0, pdbi->ptMinSize.x, pdbi->ptMinSize.y, pdbi->ptIntegral.y, @@ -334,8 +328,6 @@ HRESULT STDMETHODCALLTYPE Initialize(IN OUT ITrayWindow *tray, HWND hWndStartButton) { m_Tray = tray; - m_BandID = (DWORD) -1; - m_hWndStartButton = hWndStartButton; return S_OK; } Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Sat Jul 22 09:13:33 2017 @@ -1688,8 +1688,14 @@ pRect->top = pRect->bottom - (rebarRect.bottom - rebarRect.top + margins.cy); break; case ABE_LEFT: + rebarRect.right = rebarRect.left + (pRect->right - pRect->left - margins.cx); + ::SendMessageW(m_Rebar, RB_SIZETORECT, RBSTR_CHANGERECT, (LPARAM)&rebarRect); + pRect->right = pRect->left + (rebarRect.right - rebarRect.left + margins.cx); + break; case ABE_RIGHT: - /* FIXME: what to do here? */ + rebarRect.left = rebarRect.right - (pRect->right - pRect->left - margins.cx); + ::SendMessageW(m_Rebar, RB_SIZETORECT, RBSTR_CHANGERECT, (LPARAM)&rebarRect); + pRect->left = pRect->right - (rebarRect.right - rebarRect.left + margins.cx); break; }

7 years, 5 months

[gadamopoulos] 75385: [BROWSEUI] -CBandSite: Remove CCS_NORESIZE style. This is a hack probably needed because our rebar control is buggy. [EXPLORER] -CTaskBand::GetBandInfo: Use the toolbar button...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Jul 21 14:32:15 2017 New Revision: 75385 URL: http://svn.reactos.org/svn/reactos?rev=75385&view=rev Log: [BROWSEUI] -CBandSite: Remove CCS_NORESIZE style. This is a hack probably needed because our rebar control is buggy. [EXPLORER] -CTaskBand::GetBandInfo: Use the toolbar button size as the minimum and integral size for the band. -CTaskSwitchWnd: Use the system small icon size for the size of the icon. Recreate the image list if this size changes. This together with the size of the font are the only factors for the size of the toolbar and consequently for the size of the band and if it is the only band, the size of the taskbar. Don't use TB_SETBUTTONSIZE. Now the size of the image list and the font dictate the size. -CTrayWindow: In the classic theme make the start button have the same height with the tasks toolbar button height. Improve the calculation of the size of the taskbar in FitToRebar. These changes should make the taskbar and the toolbar have a proper size. On top of that the taskbar is finally resizable (however our rebar is too buggy and still fills only the first line in the taskbar). While testing this I noticed that moving the taskbar in the sides of the screen is buggy now. I'm not sure if this was uncovered by these changes, if this was broken before or this was caused by these changes (looks unlikely to me) but will be fixed in subsequent commits). Modified: trunk/reactos/base/shell/explorer/taskband.cpp trunk/reactos/base/shell/explorer/taskswnd.cpp trunk/reactos/base/shell/explorer/traywnd.cpp trunk/reactos/dll/win32/browseui/shellbars/CBandSite.cpp Modified: trunk/reactos/base/shell/explorer/taskband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskband.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskband.cpp [iso-8859-1] Fri Jul 21 14:32:15 2017 @@ -104,6 +104,8 @@ if (m_hWnd != NULL) { + HWND hwndToolbar = ::GetWindow(m_hWnd, GW_CHILD); + /* The task band never has a title */ pdbi->dwMask &= ~DBIM_TITLE; @@ -125,13 +127,11 @@ } else { - /* When the band is horizontal its minimum height is the height of the start button */ - RECT rcButton; - GetWindowRect(m_hWndStartButton, &rcButton); - pdbi->ptMinSize.y = rcButton.bottom - rcButton.top; - pdbi->ptIntegral.y = pdbi->ptMinSize.y + (3 * GetSystemMetrics(SM_CYEDGE) / 2); /* FIXME: Query metrics */ - /* We're not going to allow task bands where not even the minimum button size fits into the band */ - pdbi->ptMinSize.x = pdbi->ptIntegral.y; + /* Obtain the button size, to be used as the integral size */ + DWORD size = SendMessageW(hwndToolbar, TB_GETBUTTONSIZE, 0, 0); + pdbi->ptIntegral.x = 0; + pdbi->ptIntegral.y = GET_Y_LPARAM(size); + pdbi->ptMinSize = pdbi->ptIntegral; } /* Ignored: pdbi->ptMaxSize.x */ Modified: trunk/reactos/base/shell/explorer/taskswnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/tasksw… ============================================================================== --- trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] Fri Jul 21 14:32:15 2017 @@ -1142,9 +1142,25 @@ LONG NewBtnSize; BOOL Horizontal; - int cx = GetSystemMetrics(SM_CXMINIMIZED); - int cy = m_ButtonSize.cy = GetSystemMetrics(SM_CYSIZE); - m_TaskBar.SetButtonSize(cx, cy); + /* Update the size of the image list if needed */ + int cx, cy; + ImageList_GetIconSize(m_ImageList, &cx, &cy); + if (cx != GetSystemMetrics(SM_CXSMICON) || cy != GetSystemMetrics(SM_CYSMICON)) + { + ImageList_SetIconSize(m_ImageList, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON)); + + /* SetIconSize removes all icons so we have to reinsert them */ + PTASK_ITEM TaskItem = m_TaskItems; + PTASK_ITEM LastTaskItem = m_TaskItems + m_TaskItemCount; + while (TaskItem != LastTaskItem) + { + TaskItem->IconIndex = -1; + UpdateTaskItemButton(TaskItem); + + TaskItem++; + } + m_TaskBar.SetImageList(m_ImageList); + } if (GetClientRect(&rcClient) && !IsRectEmpty(&rcClient)) { @@ -1286,7 +1302,7 @@ return EnumWindows(s_EnumWindowsProc, (LPARAM)this); } - LRESULT OnThemeChanged() + LRESULT OnThemeChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { TRACE("OmThemeChanged\n"); @@ -1301,20 +1317,14 @@ return TRUE; } - LRESULT OnThemeChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) - { - return OnThemeChanged(); - } - LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { if (!m_TaskBar.Initialize(m_hWnd)) return FALSE; SetWindowTheme(m_TaskBar.m_hWnd, L"TaskBand", NULL); - OnThemeChanged(); - - m_ImageList = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 0, 1000); + + m_ImageList = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, 0, 1000); m_TaskBar.SetImageList(m_ImageList); /* Set proper spacing between buttons */ @@ -1371,7 +1381,7 @@ return Ret; } - LRESULT HandleShellHookMsg(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + LRESULT OnShellHook(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { BOOL Ret = FALSE; @@ -1447,14 +1457,6 @@ } return Ret; - } - - VOID EnableGrouping(IN BOOL bEnable) - { - m_IsGroupingEnabled = bEnable; - - /* Collapse or expand groups if necessary */ - UpdateButtonsSize(FALSE); } VOID HandleTaskItemClick(IN OUT PTASK_ITEM TaskItem) @@ -1648,27 +1650,21 @@ return Ret; } - LRESULT DrawBackground(HDC hdc) - { + LRESULT OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + HDC hdc = (HDC) wParam; + + if (!IsAppThemed()) + { + bHandled = FALSE; + return 0; + } + RECT rect; - GetClientRect(&rect); DrawThemeParentBackground(m_hWnd, hdc, &rect); return TRUE; - } - - LRESULT OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) - { - HDC hdc = (HDC) wParam; - - if (!IsAppThemed()) - { - bHandled = FALSE; - return 0; - } - - return DrawBackground(hdc); } LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -1724,7 +1720,10 @@ LRESULT Ret = m_IsGroupingEnabled; if ((BOOL)wParam != m_IsGroupingEnabled) { - EnableGrouping((BOOL) wParam); + m_IsGroupingEnabled = (BOOL)wParam; + + /* Collapse or expand groups if necessary */ + UpdateButtonsSize(FALSE); } return Ret; } @@ -1833,7 +1832,7 @@ MESSAGE_HANDLER(WM_TIMER, OnTimer) MESSAGE_HANDLER(WM_SETFONT, OnSetFont) MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChanged) - MESSAGE_HANDLER(m_ShellHookMsg, HandleShellHookMsg) + MESSAGE_HANDLER(m_ShellHookMsg, OnShellHook) MESSAGE_HANDLER(WM_MOUSEACTIVATE, OnMouseActivate) MESSAGE_HANDLER(WM_KLUDGEMINRECT, OnKludgeItemRect) END_MSG_MAP() Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Fri Jul 21 14:32:15 2017 @@ -1532,6 +1532,13 @@ Horizontal = IsPosHorizontal(); + IUnknown_Exec(m_TrayBandSite, + IID_IDeskBand, + DBID_BANDINFOCHANGED, + 0, + NULL, + NULL); + /* We're about to resize/move the start button, the rebar control and the tray notification control */ dwp = BeginDeferWindowPos(3); @@ -1545,6 +1552,16 @@ StartSize = m_StartButton.GetSize(); if (StartSize.cx > rcClient.right) StartSize.cx = rcClient.right; + + if (!m_Theme) + { + HWND hwndTaskToolbar = ::GetWindow(m_TaskSwitch, GW_CHILD); + if (hwndTaskToolbar) + { + DWORD size = SendMessageW(hwndTaskToolbar, TB_GETBUTTONSIZE, 0, 0); + StartSize.cy = HIWORD(size); + } + } if (m_StartButton.m_hWnd != NULL) { @@ -1646,15 +1663,16 @@ void FitToRebar(PRECT pRect) { /* Get the rect of the rebar */ - RECT rebarRect, taskbarRect; + RECT rebarRect, taskbarRect, clientRect; ::GetWindowRect(m_Rebar, &rebarRect); ::GetWindowRect(m_hWnd, &taskbarRect); + ::GetClientRect(m_hWnd, &clientRect); OffsetRect(&rebarRect, -taskbarRect.left, -taskbarRect.top); /* Calculate the difference of size of the taskbar and the rebar */ SIZE margins; - margins.cx = taskbarRect.right - taskbarRect.left - rebarRect.right + rebarRect.left; - margins.cy = taskbarRect.bottom - taskbarRect.top - rebarRect.bottom + rebarRect.top; + margins.cx = taskbarRect.right - taskbarRect.left - clientRect.right + clientRect.left; + margins.cy = taskbarRect.bottom - taskbarRect.top - clientRect.bottom + clientRect.top; /* Calculate the new size of the rebar and make it resize, then change the new taskbar size */ switch (m_Position) Modified: trunk/reactos/dll/win32/browseui/shellbars/CBandSite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellba… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbars/CBandSite.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbars/CBandSite.cpp [iso-8859-1] Fri Jul 21 14:32:15 2017 @@ -763,7 +763,7 @@ return E_FAIL; style = WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | RBS_VARHEIGHT | RBS_AUTOSIZE | - RBS_BANDBORDERS | CCS_NODIVIDER | CCS_NORESIZE | CCS_NOPARENTALIGN; + RBS_BANDBORDERS | CCS_NODIVIDER | /*CCS_NORESIZE |*/ CCS_NOPARENTALIGN; fRebarWindow = CreateWindowExW(WS_EX_TOOLWINDOW, REBARCLASSNAMEW,

7 years, 5 months

← Newer
1
...
5
6
7
8
9
10
11
...
22
Older →

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 July 2017