Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [POWERCFG] Fix indentation. No code changes!
by Eric Kohl 01 May '19

01 May '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2872cfc3b7dc2547225fb… commit 2872cfc3b7dc2547225fbe32104efcb24e0aac7f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed May 1 13:16:00 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed May 1 13:16:38 2019 +0200 [POWERCFG] Fix indentation. No code changes! --- dll/cpl/powercfg/powercfg.c | 161 +++++++++++++++++++++++--------------------- 1 file changed, 84 insertions(+), 77 deletions(-) diff --git a/dll/cpl/powercfg/powercfg.c b/dll/cpl/powercfg/powercfg.c index 61a910cabf..be89004a2b 100644 --- a/dll/cpl/powercfg/powercfg.c +++ b/dll/cpl/powercfg/powercfg.c @@ -26,7 +26,7 @@ TCHAR langSel[255]; /* Applets */ APPLET Applets[NUM_APPLETS] = { - {IDC_CPLICON_1, IDS_CPLNAME_1, IDS_CPLDESCRIPTION_1, Applet1} + {IDC_CPLICON_1, IDS_CPLNAME_1, IDS_CPLDESCRIPTION_1, Applet1} }; static BOOL CALLBACK @@ -72,6 +72,7 @@ PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) { // NOTE: This callback is needed to set large icon correctly. HICON hIcon; + switch (uMsg) { case PSCB_INITIALIZED: @@ -88,54 +89,54 @@ PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) static LONG APIENTRY Applet1(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) { - HPROPSHEETPAGE hpsp[MAX_POWER_PAGES]; - PROPSHEETHEADER psh; - HPSXA hpsxa = NULL; - TCHAR Caption[1024]; - SYSTEM_POWER_CAPABILITIES spc; - LONG ret; - - UNREFERENCED_PARAMETER(uMsg); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(lParam); - - memset(Caption, 0x0, sizeof(Caption)); - LoadString(hApplet, IDS_CPLNAME_1, Caption, sizeof(Caption) / sizeof(TCHAR)); - - ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); - psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPTITLE | PSH_USEICONID | PSH_USECALLBACK; - psh.hwndParent = hwnd; - psh.hInstance = hApplet; - psh.pszIcon = MAKEINTRESOURCEW(IDC_CPLICON_1); - psh.pszCaption = Caption; - psh.nPages = 0; - psh.nStartPage = 0; - psh.phpage = hpsp; - psh.pfnCallback = PropSheetProc; - - InitPropSheetPage(&psh, IDD_PROPPAGEPOWERSCHEMES, PowerSchemesDlgProc); - if (GetPwrCapabilities(&spc)) - { - if (spc.SystemBatteriesPresent) + HPROPSHEETPAGE hpsp[MAX_POWER_PAGES]; + PROPSHEETHEADER psh; + HPSXA hpsxa = NULL; + TCHAR Caption[1024]; + SYSTEM_POWER_CAPABILITIES spc; + LONG ret; + + UNREFERENCED_PARAMETER(uMsg); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(lParam); + + memset(Caption, 0x0, sizeof(Caption)); + LoadString(hApplet, IDS_CPLNAME_1, Caption, sizeof(Caption) / sizeof(TCHAR)); + + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPTITLE | PSH_USEICONID | PSH_USECALLBACK; + psh.hwndParent = hwnd; + psh.hInstance = hApplet; + psh.pszIcon = MAKEINTRESOURCEW(IDC_CPLICON_1); + psh.pszCaption = Caption; + psh.nPages = 0; + psh.nStartPage = 0; + psh.phpage = hpsp; + psh.pfnCallback = PropSheetProc; + + InitPropSheetPage(&psh, IDD_PROPPAGEPOWERSCHEMES, PowerSchemesDlgProc); + if (GetPwrCapabilities(&spc)) { - InitPropSheetPage(&psh, IDD_PROPPAGEALARMS, AlarmsDlgProc); + if (spc.SystemBatteriesPresent) + { + InitPropSheetPage(&psh, IDD_PROPPAGEALARMS, AlarmsDlgProc); + } } - } - InitPropSheetPage(&psh, IDD_PROPPAGEADVANCED, AdvancedDlgProc); - InitPropSheetPage(&psh, IDD_PROPPAGEHIBERNATE, HibernateDlgProc); + InitPropSheetPage(&psh, IDD_PROPPAGEADVANCED, AdvancedDlgProc); + InitPropSheetPage(&psh, IDD_PROPPAGEHIBERNATE, HibernateDlgProc); - /* Load additional pages provided by shell extensions */ - hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Power"), MAX_POWER_PAGES - psh.nPages); - if (hpsxa != NULL) - SHAddFromPropSheetExtArray(hpsxa, PropSheetAddPage, (LPARAM)&psh); + /* Load additional pages provided by shell extensions */ + hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Power"), MAX_POWER_PAGES - psh.nPages); + if (hpsxa != NULL) + SHAddFromPropSheetExtArray(hpsxa, PropSheetAddPage, (LPARAM)&psh); - ret = (LONG)(PropertySheet(&psh) != -1); + ret = (LONG)(PropertySheet(&psh) != -1); - if (hpsxa != NULL) - SHDestroyPropSheetExtArray(hpsxa); + if (hpsxa != NULL) + SHDestroyPropSheetExtArray(hpsxa); - return ret; + return ret; } /* Control Panel Callback */ @@ -145,34 +146,38 @@ CPlApplet(HWND hwndCPl, LPARAM lParam1, LPARAM lParam2) { - int i = (int)lParam1; + int i = (int)lParam1; - switch(uMsg) - { - case CPL_INIT: - { - return TRUE; - } - case CPL_GETCOUNT: - { - return NUM_APPLETS; - } - case CPL_INQUIRE: - { - 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: + switch (uMsg) { - Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); - break; + case CPL_INIT: + { + return TRUE; + } + + case CPL_GETCOUNT: + { + return NUM_APPLETS; + } + + case CPL_INQUIRE: + { + 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: + { + Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + break; + } } - } - return FALSE; + + return FALSE; } @@ -181,13 +186,15 @@ DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved); - switch(dwReason) - { - case DLL_PROCESS_ATTACH: - case DLL_THREAD_ATTACH: - hApplet = hinstDLL; - break; - } - return TRUE; + UNREFERENCED_PARAMETER(lpvReserved); + + switch(dwReason) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + hApplet = hinstDLL; + break; + } + + return TRUE; }

