Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SHELL32] HCR_GetIconA(): Properly use icon_idx (#2482)
by Serge Gautherie 30 Mar '20

30 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=07efa2ef53b3538b314c8… commit 07efa2ef53b3538b314c814a86ff7560ed8a137e Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Mar 30 12:24:59 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Mar 30 12:24:59 2020 +0200 [SHELL32] HCR_GetIconA(): Properly use icon_idx (#2482) CORE-11713 Import https://source.winehq.org/git/wine.git/commit/7cc2806e0e0d97c0df93e2695351a… --- dll/win32/shell32/wine/classes.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/wine/classes.c b/dll/win32/shell32/wine/classes.c index c2c014c09d0..b2a5ca54256 100644 --- a/dll/win32/shell32/wine/classes.c +++ b/dll/win32/shell32/wine/classes.c @@ -332,7 +332,12 @@ BOOL HCR_GetIconA(LPCSTR szClass, LPSTR szDest, LPCSTR szName, DWORD len, int* p ret = HCR_RegGetIconA(hkey, szDest, szName, len, picon_idx); RegCloseKey(hkey); } - TRACE("-- %s %i\n", szDest, *picon_idx); + + if (ret) + TRACE("-- %s %i\n", szDest, *picon_idx); + else + TRACE("-- not found\n"); + return ret; }

1 0

[reactos] 01/01: [WINMM] Add a WARN() when winejoystick.drv is missing (#2480)
by Serge Gautherie 30 Mar '20

30 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=78d8705181721c5e6cffb… commit 78d8705181721c5e6cffb4598fcfeb947b0d91e3 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Mar 30 12:14:52 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Mar 30 12:14:52 2020 +0200 [WINMM] Add a WARN() when winejoystick.drv is missing (#2480) Follow-up to 97150ce9. Import https://source.winehq.org/git/wine.git/commit/175a2a027637719d1f3c644d97b6d… --- dll/win32/winmm/joystick.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dll/win32/winmm/joystick.c b/dll/win32/winmm/joystick.c index 92bd48d3995..304c279e322 100644 --- a/dll/win32/winmm/joystick.c +++ b/dll/win32/winmm/joystick.c @@ -66,6 +66,8 @@ static BOOL JOY_LoadDriver(DWORD dwJoyID) if (!JOY_Sticks[dwJoyID].hDriver) { + WARN("OpenDriverA(\"winejoystick.drv\") failed\n"); + /* The default driver is missing, don't attempt to load it again */ winejoystick_missing = TRUE; }

1 0

[reactos] 01/01: [GDI32] Allow BI_BITFIELDS compression in CreateDIBitmap (#2448)
by Tibor Lajos Füzi 30 Mar '20

30 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6020af20146d798b878d5… commit 6020af20146d798b878d5701fb16328c16835be5 Author: Tibor Lajos Füzi <tibor.fuzi(a)gmail.com> AuthorDate: Mon Mar 30 12:11:38 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Mar 30 12:11:38 2020 +0200 [GDI32] Allow BI_BITFIELDS compression in CreateDIBitmap (#2448) CORE-16750, CORE-15960 --- win32ss/gdi/gdi32/objects/bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/gdi/gdi32/objects/bitmap.c b/win32ss/gdi/gdi32/objects/bitmap.c index a3f4c482c6f..3e56194ce95 100644 --- a/win32ss/gdi/gdi32/objects/bitmap.c +++ b/win32ss/gdi/gdi32/objects/bitmap.c @@ -486,7 +486,7 @@ CreateDIBitmap( } /* Check if the Compr is incompatible */ - if ((Compression == BI_JPEG) || (Compression == BI_PNG) || (Compression == BI_BITFIELDS)) + if ((Compression == BI_JPEG) || (Compression == BI_PNG)) { DPRINT1("Invalid compression: %lu!\n", Compression); goto Exit;

1 0

[reactos] 01/01: [RPCRT4] Fix 'Routeines' typos (#2481)
by Serge Gautherie 30 Mar '20

30 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6e79e60883aed64ab1820… commit 6e79e60883aed64ab18201ac24e945d2933faa2b Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Mar 30 10:28:52 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Mar 30 10:28:52 2020 +0200 [RPCRT4] Fix 'Routeines' typos (#2481) Addendum to b6fdb56b9adf780902cc9cf65af1f76365a96ce4. Import https://source.winehq.org/git/wine.git/commit/c73352047d20a503c67bdd583f6ef… CORE-15682 --- dll/win32/rpcrt4/rpcrt4.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/rpcrt4/rpcrt4.spec b/dll/win32/rpcrt4/rpcrt4.spec index 38bdfd310ee..77b0e8d9c09 100644 --- a/dll/win32/rpcrt4/rpcrt4.spec +++ b/dll/win32/rpcrt4/rpcrt4.spec @@ -511,9 +511,9 @@ 511 stub long_from_ndr 512 stub long_from_ndr_temp 513 stub pfnFreeRoutines -514 stub pfnMarshallRouteines +514 stub pfnMarshallRoutines 515 stub pfnSizeRoutines -516 stub pfnUnmarshallRouteines +516 stub pfnUnmarshallRoutines 517 stub short_array_from_ndr 518 stub short_from_ndr 519 stub short_from_ndr_temp

1 0

[reactos] 01/01: [CMAKE] Fix symbol directory for non-MSVC builds
by Jérôme Gardou 30 Mar '20

30 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a8901130a6c9d2df5632… commit 5a8901130a6c9d2df563207abf3d0a4544bdbc92 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Mar 20 10:30:33 2020 +0000 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Mon Mar 30 07:54:21 2020 +0000 [CMAKE] Fix symbol directory for non-MSVC builds --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ea234693986..777a0335304 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -249,7 +249,11 @@ else() endif() # For MSVC builds, this puts all debug symbols file in the same directory. - set(CMAKE_PDB_OUTPUT_DIRECTORY "${REACTOS_BINARY_DIR}/msvc_pdb") + if (MSVC) + set(CMAKE_PDB_OUTPUT_DIRECTORY "${REACTOS_BINARY_DIR}/msvc_pdb") + elseif(SEPARATE_DBG) + set(CMAKE_PDB_OUTPUT_DIRECTORY "${REACTOS_BINARY_DIR}/symbols") + endif() #begin with boot so reactos_cab target is defined before all other modules add_subdirectory(boot)

1 0

[reactos] 01/01: [KDGDB] Various fixes and improvements
by Jérôme Gardou 30 Mar '20

30 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de369ce26ba0bfc657754… commit de369ce26ba0bfc6577543ede93b41418098940a Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Mar 20 10:32:19 2020 +0000 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Mon Mar 30 07:53:34 2020 +0000 [KDGDB] Various fixes and improvements --- drivers/base/kdgdb/gdb_input.c | 14 +++++++------- drivers/base/kdgdb/gdb_receive.c | 28 ++++++++++++++++++++-------- drivers/base/kdgdb/kdcom.c | 16 ++++++++++------ drivers/base/kdgdb/kdgdb.h | 1 + drivers/base/kdgdb/kdpacket.c | 17 +++++++++++++++-- 5 files changed, 53 insertions(+), 23 deletions(-) diff --git a/drivers/base/kdgdb/gdb_input.c b/drivers/base/kdgdb/gdb_input.c index 9331dbd9e8c..ab2efdc10a4 100644 --- a/drivers/base/kdgdb/gdb_input.c +++ b/drivers/base/kdgdb/gdb_input.c @@ -368,15 +368,16 @@ handle_gdb_query(void) PLDR_DATA_TABLE_ENTRY TableEntry = CONTAINING_RECORD(CurrentEntry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); PVOID DllBase = (PVOID)((ULONG_PTR)TableEntry->DllBase + 0x1000); LONG mem_length; - char* ptr; + USHORT i; /* Convert names to lower case. Yes this _is_ ugly */ - _snprintf(name_helper, 64, "%wZ", &TableEntry->BaseDllName); - for (ptr = name_helper; *ptr; ptr++) + for (i = 0; i < (TableEntry->BaseDllName.Length / sizeof(WCHAR)); i++) { - if (*ptr >= 'A' && *ptr <= 'Z') - *ptr += 'a' - 'A'; + name_helper[i] = (char)TableEntry->BaseDllName.Buffer[i]; + if (name_helper[i] >= 'A' && name_helper[i] <= 'Z') + name_helper[i] += 'a' - 'A'; } + name_helper[i] = 0; /* GDB doesn't load the file if you don't prefix it with a drive letter... */ mem_length = _snprintf(str_helper, 256, "<library name=\"C:\\%s\"><segment address=\"0x%p\"/></library>", &name_helper, DllBase); @@ -393,7 +394,7 @@ handle_gdb_query(void) /* We're done for this pass */ return finish_gdb_packet(); } - + Sent += send_gdb_partial_binary(str_helper, mem_length); } @@ -404,7 +405,6 @@ handle_gdb_query(void) } return finish_gdb_packet(); - } KDDBGPRINT("KDGDB: Unknown query: %s\n", gdb_input); diff --git a/drivers/base/kdgdb/gdb_receive.c b/drivers/base/kdgdb/gdb_receive.c index a246f5f3d51..b97769d1742 100644 --- a/drivers/base/kdgdb/gdb_receive.c +++ b/drivers/base/kdgdb/gdb_receive.c @@ -30,24 +30,22 @@ KDSTATUS NTAPI gdb_receive_packet(_Inout_ PKD_CONTEXT KdContext) { - UCHAR* ByteBuffer = (UCHAR*)gdb_input; + UCHAR* ByteBuffer; UCHAR Byte; KDSTATUS Status; - CHAR CheckSum = 0, ReceivedCheckSum; + CHAR CheckSum, ReceivedCheckSum; do { Status = KdpReceiveByte(&Byte); if (Status != KdPacketReceived) return Status; - if (Byte == 0x03) - { - KDDBGPRINT("BREAK!"); - KdContext->KdpControlCPending = TRUE; - return KdPacketNeedsResend; - } } while (Byte != '$'); +get_packet: + CheckSum = 0; + ByteBuffer = (UCHAR*)gdb_input; + while (TRUE) { /* Try to get a byte from the port */ @@ -94,6 +92,20 @@ end: return KdPacketNeedsResend; } + /* Ensure there is nothing left in the pipe */ + while (KdpPollByte(&Byte) == KdPacketReceived) + { + switch (Byte) + { + case '$': + KDDBGPRINT("Received new packet just after %s.\n", gdb_input); + goto get_packet; + case 0x03: + KdContext->KdpControlCPending = TRUE; + break; + } + } + /* Acknowledge */ KdpSendByte('+'); diff --git a/drivers/base/kdgdb/kdcom.c b/drivers/base/kdgdb/kdcom.c index 1a798b74403..af9ec39829c 100644 --- a/drivers/base/kdgdb/kdcom.c +++ b/drivers/base/kdgdb/kdcom.c @@ -129,11 +129,9 @@ KdpPortInitialize(IN ULONG ComPortNumber, { return STATUS_INVALID_PARAMETER; } - else - { - KdComPortInUse = KdComPort.Address; - return STATUS_SUCCESS; - } + + KdComPortInUse = KdComPort.Address; + return STATUS_SUCCESS; } /****************************************************************************** @@ -300,7 +298,13 @@ KDSTATUS NTAPI KdpReceiveByte(_Out_ PUCHAR OutByte) { - USHORT CpStatus = CpGetByte(&KdComPort, OutByte, TRUE, FALSE); + USHORT CpStatus; + + do + { + CpStatus = CpGetByte(&KdComPort, OutByte, TRUE, FALSE); + } while (CpStatus == CP_GET_NODATA); + /* Get the byte */ if (CpStatus == CP_GET_SUCCESS) { diff --git a/drivers/base/kdgdb/kdgdb.h b/drivers/base/kdgdb/kdgdb.h index d2f4cd1de34..d09ef74593b 100644 --- a/drivers/base/kdgdb/kdgdb.h +++ b/drivers/base/kdgdb/kdgdb.h @@ -96,6 +96,7 @@ extern const char hex_chars[]; KDSTATUS NTAPI KdpPollBreakIn(VOID); VOID NTAPI KdpSendByte(_In_ UCHAR Byte); KDSTATUS NTAPI KdpReceiveByte(_Out_ PUCHAR OutByte); +KDSTATUS NTAPI KdpPollByte(OUT PUCHAR OutByte); /* kdpacket.c */ extern DBGKD_ANY_WAIT_STATE_CHANGE CurrentStateChange; diff --git a/drivers/base/kdgdb/kdpacket.c b/drivers/base/kdgdb/kdpacket.c index 3e6474a68bc..fe776eef55e 100644 --- a/drivers/base/kdgdb/kdpacket.c +++ b/drivers/base/kdgdb/kdpacket.c @@ -360,15 +360,25 @@ KdReceivePacket( _Out_ PULONG DataLength, _Inout_ PKD_CONTEXT KdContext) { - KDDBGPRINT("KdReceivePacket.\n"); + KDDBGPRINT("KdReceivePacket --> "); if (PacketType == PACKET_TYPE_KD_POLL_BREAKIN) { + static BOOLEAN firstTime = TRUE; + KDDBGPRINT("Polling break in.\n"); + if (firstTime) + { + /* Force debug break on init */ + firstTime = FALSE; + return KdPacketReceived; + } + return KdpPollBreakIn(); } if (PacketType == PACKET_TYPE_KD_DEBUG_IO) { + KDDBGPRINT("Debug prompt.\n"); /* HACK ! RtlAssert asks for (boipt), always say "o" --> break once. */ MessageData->Length = 1; MessageData->Buffer[0] = 'o'; @@ -379,14 +389,17 @@ KdReceivePacket( { DBGKD_MANIPULATE_STATE64* State = (DBGKD_MANIPULATE_STATE64*)MessageHeader->Buffer; + KDDBGPRINT("State manipulation: "); + /* Maybe we are in a send<->receive loop that GDB doesn't need to know about */ if (KdpManipulateStateHandler != NULL) { - KDDBGPRINT("KDGBD: We have a manipulate state handler.\n"); + KDDBGPRINT("We have a manipulate state handler.\n"); return KdpManipulateStateHandler(State, MessageData, DataLength, KdContext); } /* Receive data from GDB and interpret it */ + KDDBGPRINT("Receiving data from GDB.\n"); return gdb_receive_and_interpret_packet(State, MessageData, DataLength, KdContext); }

1 0

[reactos] 01/01: [NTOSKRNL] Fix build
by Jérôme Gardou 30 Mar '20

30 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0b5033e2ff891f47f0a72… commit 0b5033e2ff891f47f0a72c00847ab2028f279511 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Mar 20 10:32:40 2020 +0000 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Mon Mar 30 07:36:30 2020 +0000 [NTOSKRNL] Fix build --- ntoskrnl/kd64/kdapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/kd64/kdapi.c b/ntoskrnl/kd64/kdapi.c index e7d304bf726..06c80a29668 100644 --- a/ntoskrnl/kd64/kdapi.c +++ b/ntoskrnl/kd64/kdapi.c @@ -2165,7 +2165,7 @@ KdSystemDebugControl( _In_ KPROCESSOR_MODE PreviousMode) { /* Handle some internal commands */ - switch (Command) + switch ((ULONG)Command) { #if DBG case ' soR': /* ROS-INTERNAL */

1 0

[reactos] 01/01: [HOTPLUG] Enable the hotplug.cpl and add the 'Safely Remove Hardware' dialog
by Eric Kohl 29 Mar '20

29 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2125fec23adb22186da43… commit 2125fec23adb22186da43351edb9d680b171f379 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Mar 30 00:37:45 2020 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Mar 30 00:38:33 2020 +0200 [HOTPLUG] Enable the hotplug.cpl and add the 'Safely Remove Hardware' dialog --- dll/cpl/CMakeLists.txt | 1 + dll/cpl/hotplug/CMakeLists.txt | 3 ++ dll/cpl/hotplug/hotplug.c | 85 ++++++++++++++++++++++++++++++---------- dll/cpl/hotplug/hotplug.rc | 18 +++++++++ dll/cpl/hotplug/lang/de-DE.rc | 18 +++++++++ dll/cpl/hotplug/lang/en-US.rc | 18 +++++++++ dll/cpl/hotplug/resource.h | 19 ++++++--- dll/cpl/hotplug/resources/1.ico | Bin 0 -> 2550 bytes 8 files changed, 136 insertions(+), 26 deletions(-) diff --git a/dll/cpl/CMakeLists.txt b/dll/cpl/CMakeLists.txt index beaa7e200db..d4f7bfc499d 100644 --- a/dll/cpl/CMakeLists.txt +++ b/dll/cpl/CMakeLists.txt @@ -4,6 +4,7 @@ add_subdirectory(appwiz) add_subdirectory(console) add_subdirectory(desk) add_subdirectory(hdwwiz) +add_subdirectory(hotplug) add_subdirectory(inetcpl) add_subdirectory(input) add_subdirectory(intl) diff --git a/dll/cpl/hotplug/CMakeLists.txt b/dll/cpl/hotplug/CMakeLists.txt index 65bd5237a20..ec6588697c5 100644 --- a/dll/cpl/hotplug/CMakeLists.txt +++ b/dll/cpl/hotplug/CMakeLists.txt @@ -5,6 +5,9 @@ list(APPEND SOURCE hotplug.c enum.c) +file(GLOB hotplug_rc_deps resources/*.*) +add_rc_deps(hotplug.rc ${hotplug_rc_deps}) + add_library(hotplug MODULE ${SOURCE} hotplug.rc diff --git a/dll/cpl/hotplug/hotplug.c b/dll/cpl/hotplug/hotplug.c index 295a3cbad82..c67d0d80376 100644 --- a/dll/cpl/hotplug/hotplug.c +++ b/dll/cpl/hotplug/hotplug.c @@ -8,26 +8,66 @@ #include "hotplug.h" +#define NDEBUG +#include <debug.h> + // globals HINSTANCE hApplet = 0; /* Applets */ APPLET Applets[NUM_APPLETS] = { - {IDC_CPLICON, IDS_CPLNAME, IDS_CPLDESCRIPTION, InitApplet} + {IDI_HOTPLUG, IDS_CPLNAME, IDS_CPLDESCRIPTION, InitApplet} }; +INT_PTR +CALLBACK +SafeRemovalDlgProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + + switch (uMsg) + { + case WM_INITDIALOG: + return TRUE; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDCLOSE: + EndDialog(hwndDlg, TRUE); + break; + + } + break; + } + + return FALSE; +} + + LONG APIENTRY InitApplet( - HWND hwnd, + HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) { + DPRINT1("InitApplet()\n"); + + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_SAFE_REMOVE_HARDWARE_DIALOG), + hwnd, + SafeRemovalDlgProc); + // TODO - return FALSE; + return TRUE; } @@ -39,29 +79,32 @@ CPlApplet( LPARAM lParam1, LPARAM lParam2) { + UINT i = (UINT)lParam1; + switch(uMsg) { case CPL_INIT: - { return TRUE; - } + case CPL_GETCOUNT: - { return NUM_APPLETS; - } + case CPL_INQUIRE: - { - CPLINFO *CPlInfo = (CPLINFO*)lParam2; - CPlInfo->idIcon = Applets[0].idIcon; - CPlInfo->idName = Applets[0].idName; - CPlInfo->idInfo = Applets[0].idDescription; + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + } break; - } + case CPL_DBLCLK: - { - InitApplet(hwndCPl, uMsg, lParam1, lParam2); + Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); break; - } + + case CPL_STARTWPARMSW: + return Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); } return FALSE; } @@ -76,12 +119,12 @@ DllMain( { UNREFERENCED_PARAMETER(lpvReserved); - switch(dwReason) + switch (dwReason) { - case DLL_PROCESS_ATTACH: - case DLL_THREAD_ATTACH: - hApplet = hinstDLL; - break; + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + hApplet = hinstDLL; + break; } return TRUE; } diff --git a/dll/cpl/hotplug/hotplug.rc b/dll/cpl/hotplug/hotplug.rc index 95b9ee77cc4..270b75c77ef 100644 --- a/dll/cpl/hotplug/hotplug.rc +++ b/dll/cpl/hotplug/hotplug.rc @@ -7,11 +7,29 @@ */ #include <windef.h> +#include <winuser.h> +#include <commctrl.h> #include "resource.h" +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Hardware Safe Removal Support" #define REACTOS_STR_INTERNAL_NAME "hotplug" #define REACTOS_STR_ORIGINAL_FILENAME "hotplug.dll" #include <reactos/version.rc> + +IDI_HOTPLUG ICON "resources/1.ico" + +#include <reactos/manifest_hosted.rc> + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif diff --git a/dll/cpl/hotplug/lang/de-DE.rc b/dll/cpl/hotplug/lang/de-DE.rc new file mode 100644 index 00000000000..46e04653c88 --- /dev/null +++ b/dll/cpl/hotplug/lang/de-DE.rc @@ -0,0 +1,18 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_SAFE_REMOVE_HARDWARE_DIALOG DIALOGEX 0, 0, 278, 245 +CAPTION "Hardware sicher entfernen" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HOTPLUG, IDC_SAFE_REMOVE_ICON, 7, 10, 20, 20 + LTEXT "Wählen Sie das Gerät aus, das Sie entfernen möchten, und klicken Sie auf ""Beenden"". Sie erhalten eine Benachrichtigung, wenn Sie das Gerät sicher entfernen können.", IDC_STATIC, 36, 12, 234, 24, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Hardwarekomponenten:", IDC_STATIC, 7, 42, 248, 8, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_SAFE_REMOVE_DEVICE_TREE, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 7, 52, 264, 102 + LTEXT "", IDC_SAFE_REMOVE_TEXT, 7, 156, 264, 16, WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "E&igenschaften", IDC_SAFE_REMOVE_PROPERTIES, 158, 178, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "B&eenden", IDC_SAFE_REMOVE_STOP, 216, 178, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_STATIC, "static", SS_CENTER | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 200, 264, 1 + AUTOCHECKBOX "&Gerätekomponenten anzeigen", IDC_SAFE_REMOVE_DISPLAY_COMPONENTS, 7, 208, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Schließen", IDCLOSE, 216, 224, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END diff --git a/dll/cpl/hotplug/lang/en-US.rc b/dll/cpl/hotplug/lang/en-US.rc new file mode 100644 index 00000000000..1ac4e2e06e2 --- /dev/null +++ b/dll/cpl/hotplug/lang/en-US.rc @@ -0,0 +1,18 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_SAFE_REMOVE_HARDWARE_DIALOG DIALOGEX 0, 0, 278, 245 +CAPTION "Safely Remove Hardware" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HOTPLUG, IDC_SAFE_REMOVE_ICON, 7, 10, 20, 20 + LTEXT "Select the device you want to unplug or eject, and then click Stop. When ReactOS notifies you that it is safe to do so unplug the device from your computer.", IDC_STATIC, 36, 12, 234, 24, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Hardware devices:", IDC_STATIC, 7, 42, 248, 8, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_SAFE_REMOVE_DEVICE_TREE, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 7, 52, 264, 102 + LTEXT "", IDC_SAFE_REMOVE_TEXT, 7, 156, 264, 16, WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "&Properties", IDC_SAFE_REMOVE_PROPERTIES, 158, 178, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Stop", IDC_SAFE_REMOVE_STOP, 216, 178, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_STATIC, "static", SS_CENTER | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 200, 264, 1 + AUTOCHECKBOX "&Display device components", IDC_SAFE_REMOVE_DISPLAY_COMPONENTS, 7, 208, 112, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Close", IDCLOSE, 216, 224, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END diff --git a/dll/cpl/hotplug/resource.h b/dll/cpl/hotplug/resource.h index 35f5f2a5195..5ad44b59c03 100644 --- a/dll/cpl/hotplug/resource.h +++ b/dll/cpl/hotplug/resource.h @@ -1,12 +1,21 @@ #pragma once +/* Icon ids */ +#define IDI_HOTPLUG 100 + /* Dialog ids */ -#define IDD_SAFE_REMOVE_HARDWARE_DIALOG 100 -#define IDD_CONFIRM_STOP_HARDWARE_DIALOG 101 +#define IDC_STATIC -1 + +#define IDD_SAFE_REMOVE_HARDWARE_DIALOG 300 +#define IDC_SAFE_REMOVE_ICON 301 +#define IDC_SAFE_REMOVE_DEVICE_TREE 302 +#define IDC_SAFE_REMOVE_TEXT 303 +#define IDC_SAFE_REMOVE_PROPERTIES 304 +#define IDC_SAFE_REMOVE_STOP 305 +#define IDC_SAFE_REMOVE_DISPLAY_COMPONENTS 306 + +#define IDD_CONFIRM_STOP_HARDWARE_DIALOG 310 /* Resource strings ids */ #define IDS_CPLNAME 1000 #define IDS_CPLDESCRIPTION 1001 - -/* Control ids */ -#define IDC_CPLICON 10000 diff --git a/dll/cpl/hotplug/resources/1.ico b/dll/cpl/hotplug/resources/1.ico new file mode 100644 index 00000000000..f615f0ebd3c Binary files /dev/null and b/dll/cpl/hotplug/resources/1.ico differ

1 0

[reactos] 02/02: [RTL] Introduce RtlpImageNtHeader, which implements the required functionality. ntdll and ntoskrnl now have a wrapper for this, with SEH. This protects the function against malformed / bad images, whilst still being able to use the code in freeldr et al. Idea from Thomas. CORE-14857
by Mark Jansen 29 Mar '20

29 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=177ae91bf63810daae17f… commit 177ae91bf63810daae17f15bb21be16592c485a1 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Mar 28 14:28:49 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 29 21:27:38 2020 +0200 [RTL] Introduce RtlpImageNtHeader, which implements the required functionality. ntdll and ntoskrnl now have a wrapper for this, with SEH. This protects the function against malformed / bad images, whilst still being able to use the code in freeldr et al. Idea from Thomas. CORE-14857 --- boot/environ/CMakeLists.txt | 1 + boot/environ/lib/rtl/libsupp.c | 39 ++++++++++++++++++++++++++++++ boot/freeldr/freeldr/lib/rtl/libsupp.c | 27 +++++++++++++++++++++ dll/ntdll/rtl/libsupp.c | 43 ++++++++++++++++++++++++++++++++++ dll/win32/kernel32/client/loader.c | 13 ++-------- ntoskrnl/rtl/libsupp.c | 43 ++++++++++++++++++++++++++++++++++ sdk/lib/rtl/image.c | 3 +-- 7 files changed, 156 insertions(+), 13 deletions(-) diff --git a/boot/environ/CMakeLists.txt b/boot/environ/CMakeLists.txt index f79136c42ea..daa621ac216 100644 --- a/boot/environ/CMakeLists.txt +++ b/boot/environ/CMakeLists.txt @@ -20,6 +20,7 @@ list(APPEND BOOTLIB_SOURCE lib/misc/resource.c lib/misc/font.c lib/misc/rtlcompat.c + lib/rtl/libsupp.c lib/firmware/fwutil.c lib/firmware/efi/firmware.c lib/mm/mm.c diff --git a/boot/environ/lib/rtl/libsupp.c b/boot/environ/lib/rtl/libsupp.c new file mode 100644 index 00000000000..257b859893a --- /dev/null +++ b/boot/environ/lib/rtl/libsupp.c @@ -0,0 +1,39 @@ +/* + * COPYRIGHT: See COPYING.ARM in the top level directory + * PROJECT: ReactOS UEFI Boot Library + * FILE: boot/environ/lib/rtl/libsupp.c + * PURPOSE: RTL Support Routines + * PROGRAMMER: Mark Jansen (mark.jansen(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "bl.h" + +/* FUNCTIONS *****************************************************************/ + +/* Ldr access to IMAGE_NT_HEADERS without SEH */ + +/* Rtl SEH-Free version of this */ +NTSTATUS +NTAPI +RtlpImageNtHeaderEx( + _In_ ULONG Flags, + _In_ PVOID Base, + _In_ ULONG64 Size, + _Out_ PIMAGE_NT_HEADERS *OutHeaders); + + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlImageNtHeaderEx( + _In_ ULONG Flags, + _In_ PVOID Base, + _In_ ULONG64 Size, + _Out_ PIMAGE_NT_HEADERS *OutHeaders) +{ + return RtlpImageNtHeaderEx(Flags, Base, Size, OutHeaders); +} diff --git a/boot/freeldr/freeldr/lib/rtl/libsupp.c b/boot/freeldr/freeldr/lib/rtl/libsupp.c index eb9bc2acd13..585164d03f3 100644 --- a/boot/freeldr/freeldr/lib/rtl/libsupp.c +++ b/boot/freeldr/freeldr/lib/rtl/libsupp.c @@ -57,3 +57,30 @@ RtlpSafeCopyMemory( RtlCopyMemory(Destination, Source, Length); return STATUS_SUCCESS; } + +/* Ldr access to IMAGE_NT_HEADERS without SEH */ + +/* Rtl SEH-Free version of this */ +NTSTATUS +NTAPI +RtlpImageNtHeaderEx( + _In_ ULONG Flags, + _In_ PVOID Base, + _In_ ULONG64 Size, + _Out_ PIMAGE_NT_HEADERS *OutHeaders); + + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlImageNtHeaderEx( + _In_ ULONG Flags, + _In_ PVOID Base, + _In_ ULONG64 Size, + _Out_ PIMAGE_NT_HEADERS *OutHeaders) +{ + return RtlpImageNtHeaderEx(Flags, Base, Size, OutHeaders); +} + diff --git a/dll/ntdll/rtl/libsupp.c b/dll/ntdll/rtl/libsupp.c index 94c6f0e5b00..c16f243cec4 100644 --- a/dll/ntdll/rtl/libsupp.c +++ b/dll/ntdll/rtl/libsupp.c @@ -505,6 +505,49 @@ RtlpGetAtomEntry(PRTL_ATOM_TABLE AtomTable, ULONG Index) return NULL; } +/* Ldr SEH-Protected access to IMAGE_NT_HEADERS */ + +/* Rtl SEH-Free version of this */ +NTSTATUS +NTAPI +RtlpImageNtHeaderEx( + _In_ ULONG Flags, + _In_ PVOID Base, + _In_ ULONG64 Size, + _Out_ PIMAGE_NT_HEADERS *OutHeaders); + + +/* + * @implemented + * @note: This is here, so that we do not drag SEH into rosload, freeldr and bootmgfw + */ +NTSTATUS +NTAPI +RtlImageNtHeaderEx( + _In_ ULONG Flags, + _In_ PVOID Base, + _In_ ULONG64 Size, + _Out_ PIMAGE_NT_HEADERS *OutHeaders) +{ + NTSTATUS Status; + + /* Assume failure. This is also done in RtlpImageNtHeaderEx, but this is guarded by SEH. */ + if (OutHeaders != NULL) + *OutHeaders = NULL; + + _SEH2_TRY + { + Status = RtlpImageNtHeaderEx(Flags, Base, Size, OutHeaders); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Fail with the SEH error */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + return Status; +} /* * Ldr Resource support code diff --git a/dll/win32/kernel32/client/loader.c b/dll/win32/kernel32/client/loader.c index ec4111470a3..93eb366a0f0 100644 --- a/dll/win32/kernel32/client/loader.c +++ b/dll/win32/kernel32/client/loader.c @@ -464,17 +464,8 @@ FreeLibrary(HINSTANCE hLibModule) if (LDR_IS_DATAFILE(hLibModule)) { - // FIXME: This SEH should go inside RtlImageNtHeader instead - // See https://jira.reactos.org/browse/CORE-14857 - _SEH2_TRY - { - /* This is a LOAD_LIBRARY_AS_DATAFILE module, check if it's a valid one */ - NtHeaders = RtlImageNtHeader((PVOID)((ULONG_PTR)hLibModule & ~1)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - NtHeaders = NULL; - } _SEH2_END + /* This is a LOAD_LIBRARY_AS_DATAFILE module, check if it's a valid one */ + NtHeaders = RtlImageNtHeader((PVOID)((ULONG_PTR)hLibModule & ~1)); if (NtHeaders) { diff --git a/ntoskrnl/rtl/libsupp.c b/ntoskrnl/rtl/libsupp.c index d461a795377..c1ded68d35c 100644 --- a/ntoskrnl/rtl/libsupp.c +++ b/ntoskrnl/rtl/libsupp.c @@ -691,6 +691,49 @@ RtlpGetAtomEntry(PRTL_ATOM_TABLE AtomTable, ULONG Index) return Entry; } +/* Ldr SEH-Protected access to IMAGE_NT_HEADERS */ + +/* Rtl SEH-Free version of this */ +NTSTATUS +NTAPI +RtlpImageNtHeaderEx( + _In_ ULONG Flags, + _In_ PVOID Base, + _In_ ULONG64 Size, + _Out_ PIMAGE_NT_HEADERS *OutHeaders); + +/* + * @implemented + * @note: This is here, so that we do not drag SEH into rosload, freeldr and bootmgfw + */ +NTSTATUS +NTAPI +RtlImageNtHeaderEx( + _In_ ULONG Flags, + _In_ PVOID Base, + _In_ ULONG64 Size, + _Out_ PIMAGE_NT_HEADERS *OutHeaders) +{ + NTSTATUS Status; + + /* Assume failure. This is also done in RtlpImageNtHeaderEx, but this is guarded by SEH. */ + if (OutHeaders != NULL) + *OutHeaders = NULL; + + _SEH2_TRY + { + Status = RtlpImageNtHeaderEx(Flags, Base, Size, OutHeaders); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Fail with the SEH error */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + return Status; +} + /* * Ldr Resource support code */ diff --git a/sdk/lib/rtl/image.c b/sdk/lib/rtl/image.c index 5629c775fde..5ae6f679f72 100644 --- a/sdk/lib/rtl/image.c +++ b/sdk/lib/rtl/image.c @@ -134,11 +134,10 @@ LdrVerifyMappedImageMatchesChecksum( /* * @implemented - * @note This needs SEH (See https://jira.reactos.org/browse/CORE-14857) */ NTSTATUS NTAPI -RtlImageNtHeaderEx( +RtlpImageNtHeaderEx( _In_ ULONG Flags, _In_ PVOID Base, _In_ ULONG64 Size,

1 0

[reactos] 01/02: [NDK] Ensure RTL_IMAGE_NT_HEADER_EX_FLAG_NO_RANGE_CHECK is available regardless of NTOS_MODE_USER being defined. CORE-14857
by Mark Jansen 29 Mar '20

29 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4b2665046d4a35aa3cd24… commit 4b2665046d4a35aa3cd2497f6b19abc52381efa5 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Mar 28 16:30:42 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 29 21:27:38 2020 +0200 [NDK] Ensure RTL_IMAGE_NT_HEADER_EX_FLAG_NO_RANGE_CHECK is available regardless of NTOS_MODE_USER being defined. CORE-14857 --- sdk/include/ndk/rtltypes.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sdk/include/ndk/rtltypes.h b/sdk/include/ndk/rtltypes.h index ee3206768e6..42178ec0f7a 100644 --- a/sdk/include/ndk/rtltypes.h +++ b/sdk/include/ndk/rtltypes.h @@ -290,11 +290,6 @@ C_ASSERT(HEAP_CREATE_VALID_MASK == 0x0007F0FF); #define RTL_FIND_CHAR_IN_UNICODE_STRING_COMPLEMENT_CHAR_SET 2 #define RTL_FIND_CHAR_IN_UNICODE_STRING_CASE_INSENSITIVE 4 -// -// RtlImageNtHeaderEx Flags -// -#define RTL_IMAGE_NT_HEADER_EX_FLAG_NO_RANGE_CHECK 0x00000001 - // // RtlDosApplyFileIsolationRedirection_Ustr Flags // @@ -354,6 +349,13 @@ C_ASSERT(HEAP_CREATE_VALID_MASK == 0x0007F0FF); #define MESSAGE_RESOURCE_UNICODE 0x0001 #endif /* !NTOS_MODE_USER */ + +// +// RtlImageNtHeaderEx Flags +// +#define RTL_IMAGE_NT_HEADER_EX_FLAG_NO_RANGE_CHECK 0x00000001 + + #define MAXIMUM_LEADBYTES 12 //

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