Ros-diffs July 2019

ros-diffs@reactos.org

22 participants
146 discussions

[reactos] 01/01: [USER32_APITEST][INCLUDE] Add MessageStateAnalyzer testcase (#1732)
by Katayama Hirofumi MZ 24 Jul '19

24 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=782160bbc02dcfd312e9c… commit 782160bbc02dcfd312e9c80cdf6d4932a21df8b7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jul 25 01:45:55 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jul 25 01:45:55 2019 +0900 [USER32_APITEST][INCLUDE] Add MessageStateAnalyzer testcase (#1732) I want to visualize the message stream and verify the states of each message. ROSTESTS-328 - Add a testcase named MessageStateAnalyzer into user32_apitest. - Also fix type casts in <windowsx.h>. --- modules/rostests/apitests/user32/CMakeLists.txt | 1 + .../apitests/user32/MessageStateAnalyzer.c | 569 +++++++++++++++++++++ modules/rostests/apitests/user32/testlist.c | 2 + sdk/include/psdk/windowsx.h | 24 +- sdk/include/reactos/msgdump.h | 5 +- 5 files changed, 588 insertions(+), 13 deletions(-) diff --git a/modules/rostests/apitests/user32/CMakeLists.txt b/modules/rostests/apitests/user32/CMakeLists.txt index 5652cc76bfa..24a6921472b 100644 --- a/modules/rostests/apitests/user32/CMakeLists.txt +++ b/modules/rostests/apitests/user32/CMakeLists.txt @@ -23,6 +23,7 @@ list(APPEND SOURCE InitializeLpkHooks.c LoadImage.c LookupIconIdFromDirectoryEx.c + MessageStateAnalyzer.c NextDlgItem.c PrivateExtractIcons.c RealGetWindowClass.c diff --git a/modules/rostests/apitests/user32/MessageStateAnalyzer.c b/modules/rostests/apitests/user32/MessageStateAnalyzer.c new file mode 100644 index 00000000000..490b69d3e69 --- /dev/null +++ b/modules/rostests/apitests/user32/MessageStateAnalyzer.c @@ -0,0 +1,569 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: debugging and analysis of message states + * COPYRIGHT: Copyright 2019 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ +#include <strsafe.h> +#include "undocuser.h" +#include "winxx.h" + +static void MsgDumpPrintf(LPCSTR fmt, ...) +{ + static char s_szText[1024]; + va_list va; + va_start(va, fmt); + StringCbVPrintfA(s_szText, sizeof(s_szText), fmt, va); + trace("%s", s_szText); + va_end(va); +} +#define MSGDUMP_TPRINTF MsgDumpPrintf +static char s_prefix[16] = ""; +#define MSGDUMP_PREFIX s_prefix +#include "msgdump.h" /* msgdump.h needs MSGDUMP_TPRINTF and MSGDUMP_PREFIX */ + +typedef enum STAGE_TYPE +{ + STAGE_TYPE_SEQUENCE, + STAGE_TYPE_COUNTING +} STAGE_TYPE; + +typedef struct STAGE +{ + INT nLine; + UINT uParentMsg; + INT nLevel; + STAGE_TYPE nType; + INT iFirstAction; + INT nCount; + UINT uMessages[10]; + INT iActions[10]; + INT nCounters[10]; +} STAGE; + +/* variables */ +static INT s_iStage; +static INT s_iStep; +static INT s_nLevel; +static BOOL s_bNextStage; +static INT s_nCounters[10]; +static UINT s_msgStack[32]; +static const STAGE *s_pStages; +static INT s_cStages; + +/* macros */ +#define TIMEOUT_TIMER 999 +#define TOTAL_TIMEOUT (5 * 1000) +#define WIDTH 300 +#define HEIGHT 200 +#define PARENT_MSG s_msgStack[s_nLevel - 1] + +static void DoInitialize(const STAGE *pStages, INT cStages) +{ + s_iStage = s_iStep = s_nLevel = 0; + s_bNextStage = FALSE; + ZeroMemory(s_nCounters, sizeof(s_nCounters)); + ZeroMemory(s_msgStack, sizeof(s_msgStack)); + s_pStages = pStages; + s_cStages = cStages; +} + +static void DoFinish(void) +{ + ok_int(s_iStage, s_cStages); + if (s_iStage != s_cStages) + { + skip("Some stage(s) skipped (Step: %d)\n", s_iStep); + } +} + +typedef enum ACTION +{ + ACTION_ZERO = 0, + ACTION_FIRSTMINMAX, + ACTION_NCCREATE, + ACTION_SHOW, + ACTION_IME_SETCONTEXT_OPEN, + ACTION_IME_NOTIFY_OPEN, + ACTION_DESTROY, + ACTION_IME_SETCONTEXT_CLOSE, + ACTION_IME_NOTIFY_CLOSE, + ACTION_HIDE, + ACTION_DEACTIVATE, + ACTION_ACTIVATE +} ACTION; + +static void DoAction(HWND hwnd, INT iAction, WPARAM wParam, LPARAM lParam) +{ + RECT rc; + switch (iAction) + { + case ACTION_ZERO: + /* does nothing */ + break; + case ACTION_FIRSTMINMAX: + GetWindowRect(hwnd, &rc); + ok_long(rc.right - rc.left, 0); + ok_long(rc.bottom - rc.top, 0); + ok_int(IsWindowVisible(hwnd), FALSE); + break; + case ACTION_NCCREATE: + GetWindowRect(hwnd, &rc); + ok_long(rc.right - rc.left, WIDTH); + ok_long(rc.bottom - rc.top, HEIGHT); + ok_int(IsWindowVisible(hwnd), FALSE); + break; + case ACTION_SHOW: + ShowWindow(hwnd, SW_SHOWNORMAL); + break; + case ACTION_IME_SETCONTEXT_OPEN: + ok(wParam == 1, "Step %d: wParam was %p\n", s_iStep, (void *)wParam); + ok(lParam == 0xC000000F, "Step %d: lParam was %p\n", s_iStep, (void *)lParam); + break; + case ACTION_IME_NOTIFY_OPEN: + ok(wParam == 2, "Step %d: wParam was %p\n", s_iStep, (void *)wParam); + ok(lParam == 0, "Step %d: lParam was %p\n", s_iStep, (void *)lParam); + break; + case ACTION_DESTROY: + DestroyWindow(hwnd); + break; + case ACTION_IME_SETCONTEXT_CLOSE: + ok(wParam == 0, "Step %d: wParam was %p\n", s_iStep, (void *)wParam); + ok(lParam == 0xC000000F, "Step %d: lParam was %p\n", s_iStep, (void *)lParam); + break; + case ACTION_IME_NOTIFY_CLOSE: + ok(wParam == 1, "Step %d: wParam was %p\n", s_iStep, (void *)wParam); + ok(lParam == 0, "Step %d: lParam was %p\n", s_iStep, (void *)lParam); + break; + case ACTION_HIDE: + ShowWindow(hwnd, SW_HIDE); + break; + case ACTION_DEACTIVATE: + SetForegroundWindow(GetDesktopWindow()); + break; + case ACTION_ACTIVATE: + SetForegroundWindow(hwnd); + break; + } +} + +static void NextStage(HWND hwnd) +{ + INT i, iAction; + const STAGE *pStage = &s_pStages[s_iStage]; + + if (pStage->nType == STAGE_TYPE_COUNTING) + { + /* check counters */ + for (i = 0; i < pStage->nCount; ++i) + { + if (pStage->nCounters[i] > 0) + { + ok(pStage->nCounters[i] == s_nCounters[i], + "Line %d: s_nCounters[%d] expected %d but %d.\n", + pStage->nLine, i, pStage->nCounters[i], s_nCounters[i]); + } + } + } + + /* go to next stage */ + ++s_iStage; + if (s_iStage >= s_cStages) + { + DestroyWindow(hwnd); + return; + } + trace("Stage %d (Line %d)\n", s_iStage, s_pStages[s_iStage].nLine); + + s_iStep = 0; + ZeroMemory(s_nCounters, sizeof(s_nCounters)); + + iAction = s_pStages[s_iStage].iFirstAction; + if (iAction) + PostMessage(hwnd, WM_COMMAND, iAction, 0); +} + +static void DoStage(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + INT i, iAction; + const STAGE *pStage; + s_bNextStage = FALSE; + + if (s_iStage >= s_cStages) + return; + + pStage = &s_pStages[s_iStage]; + switch (pStage->nType) + { + case STAGE_TYPE_SEQUENCE: + if (pStage->uMessages[s_iStep] == uMsg) + { + ok_int(1, 1); + ok(s_nLevel == pStage->nLevel, + "Line %d, Step %d: Level expected %d but %d.\n", + pStage->nLine, s_iStep, pStage->nLevel, s_nLevel); + ok(PARENT_MSG == pStage->uParentMsg, + "Line %d, Step %d: PARENT_MSG expected %u but %u.\n", + pStage->nLine, s_iStep, pStage->uParentMsg, PARENT_MSG); + + iAction = pStage->iActions[s_iStep]; + if (iAction) + DoAction(hwnd, iAction, wParam, lParam); + + ++s_iStep; + if (s_iStep >= pStage->nCount) + s_bNextStage = TRUE; + } + break; + case STAGE_TYPE_COUNTING: + for (i = 0; i < pStage->nCount; ++i) + { + if (pStage->uMessages[i] == uMsg) + { + ok_int(1, 1); + ok(s_nLevel == pStage->nLevel, + "Line %d: Level expected %d but %d.\n", + pStage->nLine, pStage->nLevel, s_nLevel); + ok(PARENT_MSG == pStage->uParentMsg, + "Line %d: PARENT_MSG expected %u but %u.\n", + pStage->nLine, pStage->uParentMsg, PARENT_MSG); + + iAction = pStage->iActions[i]; + if (iAction) + DoAction(hwnd, iAction, wParam, lParam); + + ++s_nCounters[i]; + + if (i == pStage->nCount - 1) + s_bNextStage = TRUE; + break; + } + } + break; + } + + if (s_bNextStage) + { + NextStage(hwnd); + } +} + +static LRESULT CALLBACK +InnerWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + case WM_COMMAND: + DoAction(hwnd, LOWORD(wParam), 0, 0); + break; + case WM_TIMER: + KillTimer(hwnd, (UINT)wParam); + if (wParam == TIMEOUT_TIMER) + DestroyWindow(hwnd); + break; + case WM_DESTROY: + PostQuitMessage(0); + break; + case WM_NCCREATE: + SetTimer(hwnd, TIMEOUT_TIMER, TOTAL_TIMEOUT, NULL); + /* FALL THROUGH */ + default: + return DefWindowProc(hwnd, uMsg, wParam, lParam); + } + return 0; +} + +static void DoBuildPrefix(void) +{ + DWORD Flags = InSendMessageEx(NULL); + INT i = 0; + + if (Flags & ISMEX_CALLBACK) + s_prefix[i++] = 'C'; + if (Flags & ISMEX_NOTIFY) + s_prefix[i++] = 'N'; + if (Flags & ISMEX_REPLIED) + s_prefix[i++] = 'R'; + if (Flags & ISMEX_SEND) + s_prefix[i++] = 'S'; + if (i == 0) + s_prefix[i++] = 'P'; + + s_prefix[i++] = ':'; + s_prefix[i++] = ' '; + s_prefix[i] = 0; +} + +static const STAGE s_GeneralStages[] = +{ + /* Stage 0 */ + { + __LINE__, WM_NULL, 1, STAGE_TYPE_SEQUENCE, 0, + 4, + { WM_GETMINMAXINFO, WM_NCCREATE, WM_NCCALCSIZE, WM_CREATE }, + { ACTION_FIRSTMINMAX, ACTION_NCCREATE, 0, 0 }, + }, + /* Stage 1 */ + { + __LINE__, WM_COMMAND, 2, STAGE_TYPE_SEQUENCE, ACTION_SHOW, + 6, + { WM_SHOWWINDOW, WM_WINDOWPOSCHANGING, WM_WINDOWPOSCHANGING, + WM_ACTIVATEAPP, WM_NCACTIVATE, WM_ACTIVATE }, + }, + { + __LINE__, WM_COMMAND, 2, STAGE_TYPE_SEQUENCE, ACTION_DESTROY, + 6, + { WM_WINDOWPOSCHANGING, WM_WINDOWPOSCHANGED, WM_NCACTIVATE, + WM_ACTIVATE, WM_ACTIVATEAPP, WM_KILLFOCUS }, + }, + { + __LINE__, WM_COMMAND, 2, STAGE_TYPE_SEQUENCE, 0, + 2, + { WM_DESTROY, WM_NCDESTROY }, + }, +}; + +static LRESULT CALLBACK +WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + LRESULT lResult; + + /* build s_prefix */ + DoBuildPrefix(); + + /* message dump */ + MD_msgdump(hwnd, uMsg, wParam, lParam); + + ++s_nLevel; + s_msgStack[s_nLevel] = uMsg; + { + /* do inner task */ + DoStage(hwnd, uMsg, wParam, lParam); + lResult = InnerWindowProc(hwnd, uMsg, wParam, lParam); + } + --s_nLevel; + + /* message return */ + StringCbCopyA(s_prefix, sizeof(s_prefix), "R: "); + MD_msgresult(hwnd, uMsg, wParam, lParam, lResult); + return lResult; +} + +static void General_DoTest(void) +{ + WNDCLASSA wc; + HWND hwnd; + MSG msg; + static const char s_szName[] = "MessageStateAnalyzerGeneral"; + + trace("General_DoTest\n"); + DoInitialize(s_GeneralStages, ARRAYSIZE(s_GeneralStages)); + + /* register window class */ + ZeroMemory(&wc, sizeof(wc)); + wc.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS; + wc.lpfnWndProc = WindowProc; + wc.hInstance = GetModuleHandleA(NULL); + wc.hIcon = LoadIcon(NULL, IDI_APPLICATION); + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1); + wc.lpszClassName = s_szName; + if (!RegisterClassA(&wc)) + { + skip("RegisterClassW failed.\n"); + return; + } + + /* create a window */ + hwnd = CreateWindowA(s_szName, s_szName, WS_OVERLAPPEDWINDOW, + 0, 0, WIDTH, HEIGHT, NULL, NULL, + GetModuleHandleW(NULL), NULL); + if (!hwnd) + { + skip("CreateWindowW failed.\n"); + return; + } + + /* message loop */ + while (GetMessageA(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + + ok_int(UnregisterClassA(s_szName, GetModuleHandleA(NULL)), TRUE); + + DoFinish(); +} + +static const STAGE s_IMEStages[] = +{ + /* Stage 0 */ + { + __LINE__, WM_NULL, 1, STAGE_TYPE_SEQUENCE, 0, + 4, + { WM_GETMINMAXINFO, WM_NCCREATE, WM_NCCALCSIZE, WM_CREATE }, + { ACTION_FIRSTMINMAX, ACTION_NCCREATE, 0, 0 }, + }, + /* Stage 1 */ + // show + { + __LINE__, WM_COMMAND, 2, STAGE_TYPE_SEQUENCE, ACTION_SHOW, + 6, + { WM_SHOWWINDOW, WM_WINDOWPOSCHANGING, WM_WINDOWPOSCHANGING, + WM_ACTIVATEAPP, WM_NCACTIVATE, WM_ACTIVATE }, + }, + { + __LINE__, WM_ACTIVATE, 3, STAGE_TYPE_SEQUENCE, 0, + 1, + { WM_IME_SETCONTEXT }, + { ACTION_IME_SETCONTEXT_OPEN }, + }, + { + __LINE__, WM_IME_SETCONTEXT, 4, STAGE_TYPE_SEQUENCE, 0, + 1, + { WM_IME_NOTIFY }, + { ACTION_IME_NOTIFY_OPEN }, + }, + // hide + { + __LINE__, WM_COMMAND, 2, STAGE_TYPE_SEQUENCE, ACTION_HIDE, + 8, + { WM_SHOWWINDOW, WM_WINDOWPOSCHANGING, WM_WINDOWPOSCHANGED, + WM_NCACTIVATE, WM_ACTIVATE, WM_ACTIVATEAPP, WM_KILLFOCUS, + WM_IME_SETCONTEXT }, + { 0, 0, 0, 0, 0, 0, 0, ACTION_IME_SETCONTEXT_CLOSE } + }, + { + __LINE__, WM_IME_SETCONTEXT, 3, STAGE_TYPE_SEQUENCE, 0, + 1, + { WM_IME_NOTIFY }, + { ACTION_IME_NOTIFY_CLOSE } + }, + // show again + { + __LINE__, WM_COMMAND, 2, STAGE_TYPE_SEQUENCE, 3, + 6, + { WM_SHOWWINDOW, WM_WINDOWPOSCHANGING, WM_WINDOWPOSCHANGING, + WM_ACTIVATEAPP, WM_NCACTIVATE, WM_ACTIVATE }, + }, + { + __LINE__, WM_ACTIVATE, 3, STAGE_TYPE_SEQUENCE, 0, + 1, + { WM_IME_SETCONTEXT }, + { ACTION_IME_SETCONTEXT_OPEN }, + }, + { + __LINE__, WM_IME_SETCONTEXT, 4, STAGE_TYPE_SEQUENCE, 0, + 1, + { WM_IME_NOTIFY }, + { ACTION_IME_NOTIFY_OPEN }, + }, + // deactivate + { + __LINE__, WM_COMMAND, 2, STAGE_TYPE_SEQUENCE, ACTION_DEACTIVATE, + 4, + { WM_NCACTIVATE, WM_ACTIVATE, WM_ACTIVATEAPP, WM_KILLFOCUS }, + }, + { + __LINE__, WM_COMMAND, 2, STAGE_TYPE_SEQUENCE, 0, + 1, + { WM_IME_SETCONTEXT }, + { ACTION_IME_SETCONTEXT_CLOSE } + }, + { + __LINE__, WM_IME_SETCONTEXT, 3, STAGE_TYPE_SEQUENCE, 0, + 1, + { WM_IME_NOTIFY }, + { ACTION_IME_NOTIFY_CLOSE } + }, + // activate + { + __LINE__, WM_ACTIVATE, 3, STAGE_TYPE_SEQUENCE, ACTION_ACTIVATE, + 1, + { WM_IME_SETCONTEXT }, + { ACTION_IME_SETCONTEXT_OPEN } + }, + { + __LINE__, WM_IME_SETCONTEXT, 4, STAGE_TYPE_SEQUENCE, 0, + 1, + { WM_IME_NOTIFY }, + { ACTION_IME_NOTIFY_OPEN }, + }, + // destroy + { + __LINE__, WM_COMMAND, 2, STAGE_TYPE_SEQUENCE, ACTION_DESTROY, + 2, + { WM_WINDOWPOSCHANGING, WM_WINDOWPOSCHANGED }, + }, + { + __LINE__, WM_COMMAND, 2, STAGE_TYPE_SEQUENCE, 0, + 1, + { WM_IME_SETCONTEXT }, + { ACTION_IME_SETCONTEXT_CLOSE } + }, + { + __LINE__, WM_IME_SETCONTEXT, 3, STAGE_TYPE_SEQUENCE, 0, + 1, + { WM_IME_NOTIFY }, + { ACTION_IME_NOTIFY_CLOSE } + }, + { + __LINE__, WM_COMMAND, 2, STAGE_TYPE_SEQUENCE, 0, + 2, + { WM_DESTROY, WM_NCDESTROY }, + }, +}; + +static void IME_DoTest(void) +{ + WNDCLASSA wc; + HWND hwnd; + MSG msg; + static const char s_szName[] = "MessageStateAnalyzerIME"; + + trace("IME_DoTest\n"); + DoInitialize(s_IMEStages, ARRAYSIZE(s_IMEStages)); + + /* register window class */ + ZeroMemory(&wc, sizeof(wc)); + wc.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS; + wc.lpfnWndProc = WindowProc; + wc.hInstance = GetModuleHandleA(NULL); + wc.hIcon = LoadIcon(NULL, IDI_APPLICATION); + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1); + wc.lpszClassName = s_szName; + if (!RegisterClassA(&wc)) + { + skip("RegisterClassW failed.\n"); + return; + } + + /* create a window */ + hwnd = CreateWindowA(s_szName, s_szName, WS_OVERLAPPEDWINDOW, + 0, 0, WIDTH, HEIGHT, NULL, NULL, + GetModuleHandleW(NULL), NULL); + if (!hwnd) + { + skip("CreateWindowW failed.\n"); + return; + } + + /* message loop */ + while (GetMessageA(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + + ok_int(UnregisterClassA(s_szName, GetModuleHandleA(NULL)), TRUE); + + DoFinish(); +} + +START_TEST(MessageStateAnalyzer) +{ + General_DoTest(); + IME_DoTest(); +} diff --git a/modules/rostests/apitests/user32/testlist.c b/modules/rostests/apitests/user32/testlist.c index 82af0c926de..0118bf23b69 100644 --- a/modules/rostests/apitests/user32/testlist.c +++ b/modules/rostests/apitests/user32/testlist.c @@ -25,6 +25,7 @@ extern void func_GetWindowPlacement(void); extern void func_InitializeLpkHooks(void); extern void func_LoadImage(void); extern void func_LookupIconIdFromDirectoryEx(void); +extern void func_MessageStateAnalyzer(void); extern void func_NextDlgItem(void); extern void func_PrivateExtractIcons(void); extern void func_RealGetWindowClass(void); @@ -71,6 +72,7 @@ const struct test winetest_testlist[] = { "InitializeLpkHooks", func_InitializeLpkHooks }, { "LoadImage", func_LoadImage }, { "LookupIconIdFromDirectoryEx", func_LookupIconIdFromDirectoryEx }, + { "MessageStateAnalyzer", func_MessageStateAnalyzer }, { "NextDlgItem", func_NextDlgItem }, { "PrivateExtractIcons", func_PrivateExtractIcons }, { "RealGetWindowClass", func_RealGetWindowClass }, diff --git a/sdk/include/psdk/windowsx.h b/sdk/include/psdk/windowsx.h index 2064c00eafa..15dc2053bc4 100644 --- a/sdk/include/psdk/windowsx.h +++ b/sdk/include/psdk/windowsx.h @@ -313,13 +313,13 @@ #define HANDLE_WM_COPY(hwnd,wParam,lParam,fn) ((fn)(hwnd),0) #define HANDLE_WM_COPYDATA(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam),(PCOPYDATASTRUCT)(lParam)),0) #define HANDLE_WM_CREATE(hwnd,wParam,lParam,fn) ((fn)((hwnd),(LPCREATESTRUCT)(lParam)) ? 0 : (LRESULT)-1L) -#define HANDLE_WM_CTLCOLORBTN(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_BTN) -#define HANDLE_WM_CTLCOLORDLG(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_DLG) -#define HANDLE_WM_CTLCOLOREDIT(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_EDIT) -#define HANDLE_WM_CTLCOLORLISTBOX(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_LISTBOX) -#define HANDLE_WM_CTLCOLORMSGBOX(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_MSGBOX) -#define HANDLE_WM_CTLCOLORSCROLLBAR(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_SCROLLBAR) -#define HANDLE_WM_CTLCOLORSTATIC(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_STATIC) +#define HANDLE_WM_CTLCOLORBTN(hwnd,wParam,lParam,fn) (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_BTN) +#define HANDLE_WM_CTLCOLORDLG(hwnd,wParam,lParam,fn) (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_DLG) +#define HANDLE_WM_CTLCOLOREDIT(hwnd,wParam,lParam,fn) (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_EDIT) +#define HANDLE_WM_CTLCOLORLISTBOX(hwnd,wParam,lParam,fn) (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_LISTBOX) +#define HANDLE_WM_CTLCOLORMSGBOX(hwnd,wParam,lParam,fn) (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_MSGBOX) +#define HANDLE_WM_CTLCOLORSCROLLBAR(hwnd,wParam,lParam,fn) (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_SCROLLBAR) +#define HANDLE_WM_CTLCOLORSTATIC(hwnd,wParam,lParam,fn) (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_STATIC) #define HANDLE_WM_CUT(hwnd,wParam,lParam,fn) ((fn)(hwnd),0) #define HANDLE_WM_DEADCHAR(hwnd,wParam,lParam,fn) ((fn)((hwnd),(TCHAR)(wParam),(int)(short)LOWORD(lParam)),0) #define HANDLE_WM_DELETEITEM(hwnd,wParam,lParam,fn) ((fn)((hwnd),(const DELETEITEMSTRUCT*)(lParam)),0) @@ -337,7 +337,7 @@ #define HANDLE_WM_ERASEBKGND(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(BOOL)(fn)((hwnd),(HDC)(wParam)) #define HANDLE_WM_FONTCHANGE(hwnd,wParam,lParam,fn) ((fn)(hwnd),0) #define HANDLE_WM_GETDLGCODE(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(fn)(hwnd,(LPMSG)(lParam)) -#define HANDLE_WM_GETFONT(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HFONT)(fn)(hwnd) +#define HANDLE_WM_GETFONT(hwnd,wParam,lParam,fn) (LRESULT)(UINT_PTR)(HFONT)(fn)(hwnd) #define HANDLE_WM_GETMINMAXINFO(hwnd,wParam,lParam,fn) ((fn)((hwnd),(LPMINMAXINFO)(lParam)),0) #define HANDLE_WM_GETTEXT(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(int)(fn)((hwnd),(int)(wParam),(LPTSTR)(lParam)) #define HANDLE_WM_GETTEXTLENGTH(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(int)(fn)(hwnd) @@ -361,12 +361,12 @@ #define HANDLE_WM_MDICASCADE(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(fn)((hwnd),(UINT)(wParam)) #define HANDLE_WM_MDICREATE(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(fn)((hwnd),(LPMDICREATESTRUCT)(lParam)) #define HANDLE_WM_MDIDESTROY(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam)),0) -#define HANDLE_WM_MDIGETACTIVE(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(fn)(hwnd) +#define HANDLE_WM_MDIGETACTIVE(hwnd,wParam,lParam,fn) (LRESULT)(UINT_PTR)(HWND)(fn)(hwnd) #define HANDLE_WM_MDIICONARRANGE(hwnd,wParam,lParam,fn) ((fn)(hwnd),0) #define HANDLE_WM_MDIMAXIMIZE(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam)),0) #define HANDLE_WM_MDINEXT(hwnd,wParam,lParam,fn) (LRESULT)(HWND)(fn)((hwnd),(HWND)(wParam),(BOOL)lParam) #define HANDLE_WM_MDIRESTORE(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam)),0) -#define HANDLE_WM_MDISETMENU(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(fn)((hwnd),(BOOL)(wParam),(HMENU)(wParam),(HMENU)(lParam)) +#define HANDLE_WM_MDISETMENU(hwnd,wParam,lParam,fn) (LRESULT)(UINT_PTR)(HMENU)(fn)((hwnd),(BOOL)(wParam),(HMENU)(wParam),(HMENU)(lParam)) #define HANDLE_WM_MDITILE(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(fn)((hwnd),(UINT)(wParam)) #define HANDLE_WM_MEASUREITEM(hwnd,wParam,lParam,fn) ((fn)((hwnd),(MEASUREITEMSTRUCT*)(lParam)),0) #define HANDLE_WM_MENUCHAR(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(fn)((hwnd),(UINT)(LOWORD(wParam)),(UINT)HIWORD(wParam),(HMENU)(lParam)) @@ -391,7 +391,7 @@ #define HANDLE_WM_NCRBUTTONDBLCLK(hwnd,wParam,lParam,fn) ((fn)((hwnd),TRUE,(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0) #define HANDLE_WM_NCRBUTTONDOWN(hwnd,wParam,lParam,fn) ((fn)((hwnd),FALSE,(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0) #define HANDLE_WM_NCRBUTTONUP(hwnd,wParam,lParam,fn) ((fn)((hwnd),(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0) -#define HANDLE_WM_NEXTDLGCTL(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HWND)(fn)((hwnd),(HWND)(wParam),(BOOL)(lParam)) +#define HANDLE_WM_NEXTDLGCTL(hwnd,wParam,lParam,fn) (LRESULT)(UINT_PTR)(HWND)(fn)((hwnd),(HWND)(wParam),(BOOL)(lParam)) #define HANDLE_WM_PAINT(hwnd,wParam,lParam,fn) ((fn)(hwnd),0) #define HANDLE_WM_PAINTCLIPBOARD(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam),(const LPPAINTSTRUCT)GlobalLock((HGLOBAL)(lParam))),GlobalUnlock((HGLOBAL)(lParam)),0) #define HANDLE_WM_PALETTECHANGED(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam)),0) @@ -409,7 +409,7 @@ #define HANDLE_WM_RBUTTONDOWN(hwnd,wParam,lParam,fn) ((fn)((hwnd),FALSE,(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0) #define HANDLE_WM_RBUTTONUP(hwnd,wParam,lParam,fn) ((fn)((hwnd),(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0) #define HANDLE_WM_RENDERALLFORMATS(hwnd,wParam,lParam,fn) ((fn)(hwnd),0) -#define HANDLE_WM_RENDERFORMAT(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HANDLE)(fn)((hwnd),(UINT)(wParam)) +#define HANDLE_WM_RENDERFORMAT(hwnd,wParam,lParam,fn) (LRESULT)(UINT_PTR)(fn)((hwnd),(UINT)(wParam)) #define HANDLE_WM_SETCURSOR(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(BOOL)(fn)((hwnd),(HWND)(wParam),(UINT)LOWORD(lParam),(UINT)HIWORD(lParam)) #define HANDLE_WM_SETFOCUS(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam)),0) #define HANDLE_WM_SETFONT(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HFONT)(wParam),(BOOL)(lParam)),0) diff --git a/sdk/include/reactos/msgdump.h b/sdk/include/reactos/msgdump.h index 79341481d4e..2284437fc2c 100644 --- a/sdk/include/reactos/msgdump.h +++ b/sdk/include/reactos/msgdump.h @@ -5,7 +5,7 @@ * COPYRIGHT: Copyright 2018-2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #ifndef _INC_MSGDUMP -#define _INC_MSGDUMP 10 /* Version 10 */ +#define _INC_MSGDUMP 11 /* Version 11 */ /* * NOTE: MD_msgdump function in this file provides Win32API message dump feature. @@ -17,6 +17,9 @@ #ifndef _INC_WINXX #include "winxx.h" /* An unofficial extension of <windowsx.h>. */ #endif +#ifndef _INC_SHELLAPI + #include <shellapi.h> +#endif #include <strsafe.h> #ifndef MSGDUMP_TPRINTF

1 0

[reactos] 01/01: [USER32][NTUSER] Fix menu arrow drawing (of DrawFrameControl) (#1752)
by Katayama Hirofumi MZ 24 Jul '19

24 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1e91a1690d554c771d703… commit 1e91a1690d554c771d703f12416321bbe4c5b53f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jul 25 01:40:33 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jul 25 01:40:33 2019 +0900 [USER32][NTUSER] Fix menu arrow drawing (of DrawFrameControl) (#1752) CORE-13211 user32!DrawFrameControl drawed invalid menu arrow when the width is shorter than the height. - Use the squared rectangle. - Draw it in the transparent background mode. - Save the old background mode of HDC. This PR will fix UltraISO's bug. --- win32ss/user/ntuser/draw.c | 46 ++++++++++++++++++++++++-------------- win32ss/user/user32/windows/draw.c | 12 +++++++--- 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/win32ss/user/ntuser/draw.c b/win32ss/user/ntuser/draw.c index f648287c554..4b30a325a86 100644 --- a/win32ss/user/ntuser/draw.c +++ b/win32ss/user/ntuser/draw.c @@ -666,7 +666,10 @@ BOOL FASTCALL UITOOLS95_DFC_ButtonCheckRadio(HDC dc, LPRECT r, UINT uFlags, BOOL HFONT hFont, hOldFont; int i; WCHAR OutRight, OutLeft, InRight, InLeft, Center; + RECT myr; + INT cxy, nBkMode; + cxy = UITOOLS_MakeSquareRect(r, &myr); if (Radio) { OutRight = 'j'; // Outer right @@ -684,7 +687,7 @@ BOOL FASTCALL UITOOLS95_DFC_ButtonCheckRadio(HDC dc, LPRECT r, UINT uFlags, BOOL } RtlZeroMemory(&lf, sizeof(LOGFONTW)); - lf.lfHeight = r->top - r->bottom; + lf.lfHeight = cxy; lf.lfWidth = 0; lf.lfWeight = FW_NORMAL; lf.lfCharSet = DEFAULT_CHARSET; @@ -692,16 +695,18 @@ BOOL FASTCALL UITOOLS95_DFC_ButtonCheckRadio(HDC dc, LPRECT r, UINT uFlags, BOOL hFont = GreCreateFontIndirectW(&lf); hOldFont = NtGdiSelectFont(dc, hFont); + nBkMode = GreGetBkMode(dc); + if(Radio && ((uFlags & 0xff) == DFCS_BUTTONRADIOMASK)) { IntGdiSetBkMode(dc, OPAQUE); IntGdiSetTextColor(dc, IntGetSysColor(COLOR_WINDOWFRAME)); - GreTextOutW(dc, r->left, r->top, &Center, 1); + GreTextOutW(dc, myr.left, myr.top, &Center, 1); IntGdiSetBkMode(dc, TRANSPARENT); IntGdiSetTextColor(dc, IntGetSysColor(COLOR_WINDOWFRAME)); - GreTextOutW(dc, r->left, r->top, &OutRight, 1); + GreTextOutW(dc, myr.left, myr.top, &OutRight, 1); IntGdiSetTextColor(dc, IntGetSysColor(COLOR_WINDOWFRAME)); - GreTextOutW(dc, r->left, r->top, &OutLeft, 1); + GreTextOutW(dc, myr.left, myr.top, &OutLeft, 1); } else { @@ -710,26 +715,26 @@ BOOL FASTCALL UITOOLS95_DFC_ButtonCheckRadio(HDC dc, LPRECT r, UINT uFlags, BOOL /* Center section, white for active, grey for inactive */ i= !(uFlags & (DFCS_INACTIVE|DFCS_PUSHED)) ? COLOR_WINDOW : COLOR_BTNFACE; IntGdiSetTextColor(dc, IntGetSysColor(i)); - GreTextOutW(dc, r->left, r->top, &Center, 1); + GreTextOutW(dc, myr.left, myr.top, &Center, 1); if(uFlags & (DFCS_FLAT | DFCS_MONO)) { IntGdiSetTextColor(dc, IntGetSysColor(COLOR_WINDOWFRAME)); - GreTextOutW(dc, r->left, r->top, &OutRight, 1); - GreTextOutW(dc, r->left, r->top, &OutLeft, 1); - GreTextOutW(dc, r->left, r->top, &InRight, 1); - GreTextOutW(dc, r->left, r->top, &InLeft, 1); + GreTextOutW(dc, myr.left, myr.top, &OutRight, 1); + GreTextOutW(dc, myr.left, myr.top, &OutLeft, 1); + GreTextOutW(dc, myr.left, myr.top, &InRight, 1); + GreTextOutW(dc, myr.left, myr.top, &InLeft, 1); } else { IntGdiSetTextColor(dc, IntGetSysColor(COLOR_BTNSHADOW)); - GreTextOutW(dc, r->left, r->top, &OutRight, 1); + GreTextOutW(dc, myr.left, myr.top, &OutRight, 1); IntGdiSetTextColor(dc, IntGetSysColor(COLOR_BTNHIGHLIGHT)); - GreTextOutW(dc, r->left, r->top, &OutLeft, 1); + GreTextOutW(dc, myr.left, myr.top, &OutLeft, 1); IntGdiSetTextColor(dc, IntGetSysColor(COLOR_3DDKSHADOW)); - GreTextOutW(dc, r->left, r->top, &InRight, 1); + GreTextOutW(dc, myr.left, myr.top, &InRight, 1); IntGdiSetTextColor(dc, IntGetSysColor(COLOR_3DLIGHT)); - GreTextOutW(dc, r->left, r->top, &InLeft, 1); + GreTextOutW(dc, myr.left, myr.top, &InLeft, 1); } } @@ -738,12 +743,13 @@ BOOL FASTCALL UITOOLS95_DFC_ButtonCheckRadio(HDC dc, LPRECT r, UINT uFlags, BOOL WCHAR Check = (Radio) ? 'i' : 'b'; IntGdiSetTextColor(dc, IntGetSysColor(COLOR_WINDOWTEXT)); - GreTextOutW(dc, r->left, r->top, &Check, 1); + GreTextOutW(dc, myr.left, myr.top, &Check, 1); } IntGdiSetTextColor(dc, IntGetSysColor(COLOR_WINDOWTEXT)); NtGdiSelectFont(dc, hOldFont); GreDeleteObject(hFont); + IntGdiSetBkMode(dc, nBkMode); return TRUE; } @@ -944,9 +950,13 @@ BOOL FASTCALL UITOOLS95_DrawFrameScroll(HDC dc, LPRECT r, UINT uFlags) BOOL FASTCALL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags) { + // TODO: DFCS_TRANSPARENT upon DFCS_MENUARROWUP or DFCS_MENUARROWDOWN LOGFONTW lf; HFONT hFont, hOldFont; WCHAR Symbol; + RECT myr; + INT cxy, nBkMode; + cxy = UITOOLS_MakeSquareRect(r, &myr); switch(uFlags & 0xff) { case DFCS_MENUARROWUP: @@ -981,7 +991,7 @@ BOOL FASTCALL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags) } /* acquire ressources only if valid menu */ RtlZeroMemory(&lf, sizeof(LOGFONTW)); - lf.lfHeight = r->bottom - r->top; + lf.lfHeight = cxy; lf.lfWidth = 0; lf.lfWeight = FW_NORMAL; lf.lfCharSet = DEFAULT_CHARSET; @@ -998,13 +1008,15 @@ BOOL FASTCALL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags) { /* draw shadow */ IntGdiSetTextColor(dc, IntGetSysColor(COLOR_BTNHIGHLIGHT)); - GreTextOutW(dc, r->left + 1, r->top + 1, &Symbol, 1); + GreTextOutW(dc, myr.left + 1, myr.top + 1, &Symbol, 1); } #endif IntGdiSetTextColor(dc, IntGetSysColor((uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_BTNTEXT)); } /* draw selected symbol */ - GreTextOutW(dc, r->left, r->top, &Symbol, 1); + nBkMode = IntGdiSetBkMode(dc, TRANSPARENT); + GreTextOutW(dc, myr.left, myr.top, &Symbol, 1); + IntGdiSetBkMode(dc, nBkMode); /* restore previous settings */ NtGdiSelectFont(dc, hOldFont); GreDeleteObject(hFont); diff --git a/win32ss/user/user32/windows/draw.c b/win32ss/user/user32/windows/draw.c index 40e65db6e70..65bacc848d8 100644 --- a/win32ss/user/user32/windows/draw.c +++ b/win32ss/user/user32/windows/draw.c @@ -972,9 +972,13 @@ static BOOL UITOOLS95_DrawFrameScroll(HDC dc, LPRECT r, UINT uFlags) static BOOL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags) { + // TODO: DFCS_TRANSPARENT upon DFCS_MENUARROWUP or DFCS_MENUARROWDOWN LOGFONTW lf; HFONT hFont, hOldFont; TCHAR Symbol; + RECT myr; + INT cxy, nBkMode; + cxy = UITOOLS_MakeSquareRect(r, &myr); switch(uFlags & 0xff) { case DFCS_MENUARROWUP: @@ -1007,7 +1011,7 @@ static BOOL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags) } /* acquire ressources only if valid menu */ ZeroMemory(&lf, sizeof(LOGFONTW)); - lf.lfHeight = r->bottom - r->top; + lf.lfHeight = cxy; lf.lfWidth = 0; lf.lfWeight = FW_NORMAL; lf.lfCharSet = DEFAULT_CHARSET; @@ -1024,13 +1028,15 @@ static BOOL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags) { /* draw shadow */ SetTextColor(dc, GetSysColor(COLOR_BTNHIGHLIGHT)); - TextOut(dc, r->left + 1, r->top + 1, &Symbol, 1); + TextOut(dc, myr.left + 1, myr.top + 1, &Symbol, 1); } #endif SetTextColor(dc, GetSysColor((uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_BTNTEXT)); } /* draw selected symbol */ - TextOut(dc, r->left, r->top, &Symbol, 1); + nBkMode = SetBkMode(dc, TRANSPARENT); + TextOut(dc, myr.left, myr.top, &Symbol, 1); + SetBkMode(dc, nBkMode); /* restore previous settings */ SelectObject(dc, hOldFont); DeleteObject(hFont);

1 0

[reactos] 01/01: [MEDIA][FONTS] RAPPS checkmark fix (#1751)
by Katayama Hirofumi MZ 24 Jul '19

24 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=77d3d25ae83e860417eac… commit 77d3d25ae83e860417eac67b7167ad44cf262aee Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jul 24 15:39:10 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jul 24 15:39:10 2019 +0900 [MEDIA][FONTS] RAPPS checkmark fix (#1751) The checkmarks of RAPPS were strange. This PR will fix the checkmark ("b") of 12px bitmap glyph of Marlett.ttf font file. CORE-14872 --- media/fonts/Marlett.ttf | Bin 16136 -> 16136 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/Marlett.ttf b/media/fonts/Marlett.ttf index 29514b293ab..a5b1cb21299 100644 Binary files a/media/fonts/Marlett.ttf and b/media/fonts/Marlett.ttf differ

1 0

[reactos] 01/01: [MEDIA][FONTS] Add copyright notice of TransGaming Technologies
by Katayama Hirofumi MZ 23 Jul '19

23 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9b494e2ca6e8565af0d4… commit f9b494e2ca6e8565af0d42edfc385eba97b59ecf Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jul 23 21:55:38 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jul 23 21:55:38 2019 +0900 [MEDIA][FONTS] Add copyright notice of TransGaming Technologies With some font error fixed. CORE-16226 --- media/fonts/Marlett.ttf | Bin 15668 -> 16136 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/Marlett.ttf b/media/fonts/Marlett.ttf index e97a94fd900..29514b293ab 100644 Binary files a/media/fonts/Marlett.ttf and b/media/fonts/Marlett.ttf differ

1 0

[reactos] 01/01: [MEDIA][FONTS] Renewal of Marlett.ttf (#1749)
by Katayama Hirofumi MZ 23 Jul '19

23 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b8383b4546d230f854978… commit b8383b4546d230f854978c7642f124fc119e80fb Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jul 23 16:03:30 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jul 23 16:03:30 2019 +0900 [MEDIA][FONTS] Renewal of Marlett.ttf (#1749) Renewal of Marlett.ttf font file. CORE-16226, CORE-14872 - Based on Ged Murphy's Marlett.ttf (See https://github.com/reactos/reactos/blob/527f2f90577662e8eba1b1b62f958c39b3c…). - Erase the centered triangles. - Adjustment of glyphs. - Clarify the copyright ownership. - Tested with 3 test programs (RadioAndCheck, PixelPerfectGlyph and MarlettCompare). --- media/fonts/Marlett.ttf | Bin 4160 -> 15668 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/Marlett.ttf b/media/fonts/Marlett.ttf index 26b7980bb30..e97a94fd900 100644 Binary files a/media/fonts/Marlett.ttf and b/media/fonts/Marlett.ttf differ

1 0

[reactos] 01/01: [NETID][WINLOGON] Fix Computer Name Change to update Domain/Hostname on reboot. (#1684) CORE-16123
by Doug-Lyons 21 Jul '19

21 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=77671f0337ee5bf25b2ff… commit 77671f0337ee5bf25b2ffad367438157e47cec0f Author: Doug-Lyons <douglyons(a)douglyons.com> AuthorDate: Sat Jun 22 11:23:11 2019 -0500 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jul 22 00:49:47 2019 +0200 [NETID][WINLOGON] Fix Computer Name Change to update Domain/Hostname on reboot. (#1684) CORE-16123 - NETID: Correct the call when using the "Computer Name Change" in ReactOS. - WINLOGON: Update the volatile "Hostname" and "Domain" variables from their non-volatile counterparts. Co-authored-by: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> --- base/system/winlogon/winlogon.c | 136 ++++++++++++++++++++++++++++++++++++++++ dll/win32/netid/netid.c | 4 +- 2 files changed, 138 insertions(+), 2 deletions(-) diff --git a/base/system/winlogon/winlogon.c b/base/system/winlogon/winlogon.c index 68783c828b9..480272ac80a 100644 --- a/base/system/winlogon/winlogon.c +++ b/base/system/winlogon/winlogon.c @@ -147,6 +147,139 @@ WaitForLsass(VOID) } +static +VOID +UpdateTcpIpInformation(VOID) +{ + LONG lError; + HKEY hKey = NULL; + DWORD dwType, dwSize; + PWSTR pszBuffer; + WCHAR szBuffer[128] = L""; + + lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters", + 0, + KEY_QUERY_VALUE | KEY_SET_VALUE, + &hKey); + if (lError != ERROR_SUCCESS) + { + ERR("WL: RegOpenKeyExW(\"HKLM\\System\\CurrentControlSet\\Services\\Tcpip\\Parameters\") failed (error %lu)\n", lError); + return; + } + + /* + * Read the "NV Hostname" value and copy it into the "Hostname" value. + */ + + pszBuffer = szBuffer; + dwSize = ARRAYSIZE(szBuffer); + + lError = RegQueryValueExW(hKey, + L"NV Hostname", + NULL, + &dwType, + (LPBYTE)pszBuffer, + &dwSize); + if (((lError == ERROR_INSUFFICIENT_BUFFER) || (lError == ERROR_MORE_DATA)) && (dwType == REG_SZ)) + { + pszBuffer = HeapAlloc(GetProcessHeap(), 0, dwSize); + if (pszBuffer) + { + lError = RegQueryValueExW(hKey, + L"NV Hostname", + NULL, + &dwType, + (LPBYTE)pszBuffer, + &dwSize); + } + else + { + ERR("WL: Could not reallocate memory for pszBuffer\n"); + } + } + if ((lError == ERROR_SUCCESS) && (dwType == REG_SZ)) + { + TRACE("NV Hostname is '%S'.\n", pszBuffer); + + lError = RegSetValueExW(hKey, + L"Hostname", + 0, + REG_SZ, + (LPBYTE)pszBuffer, + dwSize); + if (lError != ERROR_SUCCESS) + ERR("WL: RegSetValueExW(\"Hostname\") failed (error %lu)\n", lError); + } + + /* + * Read the "NV Domain" value and copy it into the "Domain" value. + */ + + // pszBuffer = szBuffer; + // dwSize = ARRAYSIZE(szBuffer); + + lError = RegQueryValueExW(hKey, + L"NV Domain", + NULL, + &dwType, + (LPBYTE)pszBuffer, + &dwSize); + if (((lError == ERROR_INSUFFICIENT_BUFFER) || (lError == ERROR_MORE_DATA)) && (dwType == REG_SZ)) + { + if (pszBuffer != szBuffer) + { + PWSTR pszNewBuffer; + pszNewBuffer = HeapReAlloc(GetProcessHeap(), 0, pszBuffer, dwSize); + if (pszNewBuffer) + { + pszBuffer = pszNewBuffer; + } + else + { + HeapFree(GetProcessHeap(), 0, pszBuffer); + pszBuffer = NULL; + } + } + else + { + pszBuffer = HeapAlloc(GetProcessHeap(), 0, dwSize); + } + if (pszBuffer) + { + lError = RegQueryValueExW(hKey, + L"NV Domain", + NULL, + &dwType, + (LPBYTE)pszBuffer, + &dwSize); + } + else + { + ERR("WL: Could not reallocate memory for pszBuffer\n"); + } + } + if ((lError == ERROR_SUCCESS) && (dwType == REG_SZ)) + { + TRACE("NV Domain is '%S'.\n", pszBuffer); + + lError = RegSetValueExW(hKey, + L"Domain", + 0, + REG_SZ, + (LPBYTE)pszBuffer, + dwSize); + if (lError != ERROR_SUCCESS) + ERR("WL: RegSetValueExW(\"Domain\") failed (error %lu)\n", lError); + } + + if (pszBuffer != szBuffer) + HeapFree(GetProcessHeap(), 0, pszBuffer); + + RegCloseKey(hKey); +} + + static BOOL InitKeyboardLayouts(VOID) @@ -322,6 +455,9 @@ WinMain( RtlSetProcessIsCritical(TRUE, NULL, FALSE); RtlSetThreadIsCritical(TRUE, NULL, FALSE); + /* Update the cached TCP/IP Information in the registry */ + UpdateTcpIpInformation(); + if (!RegisterLogonProcess(GetCurrentProcessId(), TRUE)) { ERR("WL: Could not register logon process\n"); diff --git a/dll/win32/netid/netid.c b/dll/win32/netid/netid.c index bcc9ce80c8f..a9e30b01bbf 100644 --- a/dll/win32/netid/netid.c +++ b/dll/win32/netid/netid.c @@ -232,7 +232,7 @@ NetworkPropDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) SetFocus(GetDlgItem(hDlg, 1002)); break; } - else if (!SetComputerName(NewComputerName)) + else if (!SetComputerNameExW(ComputerNamePhysicalDnsHostname, NewComputerName)) { TCHAR szMsgText[MAX_PATH]; @@ -308,7 +308,7 @@ NetIDPage_OnInitDialog( RegCloseKey(KeyHandle); } - if (GetComputerName(ComputerName,&Size)) + if (GetComputerName(ComputerName, &Size)) { SetDlgItemText(hwndDlg, IDC_COMPUTERNAME, ComputerName); }

1 0

[reactos] 01/01: [UMPNPMGR] Implement registry functions for SuppressUI and SuppressNewHWUI handling. (#1683) CORE-15897
by Bișoc George 21 Jul '19

21 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eede1b9b7a258a9094caf… commit eede1b9b7a258a9094cafef5615b9ed8c3877081 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Wed Jun 19 17:51:11 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 21 19:02:53 2019 +0200 [UMPNPMGR] Implement registry functions for SuppressUI and SuppressNewHWUI handling. (#1683) CORE-15897 Co-authored-by: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> --- base/services/umpnpmgr/install.c | 11 +++++- base/services/umpnpmgr/precomp.h | 8 +++- base/services/umpnpmgr/umpnpmgr.c | 81 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 97 insertions(+), 3 deletions(-) diff --git a/base/services/umpnpmgr/install.c b/base/services/umpnpmgr/install.c index 2f3bdfd1050..4c876e490ef 100644 --- a/base/services/umpnpmgr/install.c +++ b/base/services/umpnpmgr/install.c @@ -340,6 +340,15 @@ cleanup: } +FORCEINLINE +BOOL +IsUISuppressionAllowed(VOID) +{ + /* Display the newdev.dll wizard UI only if it's allowed */ + return (g_IsUISuppressed || GetSuppressNewUIValue()); +} + + /* Loop to install all queued devices installations */ DWORD WINAPI @@ -368,7 +377,7 @@ DeviceInstallThread(LPVOID lpParameter) { ResetEvent(hNoPendingInstalls); Params = CONTAINING_RECORD(ListEntry, DeviceInstallParams, ListEntry); - InstallDevice(Params->DeviceIds, showWizard); + InstallDevice(Params->DeviceIds, showWizard && !IsUISuppressionAllowed()); HeapFree(GetProcessHeap(), 0, Params); } } diff --git a/base/services/umpnpmgr/precomp.h b/base/services/umpnpmgr/precomp.h index 3c51aa47b21..f7d7b4f9f72 100644 --- a/base/services/umpnpmgr/precomp.h +++ b/base/services/umpnpmgr/precomp.h @@ -39,7 +39,6 @@ typedef struct WCHAR DeviceIds[1]; } DeviceInstallParams; - /* install.c */ extern HANDLE hUserToken; @@ -52,6 +51,10 @@ extern HANDLE hDeviceInstallListNotEmpty; BOOL SetupIsActive(VOID); +FORCEINLINE +BOOL +IsUISuppressionAllowed(VOID); + DWORD WINAPI DeviceInstallThread( @@ -70,6 +73,9 @@ RpcServerThread( extern HKEY hEnumKey; extern HKEY hClassKey; +extern BOOL g_IsUISuppressed; +BOOL +GetSuppressNewUIValue(VOID); #endif /* _UMPNPMGR_PCH_ */ \ No newline at end of file diff --git a/base/services/umpnpmgr/umpnpmgr.c b/base/services/umpnpmgr/umpnpmgr.c index 7aa64813c75..0195f73813c 100644 --- a/base/services/umpnpmgr/umpnpmgr.c +++ b/base/services/umpnpmgr/umpnpmgr.c @@ -43,7 +43,7 @@ static SERVICE_STATUS ServiceStatus; HKEY hEnumKey = NULL; HKEY hClassKey = NULL; - +BOOL g_IsUISuppressed = FALSE; /* FUNCTIONS *****************************************************************/ @@ -268,6 +268,77 @@ ServiceControlHandler(DWORD dwControl, } } +static DWORD +GetBooleanRegValue( + IN HKEY hKey, + IN PCWSTR lpSubKey, + IN PCWSTR lpValue, + OUT PBOOL pValue) +{ + DWORD dwError, dwType, dwData; + DWORD cbData = sizeof(dwData); + HKEY hSubKey = NULL; + + /* Default value */ + *pValue = FALSE; + + dwError = RegOpenKeyExW(hKey, + lpSubKey, + 0, + KEY_READ, + &hSubKey); + if (dwError != ERROR_SUCCESS) + { + DPRINT("GetBooleanRegValue(): RegOpenKeyExW() has failed to open '%S' key! (Error: %lu)\n", + lpSubKey, dwError); + return dwError; + } + + dwError = RegQueryValueExW(hSubKey, + lpValue, + 0, + &dwType, + (PBYTE)&dwData, + &cbData); + if (dwError != ERROR_SUCCESS) + { + DPRINT("GetBooleanRegValue(): RegQueryValueExW() has failed to query '%S' value! (Error: %lu)\n", + lpValue, dwError); + goto Cleanup; + } + if (dwType != REG_DWORD) + { + DPRINT("GetBooleanRegValue(): The value is not of REG_DWORD type!\n"); + goto Cleanup; + } + + /* Return the value */ + *pValue = (dwData == 1); + +Cleanup: + RegCloseKey(hSubKey); + + return dwError; +} + +BOOL +GetSuppressNewUIValue(VOID) +{ + BOOL bSuppressNewHWUI = FALSE; + + /* + * Query the SuppressNewHWUI policy registry value. Don't cache it + * as we want to update our behaviour in consequence. + */ + GetBooleanRegValue(HKEY_LOCAL_MACHINE, + L"Software\\Policies\\Microsoft\\Windows\\DeviceInstall\\Settings", + L"SuppressNewHWUI", + &bSuppressNewHWUI); + if (bSuppressNewHWUI) + DPRINT("GetSuppressNewUIValue(): newdev.dll's wizard UI won't be shown!\n"); + + return bSuppressNewHWUI; +} VOID WINAPI ServiceMain(DWORD argc, LPTSTR *argv) @@ -363,6 +434,14 @@ InitializePnPManager(VOID) InitializeSListHead(&DeviceInstallListHead); + /* Query the SuppressUI registry value and cache it for our whole lifetime */ + GetBooleanRegValue(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Services\\PlugPlay\\Parameters", + L"SuppressUI", + &g_IsUISuppressed); + if (g_IsUISuppressed) + DPRINT("UMPNPMGR: newdev.dll's wizard UI won't be shown!\n"); + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Enum", 0,

1 0

[reactos] 02/02: [SRVSVC][WKSSVC] Set the stop pending status before stopping the services and stop the RPC listener on shutdown as well.
by Eric Kohl 21 Jul '19

21 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e0c97c9ecacf5eae342ca… commit e0c97c9ecacf5eae342ca412a5c8db38ea631596 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jul 21 18:56:02 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jul 21 18:56:59 2019 +0200 [SRVSVC][WKSSVC] Set the stop pending status before stopping the services and stop the RPC listener on shutdown as well. --- base/services/srvsvc/srvsvc.c | 4 ++++ base/services/wkssvc/wkssvc.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/base/services/srvsvc/srvsvc.c b/base/services/srvsvc/srvsvc.c index a4e77f2c8f8..32d73ea89b4 100644 --- a/base/services/srvsvc/srvsvc.c +++ b/base/services/srvsvc/srvsvc.c @@ -79,6 +79,7 @@ ServiceControlHandler(DWORD dwControl, { case SERVICE_CONTROL_STOP: TRACE(" SERVICE_CONTROL_STOP received\n"); + UpdateServiceStatus(SERVICE_STOP_PENDING); /* Stop listening to incoming RPC messages */ RpcMgmtStopServerListening(NULL); UpdateServiceStatus(SERVICE_STOPPED); @@ -102,6 +103,9 @@ ServiceControlHandler(DWORD dwControl, case SERVICE_CONTROL_SHUTDOWN: TRACE(" SERVICE_CONTROL_SHUTDOWN received\n"); + UpdateServiceStatus(SERVICE_STOP_PENDING); + /* Stop listening to incoming RPC messages */ + RpcMgmtStopServerListening(NULL); UpdateServiceStatus(SERVICE_STOPPED); return ERROR_SUCCESS; diff --git a/base/services/wkssvc/wkssvc.c b/base/services/wkssvc/wkssvc.c index eba9053e5e0..9feb7bb50e2 100644 --- a/base/services/wkssvc/wkssvc.c +++ b/base/services/wkssvc/wkssvc.c @@ -76,6 +76,7 @@ ServiceControlHandler(DWORD dwControl, { case SERVICE_CONTROL_STOP: TRACE(" SERVICE_CONTROL_STOP received\n"); + UpdateServiceStatus(SERVICE_STOP_PENDING); /* Stop listening to incoming RPC messages */ RpcMgmtStopServerListening(NULL); UpdateServiceStatus(SERVICE_STOPPED); @@ -99,6 +100,9 @@ ServiceControlHandler(DWORD dwControl, case SERVICE_CONTROL_SHUTDOWN: TRACE(" SERVICE_CONTROL_SHUTDOWN received\n"); + UpdateServiceStatus(SERVICE_STOP_PENDING); + /* Stop listening to incoming RPC messages */ + RpcMgmtStopServerListening(NULL); UpdateServiceStatus(SERVICE_STOPPED); return ERROR_SUCCESS;

1 0

[reactos] 01/02: [WMISERV][WUAUSERV] Stop the service if the stop event creation fails.
by Eric Kohl 21 Jul '19

21 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f082ecc6842b818dfb92… commit 1f082ecc6842b818dfb92ec9bf41a90bf60382a3 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jul 21 18:51:33 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jul 21 18:56:57 2019 +0200 [WMISERV][WUAUSERV] Stop the service if the stop event creation fails. --- base/services/wmisvc/wmisvc.c | 18 ++++++++++++------ base/services/wuauserv/wuauserv.c | 18 ++++++++++++------ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/base/services/wmisvc/wmisvc.c b/base/services/wmisvc/wmisvc.c index 9ec17bb71b0..07c94eddd43 100644 --- a/base/services/wmisvc/wmisvc.c +++ b/base/services/wmisvc/wmisvc.c @@ -44,7 +44,7 @@ static WCHAR ServiceName[] = L"winmgmt"; static SERVICE_STATUS_HANDLE ServiceStatusHandle; static SERVICE_STATUS ServiceStatus; -static HANDLE ShutdownEvent; +static HANDLE hStopEvent = NULL; /* FUNCTIONS *****************************************************************/ @@ -85,7 +85,7 @@ ServiceControlHandler(DWORD dwControl, { case SERVICE_CONTROL_STOP: DPRINT1(" SERVICE_CONTROL_STOP received\n"); - SetEvent(ShutdownEvent); + SetEvent(hStopEvent); UpdateServiceStatus(SERVICE_STOP_PENDING); return ERROR_SUCCESS; @@ -107,7 +107,7 @@ ServiceControlHandler(DWORD dwControl, case SERVICE_CONTROL_SHUTDOWN: DPRINT1(" SERVICE_CONTROL_SHUTDOWN received\n"); - SetEvent(ShutdownEvent); + SetEvent(hStopEvent); UpdateServiceStatus(SERVICE_STOP_PENDING); return ERROR_SUCCESS; @@ -134,13 +134,19 @@ ServiceMain(DWORD argc, LPTSTR *argv) return; } - ShutdownEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + hStopEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + if (hStopEvent == NULL) + { + DPRINT1("CreateEvent() failed! (Error %lu)\n", GetLastError()); + goto done; + } UpdateServiceStatus(SERVICE_RUNNING); - WaitForSingleObject(ShutdownEvent, INFINITE); - CloseHandle(ShutdownEvent); + WaitForSingleObject(hStopEvent, INFINITE); + CloseHandle(hStopEvent); +done: UpdateServiceStatus(SERVICE_STOPPED); } diff --git a/base/services/wuauserv/wuauserv.c b/base/services/wuauserv/wuauserv.c index cd9062c1145..6ebc0809ec1 100644 --- a/base/services/wuauserv/wuauserv.c +++ b/base/services/wuauserv/wuauserv.c @@ -15,7 +15,7 @@ static WCHAR ServiceName[] = L"wuauserv"; static SERVICE_STATUS_HANDLE ServiceStatusHandle; static SERVICE_STATUS ServiceStatus; -static HANDLE exitEvent = NULL; +static HANDLE hStopEvent = NULL; /* FUNCTIONS *****************************************************************/ @@ -55,7 +55,7 @@ ServiceControlHandler(DWORD dwControl, { case SERVICE_CONTROL_STOP: DPRINT1("WU ServiceControlHandler() SERVICE_CONTROL_STOP received\n"); - SetEvent(exitEvent); + SetEvent(hStopEvent); UpdateServiceStatus(SERVICE_STOP_PENDING); return ERROR_SUCCESS; @@ -77,7 +77,7 @@ ServiceControlHandler(DWORD dwControl, case SERVICE_CONTROL_SHUTDOWN: DPRINT1("WU ServiceControlHandler() SERVICE_CONTROL_SHUTDOWN received\n"); - SetEvent(exitEvent); + SetEvent(hStopEvent); UpdateServiceStatus(SERVICE_STOP_PENDING); return ERROR_SUCCESS; @@ -104,13 +104,19 @@ ServiceMain(DWORD argc, LPTSTR *argv) return; } - exitEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + hStopEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + if (hStopEvent == NULL) + { + DPRINT1("CreateEvent() failed! (Error %lu)\n", GetLastError()); + goto done; + } UpdateServiceStatus(SERVICE_RUNNING); - WaitForSingleObject(exitEvent, INFINITE); - CloseHandle(exitEvent); + WaitForSingleObject(hStopEvent, INFINITE); + CloseHandle(hStopEvent); +done: UpdateServiceStatus(SERVICE_STOPPED); }

1 0

[reactos] 01/01: [W32TIME] Use a reasonable fallback of 9 hours. (#1724) CORE-16181
by Benjamin Aerni 21 Jul '19

21 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b9543c31a443cd997ee3… commit 5b9543c31a443cd997ee357043ac4fc6119e8df2 Author: Benjamin Aerni <daprogramerforbatch(a)gmail.com> AuthorDate: Fri Jul 12 23:42:10 2019 -0700 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 21 17:47:13 2019 +0200 [W32TIME] Use a reasonable fallback of 9 hours. (#1724) CORE-16181 This allows preventing spamming the time servers if the registry entry becomes corrupted or missing. Also, disallow a setting of less than 2 minutes for the same reasons, and instead use the fallback of 9 hours. --- base/services/w32time/w32time.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/base/services/w32time/w32time.c b/base/services/w32time/w32time.c index c32624f8b9a..d6a6828b637 100644 --- a/base/services/w32time/w32time.c +++ b/base/services/w32time/w32time.c @@ -129,16 +129,18 @@ GetIntervalSetting(VOID) LONG lRet; dwData = 0; - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"SYSTEM\\CurrentControlSet\\Services\\W32Time\\TimeProviders\\NtpClient", - 0, - KEY_QUERY_VALUE, - &hKey) == ERROR_SUCCESS) + lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Services\\W32Time\\TimeProviders\\NtpClient", + 0, + KEY_QUERY_VALUE, + &hKey); + if (lRet == ERROR_SUCCESS) { - /* This key holds the update interval in seconds - * It is useful for testing to set it to a value of 10 (Decimal) - * This will cause the clock to try and update every 10 seconds - * So you can change the time and expect it to be set back correctly in 10-20 seconds + /* + * This key holds the update interval in seconds. + * It is useful for testing to set it to a value of 10 (Decimal). + * This will cause the clock to try and update every 10 seconds. + * So you can change the time and expect it to be set back correctly in 10-20 seconds. */ lRet = RegQueryValueExW(hKey, L"SpecialPollInterval", @@ -149,8 +151,8 @@ GetIntervalSetting(VOID) RegCloseKey(hKey); } - if (lRet != ERROR_SUCCESS) - return 0; + if (lRet != ERROR_SUCCESS || dwData < 120) + return 9 * 60 * 60; // 9 hours, because Windows uses 9 hrs, 6 mins and 8 seconds by default. else return dwData; }

1 0

← Newer
1
2
3
4
5
6
7
8
...
15
Older →

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