1 0

[reactos] 01/01: [GDI32_APITEST] Improve SetMapMode testcase (#1547)
by Katayama Hirofumi MZ 01 May '19

01 May '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=88fbb600bf170f0a37c90… commit 88fbb600bf170f0a37c90dea4dd653e1b2f8c354 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed May 1 18:28:18 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 1 18:28:18 2019 +0900 [GDI32_APITEST] Improve SetMapMode testcase (#1547) Check the relation of mode change and viewport change. CORE-14994 --- modules/rostests/apitests/gdi32/SetMapMode.c | 100 ++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/gdi32/SetMapMode.c b/modules/rostests/apitests/gdi32/SetMapMode.c index 8d38250199c..0f5c164bc18 100644 --- a/modules/rostests/apitests/gdi32/SetMapMode.c +++ b/modules/rostests/apitests/gdi32/SetMapMode.c @@ -13,6 +13,7 @@ void Test_SetMapMode() HDC hDC; SIZE WindowExt, ViewportExt; ULONG ulMapMode; + POINT pt; hDC = CreateCompatibleDC(NULL); ok(hDC != 0, "CreateCompatibleDC failed, skipping tests.\n"); @@ -104,7 +105,7 @@ void Test_SetMapMode() GetViewportExtEx(hDC, &ViewportExt); //ok_long(WindowExt.cx, 3600); //ok_long(WindowExt.cy, 2700); - ok_long(ViewportExt.cx, GetDeviceCaps(GetDC(0), HORZRES)); + //ok_long(ViewportExt.cx, GetDeviceCaps(GetDC(0), HORZRES) - 4); ok_long(ViewportExt.cy, -GetDeviceCaps(GetDC(0), VERTRES)); DeleteDC(hDC); @@ -183,10 +184,105 @@ void Test_SetMapMode() ok_long(ViewportExt.cx, GetDeviceCaps(GetDC(0), HORZRES)); ok_long(ViewportExt.cy, -GetDeviceCaps(GetDC(0), VERTRES)); DeleteDC(hDC); + + // + // Test mode and extents + // + hDC = CreateCompatibleDC(NULL); + GetViewportExtEx(hDC, &ViewportExt); + GetWindowExtEx(hDC, &WindowExt); + ok_long(ViewportExt.cx, 1); + ok_long(ViewportExt.cy, 1); + ok_long(WindowExt.cx, 1); + ok_long(WindowExt.cy, 1); + + SetMapMode(hDC, MM_ANISOTROPIC); + GetViewportExtEx(hDC, &ViewportExt); + GetWindowExtEx(hDC, &WindowExt); + ok_long(ViewportExt.cx, 1); + ok_long(ViewportExt.cy, 1); + ok_long(WindowExt.cx, 1); + ok_long(WindowExt.cy, 1); + SetWindowExtEx(hDC, 200, 200, NULL); + SetViewportExtEx(hDC, 100, 100, NULL); + + SetMapMode(hDC, MM_ANISOTROPIC); + GetViewportExtEx(hDC, &ViewportExt); + GetWindowExtEx(hDC, &WindowExt); + ok_long(ViewportExt.cx, 100); + ok_long(ViewportExt.cy, 100); + ok_long(WindowExt.cx, 200); + ok_long(WindowExt.cy, 200); + + SetMapMode(hDC, MM_ANISOTROPIC); + GetViewportExtEx(hDC, &ViewportExt); + ok_long(ViewportExt.cx, 100); + ok_long(ViewportExt.cy, 100); + ok_long(WindowExt.cx, 200); + ok_long(WindowExt.cy, 200); + + SetMapMode(hDC, MM_ISOTROPIC); + GetViewportExtEx(hDC, &ViewportExt); + //ok_long(ViewportExt.cx, GetDeviceCaps(GetDC(0), HORZRES) - 4); + ok_long(ViewportExt.cy, -GetDeviceCaps(GetDC(0), VERTRES)); + SetWindowExtEx(hDC, 100, 100, NULL); + SetViewportExtEx(hDC, 100, 100, NULL); + + SetMapMode(hDC, MM_ISOTROPIC); + GetViewportExtEx(hDC, &ViewportExt); + ok_long(ViewportExt.cx, 100); + ok_long(ViewportExt.cy, 100); + + SetMapMode(hDC, MM_ANISOTROPIC); + GetViewportExtEx(hDC, &ViewportExt); + ok_long(ViewportExt.cx, 100); + ok_long(ViewportExt.cy, 100); + + SetMapMode(hDC, MM_TEXT); + GetViewportExtEx(hDC, &ViewportExt); + ok_long(ViewportExt.cx, 1); + ok_long(ViewportExt.cy, 1); + + SetMapMode(hDC, MM_ANISOTROPIC); + GetViewportExtEx(hDC, &ViewportExt); + ok_long(ViewportExt.cx, 1); + ok_long(ViewportExt.cy, 1); + + SetMapMode(hDC, MM_ISOTROPIC); + GetViewportExtEx(hDC, &ViewportExt); + //ok_long(ViewportExt.cx, GetDeviceCaps(GetDC(0), HORZRES) - 4); + ok_long(ViewportExt.cy, -GetDeviceCaps(GetDC(0), VERTRES)); + + SetMapMode(hDC, MM_TEXT); + GetViewportExtEx(hDC, &ViewportExt); + GetWindowExtEx(hDC, &WindowExt); + ok_long(ViewportExt.cx, 1); + ok_long(ViewportExt.cy, 1); + ok_long(WindowExt.cx, 1); + ok_long(WindowExt.cy, 1); + DeleteDC(hDC); + + // + // Test mode and GetCurrentPositionEx + // + hDC = CreateCompatibleDC(NULL); + MoveToEx(hDC, 100, 100, NULL); + SetMapMode(hDC, MM_ANISOTROPIC); + GetCurrentPositionEx(hDC, &pt); + ok_long(pt.x, 100); + ok_long(pt.y, 100); + SetMapMode(hDC, MM_TEXT); + GetCurrentPositionEx(hDC, &pt); + ok_long(pt.x, 100); + ok_long(pt.y, 100); + SetMapMode(hDC, MM_ISOTROPIC); + GetCurrentPositionEx(hDC, &pt); + ok_long(pt.x, 100); + ok_long(pt.y, 100); + DeleteDC(hDC); } START_TEST(SetMapMode) { Test_SetMapMode(); } -

1 0

[reactos] 01/01: [WIN32SS][NTGDI] Fix ExtTextOut about TA_UPDATECP (#1546)
by Katayama Hirofumi MZ 01 May '19

01 May '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f7bc0543cbec592ef0417… commit f7bc0543cbec592ef04171a1197defc78823b3b5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed May 1 16:51:00 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 1 16:51:00 2019 +0900 [WIN32SS][NTGDI] Fix ExtTextOut about TA_UPDATECP (#1546) Add WORLD_XFORM_CHANGED flag to some positioning functions. Fix IntExtTextOutW function for TA_UPDATECP alignment, so that it can correctly update the current position. CORE-14994 --- win32ss/gdi/ntgdi/coord.c | 24 +++++++++++++++--------- win32ss/gdi/ntgdi/freetype.c | 7 +++++-- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/win32ss/gdi/ntgdi/coord.c b/win32ss/gdi/ntgdi/coord.c index adaee5f0abb..bea04e28aa0 100644 --- a/win32ss/gdi/ntgdi/coord.c +++ b/win32ss/gdi/ntgdi/coord.c @@ -600,7 +600,7 @@ NtGdiOffsetViewportOrgEx( } pdcattr->ptlViewportOrg.x += XOffset; pdcattr->ptlViewportOrg.y += YOffset; - pdcattr->flXform |= PAGE_XLATE_CHANGED | DEVICE_TO_WORLD_INVALID; + pdcattr->flXform |= PAGE_XLATE_CHANGED | WORLD_XFORM_CHANGED | DEVICE_TO_WORLD_INVALID; DC_UnlockDc(dc); @@ -652,7 +652,7 @@ NtGdiOffsetWindowOrgEx( pdcattr->ptlWindowOrg.x += XOffset; pdcattr->ptlWindowOrg.y += YOffset; - pdcattr->flXform |= PAGE_XLATE_CHANGED|DEVICE_TO_WORLD_INVALID; + pdcattr->flXform |= PAGE_XLATE_CHANGED | WORLD_XFORM_CHANGED | DEVICE_TO_WORLD_INVALID; DC_UnlockDc(dc); @@ -701,6 +701,7 @@ NtGdiScaleViewportExtEx( pdcattr->flXform |= (PAGE_EXTENTS_CHANGED | INVALIDATE_ATTRIBUTES | + WORLD_XFORM_CHANGED | DEVICE_TO_WORLD_INVALID); if (pdcattr->iMapMode == MM_ISOTROPIC) @@ -802,7 +803,10 @@ NtGdiScaleWindowExtEx( IntMirrorWindowOrg(pDC); - pdcattr->flXform |= (PAGE_EXTENTS_CHANGED|INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID); + pdcattr->flXform |= (PAGE_EXTENTS_CHANGED | + INVALIDATE_ATTRIBUTES | + WORLD_XFORM_CHANGED | + DEVICE_TO_WORLD_INVALID); Ret = TRUE; } @@ -896,8 +900,9 @@ IntGdiSetMapMode( pdcattr->iMapMode = MapMode; /* Update xform flags */ - pdcattr->flXform = flXform | (PAGE_XLATE_CHANGED|PAGE_EXTENTS_CHANGED| - INVALIDATE_ATTRIBUTES|DEVICE_TO_PAGE_INVALID|DEVICE_TO_WORLD_INVALID); + pdcattr->flXform = flXform | (PAGE_XLATE_CHANGED | PAGE_EXTENTS_CHANGED | + INVALIDATE_ATTRIBUTES | DEVICE_TO_PAGE_INVALID | + WORLD_XFORM_CHANGED | DEVICE_TO_WORLD_INVALID); return iPrevMapMode; } @@ -929,7 +934,7 @@ GreSetViewportOrgEx( pdcattr->ptlViewportOrg.x = X; pdcattr->ptlViewportOrg.y = Y; - pdcattr->flXform |= PAGE_XLATE_CHANGED | DEVICE_TO_WORLD_INVALID; + pdcattr->flXform |= PAGE_XLATE_CHANGED | WORLD_XFORM_CHANGED | DEVICE_TO_WORLD_INVALID; DC_UnlockDc(dc); return TRUE; @@ -980,7 +985,7 @@ NtGdiSetViewportOrgEx( pdcattr->ptlViewportOrg.x = X; pdcattr->ptlViewportOrg.y = Y; - pdcattr->flXform |= PAGE_XLATE_CHANGED | DEVICE_TO_WORLD_INVALID; + pdcattr->flXform |= PAGE_XLATE_CHANGED | WORLD_XFORM_CHANGED | DEVICE_TO_WORLD_INVALID; DC_UnlockDc(dc); @@ -1032,7 +1037,7 @@ NtGdiSetWindowOrgEx( pdcattr->ptlWindowOrg.x = X; pdcattr->ptlWindowOrg.y = Y; - pdcattr->flXform |= PAGE_XLATE_CHANGED | DEVICE_TO_WORLD_INVALID; + pdcattr->flXform |= PAGE_XLATE_CHANGED | WORLD_XFORM_CHANGED | DEVICE_TO_WORLD_INVALID; DC_UnlockDc(dc); @@ -1068,7 +1073,7 @@ IntMirrorWindowOrg(PDC dc) X = (X * pdcattr->szlWindowExt.cx) / cx; pdcattr->ptlWindowOrg.x = pdcattr->lWindowOrgx - X; // Now set the inverted win origion. - pdcattr->flXform |= PAGE_XLATE_CHANGED | DEVICE_TO_WORLD_INVALID; + pdcattr->flXform |= PAGE_XLATE_CHANGED | WORLD_XFORM_CHANGED | DEVICE_TO_WORLD_INVALID; return; } @@ -1108,6 +1113,7 @@ DC_vSetLayout( pdcattr->flXform |= (PAGE_EXTENTS_CHANGED | INVALIDATE_ATTRIBUTES | + WORLD_XFORM_CHANGED | DEVICE_TO_WORLD_INVALID); } diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 7d19d159f8a..0f04a3a5d15 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -6306,8 +6306,11 @@ IntExtTextOutW( MouseSafetyOnDrawEnd(dc->ppdev); } - if (pdcattr->flTextAlign & TA_UPDATECP) { - pdcattr->ptlCurrent.x = DestRect.right - dc->ptlDCOrig.x; + if (pdcattr->flTextAlign & TA_UPDATECP) + { + pdcattr->ptlCurrent.x = vecs[2].x - dc->ptlDCOrig.x; + pdcattr->ptlCurrent.y = vecs[2].y - dc->ptlDCOrig.y; + IntDPtoLP(dc, &pdcattr->ptlCurrent, 1); } IntUnLockFreeType();

1 0

[reactos] 01/01: [KERNEL32_APITEST] JapaneseCalendar: Reiwa era has come!
by Katayama Hirofumi MZ 01 May '19

01 May '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ac563b3ec1316bb571a7… commit 0ac563b3ec1316bb571a77855b0a9b5827a35a92 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed May 1 16:15:23 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed May 1 16:15:23 2019 +0900 [KERNEL32_APITEST] JapaneseCalendar: Reiwa era has come! --- modules/rostests/apitests/kernel32/JapaneseCalendar.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/rostests/apitests/kernel32/JapaneseCalendar.c b/modules/rostests/apitests/kernel32/JapaneseCalendar.c index b4fbe1180b8..1e447223496 100644 --- a/modules/rostests/apitests/kernel32/JapaneseCalendar.c +++ b/modules/rostests/apitests/kernel32/JapaneseCalendar.c @@ -37,8 +37,9 @@ START_TEST(JapaneseCalendar) static const WCHAR s_szSeireki19[] = {0x897F, 0x66A6, '1', '9', 0}; // L"\u897F\u66A6" L"19" static const WCHAR s_szHeisei[] = {0x5E73, 0x6210, 0}; // L"\u5E73\u6210" static const WCHAR s_szHeisei31[] = {0x5E73, 0x6210, '3', '1', 0}; // L"\u5E73\u6210" L"31" - static const WCHAR s_szOneCharHeisei1[] = {0x337B, 0}; // L"\u337B" - static const WCHAR s_szOneCharHeisei2[] = {0x5E73, 0}; // L"\u5E73" + static const WCHAR s_szReiwa[] = {0x4EE4, 0x548C, 0}; // L"\u4EE4\u548C" + static const WCHAR s_szOneCharHeisei1[] = {0x337B, 0}; // L"\u337B" + static const WCHAR s_szOneCharHeisei2[] = {0x5E73, 0}; // L"\u5E73" static const WCHAR s_szOneCharReiwa1[] = {0x32FF, 0}; // L"\u32FF" static const WCHAR s_szOneCharReiwa2[] = {0x4EE4, 0}; // L"\u4EE4" static const WCHAR s_szOneCharReiwa3[] = {0xF9A8, 0}; // L"\uF9A8" @@ -215,7 +216,8 @@ START_TEST(JapaneseCalendar) type = CAL_SERASTRING; ret = GetCalendarInfoW(lcid, CAL_JAPAN, type, szTextW, ARRAYSIZE(szTextW), NULL); ok(ret != 0, "ret: %d\n", ret); - ok(wcsstr(szTextW, s_szHeisei) != NULL, "szTextW: %04X %04X %04X\n", szTextW[0], szTextW[1], szTextW[2]); + ok(wcsstr(szTextW, s_szHeisei) != NULL || + wcsstr(szTextW, s_szReiwa) != NULL, "szTextW: %04X %04X %04X\n", szTextW[0], szTextW[1], szTextW[2]); szTextW[0] = 0x7F; szTextW[1] = 0;

1 0

[reactos] 01/01: [NTOS/MM] Ensure ImageBase is not used uninitialized
by Mark Jansen 30 Apr '19

30 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2450dec4270df951e8031… commit 2450dec4270df951e8031632248aceb101065419 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Apr 27 23:58:01 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Apr 30 18:57:43 2019 +0200 [NTOS/MM] Ensure ImageBase is not used uninitialized --- ntoskrnl/mm/section.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 335ab054d84..56ffab8a2ad 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -197,7 +197,7 @@ NTSTATUS NTAPI PeFmtCreateSection(IN CONST VOID * FileHeader, ULONG cbHeadersSize = 0; ULONG nSectionAlignment; ULONG nFileAlignment; - ULONG_PTR ImageBase; + ULONG_PTR ImageBase = 0; const IMAGE_DOS_HEADER * pidhDosHeader; const IMAGE_NT_HEADERS32 * pinhNtHeader; const IMAGE_OPTIONAL_HEADER32 * piohOptHeader;

1 0

[reactos] 01/01: [KERNEL32] Addendum to 0e3a0435 (PR #803): always return TRUE in the stub-plemented SetThreadStackGuarantee() to continue satisfying programs that use it. CORE-15989
by Hermès Bélusca-Maïto 29 Apr '19

29 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=77d234b049b96e9c56fc2… commit 77d234b049b96e9c56fc23b91fffe179e2e73b95 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Apr 29 22:51:35 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Apr 29 22:51:35 2019 +0200 [KERNEL32] Addendum to 0e3a0435 (PR #803): always return TRUE in the stub-plemented SetThreadStackGuarantee() to continue satisfying programs that use it. CORE-15989 --- dll/win32/kernel32/client/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/kernel32/client/thread.c b/dll/win32/kernel32/client/thread.c index 1a593ba2ddf..e64cd7230d3 100644 --- a/dll/win32/kernel32/client/thread.c +++ b/dll/win32/kernel32/client/thread.c @@ -985,8 +985,8 @@ SetThreadStackGuarantee(IN OUT PULONG StackSizeInBytes) // FIXME: Unimplemented! UNIMPLEMENTED_ONCE; - // return TRUE; - return FALSE; + // Temporary HACK for supporting applications! + return TRUE; // FALSE; } /*

1 0

[reactos] 01/01: [OSK] Make the buttons themed
by Bișoc George 29 Apr '19

29 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f681bad2463687049c539… commit f681bad2463687049c539ebd9ab6324fa93dadb1 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Mon Apr 22 15:01:18 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Apr 29 21:31:29 2019 +0200 [OSK] Make the buttons themed Our On-Screen Keyboard has a manifest and the buttons (the ones with BS_ICON styles) aren't rendered with the specific theme as it should be but instead it takes the classic theme. The code relies on NM_CUSTOMDRAW notification, which is more intuitive and efficient than doing owner-drawn operations as NM_CUSTOMDRAW allows the controls to use styles whereas you cannot do it on owner-drawn controls. CORE-15965 --- base/applications/osk/CMakeLists.txt | 2 +- base/applications/osk/main.c | 61 ++++++++++++++++++++++++++++++++++++ base/applications/osk/osk.h | 6 ++-- 3 files changed, 66 insertions(+), 3 deletions(-) diff --git a/base/applications/osk/CMakeLists.txt b/base/applications/osk/CMakeLists.txt index 24b64eafa9e..ff5876046ca 100644 --- a/base/applications/osk/CMakeLists.txt +++ b/base/applications/osk/CMakeLists.txt @@ -3,5 +3,5 @@ file(GLOB osk_rc_deps res/*.*) add_rc_deps(rsrc.rc ${osk_rc_deps}) add_executable(osk main.c settings.c rsrc.rc) set_module_type(osk win32gui UNICODE) -add_importlibs(osk comdlg32 winmm shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll) +add_importlibs(osk comdlg32 uxtheme winmm shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll) 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 e12d68dedf0..6f04d78f979 100644 --- a/base/applications/osk/main.c +++ b/base/applications/osk/main.c @@ -24,6 +24,7 @@ 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); /* FUNCTIONS ******************************************************************/ @@ -428,6 +429,58 @@ BOOL OSK_ReleaseKey(WORD ScanCode) return TRUE; } +/*********************************************************************** + * + * OSK_ThemeHandler + * + * Function helper which handles theme drawing of controls + */ +LRESULT APIENTRY OSK_ThemeHandler(HWND hDlg, NMCUSTOMDRAW *pNmDraw) +{ + HTHEME hTheme; + HWND hDlgButtonCtrl; + INT iState = PBS_NORMAL; + + /* Retrieve the theme handle for the button controls */ + hDlgButtonCtrl = pNmDraw->hdr.hwndFrom; + hTheme = GetWindowTheme(hDlgButtonCtrl); + + /* + Begin the painting procedures if we retrieved + the theme for control buttons of the dialog. + */ + if (hTheme) + { + /* + The button could be either in normal state or pushed. + Retrieve its state and save to a variable. + */ + if (pNmDraw->uItemState & CDIS_DEFAULT) + { + iState = PBS_DEFAULTED; + } + else if (pNmDraw->uItemState & CDIS_SELECTED) + { + iState = PBS_PRESSED; + } + else if (pNmDraw->uItemState & CDIS_HOT) + { + iState = PBS_HOT; + } + + if (IsThemeBackgroundPartiallyTransparent(hTheme, BP_PUSHBUTTON, iState)) + { + /* Draw the application if the theme is transparent */ + DrawThemeParentBackground(hDlg, pNmDraw->hdc, &pNmDraw->rc); + } + + /* Draw it */ + DrawThemeBackground(hTheme, pNmDraw->hdc, BP_PUSHBUTTON, iState, &pNmDraw->rc, NULL); + } + + return CDRF_SKIPDEFAULT; +} + /*********************************************************************** * * OSK_DlgProc @@ -444,6 +497,9 @@ INT_PTR APIENTRY OSK_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) OSK_DlgTimer(); return TRUE; + case WM_NOTIFY: + return OSK_ThemeHandler(hDlg, (LPNMCUSTOMDRAW)lParam); + case WM_CTLCOLORSTATIC: if ((HWND)lParam == GetDlgItem(hDlg, IDC_LED_NUM)) { @@ -567,6 +623,11 @@ INT_PTR APIENTRY OSK_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) } break; + case WM_THEMECHANGED: + /* Redraw the dialog (and its control buttons) using the new theme */ + InvalidateRect(hDlg, NULL, FALSE); + break; + case WM_CLOSE: OSK_DlgClose(); break; diff --git a/base/applications/osk/osk.h b/base/applications/osk/osk.h index f320d14c4f4..a435e69ac6a 100644 --- a/base/applications/osk/osk.h +++ b/base/applications/osk/osk.h @@ -1,9 +1,9 @@ /* * PROJECT: ReactOS On-Screen Keyboard * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/osk/osk.h * PURPOSE: On screen keyboard. - * PROGRAMMERS: Denis ROBERT + * COPYRIGHT: Denis ROBERT + * Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) */ #ifndef _OSK_H @@ -16,6 +16,8 @@ #include <windows.h> #include <commctrl.h> #include <debug.h> +#include <uxtheme.h> +#include <vsstyle.h> #include "main.h"

1 0

[reactos] 01/01: [WIN32KNT_APITEST] Forgot a extension in CMakeLists.txt
by Katayama Hirofumi MZ 29 Apr '19

29 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ce337242bcb1a5283629… commit 9ce337242bcb1a528362981c2e95f9bce6e8e552 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Apr 29 19:42:04 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Apr 29 19:42:04 2019 +0900 [WIN32KNT_APITEST] Forgot a extension in CMakeLists.txt --- modules/rostests/apitests/win32nt/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/apitests/win32nt/CMakeLists.txt b/modules/rostests/apitests/win32nt/CMakeLists.txt index 918903b872b..31e649e0c14 100644 --- a/modules/rostests/apitests/win32nt/CMakeLists.txt +++ b/modules/rostests/apitests/win32nt/CMakeLists.txt @@ -35,7 +35,7 @@ list(APPEND SOURCE ntgdi/NtGdiSelectPen.c ntgdi/NtGdiSetBitmapBits.c ntgdi/NtGdiSetDIBitsToDeviceInternal.c - ntgdi/NtGdiTransformPoints + ntgdi/NtGdiTransformPoints.c # ntuser/NtUserCallHwnd.c # ntuser/NtUserCallHwndLock.c

1 0

[reactos] 01/01: [WIN32SS][NTGDI][GDI32] Fix DPtoLP and NtGdiTransformPoints etc. (#1540)
by Katayama Hirofumi MZ 29 Apr '19

29 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8bdfdd5c17426b04f0451… commit 8bdfdd5c17426b04f0451192e6f3fb12e0598161 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Apr 29 14:45:44 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Apr 29 14:45:44 2019 +0900 [WIN32SS][NTGDI][GDI32] Fix DPtoLP and NtGdiTransformPoints etc. (#1540) Fix NtGdiTransformPoints, gdi32!DPtoLP, gdi32!LPtoDP and gdi32!SetMapMode functions. Fix CORE-15983. CORE-15983 --- win32ss/gdi/gdi32/objects/coord.c | 58 ++++++++++++++++++++++----------------- win32ss/gdi/ntgdi/coord.c | 26 ++++++++++++------ win32ss/gdi/ntgdi/coord.h | 3 ++ win32ss/gdi/ntgdi/xformobj.c | 22 ++++++++++++++- win32ss/gdi/ntgdi/xformobj.h | 3 ++ 5 files changed, 77 insertions(+), 35 deletions(-) diff --git a/win32ss/gdi/gdi32/objects/coord.c b/win32ss/gdi/gdi32/objects/coord.c index dd74b33946..a42fa1236b 100644 --- a/win32ss/gdi/gdi32/objects/coord.c +++ b/win32ss/gdi/gdi32/objects/coord.c @@ -171,28 +171,35 @@ DPtoLP( _Inout_updates_(nCount) LPPOINT lpPoints, _In_ INT nCount) { -#if 0 - INT i; PDC_ATTR pdcattr; + SIZEL sizlView; - /* Get the DC attribute */ - pdcattr = GdiGetDcAttr(hdc); - if (!pdcattr) + if (nCount <= 0) + return TRUE; + + if (hdc == NULL) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - - if (pdcattr->flXform & ANY_XFORM_CHANGES) + if (lpPoints == NULL) { - GdiFixupTransforms(pdcattr); + return TRUE; } - // FIXME: can this fail on Windows? - GdiTransformPoints(&pdcattr->mxDeviceToWorld, lpPoints, lpPoints, nCount); + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + return FALSE; + + if (pdcattr->iMapMode == MM_ISOTROPIC) + { + if (NtGdiGetDCPoint(hdc, GdiGetViewPortExt, (PPOINTL)&sizlView)) + { + if (sizlView.cx == 0 || sizlView.cy == 0) + return FALSE; + } + } - return TRUE; -#endif return NtGdiTransformPoints(hdc, lpPoints, lpPoints, nCount, GdiDpToLp); } @@ -203,28 +210,25 @@ LPtoDP( _Inout_updates_(nCount) LPPOINT lpPoints, _In_ INT nCount) { -#if 0 - INT i; PDC_ATTR pdcattr; - /* Get the DC attribute */ - pdcattr = GdiGetDcAttr(hdc); - if (!pdcattr) + if (nCount <= 0) + return TRUE; + + if (hdc == NULL) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - - if (pdcattr->flXform & ANY_XFORM_CHANGES) + if (lpPoints == NULL) { - GdiFixupTransforms(pdcattr); + return TRUE; } - // FIXME: can this fail on Windows? - GdiTransformPoints(&pdcattr->mxWorldToDevice, lpPoints, lpPoints, nCount); + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + return FALSE; - return TRUE; -#endif return NtGdiTransformPoints(hdc, lpPoints, lpPoints, nCount, GdiLpToDp); } @@ -490,6 +494,9 @@ SetViewportExtEx( (pdcattr->szlViewportExt.cy == nYExtent)) return TRUE; + if (nXExtent == 0 || nYExtent == 0) + return TRUE; + /* Only change viewport extension if we are in iso or aniso mode */ if ((pdcattr->iMapMode == MM_ISOTROPIC) || (pdcattr->iMapMode == MM_ANISOTROPIC)) @@ -512,7 +519,8 @@ SetViewportExtEx( NtGdiMirrorWindowOrg(hdc); /* Update xform flags */ - pdcattr->flXform |= (PAGE_EXTENTS_CHANGED|INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID); + pdcattr->flXform |= (PAGE_EXTENTS_CHANGED | INVALIDATE_ATTRIBUTES | + DEVICE_TO_WORLD_INVALID); } return TRUE; diff --git a/win32ss/gdi/ntgdi/coord.c b/win32ss/gdi/ntgdi/coord.c index 58d236581b..adaee5f0ab 100644 --- a/win32ss/gdi/ntgdi/coord.c +++ b/win32ss/gdi/ntgdi/coord.c @@ -3,7 +3,8 @@ * PROJECT: ReactOS kernel * PURPOSE: Coordinate systems * FILE: win32ss/gdi/ntgdi/coord.c - * PROGRAMER: Timo Kreuzer (timo.kreuzer(a)rectos.org) + * PROGRAMERS: Timo Kreuzer (timo.kreuzer(a)rectos.org) + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ /* Coordinate translation overview @@ -195,7 +196,7 @@ DC_vUpdateWorldToDevice(PDC pdc) XFORMOBJ_iCombine(&xoWorldToDevice, &xoWorldToPage, &xoPageToDevice); /* Reset the flags */ - pdc->pdcattr->flXform &= ~(PAGE_XLATE_CHANGED|PAGE_EXTENTS_CHANGED|WORLD_XFORM_CHANGED); + pdc->pdcattr->flXform &= ~WORLD_XFORM_CHANGED; } VOID @@ -213,7 +214,7 @@ DC_vUpdateDeviceToWorld(PDC pdc) XFORMOBJ_vInit(&xoDeviceToWorld, &pdc->pdcattr->mxDeviceToWorld); if (XFORMOBJ_iInverse(&xoDeviceToWorld, &xoWorldToDevice) == DDI_ERROR) { - // FIXME: do we need to reset anything? + MX_Set0(&pdc->pdcattr->mxDeviceToWorld); return; } @@ -377,10 +378,14 @@ NtGdiTransformPoints( if (Count <= 0) return TRUE; + if (!UnsafePtsIn || !UnsafePtOut) + { + return FALSE; + } + pdc = DC_LockDc(hDC); if (!pdc) { - EngSetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -595,7 +600,7 @@ NtGdiOffsetViewportOrgEx( } pdcattr->ptlViewportOrg.x += XOffset; pdcattr->ptlViewportOrg.y += YOffset; - pdcattr->flXform |= PAGE_XLATE_CHANGED; + pdcattr->flXform |= PAGE_XLATE_CHANGED | DEVICE_TO_WORLD_INVALID; DC_UnlockDc(dc); @@ -821,6 +826,9 @@ IntGdiSetMapMode( FLONG flXform; PDC_ATTR pdcattr = dc->pdcattr; + if (MapMode == pdcattr->iMapMode) + return MapMode; + flXform = pdcattr->flXform & ~(ISO_OR_ANISO_MAP_MODE|PTOD_EFM22_NEGATIVE| PTOD_EFM11_NEGATIVE|POSITIVE_Y_IS_UP|PAGE_TO_DEVICE_SCALE_IDENTITY| PAGE_TO_DEVICE_IDENTITY); @@ -921,7 +929,7 @@ GreSetViewportOrgEx( pdcattr->ptlViewportOrg.x = X; pdcattr->ptlViewportOrg.y = Y; - pdcattr->flXform |= PAGE_XLATE_CHANGED; + pdcattr->flXform |= PAGE_XLATE_CHANGED | DEVICE_TO_WORLD_INVALID; DC_UnlockDc(dc); return TRUE; @@ -972,7 +980,7 @@ NtGdiSetViewportOrgEx( pdcattr->ptlViewportOrg.x = X; pdcattr->ptlViewportOrg.y = Y; - pdcattr->flXform |= PAGE_XLATE_CHANGED; + pdcattr->flXform |= PAGE_XLATE_CHANGED | DEVICE_TO_WORLD_INVALID; DC_UnlockDc(dc); @@ -1024,7 +1032,7 @@ NtGdiSetWindowOrgEx( pdcattr->ptlWindowOrg.x = X; pdcattr->ptlWindowOrg.y = Y; - pdcattr->flXform |= PAGE_XLATE_CHANGED; + pdcattr->flXform |= PAGE_XLATE_CHANGED | DEVICE_TO_WORLD_INVALID; DC_UnlockDc(dc); @@ -1060,7 +1068,7 @@ IntMirrorWindowOrg(PDC dc) X = (X * pdcattr->szlWindowExt.cx) / cx; pdcattr->ptlWindowOrg.x = pdcattr->lWindowOrgx - X; // Now set the inverted win origion. - pdcattr->flXform |= PAGE_XLATE_CHANGED; + pdcattr->flXform |= PAGE_XLATE_CHANGED | DEVICE_TO_WORLD_INVALID; return; } diff --git a/win32ss/gdi/ntgdi/coord.h b/win32ss/gdi/ntgdi/coord.h index dc3228dfad..9c7a75bbcd 100644 --- a/win32ss/gdi/ntgdi/coord.h +++ b/win32ss/gdi/ntgdi/coord.h @@ -131,6 +131,9 @@ DC_vXformDeviceToWorld( PMATRIX pmx; pmx = DC_pmxDeviceToWorld(pdc); + if (!MX_IsInvertible(pmx)) + return; + XFORMOBJ_vInit(&xo, pmx); XFORMOBJ_bApplyXform(&xo, XF_LTOL, cNumPoints, pptlDest, pptlSource); } diff --git a/win32ss/gdi/ntgdi/xformobj.c b/win32ss/gdi/ntgdi/xformobj.c index e1d2241f2c..02216a5859 100644 --- a/win32ss/gdi/ntgdi/xformobj.c +++ b/win32ss/gdi/ntgdi/xformobj.c @@ -3,7 +3,8 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: win32ss/gdi/ntgdi/xformobj.c * PURPOSE: XFORMOBJ API - * PROGRAMMER: Timo Kreuzer + * PROGRAMMERS: Timo Kreuzer + * Katayama Hirofumi MZ */ /** Includes ******************************************************************/ @@ -243,6 +244,25 @@ XFORMOBJ_iCombineXform( } } +BOOL FASTCALL +MX_IsInvertible(IN PMATRIX pmx) +{ + FLOATOBJ foDet; + MulSub(&foDet, &pmx->efM11, &pmx->efM22, &pmx->efM12, &pmx->efM21); + return !FLOATOBJ_Equal0(&foDet); +} + +VOID FASTCALL +MX_Set0(OUT PMATRIX pmx) +{ + FLOATOBJ_Set0(&pmx->efM11); + FLOATOBJ_Set0(&pmx->efM12); + FLOATOBJ_Set0(&pmx->efM21); + FLOATOBJ_Set0(&pmx->efM22); + FLOATOBJ_Set0(&pmx->efDx); + FLOATOBJ_Set0(&pmx->efDy); +} + /* * A^-1 = adj(A) / det(AT) * A^-1 = 1/(a*d - b*c) * (a22,-a12,a21,-a11) diff --git a/win32ss/gdi/ntgdi/xformobj.h b/win32ss/gdi/ntgdi/xformobj.h index 0c3ff2ee51..179890d86a 100644 --- a/win32ss/gdi/ntgdi/xformobj.h +++ b/win32ss/gdi/ntgdi/xformobj.h @@ -74,3 +74,6 @@ XFORMOBJ_bApplyXform( IN ULONG cPoints, IN PVOID pvIn, OUT PVOID pvOut); + +BOOL FASTCALL MX_IsInvertible(IN PMATRIX pmx); +VOID FASTCALL MX_Set0(OUT PMATRIX pmx);

1 0

[reactos] 01/01: [APITESTS] set_module_type(win32u module)
by Katayama Hirofumi MZ 29 Apr '19

29 Apr '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45ec49ca2f35af830d919… commit 45ec49ca2f35af830d9194e7d45640824196aad5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Apr 29 12:49:54 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Apr 29 12:49:54 2019 +0900 [APITESTS] set_module_type(win32u module) --- modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt | 2 +- modules/rostests/apitests/win32u/win32u_2ksp4/CMakeLists.txt | 2 +- modules/rostests/apitests/win32u/win32u_ros/CMakeLists.txt | 2 +- modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt | 2 +- modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt index d40ba116c0..021fba309c 100644 --- a/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt @@ -7,5 +7,5 @@ add_library(win32u_2k3sp2 MODULE ${win32u_2k3sp2_asm} ${CMAKE_CURRENT_BINARY_DIR}/win32u_2k3sp2.def) -set_module_type(win32u_2k3sp2 win32dll) +set_module_type(win32u_2k3sp2 module) add_dependencies(win32u_2k3sp2 psdk) diff --git a/modules/rostests/apitests/win32u/win32u_2ksp4/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_2ksp4/CMakeLists.txt index ca8dc375af..99f1c534ed 100644 --- a/modules/rostests/apitests/win32u/win32u_2ksp4/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/win32u_2ksp4/CMakeLists.txt @@ -7,5 +7,5 @@ add_library(win32u_2ksp4 MODULE ${win32ku_2ksp4_asm} ${CMAKE_CURRENT_BINARY_DIR}/win32u_2ksp4.def) -set_module_type(win32u_2ksp4 win32dll) +set_module_type(win32u_2ksp4 module) add_dependencies(win32u_2ksp4 psdk) diff --git a/modules/rostests/apitests/win32u/win32u_ros/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_ros/CMakeLists.txt index 86b760a70d..e8a8c03cf2 100644 --- a/modules/rostests/apitests/win32u/win32u_ros/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/win32u_ros/CMakeLists.txt @@ -9,6 +9,6 @@ add_library(win32u MODULE ${win32u_ros_asm} ${CMAKE_CURRENT_BINARY_DIR}/win32u.def) -set_module_type(win32u win32dll) +set_module_type(win32u module) add_dependencies(win32u psdk) add_rostests_file(TARGET win32u) diff --git a/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt index 4ee130196f..38737886d0 100644 --- a/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt @@ -7,5 +7,5 @@ add_library(win32u_vista MODULE ${win32u_vista_asm} ${CMAKE_CURRENT_BINARY_DIR}/win32u_vista.def) -set_module_type(win32u_vista win32dll) +set_module_type(win32u_vista module) add_dependencies(win32u_vista psdk) diff --git a/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt index 7da15784c7..6a84838435 100644 --- a/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt @@ -7,5 +7,5 @@ add_library(win32u_xpsp2 MODULE ${win32u_xpsp2_asm} ${CMAKE_CURRENT_BINARY_DIR}/win32u_xpsp2.def) -set_module_type(win32u_xpsp2 win32dll) +set_module_type(win32u_xpsp2 module) add_dependencies(win32u_xpsp2 psdk)

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