Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [RAPPS] Allow tabbing trough controls in the main window
by Mark Jansen 23 Feb '20

23 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dee771817e11d56f33e2c… commit dee771817e11d56f33e2c01ec67f3ab92b795221 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Feb 9 17:54:18 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Feb 23 17:52:05 2020 +0100 [RAPPS] Allow tabbing trough controls in the main window --- base/applications/rapps/gui.cpp | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index ad2a13f9a9f..182d1068665 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -1850,6 +1850,29 @@ public: return CWindowImpl::Create(NULL, r, szWindowName.GetString(), WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE); } + + void HandleTabOrder(int direction) + { + HWND Controls[] = { m_Toolbar->m_hWnd, m_SearchBar->m_hWnd, m_TreeView->m_hWnd, m_ListView->m_hWnd, m_RichEdit->m_hWnd }; + // When there is no control found, go to the first or last (depending on tab vs shift-tab) + int current = direction > 0 ? 0 : (_countof(Controls) - 1); + HWND hActive = ::GetFocus(); + for (int n = 0; n < _countof(Controls); ++n) + { + if (hActive == Controls[n]) + { + current = n + direction; + break; + } + } + + if (current < 0) + current = (_countof(Controls) - 1); + else if (current >= _countof(Controls)) + current = 0; + + ::SetFocus(Controls[current]); + } }; VOID ShowMainWindow(INT nShowCmd) @@ -1877,6 +1900,16 @@ VOID ShowMainWindow(INT nShowCmd) { if (!TranslateAcceleratorW(hMainWnd, KeyBrd, &Msg)) { + if (Msg.message == WM_CHAR && + Msg.wParam == VK_TAB) + { + // Move backwards if shift is held down + int direction = (GetKeyState(VK_SHIFT) & 0x8000) ? -1 : 1; + + wnd->HandleTabOrder(direction); + continue; + } + TranslateMessage(&Msg); DispatchMessageW(&Msg); }

1 0

[reactos] 02/02: [OLEACC_WINETEST] Re-enable MSVC warning C4477
by Serge Gautherie 23 Feb '20

23 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2eed38eb5f018c53dabfd… commit 2eed38eb5f018c53dabfd450a6e0bed76ea2df38 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon Jan 27 18:02:11 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Feb 23 17:50:58 2020 +0100 [OLEACC_WINETEST] Re-enable MSVC warning C4477 Follow-up to 3ee20de95fddd0502cafcf2ef279cb16052cbe91. --- modules/rostests/winetests/oleacc/CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/rostests/winetests/oleacc/CMakeLists.txt b/modules/rostests/winetests/oleacc/CMakeLists.txt index c4a6b15044b..875b79dacd8 100644 --- a/modules/rostests/winetests/oleacc/CMakeLists.txt +++ b/modules/rostests/winetests/oleacc/CMakeLists.txt @@ -1,11 +1,6 @@ add_definitions(-D__WINESRC__ -DWINETEST_USE_DBGSTR_LONGLONG) -if(MSVC) - # Disable warning C4477 (printf format warnings) - add_compile_flags("/wd4477") -endif() - add_executable(oleacc_winetest main.c testlist.c) set_module_type(oleacc_winetest win32cui) target_link_libraries(oleacc_winetest uuid)

1 0

[reactos] 01/02: [MSVCRT_WINETEST] Re-enable MSVC warning C4477
by Serge Gautherie 23 Feb '20

23 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed909ba9d919f88c9a6dd… commit ed909ba9d919f88c9a6ddf042e4154b6854f488b Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon Jan 27 18:02:11 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Feb 23 17:50:58 2020 +0100 [MSVCRT_WINETEST] Re-enable MSVC warning C4477 Follow-up to ce2df64a06314c95713b48b90f59f023d51b89d5. Also, remove '-Wno-format' for other compilers. --- modules/rostests/winetests/msvcrt/CMakeLists.txt | 9 --------- 1 file changed, 9 deletions(-) diff --git a/modules/rostests/winetests/msvcrt/CMakeLists.txt b/modules/rostests/winetests/msvcrt/CMakeLists.txt index 52585225f21..f69446b084c 100644 --- a/modules/rostests/winetests/msvcrt/CMakeLists.txt +++ b/modules/rostests/winetests/msvcrt/CMakeLists.txt @@ -4,11 +4,6 @@ add_definitions( -D_CRT_NONSTDC_NO_DEPRECATE -D__msvcrt_ulong=ULONG) -if(MSVC) - # Disable warning C4477 (printf format warnings) - add_compile_flags("/wd4477") -endif() - if(GCC AND GCC_VERSION VERSION_GREATER 7) add_compile_flags("-Wno-stringop-truncation") endif() @@ -32,10 +27,6 @@ list(APPEND SOURCE add_executable(msvcrt_winetest ${SOURCE} testlist.c) -if(USE_CLANG_CL OR (NOT MSVC)) - add_target_compile_flags(msvcrt_winetest "-Wno-format") -endif() - set_module_type(msvcrt_winetest win32cui) add_importlibs(msvcrt_winetest advapi32 msvcrt kernel32)

1 0

[reactos] 01/01: [SHELL32] Fix unneeded error Popup with Git for Windows. (#1854)
by Doug Lyons 23 Feb '20

23 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e721f780e72bc7a0c780… commit 4e721f780e72bc7a0c780a477b76b7f09126c145 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sun Feb 23 10:47:48 2020 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 23 17:47:48 2020 +0100 [SHELL32] Fix unneeded error Popup with Git for Windows. (#1854) * Fix unnecessary error popup when installing Git for Windows. * Add reasons for return value of 42. --- dll/win32/shell32/shlexec.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index 099a964c93e..3feab9c2ff6 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -1080,6 +1080,22 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec TRACE("Couldn't launch\n"); goto error; } + /* if ddeexec is NULL, then we just need to exit here */ + if (ddeexec == NULL) + { + TRACE("Exiting because ddeexec is NULL. ret=42.\n"); + /* See https://docs.microsoft.com/en-us/windows/win32/api/shellapi/nf-shellapi-she… */ + /* for reason why we use 42 here and also "Shell32_apitest ShellExecuteW" regression test */ + return 42; + } + /* if ddeexec is 'empty string', then we just need to exit here */ + if (wcscmp(ddeexec, L"") == 0) + { + TRACE("Exiting because ddeexec is 'empty string'. ret=42.\n"); + /* See https://docs.microsoft.com/en-us/windows/win32/api/shellapi/nf-shellapi-she… */ + /* for reason why we use 42 here and also "Shell32_apitest ShellExecuteW" regression test */ + return 42; + } hConv = DdeConnect(ddeInst, hszApp, hszTopic, NULL); if (!hConv) {

1 0

[reactos] 01/01: [APPCOMPAT][ACCPAGE][SDB][ROSTESTS] Implement compatibility modes for Windows 10, Server 2016 and 2019
by Oleg Dubinskiy 23 Feb '20

23 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b7495019761a169a29ee7… commit b7495019761a169a29ee733e1265d7c29fe72ff7 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Fri Oct 25 20:50:43 2019 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Feb 23 17:43:40 2020 +0100 [APPCOMPAT][ACCPAGE][SDB][ROSTESTS] Implement compatibility modes for Windows 10, Server 2016 and 2019 --- dll/appcompat/shims/layer/versionlie.c | 20 +++++++++++ dll/shellext/acppage/CLayerUIPropPage.cpp | 9 +++-- media/sdb/sysmain.xml | 47 +++++++++++++++++++++++++- modules/rostests/apitests/appshim/versionlie.c | 7 ++++ 4 files changed, 77 insertions(+), 6 deletions(-) diff --git a/dll/appcompat/shims/layer/versionlie.c b/dll/appcompat/shims/layer/versionlie.c index a1a18dc0922..7ed6c75b90c 100644 --- a/dll/appcompat/shims/layer/versionlie.c +++ b/dll/appcompat/shims/layer/versionlie.c @@ -52,6 +52,11 @@ VersionLieInfo g_Win7SP1 = { 0x1db10106, 6, 1, 7601, VER_PLATFORM_WIN32_NT, 1, 0 VersionLieInfo g_Win8RTM = { 0x23f00206, 6, 2, 9200, VER_PLATFORM_WIN32_NT, 0, 0 }; VersionLieInfo g_Win81RTM = { 0x25800306, 6, 3, 9600, VER_PLATFORM_WIN32_NT, 0, 0 }; +VersionLieInfo g_Win10RTM = { 0x47ba000a, 10, 0, 18362, VER_PLATFORM_WIN32_NT, 0, 0 }; + +VersionLieInfo g_Win2k16RTM = { 0x3fab000a, 10, 0, 16299, VER_PLATFORM_WIN32_NT, 0, 0 }; +VersionLieInfo g_Win2k19RTM = { 0x4563000a, 10, 0, 17763, VER_PLATFORM_WIN32_NT, 0, 0 }; + /* Fill the OSVERSIONINFO[EX][W|A] struct with the info from the generic VersionLieInfo */ BOOL FakeVersion(LPOSVERSIONINFOEXA pResult, VersionLieInfo* pFake) @@ -171,6 +176,7 @@ BOOL WINAPI SHIM_OBJ_NAME(APIHook_GetVersionExW)(LPOSVERSIONINFOEXA lpOsVersionI #define VERSION_INFO g_WinNT4SP5 #include "versionlie.inl" + #define SHIM_NS Win2000VersionLie #define VERSION_INFO g_Win2000 #include "versionlie.inl" @@ -235,6 +241,7 @@ BOOL WINAPI SHIM_OBJ_NAME(APIHook_GetVersionExW)(LPOSVERSIONINFOEXA lpOsVersionI #define VERSION_INFO g_Win7SP1 #include "versionlie.inl" + #define SHIM_NS Win8RTMVersionLie #define VERSION_INFO g_Win8RTM #include "versionlie.inl" @@ -244,3 +251,16 @@ BOOL WINAPI SHIM_OBJ_NAME(APIHook_GetVersionExW)(LPOSVERSIONINFOEXA lpOsVersionI #include "versionlie.inl" +#define SHIM_NS Win10RTMVersionLie +#define VERSION_INFO g_Win10RTM +#include "versionlie.inl" + + +#define SHIM_NS Win2k16RTMVersionLie +#define VERSION_INFO g_Win2k16RTM +#include "versionlie.inl" + + +#define SHIM_NS Win2k19RTMVersionLie +#define VERSION_INFO g_Win2k19RTM +#include "versionlie.inl" diff --git a/dll/shellext/acppage/CLayerUIPropPage.cpp b/dll/shellext/acppage/CLayerUIPropPage.cpp index 42c56aa3d53..a02a8d845d4 100644 --- a/dll/shellext/acppage/CLayerUIPropPage.cpp +++ b/dll/shellext/acppage/CLayerUIPropPage.cpp @@ -29,17 +29,16 @@ static struct { { L"Windows 98/ME", L"WIN98" }, { L"Windows NT 4.0 (SP5)", L"NT4SP5" }, { L"Windows 2000", L"WIN2000" }, - { L"Windows XP (SP2)", L"WINXPSP2" }, { L"Windows XP (SP3)", L"WINXPSP3" }, { L"Windows Server 2003 (SP1)", L"WINSRV03SP1" }, { L"Windows Server 2008 (SP1)", L"WINSRV08SP1" }, - { L"Windows Vista", L"VISTARTM" }, - { L"Windows Vista (SP1)", L"VISTASP1" }, { L"Windows Vista (SP2)", L"VISTASP2" }, { L"Windows 7", L"WIN7RTM" }, { L"Windows 7 (SP1)", L"WIN7SP1" }, - { L"Windows 8", L"WIN8RTM" }, { L"Windows 8.1", L"WIN81RTM" }, + { L"Windows 10", L"WIN10RTM" }, + { L"Windows Server 2016", L"WINSRV16RTM" }, + { L"Windows Server 2019", L"WINSRV19RTM" }, { NULL, NULL } }; @@ -339,7 +338,7 @@ LRESULT CLayerUIPropPage::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, HWND cboMode = GetDlgItem(IDC_COMPATIBILITYMODE); for (size_t n = 0; g_CompatModes[n].Display; ++n) ComboBox_AddString(cboMode, g_CompatModes[n].Display); - ComboBox_SetCurSel(cboMode, 5); + ComboBox_SetCurSel(cboMode, 4); CStringW explanation; if (!m_AllowPermLayer) diff --git a/media/sdb/sysmain.xml b/media/sdb/sysmain.xml index c41413abde0..c105abadab2 100644 --- a/media/sdb/sysmain.xml +++ b/media/sdb/sysmain.xml @@ -200,6 +200,33 @@ <EXCLUDE MODULE="oleaut32.dll" /> <DLLFILE>aclayers.dll</DLLFILE> </SHIM> + <SHIM NAME="Win10RTMVersionLie"> + <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> + <EXCLUDE MODULE="kernel32.dll" /> + <EXCLUDE MODULE="msvcrt.dll" /> + <EXCLUDE MODULE="ole32.dll" /> + <EXCLUDE MODULE="oleaut32.dll" /> + <DLLFILE>aclayers.dll</DLLFILE> + </SHIM> + <SHIM NAME="Win2k16RTMVersionLie"> + <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> + <EXCLUDE MODULE="kernel32.dll" /> + <EXCLUDE MODULE="msvcrt.dll" /> + <EXCLUDE MODULE="ole32.dll" /> + <EXCLUDE MODULE="oleaut32.dll" /> + <DLLFILE>aclayers.dll</DLLFILE> + </SHIM> + <SHIM NAME="Win2k19RTMVersionLie"> + <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> + <EXCLUDE MODULE="kernel32.dll" /> + <EXCLUDE MODULE="msvcrt.dll" /> + <EXCLUDE MODULE="ole32.dll" /> + <EXCLUDE MODULE="oleaut32.dll" /> + <DLLFILE>aclayers.dll</DLLFILE> + </SHIM>  @@ -363,6 +390,24 @@ <DATA NAME="SHIMVERSIONNT" DATA_DWORD="603" />  </LAYER> + <LAYER NAME="WIN10RTM"> +  + <SHIM_REF NAME="Win10RTMVersionLie" /> + <DATA NAME="SHIMVERSIONNT" DATA_DWORD="1000" /> +  + </LAYER> + <LAYER NAME="WINSRV16RTM"> +  + <SHIM_REF NAME="Win2k16RTMVersionLie" /> + <DATA NAME="SHIMVERSIONNT" DATA_DWORD="1000" /> +  + </LAYER> + <LAYER NAME="WINSRV19RTM"> +  + <SHIM_REF NAME="Win2k19RTMVersionLie" /> + <DATA NAME="SHIMVERSIONNT" DATA_DWORD="1000" /> +  + </LAYER> @@ -424,4 +469,4 @@ <SHIM_REF NAME="ShimTest" /> </EXE> </DATABASE> -</SDB> \ No newline at end of file +</SDB> diff --git a/modules/rostests/apitests/appshim/versionlie.c b/modules/rostests/apitests/appshim/versionlie.c index f7605f2e7cf..f7244fd01e8 100644 --- a/modules/rostests/apitests/appshim/versionlie.c +++ b/modules/rostests/apitests/appshim/versionlie.c @@ -288,6 +288,10 @@ VersionLieInfo g_Win7SP1 = { 0x1db10106, 6, 1, 7601, VER_PLATFORM_WIN32_NT, 1, 0 VersionLieInfo g_Win8RTM = { 0x23f00206, 6, 2, 9200, VER_PLATFORM_WIN32_NT, 0, 0 }; VersionLieInfo g_Win81RTM = { 0x25800306, 6, 3, 9600, VER_PLATFORM_WIN32_NT, 0, 0 }; +VersionLieInfo g_Win10RTM = { 0x47ba000a, 10, 0, 18362, VER_PLATFORM_WIN32_NT, 0, 0 }; + +VersionLieInfo g_Win2k16RTM = { 0x3fab000a, 10, 0, 16299, VER_PLATFORM_WIN32_NT, 0, 0 }; +VersionLieInfo g_Win2k19RTM = { 0x4563000a, 10, 0, 17763, VER_PLATFORM_WIN32_NT, 0, 0 }; DWORD get_host_winver(void) { @@ -406,4 +410,7 @@ START_TEST(versionlie) run_test("Win7SP1VersionLie", &g_Win7SP1); /* ReactOS specific. Windows does not have this version lie */ run_test("Win8RTMVersionLie", &g_Win8RTM); run_test("Win81RTMVersionLie", &g_Win81RTM); + run_test("Win10RTMVersionLie", &g_Win10RTM); /* ReactOS specific. Windows does not have this version lie */ + run_test("Win2k16RTMVersionLie", &g_Win2k16RTM); /* ReactOS specific. Windows does not have this version lie */ + run_test("Win2k19RTMVersionLie", &g_Win2k19RTM); /* ReactOS specific. Windows does not have this version lie */ }

1 0

[reactos] 02/02: [ATL] Import Wine upstream patch https://github.com/wine-mirror/wine/commit/3043ab3e62772ddef8e4e27674bf4178e0ee50c9
by Hermès Bélusca-Maïto 23 Feb '20

23 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6058bca24938e660c261… commit c6058bca24938e660c261c53a5be2e9feff5c0b1 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 23 16:44:30 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 23 16:52:03 2020 +0100 [ATL] Import Wine upstream patch https://github.com/wine-mirror/wine/commit/3043ab3e62772ddef8e4e27674bf4178… Author: Puetz Kevin A <PuetzKevinA(a)JohnDeere.com> atlbase.h: Fix some declarations on win64. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dll/win32/atl/atl.c | 2 +- modules/rostests/winetests/atl/module.c | 25 ++++++++++++++----------- sdk/include/reactos/wine/atlbase.h | 8 ++++---- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dll/win32/atl/atl.c b/dll/win32/atl/atl.c index 6461d69fc33..2f93b89d5ec 100644 --- a/dll/win32/atl/atl.c +++ b/dll/win32/atl/atl.c @@ -217,7 +217,7 @@ HRESULT WINAPI AtlInternalQueryInterface(void* this, const _ATL_INTMAP_ENTRY* pE while (pEntries[i].pFunc != 0) { - TRACE("Trying entry %i (%s %i %p)\n",i,debugstr_guid(pEntries[i].piid), + TRACE("Trying entry %i (%s %lx %p)\n",i,debugstr_guid(pEntries[i].piid), pEntries[i].dw, pEntries[i].pFunc); if (!pEntries[i].piid || IsEqualGUID(iid,pEntries[i].piid)) diff --git a/modules/rostests/winetests/atl/module.c b/modules/rostests/winetests/atl/module.c index f176d070b3c..1c2a4963805 100644 --- a/modules/rostests/winetests/atl/module.c +++ b/modules/rostests/winetests/atl/module.c @@ -163,9 +163,9 @@ static void test_winclassinfo(void) ok(len == expectedLen, "wci.m_szAutoName has length %d, expected length %d\n", len, expectedLen); } -static DWORD cb_val; +static DWORD_PTR cb_val; -static void WINAPI term_callback(DWORD dw) +static void WINAPI term_callback(DWORD_PTR dw) { cb_val = dw; } @@ -173,33 +173,36 @@ static void WINAPI term_callback(DWORD dw) static void test_term(void) { _ATL_MODULEW test; + ULONG_PTR ex; HRESULT hres; + ex = (ULONG_PTR)-37; + test.cbSize = sizeof(_ATL_MODULEW); hres = AtlModuleInit(&test, NULL, NULL); - ok (hres == S_OK, "AtlModuleInit failed (0x%x).\n", (int)hres); + ok (hres == S_OK, "AtlModuleInit failed (0x%x).\n", hres); - hres = AtlModuleAddTermFunc(&test, term_callback, 0x22); - ok (hres == S_OK, "AtlModuleAddTermFunc failed (0x%x).\n", (int)hres); + hres = AtlModuleAddTermFunc(&test, term_callback, ex); + ok (hres == S_OK, "AtlModuleAddTermFunc failed (0x%x).\n", hres); cb_val = 0xdeadbeef; hres = AtlModuleTerm(&test); - ok (hres == S_OK, "AtlModuleTerm failed (0x%x).\n", (int)hres); - ok (cb_val == 0x22, "wrong callback value (0x%x).\n", (int)cb_val); + ok (hres == S_OK, "AtlModuleTerm failed (0x%x).\n", hres); + ok (cb_val == ex, "wrong callback value (0x%lx).\n", cb_val); test.cbSize = FIELD_OFFSET(_ATL_MODULEW, dwAtlBuildVer); hres = AtlModuleInit(&test, NULL, NULL); - ok (hres == S_OK, "AtlModuleInit failed (0x%x).\n", (int)hres); + ok (hres == S_OK, "AtlModuleInit failed (0x%x).\n", hres); hres = AtlModuleAddTermFunc(&test, term_callback, 0x23); - ok (hres == S_OK, "AtlModuleAddTermFunc failed (0x%x).\n", (int)hres); + ok (hres == S_OK, "AtlModuleAddTermFunc failed (0x%x).\n", hres); cb_val = 0xdeadbeef; hres = AtlModuleTerm(&test); - ok (hres == S_OK, "AtlModuleTerm failed (0x%x).\n", (int)hres); - ok (cb_val == 0xdeadbeef, "wrong callback value (0x%x).\n", (int)cb_val); + ok (hres == S_OK, "AtlModuleTerm failed (0x%x).\n", hres); + ok (cb_val == 0xdeadbeef, "wrong callback value (0x%lx).\n", cb_val); } START_TEST(module) diff --git a/sdk/include/reactos/wine/atlbase.h b/sdk/include/reactos/wine/atlbase.h index 1e0d76082fc..4d9fafc688d 100644 --- a/sdk/include/reactos/wine/atlbase.h +++ b/sdk/include/reactos/wine/atlbase.h @@ -37,12 +37,12 @@ #endif typedef HRESULT (WINAPI _ATL_CREATORFUNC)(void* pv, REFIID riid, LPVOID* ppv); -typedef HRESULT (WINAPI _ATL_CREATORARGFUNC)(void* pv, REFIID riid, LPVOID* ppv, DWORD dw); -typedef HRESULT (WINAPI _ATL_MODULEFUNC)(DWORD dw); +typedef HRESULT (WINAPI _ATL_CREATORARGFUNC)(void* pv, REFIID riid, LPVOID* ppv, DWORD_PTR dw); +typedef HRESULT (WINAPI _ATL_MODULEFUNC)(DWORD_PTR dw); typedef LPCSTR (WINAPI _ATL_DESCRIPTIONFUNCA)(void); typedef LPCWSTR (WINAPI _ATL_DESCRIPTIONFUNCW)(void); typedef const struct _ATL_CATMAP_ENTRY* (_ATL_CATMAPFUNC)(void); -typedef void (WINAPI _ATL_TERMFUNC)(DWORD dw); +typedef void (WINAPI _ATL_TERMFUNC)(DWORD_PTR dw); typedef CRITICAL_SECTION CComCriticalSection; @@ -234,7 +234,7 @@ typedef _ATL_MODULEW _ATL_WIN_MODULE; typedef struct _ATL_INTMAP_ENTRY_TAG { const IID* piid; - DWORD dw; + DWORD_PTR dw; _ATL_CREATORARGFUNC* pFunc; } _ATL_INTMAP_ENTRY;

1 0

[reactos] 01/02: [ATL30] Addendum to commit e410a122: Import Wine upstream patch https://github.com/wine-mirror/wine/commit/5608682dc9c0f30cca0bfb24705e9b82b6a7aecc
by Hermès Bélusca-Maïto 23 Feb '20

23 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b4b0728684abc0275ac87… commit b4b0728684abc0275ac87160320dd08c0dc27458 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 23 16:10:26 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 23 16:51:58 2020 +0100 [ATL30] Addendum to commit e410a122: Import Wine upstream patch https://github.com/wine-mirror/wine/commit/5608682dc9c0f30cca0bfb24705e9b82… atl: Fix the ATL_WNDCLASSINFOW::m_szAutoName member definition and construction. Signed-off-by: Hermes Belusca-Maito <hermes.belusca(a)sfr.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dll/win32/atl/atl30.c | 15 ++++------ modules/rostests/winetests/atl/module.c | 51 +++++++++++++++++++++++++++++++++ sdk/include/reactos/wine/atlwin.h | 12 ++------ 3 files changed, 58 insertions(+), 20 deletions(-) diff --git a/dll/win32/atl/atl30.c b/dll/win32/atl/atl30.c index 254dbadb084..5d5cd52b616 100644 --- a/dll/win32/atl/atl30.c +++ b/dll/win32/atl/atl30.c @@ -313,11 +313,7 @@ ATOM WINAPI AtlModuleRegisterWndClassInfoA(_ATL_MODULEA *pm, _ATL_WNDCLASSINFOA if (!wci->m_wc.lpszClassName) { -#ifdef __REACTOS__ sprintf(wci->m_szAutoName, "ATL:%p", wci); -#else - sprintf(wci->m_szAutoName, "ATL%08lx", (UINT_PTR)wci); -#endif TRACE("auto-generated class name %s\n", wci->m_szAutoName); wci->m_wc.lpszClassName = wci->m_szAutoName; } @@ -354,8 +350,8 @@ ATOM WINAPI AtlModuleRegisterWndClassInfoA(_ATL_MODULEA *pm, _ATL_WNDCLASSINFOA * NOTES * Can be called multiple times without error, unlike RegisterClassEx(). * - * If the class name is NULL, then a class with a name of "ATLxxxxxxxx" is - * registered, where the 'x's represent a unique value. + * If the class name is NULL, then a class with a name of "ATL:xxxxxxxx" is + * registered, where 'xxxxxxxx' represents a unique hexadecimal value. * */ ATOM WINAPI AtlModuleRegisterWndClassInfoW(_ATL_MODULEW *pm, _ATL_WNDCLASSINFOW *wci, WNDPROC *pProc) @@ -376,12 +372,11 @@ ATOM WINAPI AtlModuleRegisterWndClassInfoW(_ATL_MODULEW *pm, _ATL_WNDCLASSINFOW if (!wci->m_wc.lpszClassName) { -#ifdef __REACTOS__ - static const WCHAR szFormat[] = {'A','T','L',':','%','p',0}; +#ifndef __REACTOS__ + swprintf(wci->m_szAutoName, ARRAY_SIZE(wci->m_szAutoName), L"ATL:%p", wci); #else - static const WCHAR szFormat[] = {'A','T','L','%','0','8','l','x',0}; + swprintf(wci->m_szAutoName, L"ATL:%p", wci); #endif - swprintf(wci->m_szAutoName, szFormat, (UINT_PTR)wci); TRACE("auto-generated class name %s\n", debugstr_w(wci->m_szAutoName)); wci->m_wc.lpszClassName = wci->m_szAutoName; } diff --git a/modules/rostests/winetests/atl/module.c b/modules/rostests/winetests/atl/module.c index 44aecf04577..f176d070b3c 100644 --- a/modules/rostests/winetests/atl/module.c +++ b/modules/rostests/winetests/atl/module.c @@ -25,6 +25,7 @@ #define COBJMACROS #include <wine/atlbase.h> +#include <wine/atlwin.h> #include <wine/test.h> @@ -113,6 +114,55 @@ static void test_winmodule(void) ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); } +static void test_winclassinfo(void) +{ + _ATL_MODULEW winmod; + HRESULT hres; + int len, expectedLen; + ATOM atom; + WNDPROC wndProc; + _ATL_WNDCLASSINFOW wci = + { + /* .m_wc = */ + { + sizeof(WNDCLASSEXW), + CS_VREDRAW | CS_HREDRAW, + DefWindowProcW, + 0, + 0, + NULL, + NULL, + LoadCursorW(NULL, (LPCWSTR)IDC_ARROW), + (HBRUSH)(COLOR_BTNFACE + 1), + NULL, + NULL, /* LPCSTR lpszClassName; <-- We force ATL class name generation */ + NULL + }, + /* .m_lpszOrigName = */ NULL, + /* .pWndProc = */ NULL, + /* .m_lpszCursorID = */ (LPCWSTR)IDC_ARROW, + /* .m_bSystemCursor = */ TRUE, + /* .m_atom = */ 0, + /* .m_szAutoName = */ L"" + }; + + winmod.cbSize = sizeof(winmod); + winmod.m_pCreateWndList = (void*)0xdeadbeef; + hres = AtlModuleInit(&winmod, NULL, NULL); + ok(hres == S_OK, "AtlModuleInit failed: %08x\n", hres); + ok(!winmod.m_pCreateWndList, "winmod.m_pCreateWndList = %p\n", winmod.m_pCreateWndList); + + atom = AtlModuleRegisterWndClassInfoW(&winmod, &wci, &wndProc); + ok(atom, "AtlModuleRegisterWndClassInfoA failed: %08x\n", atom); + ok(atom == wci.m_atom, "(atom = %08x) is != than (wci.m_atom = %08x)\n", atom, wci.m_atom); + + ok(wcsncmp(wci.m_szAutoName, L"ATL:", 4) == 0, "wci.m_szAutoName = '%ls', expected starting with 'ATL:'\n", wci.m_szAutoName); + + len = wcslen(wci.m_szAutoName); + expectedLen = sizeof("ATL:") + sizeof(void *) * 2 - 1; + ok(len == expectedLen, "wci.m_szAutoName has length %d, expected length %d\n", len, expectedLen); +} + static DWORD cb_val; static void WINAPI term_callback(DWORD dw) @@ -156,5 +206,6 @@ START_TEST(module) { test_StructSize(); test_winmodule(); + test_winclassinfo(); test_term(); } diff --git a/sdk/include/reactos/wine/atlwin.h b/sdk/include/reactos/wine/atlwin.h index 099f48bcb52..de31f403ba7 100644 --- a/sdk/include/reactos/wine/atlwin.h +++ b/sdk/include/reactos/wine/atlwin.h @@ -29,11 +29,7 @@ typedef struct _ATL_WNDCLASSINFOA_TAG LPCSTR m_lpszCursorID; BOOL m_bSystemCursor; ATOM m_atom; -#ifdef __REACTOS__ - CHAR m_szAutoName[sizeof("ATL:") + sizeof(void *) * 2]; // == 4 characters + NULL + number of hexadecimal digits describing a pointer. -#else - CHAR m_szAutoName[14]; -#endif + CHAR m_szAutoName[sizeof("ATL:") + sizeof(void *) * 2]; } _ATL_WNDCLASSINFOA; typedef struct _ATL_WNDCLASSINFOW_TAG @@ -44,11 +40,7 @@ typedef struct _ATL_WNDCLASSINFOW_TAG LPCWSTR m_lpszCursorID; BOOL m_bSystemCursor; ATOM m_atom; -#ifdef __REACTOS__ - WCHAR m_szAutoName[sizeof("ATL:") + sizeof(void *) * 2]; // == 4 characters + NULL + number of hexadecimal digits describing a pointer. -#else - WCHAR m_szAutoName[14]; -#endif + WCHAR m_szAutoName[sizeof("ATL:") + sizeof(void *) * 2]; } _ATL_WNDCLASSINFOW; ATOM WINAPI AtlModuleRegisterWndClassInfoA(_ATL_MODULEA *pm, _ATL_WNDCLASSINFOA *wci, WNDPROC *pProc);

1 0

[reactos] 01/01: [NTUSER] Fix regression CORE-11828
by Joachim Henze 23 Feb '20

23 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=820dbfccd015d8890d594… commit 820dbfccd015d8890d5948b6abd5089e8ab8cf86 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Feb 23 13:55:27 2020 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Feb 23 13:56:05 2020 +0100 [NTUSER] Fix regression CORE-11828 Fixes symptom "mouse pointer vanishes when closing applications via x in title-bar" The bug in WIN32SS was unhidden by SVN r65496 == git 5c1a8109c84ed0aefdac2488ff666070a7ae52f6 , when we introduced explorer_new. The old explorer had a workaround built within. Many thanks to patches author James Tabor. I intend to backport into 0.4.13RC as well. --- win32ss/user/ntuser/main.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c index 95ab58474c9..be31889664d 100644 --- a/win32ss/user/ntuser/main.c +++ b/win32ss/user/ntuser/main.c @@ -420,6 +420,16 @@ UserDeleteW32Thread(PTHREADINFO pti) ExFreePoolWithTag(pti, USERTAG_THREADINFO); IntDereferenceProcessInfo(ppi); + + { + // Find another queue for mouse cursor. + MSG msg; + msg.message = WM_MOUSEMOVE; + msg.wParam = UserGetMouseButtonsState(); + msg.lParam = MAKELPARAM(gpsi->ptCursor.x, gpsi->ptCursor.y); + msg.pt = gpsi->ptCursor; + co_MsqInsertMouseMessage(&msg, 0, 0, TRUE); + } } NTSTATUS

1 0

[reactos] 01/01: [CODEOWNERS] Add ending '/' to '/dll/shellext'
by Serge Gautherie 23 Feb '20

23 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02327ed6651e0f98cda98… commit 02327ed6651e0f98cda984d7062c365fac9fe939 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri Feb 21 00:31:48 2020 +0100 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Sun Feb 23 12:36:42 2020 +0100 [CODEOWNERS] Add ending '/' to '/dll/shellext' --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index a5f59ca0b2c..120982d5282 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -250,7 +250,7 @@ # M: # R: learn-more, learn_more, Mark Jansen # S: Maintained -/dll/shellext @learn-more +/dll/shellext/ @learn-more # UniATA # M: ThFabba, Thomas Faber

1 0

[reactos] 01/01: [REACTOS] Fix '\n.' typos
by Serge Gautherie 23 Feb '20

23 Feb '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a83762ccc5c8266cd8a0… commit 1a83762ccc5c8266cd8a00a4c5334ae7cac95112 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri Feb 21 00:33:37 2020 +0100 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Sun Feb 23 12:35:50 2020 +0100 [REACTOS] Fix '\n.' typos --- base/applications/cmdutils/help/lang/cs-CZ.rc | 2 +- base/applications/cmdutils/help/lang/de-DE.rc | 2 +- base/applications/cmdutils/help/lang/el-GR.rc | 2 +- base/applications/cmdutils/help/lang/en-US.rc | 2 +- base/applications/cmdutils/help/lang/es-ES.rc | 2 +- base/applications/cmdutils/help/lang/hu-HU.rc | 2 +- base/applications/cmdutils/help/lang/id-ID.rc | 2 +- base/applications/cmdutils/help/lang/it-IT.rc | 2 +- base/applications/cmdutils/help/lang/ja-JP.rc | 2 +- base/applications/cmdutils/help/lang/no-NO.rc | 2 +- base/applications/cmdutils/help/lang/pl-PL.rc | 2 +- base/applications/cmdutils/help/lang/ro-RO.rc | 2 +- base/applications/cmdutils/help/lang/ru-RU.rc | 2 +- base/applications/cmdutils/help/lang/sk-SK.rc | 2 +- base/applications/cmdutils/help/lang/sq-AL.rc | 2 +- base/applications/cmdutils/help/lang/sv-SE.rc | 2 +- base/applications/cmdutils/help/lang/uk-UA.rc | 2 +- base/applications/dxdiag/lang/bg-BG.rc | 2 +- base/applications/dxdiag/lang/cs-CZ.rc | 2 +- base/applications/dxdiag/lang/en-US.rc | 2 +- base/applications/dxdiag/lang/es-ES.rc | 2 +- base/applications/dxdiag/lang/fr-FR.rc | 2 +- base/applications/dxdiag/lang/he-IL.rc | 2 +- base/applications/dxdiag/lang/it-IT.rc | 2 +- base/applications/dxdiag/lang/ja-JP.rc | 2 +- base/applications/dxdiag/lang/ko-KR.rc | 2 +- base/applications/dxdiag/lang/nl-NL.rc | 2 +- base/applications/dxdiag/lang/no-NO.rc | 2 +- base/applications/dxdiag/lang/pl-PL.rc | 2 +- base/applications/dxdiag/lang/pt-BR.rc | 2 +- base/applications/dxdiag/lang/ru-RU.rc | 2 +- base/applications/dxdiag/lang/sk-SK.rc | 2 +- base/applications/dxdiag/lang/sq-AL.rc | 2 +- base/applications/dxdiag/lang/sv-SE.rc | 2 +- base/applications/dxdiag/lang/tr-TR.rc | 2 +- base/applications/dxdiag/lang/uk-UA.rc | 2 +- base/applications/dxdiag/lang/zh-TW.rc | 2 +- base/applications/shutdown/lang/it-IT.rc | 6 +++--- ntoskrnl/kdbg/kdb.c | 2 +- 39 files changed, 41 insertions(+), 41 deletions(-) diff --git a/base/applications/cmdutils/help/lang/cs-CZ.rc b/base/applications/cmdutils/help/lang/cs-CZ.rc index 5784eb32afa..696bf3623db 100644 --- a/base/applications/cmdutils/help/lang/cs-CZ.rc +++ b/base/applications/cmdutils/help/lang/cs-CZ.rc @@ -3,7 +3,7 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?""\n." + IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?"".\n" END STRINGTABLE diff --git a/base/applications/cmdutils/help/lang/de-DE.rc b/base/applications/cmdutils/help/lang/de-DE.rc index 05831c3f350..d601aa7ec40 100644 --- a/base/applications/cmdutils/help/lang/de-DE.rc +++ b/base/applications/cmdutils/help/lang/de-DE.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_NO_ENTRY "Dieser Befehl wird von der Hilfe nicht unterstützt.\nVersuchen Sie ""%s /?""\n." + IDS_NO_ENTRY "Dieser Befehl wird von der Hilfe nicht unterstützt.\nVersuchen Sie ""%s /?"".\n" END STRINGTABLE diff --git a/base/applications/cmdutils/help/lang/el-GR.rc b/base/applications/cmdutils/help/lang/el-GR.rc index 6fba5b8e120..bd2e41fe414 100644 --- a/base/applications/cmdutils/help/lang/el-GR.rc +++ b/base/applications/cmdutils/help/lang/el-GR.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?""\n." + IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?"".\n" END STRINGTABLE diff --git a/base/applications/cmdutils/help/lang/en-US.rc b/base/applications/cmdutils/help/lang/en-US.rc index 4af37082650..11c79affcab 100644 --- a/base/applications/cmdutils/help/lang/en-US.rc +++ b/base/applications/cmdutils/help/lang/en-US.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE BEGIN - IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?""\n." + IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?"".\n" END STRINGTABLE diff --git a/base/applications/cmdutils/help/lang/es-ES.rc b/base/applications/cmdutils/help/lang/es-ES.rc index 63d8c1b2a94..d37e3060e74 100644 --- a/base/applications/cmdutils/help/lang/es-ES.rc +++ b/base/applications/cmdutils/help/lang/es-ES.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?""\n." + IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?"".\n" END STRINGTABLE diff --git a/base/applications/cmdutils/help/lang/hu-HU.rc b/base/applications/cmdutils/help/lang/hu-HU.rc index 56636d8282d..de681c16af5 100644 --- a/base/applications/cmdutils/help/lang/hu-HU.rc +++ b/base/applications/cmdutils/help/lang/hu-HU.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?""\n." + IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?"".\n" END STRINGTABLE diff --git a/base/applications/cmdutils/help/lang/id-ID.rc b/base/applications/cmdutils/help/lang/id-ID.rc index e3fd901b54a..a131bbf8837 100644 --- a/base/applications/cmdutils/help/lang/id-ID.rc +++ b/base/applications/cmdutils/help/lang/id-ID.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_NO_ENTRY "Perintah ini tidak didukung oleh utilitas bantuan.\nCoba ""%s /?""\n." + IDS_NO_ENTRY "Perintah ini tidak didukung oleh utilitas bantuan.\nCoba ""%s /?"".\n" END STRINGTABLE diff --git a/base/applications/cmdutils/help/lang/it-IT.rc b/base/applications/cmdutils/help/lang/it-IT.rc index ff3684d4321..1310fa7a76a 100644 --- a/base/applications/cmdutils/help/lang/it-IT.rc +++ b/base/applications/cmdutils/help/lang/it-IT.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?""\n." + IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?"".\n" END STRINGTABLE diff --git a/base/applications/cmdutils/help/lang/ja-JP.rc b/base/applications/cmdutils/help/lang/ja-JP.rc index a3cba85d74a..3f2aa235400 100644 --- a/base/applications/cmdutils/help/lang/ja-JP.rc +++ b/base/applications/cmdutils/help/lang/ja-JP.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?""\n." + IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?"".\n" END STRINGTABLE diff --git a/base/applications/cmdutils/help/lang/no-NO.rc b/base/applications/cmdutils/help/lang/no-NO.rc index eacb9ae5b3d..92fa9702fa6 100644 --- a/base/applications/cmdutils/help/lang/no-NO.rc +++ b/base/applications/cmdutils/help/lang/no-NO.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?""\n." + IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?"".\n" END STRINGTABLE diff --git a/base/applications/cmdutils/help/lang/pl-PL.rc b/base/applications/cmdutils/help/lang/pl-PL.rc index 2338b2c9718..bc6aa74c7b5 100644 --- a/base/applications/cmdutils/help/lang/pl-PL.rc +++ b/base/applications/cmdutils/help/lang/pl-PL.rc @@ -12,7 +12,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_NO_ENTRY "To polecenie nie jest obsługiwane przez narzędzie pomocy.\nSpróbuj ""%s /?""\n." + IDS_NO_ENTRY "To polecenie nie jest obsługiwane przez narzędzie pomocy.\nSpróbuj ""%s /?"".\n" END STRINGTABLE diff --git a/base/applications/cmdutils/help/lang/ro-RO.rc b/base/applications/cmdutils/help/lang/ro-RO.rc index 81dc0b6ea66..2bd6d1756e6 100644 --- a/base/applications/cmdutils/help/lang/ro-RO.rc +++ b/base/applications/cmdutils/help/lang/ro-RO.rc @@ -9,7 +9,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_NO_ENTRY "Această comandă nu este recunoscută de utilitarul manual.\nÎncercați ""%s /?""\n." + IDS_NO_ENTRY "Această comandă nu este recunoscută de utilitarul manual.\nÎncercați ""%s /?"".\n" END STRINGTABLE diff --git a/base/applications/cmdutils/help/lang/ru-RU.rc b/base/applications/cmdutils/help/lang/ru-RU.rc index b877bfd0a2d..5d84164e4ee 100644 --- a/base/applications/cmdutils/help/lang/ru-RU.rc +++ b/base/applications/cmdutils/help/lang/ru-RU.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_NO_ENTRY "Данная команда не поддерживается. Воспользуйтесь параметром ""%s /?""\n." + IDS_NO_ENTRY "Данная команда не поддерживается. Воспользуйтесь параметром ""%s /?"".\n" END STRINGTABLE diff --git a/base/applications/cmdutils/help/lang/sk-SK.rc b/base/applications/cmdutils/help/lang/sk-SK.rc index d614852a0d8..314104276ac 100644 --- a/base/applications/cmdutils/help/lang/sk-SK.rc +++ b/base/applications/cmdutils/help/lang/sk-SK.rc @@ -10,7 +10,7 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?""\n." + IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?"".\n" END STRINGTABLE diff --git a/base/applications/cmdutils/help/lang/sq-AL.rc b/base/applications/cmdutils/help/lang/sq-AL.rc index f0842ea139c..7f6616be9e8 100644 --- a/base/applications/cmdutils/help/lang/sq-AL.rc +++ b/base/applications/cmdutils/help/lang/sq-AL.rc @@ -6,7 +6,7 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?""\n." + IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?"".\n" END STRINGTABLE diff --git a/base/applications/cmdutils/help/lang/sv-SE.rc b/base/applications/cmdutils/help/lang/sv-SE.rc index 56bb23f1a35..6074831cb53 100644 --- a/base/applications/cmdutils/help/lang/sv-SE.rc +++ b/base/applications/cmdutils/help/lang/sv-SE.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?""\n." + IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?"".\n" END STRINGTABLE diff --git a/base/applications/cmdutils/help/lang/uk-UA.rc b/base/applications/cmdutils/help/lang/uk-UA.rc index 2ef104e46c3..84af002951d 100644 --- a/base/applications/cmdutils/help/lang/uk-UA.rc +++ b/base/applications/cmdutils/help/lang/uk-UA.rc @@ -10,7 +10,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?""\n." + IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?"".\n" END STRINGTABLE diff --git a/base/applications/dxdiag/lang/bg-BG.rc b/base/applications/dxdiag/lang/bg-BG.rc index 18c768eb9d7..5d93fde0250 100644 --- a/base/applications/dxdiag/lang/bg-BG.rc +++ b/base/applications/dxdiag/lang/bg-BG.rc @@ -250,5 +250,5 @@ BEGIN IDS_DMUSIC_DLS "Supports DLS" IDS_DMUSIC_EXT "External" IDS_DMUSIC_PORT "Default Port" - IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n" + IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices.\nDo you wish to continue?\n" END diff --git a/base/applications/dxdiag/lang/cs-CZ.rc b/base/applications/dxdiag/lang/cs-CZ.rc index ee87ad1aa95..082484e8ff0 100644 --- a/base/applications/dxdiag/lang/cs-CZ.rc +++ b/base/applications/dxdiag/lang/cs-CZ.rc @@ -255,5 +255,5 @@ BEGIN IDS_DMUSIC_DLS "Podporuje DLS" IDS_DMUSIC_EXT "Externí" IDS_DMUSIC_PORT "Výchozí port" - IDS_DDDISABLE_MSG "Tímto dojde k zakázání akcelerace DirectDraw na všech zobrazovacích zařízeních\n.Přejete si pokračovat?\n" + IDS_DDDISABLE_MSG "Tímto dojde k zakázání akcelerace DirectDraw na všech zobrazovacích zařízeních.\nPřejete si pokračovat?\n" END diff --git a/base/applications/dxdiag/lang/en-US.rc b/base/applications/dxdiag/lang/en-US.rc index 6b2d7a0a99d..da2e54a4c94 100644 --- a/base/applications/dxdiag/lang/en-US.rc +++ b/base/applications/dxdiag/lang/en-US.rc @@ -250,5 +250,5 @@ BEGIN IDS_DMUSIC_DLS "Supports DLS" IDS_DMUSIC_EXT "External" IDS_DMUSIC_PORT "Default Port" - IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n" + IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices.\nDo you wish to continue?\n" END diff --git a/base/applications/dxdiag/lang/es-ES.rc b/base/applications/dxdiag/lang/es-ES.rc index 61671ed4d02..21dad48953b 100644 --- a/base/applications/dxdiag/lang/es-ES.rc +++ b/base/applications/dxdiag/lang/es-ES.rc @@ -252,5 +252,5 @@ BEGIN IDS_DMUSIC_DLS "Supports DLS" IDS_DMUSIC_EXT "External" IDS_DMUSIC_PORT "Default Port" - IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n" + IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices.\nDo you wish to continue?\n" END diff --git a/base/applications/dxdiag/lang/fr-FR.rc b/base/applications/dxdiag/lang/fr-FR.rc index 3470656f3b5..445b53a9163 100644 --- a/base/applications/dxdiag/lang/fr-FR.rc +++ b/base/applications/dxdiag/lang/fr-FR.rc @@ -250,5 +250,5 @@ BEGIN IDS_DMUSIC_DLS "Supports DLS" IDS_DMUSIC_EXT "External" IDS_DMUSIC_PORT "Default Port" - IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n" + IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices.\nDo you wish to continue?\n" END diff --git a/base/applications/dxdiag/lang/he-IL.rc b/base/applications/dxdiag/lang/he-IL.rc index f8118cfc8df..bab366e5ef1 100644 --- a/base/applications/dxdiag/lang/he-IL.rc +++ b/base/applications/dxdiag/lang/he-IL.rc @@ -259,5 +259,5 @@ BEGIN IDS_DMUSIC_DLS "Supports DLS" IDS_DMUSIC_EXT "External" IDS_DMUSIC_PORT "Default Port" - IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n" + IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices.\nDo you wish to continue?\n" END diff --git a/base/applications/dxdiag/lang/it-IT.rc b/base/applications/dxdiag/lang/it-IT.rc index af91979eb0d..cd1f07867f5 100644 --- a/base/applications/dxdiag/lang/it-IT.rc +++ b/base/applications/dxdiag/lang/it-IT.rc @@ -250,5 +250,5 @@ BEGIN IDS_DMUSIC_DLS "Supports DLS" IDS_DMUSIC_EXT "External" IDS_DMUSIC_PORT "Default Port" - IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n" + IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices.\nDo you wish to continue?\n" END diff --git a/base/applications/dxdiag/lang/ja-JP.rc b/base/applications/dxdiag/lang/ja-JP.rc index bb8820fb2de..13d9fcbcbf2 100644 --- a/base/applications/dxdiag/lang/ja-JP.rc +++ b/base/applications/dxdiag/lang/ja-JP.rc @@ -250,5 +250,5 @@ BEGIN IDS_DMUSIC_DLS "Supports DLS" IDS_DMUSIC_EXT "External" IDS_DMUSIC_PORT "Default Port" - IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n" + IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices.\nDo you wish to continue?\n" END diff --git a/base/applications/dxdiag/lang/ko-KR.rc b/base/applications/dxdiag/lang/ko-KR.rc index 1037bff92b3..f46aca6d8a8 100644 --- a/base/applications/dxdiag/lang/ko-KR.rc +++ b/base/applications/dxdiag/lang/ko-KR.rc @@ -252,5 +252,5 @@ BEGIN IDS_DMUSIC_DLS "Supports DLS" IDS_DMUSIC_EXT "External" IDS_DMUSIC_PORT "Default Port" - IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n" + IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices.\nDo you wish to continue?\n" END diff --git a/base/applications/dxdiag/lang/nl-NL.rc b/base/applications/dxdiag/lang/nl-NL.rc index a358b2d4b0f..033e5faa8ab 100644 --- a/base/applications/dxdiag/lang/nl-NL.rc +++ b/base/applications/dxdiag/lang/nl-NL.rc @@ -250,5 +250,5 @@ BEGIN IDS_DMUSIC_DLS "Supports DLS" IDS_DMUSIC_EXT "External" IDS_DMUSIC_PORT "Default Port" - IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n" + IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices.\nDo you wish to continue?\n" END diff --git a/base/applications/dxdiag/lang/no-NO.rc b/base/applications/dxdiag/lang/no-NO.rc index e967b40492d..672e2829b28 100644 --- a/base/applications/dxdiag/lang/no-NO.rc +++ b/base/applications/dxdiag/lang/no-NO.rc @@ -250,5 +250,5 @@ BEGIN IDS_DMUSIC_DLS "Supports DLS" IDS_DMUSIC_EXT "External" IDS_DMUSIC_PORT "Default Port" - IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n" + IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices.\nDo you wish to continue?\n" END diff --git a/base/applications/dxdiag/lang/pl-PL.rc b/base/applications/dxdiag/lang/pl-PL.rc index 33f540fe160..06130881db9 100644 --- a/base/applications/dxdiag/lang/pl-PL.rc +++ b/base/applications/dxdiag/lang/pl-PL.rc @@ -259,5 +259,5 @@ BEGIN IDS_DMUSIC_DLS "Obsługuje próbki DLS" IDS_DMUSIC_EXT "Zewnętrzny" IDS_DMUSIC_PORT "Port domyślny" - IDS_DDDISABLE_MSG "Spowoduje to wyłączenie przyspieszania sprzętowego DirectDraw dla wszystkich urządzeń wyświetlających w systemie\n.Czy chcesz kontynuować?\n" + IDS_DDDISABLE_MSG "Spowoduje to wyłączenie przyspieszania sprzętowego DirectDraw dla wszystkich urządzeń wyświetlających w systemie.\nCzy chcesz kontynuować?\n" END diff --git a/base/applications/dxdiag/lang/pt-BR.rc b/base/applications/dxdiag/lang/pt-BR.rc index f1f41161c83..dae11384358 100644 --- a/base/applications/dxdiag/lang/pt-BR.rc +++ b/base/applications/dxdiag/lang/pt-BR.rc @@ -252,5 +252,5 @@ BEGIN IDS_DMUSIC_DLS "Supports DLS" IDS_DMUSIC_EXT "External" IDS_DMUSIC_PORT "Default Port" - IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n" + IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices.\nDo you wish to continue?\n" END diff --git a/base/applications/dxdiag/lang/ru-RU.rc b/base/applications/dxdiag/lang/ru-RU.rc index 4b1bcf9a1ec..02bcd3e103c 100644 --- a/base/applications/dxdiag/lang/ru-RU.rc +++ b/base/applications/dxdiag/lang/ru-RU.rc @@ -250,5 +250,5 @@ BEGIN IDS_DMUSIC_DLS "Поддерживает DLS" IDS_DMUSIC_EXT "Внешний" IDS_DMUSIC_PORT "Стандартный порт" - IDS_DDDISABLE_MSG "Это отключит все аппаратное ускорение DirectDraw на всех дисплеях\n.Вы хотите продолжить?\n" + IDS_DDDISABLE_MSG "Это отключит все аппаратное ускорение DirectDraw на всех дисплеях.\nВы хотите продолжить?\n" END diff --git a/base/applications/dxdiag/lang/sk-SK.rc b/base/applications/dxdiag/lang/sk-SK.rc index fbe6f951582..44a917db138 100644 --- a/base/applications/dxdiag/lang/sk-SK.rc +++ b/base/applications/dxdiag/lang/sk-SK.rc @@ -255,5 +255,5 @@ BEGIN IDS_DMUSIC_DLS "Supports DLS" IDS_DMUSIC_EXT "External" IDS_DMUSIC_PORT "Default Port" - IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n" + IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices.\nDo you wish to continue?\n" END diff --git a/base/applications/dxdiag/lang/sq-AL.rc b/base/applications/dxdiag/lang/sq-AL.rc index 55dc77e3f67..7773a7cabfe 100644 --- a/base/applications/dxdiag/lang/sq-AL.rc +++ b/base/applications/dxdiag/lang/sq-AL.rc @@ -254,5 +254,5 @@ BEGIN IDS_DMUSIC_DLS "Supports DLS" IDS_DMUSIC_EXT "External" IDS_DMUSIC_PORT "Default Port" - IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n" + IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices.\nDo you wish to continue?\n" END diff --git a/base/applications/dxdiag/lang/sv-SE.rc b/base/applications/dxdiag/lang/sv-SE.rc index 0eebb5b047a..321facb1e0d 100644 --- a/base/applications/dxdiag/lang/sv-SE.rc +++ b/base/applications/dxdiag/lang/sv-SE.rc @@ -257,5 +257,5 @@ BEGIN IDS_DMUSIC_DLS "Supports DLS" IDS_DMUSIC_EXT "External" IDS_DMUSIC_PORT "Default Port" - IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n" + IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices.\nDo you wish to continue?\n" END diff --git a/base/applications/dxdiag/lang/tr-TR.rc b/base/applications/dxdiag/lang/tr-TR.rc index a5d8c16167d..b0585e4e6ab 100644 --- a/base/applications/dxdiag/lang/tr-TR.rc +++ b/base/applications/dxdiag/lang/tr-TR.rc @@ -252,5 +252,5 @@ BEGIN IDS_DMUSIC_DLS "DLS'yi Destekler" IDS_DMUSIC_EXT "Dış" IDS_DMUSIC_PORT "Ön Tanımlı Giriş" - IDS_DDDISABLE_MSG "Bu, tüm görüntü aygıtlarında ReactDraw için tüm donanım ivmelerini edilginleştirecektir.\n. Sürdürmek ister misiniz?\n" + IDS_DDDISABLE_MSG "Bu, tüm görüntü aygıtlarında ReactDraw için tüm donanım ivmelerini edilginleştirecektir.\nSürdürmek ister misiniz?\n" END diff --git a/base/applications/dxdiag/lang/uk-UA.rc b/base/applications/dxdiag/lang/uk-UA.rc index 839a5c7260d..971094a14cc 100644 --- a/base/applications/dxdiag/lang/uk-UA.rc +++ b/base/applications/dxdiag/lang/uk-UA.rc @@ -258,5 +258,5 @@ BEGIN IDS_DMUSIC_DLS "Supports DLS" IDS_DMUSIC_EXT "External" IDS_DMUSIC_PORT "Default Port" - IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n" + IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices.\nDo you wish to continue?\n" END diff --git a/base/applications/dxdiag/lang/zh-TW.rc b/base/applications/dxdiag/lang/zh-TW.rc index 795dfe513fb..be00d93965f 100644 --- a/base/applications/dxdiag/lang/zh-TW.rc +++ b/base/applications/dxdiag/lang/zh-TW.rc @@ -258,5 +258,5 @@ BEGIN IDS_DMUSIC_DLS "支援 DLS" IDS_DMUSIC_EXT "外部" IDS_DMUSIC_PORT "預設埠" - IDS_DDDISABLE_MSG "這將禁用 DirectDraw 所有的顯示裝置上的所有硬體加速\n.您要繼續嗎?\n" + IDS_DDDISABLE_MSG "這將禁用 DirectDraw 所有的顯示裝置上的所有硬體加速.\n您要繼續嗎?\n" END diff --git a/base/applications/shutdown/lang/it-IT.rc b/base/applications/shutdown/lang/it-IT.rc index 2decaa4eff2..268ed6f07c3 100644 --- a/base/applications/shutdown/lang/it-IT.rc +++ b/base/applications/shutdown/lang/it-IT.rc @@ -66,10 +66,10 @@ Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\ IDS_ERROR_SHUTDOWN_REBOOT "ERROR: Impossibile arrestare e riavviare al tempo stesso.\n" IDS_ERROR_TIMEOUT "ERROR: Il valore di timeout di u% è fuori dai limiti (0-315360000) \n" - IDS_ERROR_ABORT "ERROR: Impossibile interrompere l'arresto del sistema \n." + IDS_ERROR_ABORT "ERROR: Impossibile interrompere l'arresto del sistema.\n" IDS_ERROR_LOGOFF "ERROR: Impossibile disconnettersi dal sistema \n" - IDS_ERROR_SHUTDOWN "ERROR: Impossibile arrestare il sistema \n." - IDS_ERROR_RESTART "ERROR: Impossibile riavviare il sistema \n." + IDS_ERROR_SHUTDOWN "ERROR: Impossibile arrestare il sistema.\n" + IDS_ERROR_RESTART "ERROR: Impossibile riavviare il sistema.\n" IDS_ERROR_MAX_COMMENT_LENGTH "ERROR: La lunghezza del commento supera il limite massimo di caratteri impostato dal sistema \n" IDS_ERROR_HIBERNATE "ERROR: Impossibile avviare il sistema in modalità sospensione. \n" IDS_ERROR_HIBERNATE_LOCAL "ERROR: La modalità sospensione non può essere avviata in modalità remota \n" diff --git a/ntoskrnl/kdbg/kdb.c b/ntoskrnl/kdbg/kdb.c index d2a890276fe..78662445af5 100644 --- a/ntoskrnl/kdbg/kdb.c +++ b/ntoskrnl/kdbg/kdb.c @@ -388,7 +388,7 @@ KdbpStepIntoInstruction( __sidt(&Idtr.Limit); if (IntVect >= (Idtr.Limit + 1) / 8) { - /*KdbpPrint("IDT does not contain interrupt vector %d\n.", IntVect);*/ + /*KdbpPrint("IDT does not contain interrupt vector %d.\n", IntVect);*/ return TRUE; }

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