Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/02: [COMCTL32] Improve failure cases.
by Andreas Maier 15 Aug '19

15 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=49a797543f1201726999f… commit 49a797543f1201726999f0d67fabed327b58744f Author: Andreas Maier <staubim(a)quantentunnel.de> AuthorDate: Fri May 31 10:15:06 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 15 21:11:45 2019 +0200 [COMCTL32] Improve failure cases. --- dll/win32/comctl32/imagelist.c | 54 +++++++++++++++++++++++++++++++++--------- 1 file changed, 43 insertions(+), 11 deletions(-) diff --git a/dll/win32/comctl32/imagelist.c b/dll/win32/comctl32/imagelist.c index 11ad5080f0a..c7c780bbee3 100644 --- a/dll/win32/comctl32/imagelist.c +++ b/dll/win32/comctl32/imagelist.c @@ -1316,7 +1316,11 @@ static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int des #endif SelectObject( hdc, bmp ); #ifdef __REACTOS__ - BitBlt( hdc, 0, 0, cx, cy, srce_dc, src_x, src_y, SRCCOPY ); + if (!BitBlt( hdc, 0, 0, cx, cy, srce_dc, src_x, src_y, SRCCOPY )) + { + TRACE("BitBlt failed\n"); + goto done; + } #else BitBlt( hdc, 0, 0, cx, cy, himl->hdcImage, src_x, src_y, SRCCOPY ); #endif @@ -1372,10 +1376,27 @@ static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int des info->bmiColors[1].rgbBlue = 0xff; info->bmiColors[1].rgbReserved = 0; if (!(mask = CreateDIBSection( himl->hdcMask, info, DIB_RGB_COLORS, &mask_bits, 0, 0 ))) + { + TRACE("CreateDIBSection failed %i\n", GetLastError()); + goto done; + } + if (SelectObject(hdc, mask) == NULL) + { + TRACE("SelectObject failed %i\n", GetLastError()); + SelectObject(hdc, bmp); + goto done; + } + if (!BitBlt(hdc, 0, 0, cx, cy, himl->hdcMask, src_x, src_y, SRCCOPY)) + { + TRACE("BitBlt failed %i\n", GetLastError()); + SelectObject(hdc, bmp); + goto done; + } + if (SelectObject(hdc, bmp) == NULL) + { + TRACE("SelectObject failed %i\n", GetLastError()); goto done; - SelectObject( hdc, mask ); - BitBlt( hdc, 0, 0, cx, cy, himl->hdcMask, src_x, src_y, SRCCOPY ); - SelectObject( hdc, bmp ); + } for (i = 0, ptr = bits; i < cy; i++) for (j = 0; j < cx; j++, ptr++) if ((((BYTE *)mask_bits)[i * width_bytes + j / 8] << (j % 8)) & 0x80) *ptr = 0; @@ -1422,10 +1443,18 @@ HDC saturate_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int dest_y, if (!(bmp = CreateDIBSection(himl->hdcImage, info, DIB_RGB_COLORS, &bits, 0, 0 ))) goto done; /* bind both surfaces */ - SelectObject(hdc, bmp); + if (SelectObject(hdc, bmp) == NULL) + { + TRACE("SelectObject failed\n"); + goto done; + } /* copy into our dc the section that covers just the icon we we're asked for */ - BitBlt(hdc, 0, 0, cx, cy, himl->hdcImage, src_x, src_y, SRCCOPY); + if (!BitBlt(hdc, 0, 0, cx, cy, himl->hdcImage, src_x, src_y, SRCCOPY)) + { + TRACE("BitBlt failed!\n"); + goto done; + } /* loop every pixel of the bitmap */ for (i = 0, ptr = bits; i < cx * cy; i++, ptr++) @@ -1543,11 +1572,14 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) hdcSaturated = saturate_image(himl, pimldp->hdcDst, pimldp->x, pimldp->y, pt.x, pt.y, cx, cy, pimldp->rgbFg); - hImageListDC = hdcSaturated; - /* shitty way of getting subroutines to blit at the right place (top left corner), - as our modified imagelist only contains a single image for performance reasons */ - pt.x = 0; - pt.y = 0; + if (hdcSaturated != NULL) + { + hImageListDC = hdcSaturated; + /* shitty way of getting subroutines to blit at the right place (top left corner), + as our modified imagelist only contains a single image for performance reasons */ + pt.x = 0; + pt.y = 0; + } } #endif

1 0

[reactos] 01/01: [NDIS] Enforce '#if DBG' around MiniDisplayPacket[2]()
by Serge Gautherie 15 Aug '19

15 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=68bcc2df7c06377903a17… commit 68bcc2df7c06377903a17d6fcd0253c280958446 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Jun 8 03:03:40 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 15 21:08:10 2019 +0200 [NDIS] Enforce '#if DBG' around MiniDisplayPacket[2]() Also add 'static' on MiniDisplayPacket2(). --- drivers/network/ndis/ndis/miniport.c | 9 +++++---- drivers/network/ndis/ndis/protocol.c | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/network/ndis/ndis/miniport.c b/drivers/network/ndis/ndis/miniport.c index 645291cab92..ad5f7741e6c 100644 --- a/drivers/network/ndis/ndis/miniport.c +++ b/drivers/network/ndis/ndis/miniport.c @@ -57,12 +57,12 @@ KSPIN_LOCK MiniportListLock; LIST_ENTRY AdapterListHead; KSPIN_LOCK AdapterListLock; +#if DBG VOID MiniDisplayPacket( PNDIS_PACKET Packet, PCSTR Reason) { -#if DBG ULONG i, Length; UCHAR Buffer[64]; if ((DebugTraceLevel & DEBUG_PACKET) > 0) { @@ -82,9 +82,9 @@ MiniDisplayPacket( DbgPrint("\n*** %s PACKET STOP ***\n", Reason); } -#endif /* DBG */ } +static VOID MiniDisplayPacket2( PVOID HeaderBuffer, @@ -92,7 +92,6 @@ MiniDisplayPacket2( PVOID LookaheadBuffer, UINT LookaheadBufferSize) { -#if DBG if ((DebugTraceLevel & DEBUG_PACKET) > 0) { ULONG i, Length; PUCHAR p; @@ -118,8 +117,8 @@ MiniDisplayPacket2( DbgPrint("\n*** RECEIVE PACKET STOP ***\n"); } -#endif /* DBG */ } +#endif /* DBG */ PNDIS_MINIPORT_WORK_ITEM MiniGetFirstWorkItem( @@ -201,7 +200,9 @@ MiniIndicateData( "HeaderBufferSize (0x%X) LookaheadBuffer (0x%X) LookaheadBufferSize (0x%X).\n", Adapter, HeaderBuffer, HeaderBufferSize, LookaheadBuffer, LookaheadBufferSize)); +#if DBG MiniDisplayPacket2(HeaderBuffer, HeaderBufferSize, LookaheadBuffer, LookaheadBufferSize); +#endif NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); diff --git a/drivers/network/ndis/ndis/protocol.c b/drivers/network/ndis/ndis/protocol.c index d584d36f15e..83c2797e2ab 100644 --- a/drivers/network/ndis/ndis/protocol.c +++ b/drivers/network/ndis/ndis/protocol.c @@ -404,7 +404,9 @@ proSendPacketToMiniport(PLOGICAL_ADAPTER Adapter, PNDIS_PACKET Packet) return NDIS_STATUS_PENDING; } +#if DBG MiniDisplayPacket(Packet, "SEND"); +#endif if(Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler) {

1 0

[reactos] 01/01: [OSK] General refactoring
by Bișoc George 15 Aug '19

15 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84e162e66939a3e370d74… commit 84e162e66939a3e370d74196a6983840468fee4d Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Tue Jul 16 17:35:30 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 15 20:35:17 2019 +0200 [OSK] General refactoring - Replace the existing header files in favour to a pre-compiled header instead. Furthermore, move all the function prototypes in the pre-compiled header. - As per the prototype definitions, LoadDataFromRegistry() and SaveDataToRegistry() mustn't accept any number of parameters. - Rename rsrc.rc to osk.rc (main resource file) as most of user-mode applications name have their main resource as the same application's name anyways. - When querying and saving the data to registry, use only one value, greatly reducing the bloat of variables (as per the Hermes Belusca's request on #1729 PR). - Update the header description reflecting the official ReactOS Coding style guidelines. --- base/applications/osk/CMakeLists.txt | 10 +++- base/applications/osk/main.c | 16 +------ base/applications/osk/main.h | 43 ----------------- base/applications/osk/osk.h | 26 ----------- base/applications/osk/{rsrc.rc => osk.rc} | 15 ++---- base/applications/osk/osk_res.h | 5 +- base/applications/osk/precomp.h | 77 +++++++++++++++++++++++++++++++ base/applications/osk/settings.c | 71 ++++++++++++++-------------- base/applications/osk/settings.h | 15 ------ 9 files changed, 127 insertions(+), 151 deletions(-) diff --git a/base/applications/osk/CMakeLists.txt b/base/applications/osk/CMakeLists.txt index ff5876046ca..293eba14b50 100644 --- a/base/applications/osk/CMakeLists.txt +++ b/base/applications/osk/CMakeLists.txt @@ -1,7 +1,13 @@ +list(APPEND SOURCE + main.c + settings.c + precomp.h) + file(GLOB osk_rc_deps res/*.*) -add_rc_deps(rsrc.rc ${osk_rc_deps}) -add_executable(osk main.c settings.c rsrc.rc) +add_rc_deps(osk.rc ${osk_rc_deps}) +add_executable(osk ${SOURCE} osk.rc) set_module_type(osk win32gui UNICODE) add_importlibs(osk comdlg32 uxtheme winmm shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll) +add_pch(osk precomp.h SOURCE) add_cd_file(TARGET osk DESTINATION reactos/system32 FOR all) diff --git a/base/applications/osk/main.c b/base/applications/osk/main.c index 0a3a001fa91..a467eb24518 100644 --- a/base/applications/osk/main.c +++ b/base/applications/osk/main.c @@ -8,26 +8,12 @@ /* INCLUDES *******************************************************************/ -#include "osk.h" -#include "settings.h" +#include "precomp.h" /* GLOBALS ********************************************************************/ OSK_GLOBALS Globals; -/* Functions */ -int OSK_SetImage(int IdDlgItem, int IdResource); -int OSK_DlgInitDialog(HWND hDlg); -int OSK_DlgClose(void); -int OSK_DlgTimer(void); -BOOL OSK_DlgCommand(WPARAM wCommand, HWND hWndControl); -BOOL OSK_ReleaseKey(WORD ScanCode); -VOID OSK_RestoreDlgPlacement(HWND hDlg); - -INT_PTR APIENTRY OSK_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam); -LRESULT APIENTRY OSK_ThemeHandler(HWND hDlg, NMCUSTOMDRAW *pNmDraw); -int WINAPI wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int); - /* FUNCTIONS ******************************************************************/ /*********************************************************************** diff --git a/base/applications/osk/main.h b/base/applications/osk/main.h deleted file mode 100644 index 5ce6a7acb7c..00000000000 --- a/base/applications/osk/main.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * PROJECT: ReactOS On-Screen Keyboard - * LICENSE: GPL - See COPYING in the top level directory - * PURPOSE: On screen keyboard. - * COPYRIGHT: Denis ROBERT - * Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) - */ - -#ifndef _OSKMAIN_H -#define _OSKMAIN_H - -/* INCLUDES *******************************************************************/ - -#include "osk_res.h" - -/* TYPES **********************************************************************/ - -typedef struct -{ - HINSTANCE hInstance; - HWND hMainWnd; - HBRUSH hBrushGreenLed; - UINT_PTR iTimer; - /* FIXME: To be deleted when ReactOS will support WS_EX_NOACTIVATE */ - HWND hActiveWnd; - BOOL bShowWarning; - BOOL bIsEnhancedKeyboard; - BOOL bSoundClick; - BOOL bAlwaysOnTop; - INT PosX; - INT PosY; -} OSK_GLOBALS; - -/* DEFINES ********************************************************************/ - -extern OSK_GLOBALS Globals; - -#define countof(x) (sizeof(x) / sizeof((x)[0])) -#define MAX_BUFF 256 - -#endif - -/* EOF */ diff --git a/base/applications/osk/osk.h b/base/applications/osk/osk.h deleted file mode 100644 index a435e69ac6a..00000000000 --- a/base/applications/osk/osk.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * PROJECT: ReactOS On-Screen Keyboard - * LICENSE: GPL - See COPYING in the top level directory - * PURPOSE: On screen keyboard. - * COPYRIGHT: Denis ROBERT - * Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) - */ - -#ifndef _OSK_H -#define _OSK_H - -/* INCLUDES ******************************************************************/ - -#include <stdio.h> - -#include <windows.h> -#include <commctrl.h> -#include <debug.h> -#include <uxtheme.h> -#include <vsstyle.h> - -#include "main.h" - -#endif - -/* EOF */ diff --git a/base/applications/osk/rsrc.rc b/base/applications/osk/osk.rc similarity index 87% rename from base/applications/osk/rsrc.rc rename to base/applications/osk/osk.rc index 963581773d1..a897be3c8c6 100644 --- a/base/applications/osk/rsrc.rc +++ b/base/applications/osk/osk.rc @@ -1,19 +1,12 @@ /* - * PROJECT: ReactOS Kernel + * PROJECT: On-Screen Keyboard * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/osk/rsrc.rc - * PURPOSE: On Screen Keyboard - * PROGRAMMERS: Denis ROBERT + * PURPOSE: On-Screen Keyboard main resource file + * COPYRIGHT: Denis ROBERT */ /* INCLUDES ******************************************************************/ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "main.h" -#include "winnls.h" -#include "commctrl.h" -#include "osk_res.h" +#include "precomp.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS On Screen Keyboard" #define REACTOS_STR_INTERNAL_NAME "osk" diff --git a/base/applications/osk/osk_res.h b/base/applications/osk/osk_res.h index 04dd6e2b887..21d01f32f3f 100644 --- a/base/applications/osk/osk_res.h +++ b/base/applications/osk/osk_res.h @@ -1,9 +1,8 @@ /* * PROJECT: ReactOS On-Screen Keyboard * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/osk/osk_res.h - * PURPOSE: On screen keyboard. - * PROGRAMMERS: Denis ROBERT + * PURPOSE: On-Screen Keyboard resource identifiers + * COPYRIGHT: Denis ROBERT */ #define MAIN_DIALOG_ENHANCED_KB 2000 diff --git a/base/applications/osk/precomp.h b/base/applications/osk/precomp.h new file mode 100644 index 00000000000..c1e7e50543d --- /dev/null +++ b/base/applications/osk/precomp.h @@ -0,0 +1,77 @@ +/* + * PROJECT: ReactOS On-Screen Keyboard + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Pre-compiled header + * COPYRIGHT: Denis ROBERT + * Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) + */ + +#ifndef _OSK_PRECOMP_H +#define _OSK_PRECOMP_H + +/* INCLUDES *******************************************************************/ + +#include <stdio.h> + +#include <windows.h> +#include <commctrl.h> +#include <debug.h> +#include <uxtheme.h> +#include <vsstyle.h> +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winnls.h" +#include "commctrl.h" + +#include "osk_res.h" + +/* TYPES **********************************************************************/ + +typedef struct +{ + HINSTANCE hInstance; + HWND hMainWnd; + HBRUSH hBrushGreenLed; + UINT_PTR iTimer; + /* FIXME: To be deleted when ReactOS will support WS_EX_NOACTIVATE */ + HWND hActiveWnd; + + /* On-Screen Keyboard registry settings */ + BOOL bShowWarning; + BOOL bIsEnhancedKeyboard; + BOOL bSoundClick; + BOOL bAlwaysOnTop; + INT PosX; + INT PosY; +} OSK_GLOBALS; + +/* PROTOTYPES *****************************************************************/ + +/* main.c */ +int OSK_SetImage(int IdDlgItem, int IdResource); +int OSK_DlgInitDialog(HWND hDlg); +int OSK_DlgClose(void); +int OSK_DlgTimer(void); +BOOL OSK_DlgCommand(WPARAM wCommand, HWND hWndControl); +BOOL OSK_ReleaseKey(WORD ScanCode); +INT_PTR APIENTRY OSK_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam); +LRESULT APIENTRY OSK_ThemeHandler(HWND hDlg, NMCUSTOMDRAW *pNmDraw); +int WINAPI wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int); +VOID OSK_RestoreDlgPlacement(HWND hDlg); + +/* settings.c */ +BOOL LoadDataFromRegistry(VOID); +BOOL SaveDataToRegistry(VOID); +INT_PTR CALLBACK OSK_WarningProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam); + +/* DEFINES ********************************************************************/ + +extern OSK_GLOBALS Globals; + +#define countof(x) (sizeof(x) / sizeof((x)[0])) +#define MAX_BUFF 256 + +#endif /* _OSK_PRECOMP_H */ + +/* EOF */ diff --git a/base/applications/osk/settings.c b/base/applications/osk/settings.c index 5d403e89d6d..b1bcb210f96 100644 --- a/base/applications/osk/settings.c +++ b/base/applications/osk/settings.c @@ -7,16 +7,15 @@ /* INCLUDES *******************************************************************/ -#include "osk.h" -#include "settings.h" +#include "precomp.h" /* FUNCTIONS *******************************************************************/ -BOOL LoadDataFromRegistry() +BOOL LoadDataFromRegistry(VOID) { HKEY hKey; LONG lResult; - DWORD dwShowWarningData, dwLayout, dwSoundOnClick, dwPositionLeft, dwPositionTop, dwAlwaysOnTop; + DWORD dwValue; DWORD cbData = sizeof(DWORD); /* Initialize the registry application settings */ @@ -47,7 +46,7 @@ BOOL LoadDataFromRegistry() L"ShowWarning", 0, 0, - (BYTE *)&dwShowWarningData, + (BYTE *)&dwValue, &cbData); if (lResult != ERROR_SUCCESS) @@ -58,14 +57,14 @@ BOOL LoadDataFromRegistry() } /* Load the data value (it can be either FALSE or TRUE depending on the data itself) */ - Globals.bShowWarning = (dwShowWarningData != 0); + Globals.bShowWarning = (dwValue != 0); /* Query the key */ lResult = RegQueryValueExW(hKey, L"IsEnhancedKeyboard", 0, 0, - (BYTE *)&dwLayout, + (BYTE *)&dwValue, &cbData); if (lResult != ERROR_SUCCESS) @@ -76,14 +75,14 @@ BOOL LoadDataFromRegistry() } /* Load the dialog layout value */ - Globals.bIsEnhancedKeyboard = (dwLayout != 0); + Globals.bIsEnhancedKeyboard = (dwValue != 0); /* Query the key */ lResult = RegQueryValueExW(hKey, L"ClickSound", 0, 0, - (BYTE *)&dwSoundOnClick, + (BYTE *)&dwValue, &cbData); if (lResult != ERROR_SUCCESS) @@ -94,14 +93,14 @@ BOOL LoadDataFromRegistry() } /* Load the sound on click value event */ - Globals.bSoundClick = (dwSoundOnClick != 0); + Globals.bSoundClick = (dwValue != 0); /* Query the key */ lResult = RegQueryValueExW(hKey, L"WindowLeft", 0, 0, - (BYTE *)&dwPositionLeft, + (BYTE *)&dwValue, &cbData); if (lResult != ERROR_SUCCESS) @@ -112,13 +111,13 @@ BOOL LoadDataFromRegistry() } /* Load the X value data of the dialog's coordinate */ - Globals.PosX = dwPositionLeft; + Globals.PosX = dwValue; lResult = RegQueryValueExW(hKey, L"WindowTop", 0, 0, - (BYTE *)&dwPositionTop, + (BYTE *)&dwValue, &cbData); if (lResult != ERROR_SUCCESS) @@ -129,13 +128,13 @@ BOOL LoadDataFromRegistry() } /* Load the Y value data of the dialog's coordinate */ - Globals.PosY = dwPositionTop; + Globals.PosY = dwValue; lResult = RegQueryValueExW(hKey, L"AlwaysOnTop", 0, 0, - (BYTE *)&dwAlwaysOnTop, + (BYTE *)&dwValue, &cbData); if (lResult != ERROR_SUCCESS) @@ -146,18 +145,18 @@ BOOL LoadDataFromRegistry() } /* Load the window state value data */ - Globals.bAlwaysOnTop = (dwAlwaysOnTop != 0); + Globals.bAlwaysOnTop = (dwValue != 0); /* If we're here then we succeed, close the key and return TRUE */ RegCloseKey(hKey); return TRUE; } -BOOL SaveDataToRegistry() +BOOL SaveDataToRegistry(VOID) { HKEY hKey; LONG lResult; - DWORD dwShowWarningData, dwLayout, dwSoundOnClick, dwPositionLeft, dwPositionTop, dwAlwaysOnTop; + DWORD dwValue; WINDOWPLACEMENT wp; /* Set the structure length and retrieve the dialog's placement */ @@ -182,15 +181,15 @@ BOOL SaveDataToRegistry() } /* The data value of the subkey will be appended to the warning dialog switch */ - dwShowWarningData = Globals.bShowWarning; + dwValue = Globals.bShowWarning; /* Welcome warning box value key */ lResult = RegSetValueExW(hKey, L"ShowWarning", 0, REG_DWORD, - (BYTE *)&dwShowWarningData, - sizeof(dwShowWarningData)); + (BYTE *)&dwValue, + sizeof(dwValue)); if (lResult != ERROR_SUCCESS) { @@ -200,15 +199,15 @@ BOOL SaveDataToRegistry() } /* The value will be appended to the layout dialog */ - dwLayout = Globals.bIsEnhancedKeyboard; + dwValue = Globals.bIsEnhancedKeyboard; /* Keyboard dialog switcher */ lResult = RegSetValueExW(hKey, L"IsEnhancedKeyboard", 0, REG_DWORD, - (BYTE *)&dwLayout, - sizeof(dwLayout)); + (BYTE *)&dwValue, + sizeof(dwValue)); if (lResult != ERROR_SUCCESS) { @@ -218,15 +217,15 @@ BOOL SaveDataToRegistry() } /* The value will be appended to the sound on click event */ - dwSoundOnClick = Globals.bSoundClick; + dwValue = Globals.bSoundClick; /* "Sound on Click" switcher value key */ lResult = RegSetValueExW(hKey, L"ClickSound", 0, REG_DWORD, - (BYTE *)&dwSoundOnClick, - sizeof(dwSoundOnClick)); + (BYTE *)&dwValue, + sizeof(dwValue)); if (lResult != ERROR_SUCCESS) { @@ -236,15 +235,15 @@ BOOL SaveDataToRegistry() } /* The value will be appended to the X coordination dialog's placement */ - dwPositionLeft = wp.rcNormalPosition.left; + dwValue = wp.rcNormalPosition.left; /* Position X coordination of dialog's placement value key */ lResult = RegSetValueExW(hKey, L"WindowLeft", 0, REG_DWORD, - (BYTE *)&dwPositionLeft, - sizeof(dwPositionLeft)); + (BYTE *)&dwValue, + sizeof(dwValue)); if (lResult != ERROR_SUCCESS) { @@ -254,15 +253,15 @@ BOOL SaveDataToRegistry() } /* The value will be appended to the Y coordination dialog's placement */ - dwPositionTop = wp.rcNormalPosition.top; + dwValue = wp.rcNormalPosition.top; /* Position Y coordination of dialog's placement value key */ lResult = RegSetValueExW(hKey, L"WindowTop", 0, REG_DWORD, - (BYTE *)&dwPositionTop, - sizeof(dwPositionTop)); + (BYTE *)&dwValue, + sizeof(dwValue)); if (lResult != ERROR_SUCCESS) { @@ -272,15 +271,15 @@ BOOL SaveDataToRegistry() } /* Window top state value */ - dwAlwaysOnTop = Globals.bAlwaysOnTop; + dwValue = Globals.bAlwaysOnTop; /* "Always on Top" state value key */ lResult = RegSetValueExW(hKey, L"AlwaysOnTop", 0, REG_DWORD, - (BYTE *)&dwAlwaysOnTop, - sizeof(dwAlwaysOnTop)); + (BYTE *)&dwValue, + sizeof(dwValue)); if (lResult != ERROR_SUCCESS) { diff --git a/base/applications/osk/settings.h b/base/applications/osk/settings.h deleted file mode 100644 index 05e122a4fff..00000000000 --- a/base/applications/osk/settings.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * PROJECT: ReactOS On-Screen Keyboard - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * PURPOSE: Settings header file with function prototypes - * COPYRIGHT: Copyright 2018 Bișoc George (fraizeraust99 at gmail dot com) - */ - -#ifndef SETTINGS_OSK_H -#define SETTINGS_OSK_H - -BOOL LoadDataFromRegistry(VOID); -BOOL SaveDataToRegistry(VOID); -INT_PTR CALLBACK OSK_WarningProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam); - -#endif // SETTINGS_OSK_H

1 0

[reactos] 01/01: [THEMES][LUNAR] Update
by Adam Słaboń 15 Aug '19

15 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=65f42596cefa26c725b3c… commit 65f42596cefa26c725b3c93612beb48ca198bf60 Author: Adam Słaboń <asaillen456esx(a)gmail.com> AuthorDate: Sat Jul 13 17:29:46 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 15 20:25:02 2019 +0200 [THEMES][LUNAR] Update Improved Button and Combo Button bitmaps, fixed SYSSETUP Lunar resource. --- dll/win32/syssetup/resources/thmlunar.bmp | Bin 88074 -> 88074 bytes .../Lunar/lunar.msstyles/bitmaps/REACTOS_BUTTON.bmp | Bin 7874 -> 7874 bytes .../lunar.msstyles/bitmaps/REACTOS_COMBOBUTTON.bmp | Bin 3638 -> 3638 bytes .../REACTOS_STARTBUTTON \342\200\224 kopia.bmp" | Bin 12222 -> 0 bytes .../lunar.msstyles/bitmaps/SMALLCLOSEBUTTON.bmp | Bin 3222 -> 0 bytes media/themes/Lunar/lunar.msstyles/lang/en-US.rc | 2 +- media/themes/Lunar/lunar.msstyles/lang/pl-PL.rc | 2 +- 7 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/syssetup/resources/thmlunar.bmp b/dll/win32/syssetup/resources/thmlunar.bmp index bd4358f209b..8016e4e18fd 100644 Binary files a/dll/win32/syssetup/resources/thmlunar.bmp and b/dll/win32/syssetup/resources/thmlunar.bmp differ diff --git a/media/themes/Lunar/lunar.msstyles/bitmaps/REACTOS_BUTTON.bmp b/media/themes/Lunar/lunar.msstyles/bitmaps/REACTOS_BUTTON.bmp index 94f7349a280..882a93082dc 100644 Binary files a/media/themes/Lunar/lunar.msstyles/bitmaps/REACTOS_BUTTON.bmp and b/media/themes/Lunar/lunar.msstyles/bitmaps/REACTOS_BUTTON.bmp differ diff --git a/media/themes/Lunar/lunar.msstyles/bitmaps/REACTOS_COMBOBUTTON.bmp b/media/themes/Lunar/lunar.msstyles/bitmaps/REACTOS_COMBOBUTTON.bmp index 30ee38a2aa1..d87da5d3b01 100644 Binary files a/media/themes/Lunar/lunar.msstyles/bitmaps/REACTOS_COMBOBUTTON.bmp and b/media/themes/Lunar/lunar.msstyles/bitmaps/REACTOS_COMBOBUTTON.bmp differ diff --git "a/media/themes/Lunar/lunar.msstyles/bitmaps/REACTOS_STARTBUTTON \342\200\224 kopia.bmp" "b/media/themes/Lunar/lunar.msstyles/bitmaps/REACTOS_STARTBUTTON \342\200\224 kopia.bmp" deleted file mode 100644 index bf3d9f32d69..00000000000 Binary files "a/media/themes/Lunar/lunar.msstyles/bitmaps/REACTOS_STARTBUTTON \342\200\224 kopia.bmp" and /dev/null differ diff --git a/media/themes/Lunar/lunar.msstyles/bitmaps/SMALLCLOSEBUTTON.bmp b/media/themes/Lunar/lunar.msstyles/bitmaps/SMALLCLOSEBUTTON.bmp deleted file mode 100644 index bef39411baa..00000000000 Binary files a/media/themes/Lunar/lunar.msstyles/bitmaps/SMALLCLOSEBUTTON.bmp and /dev/null differ diff --git a/media/themes/Lunar/lunar.msstyles/lang/en-US.rc b/media/themes/Lunar/lunar.msstyles/lang/en-US.rc index 3511f054678..75890cdb08f 100644 --- a/media/themes/Lunar/lunar.msstyles/lang/en-US.rc +++ b/media/themes/Lunar/lunar.msstyles/lang/en-US.rc @@ -32,7 +32,7 @@ STRINGTABLE 5003, "Cernodile & Illen, built on top of Lautus" 5004, "Released under GNU/GPL 2.0, 2019" 5005, "http://www.reactos.org" -5006, "1.0" +5006, "1.1" 5007, "Visual Style for ReactOS" } diff --git a/media/themes/Lunar/lunar.msstyles/lang/pl-PL.rc b/media/themes/Lunar/lunar.msstyles/lang/pl-PL.rc index 353f1144f5e..3e3882f8bab 100644 --- a/media/themes/Lunar/lunar.msstyles/lang/pl-PL.rc +++ b/media/themes/Lunar/lunar.msstyles/lang/pl-PL.rc @@ -32,7 +32,7 @@ STRINGTABLE 5003, "Cernodile & Illen, oparte na motywie Lautus" 5004, "Wydane na licencji GNU/GPL 2.0, 2019" 5005, "http://www.reactos.org" -5006, "1.0" +5006, "1.1" 5007, "Styl wizualny dla systemu ReactOS" }

1 0

[reactos] 01/01: [SHELL32] Run Dialog Text Fix
by Shy Zedaka 15 Aug '19

15 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a3944563c34ed5b2b6aa5… commit a3944563c34ed5b2b6aa56507017afc6d53a99e5 Author: Shy Zedaka <shaytzedaka(a)outlook.com> AuthorDate: Sun Aug 4 23:54:51 2019 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 15 20:03:55 2019 +0200 [SHELL32] Run Dialog Text Fix --- 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/et-EE.rc | 2 +- dll/win32/shell32/lang/fi-FI.rc | 2 +- dll/win32/shell32/lang/fr-FR.rc | 2 +- dll/win32/shell32/lang/hi-IN.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 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index f0e31d51e3f..66935c43133 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -169,7 +169,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Напишете името на приложение, папка, документ или интернет източник и РеактОС ще го отвори.", 12289, 36, 11, 182, 18 + LTEXT "Напишете името на приложение, папка, документ или интернет източник и РеактОС ще го отвори.", 12289, 36, 11, 185, 18 LTEXT "&Отваряне:", 12305, 7, 39, 40, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 46, 37, 174, 100 DEFPUSHBUTTON "Добре", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 2153e26e6a7..a8df7f1d04c 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -168,7 +168,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 + LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 185, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 545c5e972b7..7df419e9e25 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -174,7 +174,7 @@ CAPTION "Spustit" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Zadejte název programu, složky, dokumentu, nebo zdroje v síti Internet a ReactOS jej pro vás otevře.", 12289, 36, 11, 182, 18 + LTEXT "Zadejte název programu, složky, dokumentu, nebo zdroje v síti Internet a ReactOS jej pro vás otevře.", 12289, 36, 11, 185, 18 LTEXT "&Otevřít:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index a56235c52bf..58cb3d542cf 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -174,7 +174,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Indtast navnet på det program, mappe, dokument, eller Internet Ressourcer, du vil have at ReactOS skal åbne for dig.", 12289, 36, 4, 182, 26 + LTEXT "Indtast navnet på det program, mappe, dokument, eller Internet Ressourcer, du vil have at ReactOS skal åbne for dig.", 12289, 36, 4, 185, 26 LTEXT "&Åbn:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index b7ce728a5d8..c27ddcc3605 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -168,7 +168,7 @@ CAPTION "Ausführen" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Geben Sie den Namen eines Programms, eines Ordners, eines Dokuments oder einer Internetressource an.", 12289, 36, 11, 182, 18 + LTEXT "Geben Sie den Namen eines Programms, eines Ordners, eines Dokuments oder einer Internetressource an.", 12289, 36, 11, 185, 18 LTEXT "&Öffnen:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index a876002dbb9..2f54284ad72 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -168,7 +168,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Πληκτρολογήστε το όνομα ενός προγράμματος, φακέλου, εγγράφου, ή πόρου του διαδυκτίου, και το ReactOS θα το ανοίξει.", 12289, 36, 4, 182, 25 + LTEXT "Πληκτρολογήστε το όνομα ενός προγράμματος, φακέλου, εγγράφου, ή πόρου του διαδυκτίου, και το ReactOS θα το ανοίξει.", 12289, 36, 4, 185, 25 LTEXT "Ά&νοιγμα:", 12305, 5, 39, 31, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index f131e8b1bc9..bd6f5bf13f0 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -168,7 +168,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 + LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 185, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index c6e44d96579..ab0e99822f0 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -168,7 +168,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 + LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 185, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 7cf3a777112..99a3f9fe8fc 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -176,7 +176,7 @@ CAPTION "Ejecutar" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Escriba el nombre de un programa, carpeta, documento o recurso de Internet y ReactOS lo abrirá para usted.", 12289, 36, 11, 182, 24 + LTEXT "Escriba el nombre de un programa, carpeta, documento o recurso de Internet y ReactOS lo abrirá para usted.", 12289, 36, 11, 185, 24 LTEXT "&Abrir:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "Aceptar", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index db90fb67e79..e3f70243acc 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -175,7 +175,7 @@ CAPTION "Käivitus" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Kirjuta programmi, kausta, dokumendi või Interneti-ressursi nimi ja ReactOS avab selle.", 12289, 36, 11, 182, 18 + LTEXT "Kirjuta programmi, kausta, dokumendi või Interneti-ressursi nimi ja ReactOS avab selle.", 12289, 36, 11, 185, 18 LTEXT "&Ava:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index aeff7c4c89b..d45b70b30b4 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -168,7 +168,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Anna ohjelma, dokumentti, tai Internet -ressurssi, ja ReactOS avaa sen Sinulle.", 12289, 36, 11, 182, 18 + LTEXT "Anna ohjelma, dokumentti, tai Internet -ressurssi, ja ReactOS avaa sen Sinulle.", 12289, 36, 11, 185, 18 LTEXT "&Avaa:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index c735210e0e5..50cbedfd9a0 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -168,7 +168,7 @@ CAPTION "Exécuter" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Entrez le nom d'un programme, d'un dossier, d'un document ou d'une ressource Internet, et ReactOS l'ouvrira pour vous.", 12289, 36, 4, 182, 26 + LTEXT "Entrez le nom d'un programme, d'un dossier, d'un document ou d'une ressource Internet, et ReactOS l'ouvrira pour vous.", 12289, 36, 4, 185, 26 LTEXT "&Ouvrir :", 12305, 7, 39, 26, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 41202f52043..10d651995c6 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -168,7 +168,7 @@ CAPTION "रन" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "किसी भी प्रोग्राम, फ़ोल्डर, दस्तावेज़ या इंटरनेट संसाधन का नाम टाइप करें, और रिऐक्ट ओएस इसे आपके लिए खोल देगा।", 12289, 36, 11, 182, 18 + LTEXT "किसी भी प्रोग्राम, फ़ोल्डर, दस्तावेज़ या इंटरनेट संसाधन का नाम टाइप करें, और रिऐक्ट ओएस इसे आपके लिए खोल देगा।", 12289, 36, 11, 185, 18 LTEXT "&खोलो:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "ओके", IDOK, 36, 70, 59, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 517757aa5e8..c53607bca99 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -168,7 +168,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Írd be a program nevét, egy mappáét, dokumentumét, vagy egy Internet címet, és a ReactOS megnyitja.", 12289, 36, 11, 182, 18 + LTEXT "Írd be a program nevét, egy mappáét, dokumentumét, vagy egy Internet címet, és a ReactOS megnyitja.", 12289, 36, 11, 185, 18 LTEXT "&Megnyitás:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 9554b6e5160..8816f1b0d4d 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -168,7 +168,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Digitare il nome del programma, della cartella, del documento o della risorsa Internet, e ReactOS la aprirà.", 12289, 36, 11, 182, 18 + LTEXT "Digitare il nome del programma, della cartella, del documento o della risorsa Internet, e ReactOS la aprirà.", 12289, 36, 11, 185, 18 LTEXT "&Apri:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index e2dc4a5b2f2..c6e8f3fb974 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -168,7 +168,7 @@ CAPTION "実行" FONT 9, "MS UI Gothic" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "実行するプログラム名、または開くフォルダや文書名、インターネットリソース名を入力してください。", 12289, 36, 11, 182, 18 + LTEXT "実行するプログラム名、または開くフォルダや文書名、インターネットリソース名を入力してください。", 12289, 36, 11, 185, 18 LTEXT "名前(&O):", 12305, 7, 39, 27, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 731b8530e74..1f959484194 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -168,7 +168,7 @@ CAPTION "Run" FONT 9, "굴림" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 + LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 185, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 0adeadbeb4a..2253aa474c7 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -168,7 +168,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Geef de naam van een programma, map, document, of Internet-adres op. ReactOS zal het vervolgens openen.", 12289, 36, 11, 182, 18 + LTEXT "Geef de naam van een programma, map, document, of Internet-adres op. ReactOS zal het vervolgens openen.", 12289, 36, 11, 185, 18 LTEXT "&Openen:", 12305, 7, 39, 28, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 405d41ca157..befbb8ec170 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -168,7 +168,7 @@ CAPTION "Kjør" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Skriv inn navnet på programmet, mappen, dokumentet etter Internett-ressursen du ønsker å åpne.", 12289, 36, 11, 182, 18 + LTEXT "Skriv inn navnet på programmet, mappen, dokumentet etter Internett-ressursen du ønsker å åpne.", 12289, 36, 11, 185, 18 LTEXT "&Åpne:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 81471353f59..ca4888efba8 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -173,7 +173,7 @@ CAPTION "Uruchamianie" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Wpisz nazwę programu, folderu, katalogu lub zasobu internetowego a zostanie on otwarty przez system ReactOS.", 12289, 36, 11, 182, 18 + LTEXT "Wpisz nazwę programu, folderu, katalogu lub zasobu internetowego a zostanie on otwarty przez system ReactOS.", 12289, 36, 11, 185, 18 LTEXT "&Otwórz:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 2cf3ca3d91b..75de4889eae 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -168,7 +168,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Digite o nome do programa, pasta, documento, ou endereço Internet, que o ReactOS irá abrí-lo para você.", 12289, 36, 11, 182, 18 + LTEXT "Digite o nome do programa, pasta, documento, ou endereço Internet, que o ReactOS irá abrí-lo para você.", 12289, 36, 11, 185, 18 LTEXT "&Abrir:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 75217661774..e3101314a54 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -168,7 +168,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Digite o nome do programa, pasta, documento, ou endereço Internet, que o ReactOS irá abrí-lo.", 12289, 36, 11, 182, 18 + LTEXT "Digite o nome do programa, pasta, documento, ou endereço Internet, que o ReactOS irá abrí-lo.", 12289, 36, 11, 185, 18 LTEXT "&Abrir:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index c240a1ffc43..b38c1cdb31e 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -170,7 +170,7 @@ CAPTION "Executare" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Tastați numele unui program, dosar, document, sau a unei resurse de Internet, în vederea deschiderii în ReactOS.", 12289, 36, 4, 182, 26 + LTEXT "Tastați numele unui program, dosar, document, sau a unei resurse de Internet, în vederea deschiderii în ReactOS.", 12289, 36, 4, 185, 26 LTEXT "&Deschide:", 12305, 7, 39, 33, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 41, 37, 179, 100 DEFPUSHBUTTON "Con&firmă", IDOK, 36, 70, 59, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index bb4c4739f5c..cb72c7e7da1 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -175,7 +175,7 @@ CAPTION "Выполнить" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Введите имя программы, папки, документа или ресурс Интернета, и ReactOS откроет их.", 12289, 36, 11, 182, 18 + LTEXT "Введите имя программы, папки, документа или ресурс Интернета, и ReactOS откроет их.", 12289, 36, 11, 185, 18 LTEXT "&Открыть:", 12305, 7, 39, 34, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 43, 37, 177, 100 DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index cbf72b27f09..4801c057129 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -168,7 +168,7 @@ CAPTION "Spustenie" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Zadajte názov programu, priečinka, dokumentu alebo internetového zdroja a systém ReactOS ho otvorí.", 12289, 36, 11, 182, 18 + LTEXT "Zadajte názov programu, priečinka, dokumentu alebo internetového zdroja a systém ReactOS ho otvorí.", 12289, 36, 11, 185, 18 LTEXT "&Otvoriť:", 12305, 7, 39, 28, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 39, 37, 181, 100 DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 9ae2492e694..8865ff95873 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -168,7 +168,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Vnesite ime programa, mape, dokumenta ali spletne strani, in ReactOS ga (jo) bo odprl.", 12289, 36, 11, 182, 18 + LTEXT "Vnesite ime programa, mape, dokumenta ali spletne strani, in ReactOS ga (jo) bo odprl.", 12289, 36, 11, 185, 18 LTEXT "&Odpri:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "V redu", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 894df616f8e..6bd6e06a641 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -172,7 +172,7 @@ CAPTION "Ekzekuto" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Shkruaj emrin e një programi, dosje, dokumenti, apo burim interneti, dhe ReactOS do të hap atë për ju.", 12289, 36, 11, 182, 18 + LTEXT "Shkruaj emrin e një programi, dosje, dokumenti, apo burim interneti, dhe ReactOS do të hap atë për ju.", 12289, 36, 11, 185, 18 LTEXT "&Hap:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 5bd672219da..21d140c3078 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -168,7 +168,7 @@ CAPTION "Kör" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Skriv namnet på ett program, en mapp, ett dokument eller en internetresurs som du vill öppna.", 12289, 36, 11, 182, 18 + LTEXT "Skriv namnet på ett program, en mapp, ett dokument eller en internetresurs som du vill öppna.", 12289, 36, 11, 185, 18 LTEXT "&Öppna:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 707daa2bb5b..672d522488d 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -170,7 +170,7 @@ CAPTION "Çalıştır" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Bir izlencenin, dizinin, belgenin veyâ Umûmî Ağ kaynağının adını yazınız, ReactOS onu sizin için açacaktır.", 12289, 36, 11, 182, 18 + LTEXT "Bir izlencenin, dizinin, belgenin veyâ Umûmî Ağ kaynağının adını yazınız, ReactOS onu sizin için açacaktır.", 12289, 36, 11, 185, 18 LTEXT "&Aç:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "Tamam", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 44bf966633b..7c1de4f9dcd 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -168,7 +168,7 @@ CAPTION "Виконати" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Введіть ім'я програми, папки, документа або ресурсу Інтернету, і ReactOS відкриє їх.", 12289, 36, 11, 182, 18 + LTEXT "Введіть ім'я програми, папки, документа або ресурсу Інтернету, і ReactOS відкриє їх.", 12289, 36, 11, 185, 18 LTEXT "&Відкрити:", 12305, 7, 39, 32, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 43, 37, 177, 100 DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 8dc96b14aa9..c8422233f31 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -178,7 +178,7 @@ CAPTION "运行" FONT 9, "宋体" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "请输入程序、目录、文件或 Internet 资源名，ReactOS 将为您打开它。", 12289, 36, 11, 182, 18 + LTEXT "请输入程序、目录、文件或 Internet 资源名，ReactOS 将为您打开它。", 12289, 36, 11, 185, 18 LTEXT "打开(&O):", 12305, 7, 39, 32, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 42, 37, 178, 100 DEFPUSHBUTTON "确定", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index c0318181a0c..23d31c02a43 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -177,7 +177,7 @@ CAPTION "執行" FONT 9, "新細明體" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "請輸入程式、資料夾、文件或網際網路的资源名稱，ReactOS 將幫助您開啟。", 12289, 36, 11, 182, 18 + LTEXT "請輸入程式、資料夾、文件或網際網路的资源名稱，ReactOS 將幫助您開啟。", 12289, 36, 11, 185, 18 LTEXT "開啟(&O):", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "確定", IDOK, 36, 70, 59, 14, WS_TABSTOP

1 0

[reactos] 01/01: [TASKMGR] Implement proper process tree ending
by Paweł Cholewa 15 Aug '19

15 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3276824586fefd531f447… commit 3276824586fefd531f4473046618fa2724442a53 Author: Paweł Cholewa <DaMcpg(a)protonmail.com> AuthorDate: Thu Aug 15 19:07:05 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 15 19:07:05 2019 +0200 [TASKMGR] Implement proper process tree ending * Implement ShutdownProcessTree in endproc.c which recursively kills process trees * Include tlhelp32.h in precomp.h * Check if the child process can be shut down --- base/applications/taskmgr/endproc.c | 53 ++++++++++++++++++++++++++++++++++++- base/applications/taskmgr/precomp.h | 1 + 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/base/applications/taskmgr/endproc.c b/base/applications/taskmgr/endproc.c index 04d194cafa2..74ce95f3480 100644 --- a/base/applications/taskmgr/endproc.c +++ b/base/applications/taskmgr/endproc.c @@ -107,6 +107,57 @@ BOOL IsCriticalProcess(HANDLE hProcess) return FALSE; } +BOOL ShutdownProcessTreeHelper(HANDLE hSnapshot, HANDLE hParentProcess, DWORD dwParentPID) +{ + HANDLE hChildHandle; + PROCESSENTRY32W ProcessEntry = {0}; + ProcessEntry.dwSize = sizeof(ProcessEntry); + + if (Process32FirstW(hSnapshot, &ProcessEntry)) + { + do + { + if (ProcessEntry.th32ParentProcessID == dwParentPID) + { + hChildHandle = OpenProcess(PROCESS_TERMINATE | PROCESS_QUERY_INFORMATION, + FALSE, + ProcessEntry.th32ProcessID); + if (!hChildHandle || IsCriticalProcess(hChildHandle)) + { + if (hChildHandle) + { + CloseHandle(hChildHandle); + } + continue; + } + if (!ShutdownProcessTreeHelper(hSnapshot, hChildHandle, ProcessEntry.th32ProcessID)) + { + CloseHandle(hChildHandle); + return FALSE; + } + CloseHandle(hChildHandle); + } + } while (Process32NextW(hSnapshot, &ProcessEntry)); + } + + return TerminateProcess(hParentProcess, 0); +} + +BOOL ShutdownProcessTree(HANDLE hParentProcess, DWORD dwParentPID) +{ + HANDLE hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); + BOOL bResult; + + if (!hSnapshot) + { + return FALSE; + } + + bResult = ShutdownProcessTreeHelper(hSnapshot, hParentProcess, dwParentPID); + CloseHandle(hSnapshot); + return bResult; +} + void ProcessPage_OnEndProcessTree(void) { DWORD dwProcessId; @@ -147,7 +198,7 @@ void ProcessPage_OnEndProcessTree(void) return; } - if (!TerminateProcess(hProcess, 0)) + if (!ShutdownProcessTree(hProcess, dwProcessId)) { GetLastErrorText(strErrorText, 260); LoadStringW(hInst, IDS_MSG_UNABLETERMINATEPRO, szTitle, 256); diff --git a/base/applications/taskmgr/precomp.h b/base/applications/taskmgr/precomp.h index f6bc6813170..d929d4c33f6 100644 --- a/base/applications/taskmgr/precomp.h +++ b/base/applications/taskmgr/precomp.h @@ -18,6 +18,7 @@ #include <winreg.h> #include <commctrl.h> #include <shellapi.h> +#include <tlhelp32.h> #include "column.h" #include "taskmgr.h"

1 0

[reactos] 01/01: [NTOSKRNL] Move DPRINT1("Thread wants too much stack\n") around
by Serge Gautherie 15 Aug '19

15 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=66bf74d228c9d6443c840… commit 66bf74d228c9d6443c8408ae6d37ae7c43251f29 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Apr 25 03:22:16 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 18:18:59 2019 +0200 [NTOSKRNL] Move DPRINT1("Thread wants too much stack\n") around To KiUserModeCallout() from MmGrowKernelStackEx(). As suggested by Thomas Faber: "MmGrowKernelStackEx really shouldn't be DPRINT'ing." CORE-14494 --- ntoskrnl/ke/i386/usercall.c | 10 +++++++++- ntoskrnl/mm/ARM3/procsup.c | 1 - 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/ke/i386/usercall.c b/ntoskrnl/ke/i386/usercall.c index 8fbed380bb9..8f59f7dc103 100644 --- a/ntoskrnl/ke/i386/usercall.c +++ b/ntoskrnl/ke/i386/usercall.c @@ -282,7 +282,15 @@ KiUserModeCallout(PKCALLOUT_FRAME CalloutFrame) Status = MmGrowKernelStack((PVOID)InitialStack); /* Quit if we failed */ - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + if (Status == STATUS_STACK_OVERFLOW) + { + DPRINT1("Thread wants too much stack\n"); + } + + return Status; + } } /* Save the current callback stack and initial stack */ diff --git a/ntoskrnl/mm/ARM3/procsup.c b/ntoskrnl/mm/ARM3/procsup.c index cbc784066a0..6407b7896d0 100644 --- a/ntoskrnl/mm/ARM3/procsup.c +++ b/ntoskrnl/mm/ARM3/procsup.c @@ -405,7 +405,6 @@ MmGrowKernelStackEx(IN PVOID StackPointer, // // Sorry! // - DPRINT1("Thread wants too much stack\n"); return STATUS_STACK_OVERFLOW; }

1 0

[reactos] 13/13: [FREELDR] Improve debug output
by Timo Kreuzer 15 Aug '19

15 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cbb7ad6f5b34b2d0f07a5… commit cbb7ad6f5b34b2d0f07a5ff9777cc0d97d8a117b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 27 09:58:38 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 18:04:57 2019 +0200 [FREELDR] Improve debug output --- boot/freeldr/freeldr/lib/peloader.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index cf90eb851e7..bd4e66573d9 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -287,7 +287,7 @@ WinLdrLoadImage(IN PCHAR FileName, Status = ArcOpen(FileName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { - WARN("Error while opening '%s', Status: %u\n", FileName, Status); + ERR("ArcOpen(FileName: \"%s\", OpenReadOnly: %u) failed. Status %u\n", FileName, OpenReadOnly, Status); return FALSE; } @@ -295,7 +295,7 @@ WinLdrLoadImage(IN PCHAR FileName, Status = ArcRead(FileId, HeadersBuffer, SECTOR_SIZE * 2, &BytesRead); if (Status != ESUCCESS) { - WARN("Error while reading '%s', Status: %u\n", FileName, Status); + ERR("ArcRead(File: '%s') failed. Status: %u\n", FileName, Status); UiMessageBox("Error reading from file."); ArcClose(FileId); return FALSE; @@ -305,7 +305,7 @@ WinLdrLoadImage(IN PCHAR FileName, NtHeaders = RtlImageNtHeader(HeadersBuffer); if (!NtHeaders) { - // Print(L"Error - no NT header found in %s\n", FileName); + ERR("No NT header found in \"%s\"\n", FileName); UiMessageBox("Error - no NT header found."); ArcClose(FileId); return FALSE; @@ -314,7 +314,7 @@ WinLdrLoadImage(IN PCHAR FileName, /* Ensure this is executable image */ if (((NtHeaders->FileHeader.Characteristics & IMAGE_FILE_EXECUTABLE_IMAGE) == 0)) { - // Print(L"Not an executable image %s\n", FileName); + ERR("Not an executable image \"%s\"\n", FileName); UiMessageBox("Not an executable image."); ArcClose(FileId); return FALSE; @@ -336,7 +336,7 @@ WinLdrLoadImage(IN PCHAR FileName, if (PhysicalBase == NULL) { - // Print(L"Failed to alloc pages for image %s\n", FileName); + ERR("Failed to alloc %lu bytes for image %s\n", NtHeaders->OptionalHeader.SizeOfImage, FileName); UiMessageBox("Failed to alloc pages for image."); ArcClose(FileId); return FALSE; @@ -353,7 +353,7 @@ WinLdrLoadImage(IN PCHAR FileName, Status = ArcSeek(FileId, &Position, SeekAbsolute); if (Status != ESUCCESS) { - WARN("Error while seeking '%s', Status: %u\n", FileName, Status); + ERR("ArcSeek(File: '%s') failed. Status: 0x%lx\n", FileName, Status); UiMessageBox("Error seeking the start of a file."); ArcClose(FileId); return FALSE; @@ -362,7 +362,7 @@ WinLdrLoadImage(IN PCHAR FileName, Status = ArcRead(FileId, PhysicalBase, NtHeaders->OptionalHeader.SizeOfHeaders, &BytesRead); if (Status != ESUCCESS) { - WARN("Error while reading '%s', Status: %u\n", FileName, Status); + ERR("ArcRead(File: '%s') failed. Status: %u\n", FileName, Status); UiMessageBox("Error reading headers."); ArcClose(FileId); return FALSE;

1 0

[reactos] 12/13: [NTOS:MM] MmSizeOfSystemCacheInPages is ULONG_PTR, not ULONG
by Timo Kreuzer 15 Aug '19

15 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de679e8f334e565946f2c… commit de679e8f334e565946f2ce32390780b7c95ba5a2 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 27 09:32:29 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 18:04:57 2019 +0200 [NTOS:MM] MmSizeOfSystemCacheInPages is ULONG_PTR, not ULONG Fixes failed assertion on x64. --- ntoskrnl/mm/ARM3/mminit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/mm/ARM3/mminit.c b/ntoskrnl/mm/ARM3/mminit.c index 5e4bc303e01..f1d7c2b7e95 100644 --- a/ntoskrnl/mm/ARM3/mminit.c +++ b/ntoskrnl/mm/ARM3/mminit.c @@ -242,7 +242,7 @@ PMMPTE MiHighestUserPxe; /* These variables define the system cache address space */ PVOID MmSystemCacheStart = (PVOID)MI_SYSTEM_CACHE_START; PVOID MmSystemCacheEnd; -ULONG MmSizeOfSystemCacheInPages; +ULONG_PTR MmSizeOfSystemCacheInPages; MMSUPPORT MmSystemCacheWs; //

1 0

[reactos] 11/13: [NTOS:KE:I386] Fix parameter description for KiSwapContext
by Timo Kreuzer 15 Aug '19

15 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=adcae016c5ef76ed03a3b… commit adcae016c5ef76ed03a3b0b1fa3afd7b16f393ac Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Jun 27 18:05:55 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 18:04:57 2019 +0200 [NTOS:KE:I386] Fix parameter description for KiSwapContext --- ntoskrnl/ke/i386/ctxswitch.S | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/ntoskrnl/ke/i386/ctxswitch.S b/ntoskrnl/ke/i386/ctxswitch.S index 1151a021b14..b680195d19d 100644 --- a/ntoskrnl/ke/i386/ctxswitch.S +++ b/ntoskrnl/ke/i386/ctxswitch.S @@ -29,13 +29,10 @@ EXTERN _KeI386FxsrPresent:DWORD * \brief * The KiSwapContextInternal routine switches context to another thread. * - * BOOLEAN USERCALL KiSwapContextInternal(); + * BOOLEAN USERCALL KiSwapContextInternal(ULONG_PTR OldThreadAndApcFlag@<edx>); * - * Params: - * ESI - Pointer to the KTHREAD to which the caller wishes to - * switch to. - * EDI - Pointer to the KTHREAD to which the caller wishes to - * switch from. + * \param OldThreadAndApcFlag@<edx> + * Pointer to the current thread with the lowest bit set to the current IRQL. * * \returns * APC state. @@ -59,14 +56,14 @@ PUBLIC @KiSwapContextInternal@0 * The KiSwapContext routine switches context to another thread. * * BOOLEAN FASTCALL - * KiSwapContext(PKTHREAD CurrentThread, PKTHREAD TargetThread); + * KiSwapContext(KIRQL WaitIrql@<cl>, PKTHREAD CurrentThread@<edx>); * - * \param CurrentThread + * \param WaitIrql@<cl> + * The IRQL at which the wait happens. + * + * \param CurrentThread@<edx> * Pointer to the KTHREAD of the current thread. * - * \param TargetThread - * Pointer to the KTHREAD to which the caller wishes to switch to. - * * \returns * The WaitStatus of the Target Thread. * @@ -90,13 +87,13 @@ PUBLIC @KiSwapContext@8 mov [esp+4], edi mov [esp+0], ebp - /* Get the wait IRQL */ + /* Combine current thread and the wait IRQL in edx */ or dl, cl /* Do the swap with the registers correctly setup */ call @KiSwapContextInternal@0 - /* Return the registers */ + /* Restore the registers */ mov ebp, [esp+0] mov edi, [esp+4] mov esi, [esp+8]

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs