Ros-diffs

ros-diffs@reactos.org

81390 discussions

03/03: [SERVICES] Use safe-string routines in some places, and do not hardcode buffer lengths.
by Hermès Bélusca-Maïto 24 Feb '18

24 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6d65fec691ea650789b1… commit c6d65fec691ea650789b1b2fa5eaf4b8e1d859c4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 25 00:48:43 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 25 00:50:01 2018 +0100 [SERVICES] Use safe-string routines in some places, and do not hardcode buffer lengths. --- base/system/services/database.c | 22 ++++++++------- base/system/services/rpcserver.c | 58 ++++++++++++++++++++-------------------- 2 files changed, 42 insertions(+), 38 deletions(-) diff --git a/base/system/services/database.c b/base/system/services/database.c index 9ae8441b64..580dc0fd69 100644 --- a/base/system/services/database.c +++ b/base/system/services/database.c @@ -15,6 +15,7 @@ #include "services.h" #include <userenv.h> +#include <strsafe.h> #define NDEBUG #include <debug.h> @@ -88,7 +89,8 @@ ScmCreateNewControlPipe(PSERVICE_IMAGE pServiceImage) } /* Create '\\.\pipe\net\NtControlPipeXXX' instance */ - swprintf(szControlPipeName, L"\\\\.\\pipe\\net\\NtControlPipe%lu", ServiceCurrent); + StringCchPrintfW(szControlPipeName, ARRAYSIZE(szControlPipeName), + L"\\\\.\\pipe\\net\\NtControlPipe%lu", ServiceCurrent); DPRINT("PipeName: %S\n", szControlPipeName); @@ -1861,7 +1863,8 @@ ScmLoadService(PSERVICE Service, if (Service->dwErrorControl != SERVICE_ERROR_IGNORE) { /* Log a failed service start */ - swprintf(szLogBuffer, L"%lu", dwError); + StringCchPrintfW(szLogBuffer, ARRAYSIZE(szLogBuffer), + L"%lu", dwError); lpLogStrings[0] = Service->lpServiceName; lpLogStrings[1] = szLogBuffer; ScmLogEvent(EVENT_SERVICE_START_FAILED, @@ -1990,19 +1993,21 @@ ScmAutoStartServices(VOID) CurrentService = CONTAINING_RECORD(ServiceEntry, SERVICE, ServiceListEntry); /* Build the safe boot path */ - wcscpy(szSafeBootServicePath, - L"SYSTEM\\CurrentControlSet\\Control\\SafeBoot"); + StringCchCopyW(szSafeBootServicePath, ARRAYSIZE(szSafeBootServicePath), + L"SYSTEM\\CurrentControlSet\\Control\\SafeBoot"); switch (SafeBootEnabled) { /* NOTE: Assumes MINIMAL (1) and DSREPAIR (3) load same items */ case 1: case 3: - wcscat(szSafeBootServicePath, L"\\Minimal\\"); + StringCchCatW(szSafeBootServicePath, ARRAYSIZE(szSafeBootServicePath), + L"\\Minimal\\"); break; case 2: - wcscat(szSafeBootServicePath, L"\\Network\\"); + StringCchCatW(szSafeBootServicePath, ARRAYSIZE(szSafeBootServicePath), + L"\\Network\\"); break; } @@ -2019,9 +2024,8 @@ ScmAutoStartServices(VOID) RegCloseKey(hKey); /* Finish Safe Boot path off */ - wcsncat(szSafeBootServicePath, - CurrentService->lpServiceName, - MAX_PATH - wcslen(szSafeBootServicePath)); + StringCchCatW(szSafeBootServicePath, ARRAYSIZE(szSafeBootServicePath), + CurrentService->lpServiceName); /* Check that the key is in the Safe Boot path */ dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c index 0a518d06ad..e022dff97c 100644 --- a/base/system/services/rpcserver.c +++ b/base/system/services/rpcserver.c @@ -13,6 +13,7 @@ #include "services.h" #include <winnls.h> +#include <strsafe.h> #define NDEBUG #include <debug.h> @@ -1241,36 +1242,36 @@ RControlService( if (dwError == ERROR_SUCCESS) { - if (dwControl == SERVICE_CONTROL_STOP || - dwControl == SERVICE_CONTROL_PAUSE || - dwControl == SERVICE_CONTROL_CONTINUE) - { - /* Log a successful send control */ + if (dwControl == SERVICE_CONTROL_STOP || + dwControl == SERVICE_CONTROL_PAUSE || + dwControl == SERVICE_CONTROL_CONTINUE) + { + /* Log a successful send control */ - switch (dwControl) - { - case SERVICE_CONTROL_STOP: - uID = IDS_SERVICE_STOP; - break; + switch (dwControl) + { + case SERVICE_CONTROL_STOP: + uID = IDS_SERVICE_STOP; + break; - case SERVICE_CONTROL_PAUSE: - uID = IDS_SERVICE_PAUSE; - break; + case SERVICE_CONTROL_PAUSE: + uID = IDS_SERVICE_PAUSE; + break; - case SERVICE_CONTROL_CONTINUE: - uID = IDS_SERVICE_RESUME; - break; - } - LoadStringW(GetModuleHandle(NULL), uID, szLogBuffer, 80); + case SERVICE_CONTROL_CONTINUE: + uID = IDS_SERVICE_RESUME; + break; + } + LoadStringW(GetModuleHandle(NULL), uID, szLogBuffer, ARRAYSIZE(szLogBuffer)); - lpLogStrings[0] = lpService->lpDisplayName; - lpLogStrings[1] = szLogBuffer; + lpLogStrings[0] = lpService->lpDisplayName; + lpLogStrings[1] = szLogBuffer; - ScmLogEvent(EVENT_SERVICE_CONTROL_SUCCESS, - EVENTLOG_INFORMATION_TYPE, - 2, - lpLogStrings); - } + ScmLogEvent(EVENT_SERVICE_CONTROL_SUCCESS, + EVENTLOG_INFORMATION_TYPE, + 2, + lpLogStrings); + } } return dwError; @@ -1757,7 +1758,8 @@ RSetServiceStatus( (lpServiceStatus->dwWin32ExitCode != ERROR_SUCCESS)) { /* Log a failed service stop */ - swprintf(szLogBuffer, L"%lu", lpServiceStatus->dwWin32ExitCode); + StringCchPrintfW(szLogBuffer, ARRAYSIZE(szLogBuffer), + L"%lu", lpServiceStatus->dwWin32ExitCode); lpLogStrings[0] = lpService->lpDisplayName; lpLogStrings[1] = szLogBuffer; @@ -1787,7 +1789,7 @@ RSetServiceStatus( break; } - LoadStringW(GetModuleHandle(NULL), uID, szLogBuffer, 80); + LoadStringW(GetModuleHandle(NULL), uID, szLogBuffer, ARRAYSIZE(szLogBuffer)); lpLogStrings[0] = lpService->lpDisplayName; lpLogStrings[1] = szLogBuffer; @@ -1797,8 +1799,6 @@ RSetServiceStatus( lpLogStrings); } - - DPRINT("Set %S to %lu\n", lpService->lpDisplayName, lpService->Status.dwCurrentState); DPRINT("RSetServiceStatus() done\n");

1 0

02/03: [SERVICES] Send services shutdown notifications only if they accept them.
by Hermès Bélusca-Maïto 24 Feb '18

24 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1aa359ec7f5cd7597d3d1… commit 1aa359ec7f5cd7597d3d138c7323dedac9774e41 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 25 00:31:17 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 25 00:49:58 2018 +0100 [SERVICES] Send services shutdown notifications only if they accept them. --- base/system/services/database.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/base/system/services/database.c b/base/system/services/database.c index d28a98c082..9ae8441b64 100644 --- a/base/system/services/database.c +++ b/base/system/services/database.c @@ -2164,10 +2164,11 @@ ScmAutoShutdownServices(VOID) { CurrentService = CONTAINING_RECORD(ServiceEntry, SERVICE, ServiceListEntry); - if (CurrentService->Status.dwCurrentState == SERVICE_RUNNING || - CurrentService->Status.dwCurrentState == SERVICE_START_PENDING) + if ((CurrentService->Status.dwControlsAccepted & SERVICE_ACCEPT_SHUTDOWN) && + (CurrentService->Status.dwCurrentState == SERVICE_RUNNING || + CurrentService->Status.dwCurrentState == SERVICE_START_PENDING)) { - /* shutdown service */ + /* Send the shutdown notification */ DPRINT("Shutdown service: %S\n", CurrentService->lpServiceName); ScmControlService(CurrentService->lpImage->hControlPipe, CurrentService->lpServiceName,

1 0

01/03: [SERVICES] Add french translation.
by Hermès Bélusca-Maïto 24 Feb '18

24 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c097b47404ef88f6522f… commit 6c097b47404ef88f6522f9242c4b5cb4b7964b5b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 25 00:06:27 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 25 00:49:55 2018 +0100 [SERVICES] Add french translation. --- base/system/services/lang/fr-FR.rc | 12 ++++++++++++ base/system/services/services.rc | 20 +++++++------------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/base/system/services/lang/fr-FR.rc b/base/system/services/lang/fr-FR.rc new file mode 100644 index 0000000000..8e5bdf78dd --- /dev/null +++ b/base/system/services/lang/fr-FR.rc @@ -0,0 +1,12 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_SERVICE_START "démarrer" + IDS_SERVICE_STOP "arrêt" + IDS_SERVICE_PAUSE "pause" + IDS_SERVICE_RESUME "continuer" + IDS_SERVICE_RUNNING "En cours d'exécution" + IDS_SERVICE_STOPPED "Arrêté" + IDS_SERVICE_PAUSED "En pause" +END diff --git a/base/system/services/services.rc b/base/system/services/services.rc index 94f2f20c8f..71070cdf30 100644 --- a/base/system/services/services.rc +++ b/base/system/services/services.rc @@ -3,9 +3,9 @@ #include "resource.h" -#define REACTOS_STR_FILE_DESCRIPTION "Service Control Manager" -#define REACTOS_STR_INTERNAL_NAME "Services" -#define REACTOS_STR_ORIGINAL_FILENAME "Services.exe" +#define REACTOS_STR_FILE_DESCRIPTION "Service Control Manager" +#define REACTOS_STR_INTERNAL_NAME "services" +#define REACTOS_STR_ORIGINAL_FILENAME "services.exe" #include <reactos/version.rc> @@ -15,39 +15,33 @@ #ifdef LANGUAGE_CS_CZ #include "lang/cs-CZ.rc" #endif - #ifdef LANGUAGE_DE_DE #include "lang/de-DE.rc" #endif - #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif - +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif - #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif - #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif - #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif - #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif - #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif - #ifdef LANGUAGE_ZH_TW #include "lang/zh-TW.rc" -#endif \ No newline at end of file +#endif

1 0

01/01: [TRANSLATION] German syntax fix.
by Simon Dräger 24 Feb '18

24 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd3b6d8c09facf7887381… commit fd3b6d8c09facf78873814a7271c329b0d741c31 Author: Simon Dräger <20014538+C0nflict(a)users.noreply.github.com> AuthorDate: Sat Feb 24 17:13:53 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Feb 24 23:32:31 2018 +0100 [TRANSLATION] German syntax fix. It is rather unusual to put a "then" after "If..", so removed that. --- base/setup/reactos/lang/de-DE.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/setup/reactos/lang/de-DE.rc b/base/setup/reactos/lang/de-DE.rc index f2528f61e3..7287cfed83 100644 --- a/base/setup/reactos/lang/de-DE.rc +++ b/base/setup/reactos/lang/de-DE.rc @@ -123,7 +123,7 @@ BEGIN IDS_RESTARTSUBTITLE "Die erste Stufe des Setup wurde abgeschlossen, starten Sie den Rechner neu, um mit der zweiten Stufe fortzufahren." IDS_SUMMARYTITLE "Installationszusammenfassung" IDS_SUMMARYSUBTITLE "Liste alle Installationseinstellungen vor Anwendung auf die Geräte auf" - IDS_ABORTSETUP "ReactOS ist nicht vollständig auf Ihrem Computer installiert. Wenn Sie das Setup verlassen, dann müssen Sie das Setup nochmals ausführen, um ReactOS zu installieren. Wirklich beenden?" + IDS_ABORTSETUP "ReactOS ist nicht vollständig auf Ihrem Computer installiert. Wenn Sie das Setup verlassen, müssen Sie das Setup nochmals ausführen, um ReactOS zu installieren. Wirklich beenden?" IDS_ABORTSETUP2 "Installation abbrechen?" IDS_NO_TXTSETUP_SIF "Die Datei 'txtsetup.sif' konnte nicht gefunden werden.\nSetup kann nicht fortfahren." IDS_CAPTION "ReactOS Setup"

1 0

01/01: [BOOTDATA] Fix path to temp folder for the Swedish locale (#381)
by Harteex 24 Feb '18

24 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23a6b69c4d5156072a2a6… commit 23a6b69c4d5156072a2a6a99b8a089fe3c2261ac Author: Harteex <harteex(a)gmail.com> AuthorDate: Sat Feb 24 23:08:55 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Feb 24 23:08:55 2018 +0100 [BOOTDATA] Fix path to temp folder for the Swedish locale (#381) --- boot/bootdata/hivedef.inf | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf index 07aad189c9..618635a7d7 100644 --- a/boot/bootdata/hivedef.inf +++ b/boot/bootdata/hivedef.inf @@ -2747,8 +2747,43 @@ TEMP_DIR="%USERPROFILE%\Local Settings\Temp" ; LANG_SWEDISH SUBLANG_NEUTRAL -;[Strings.001D] -;TEMP_DIR="%USERPROFILE%\..." +[Strings.001D] +POWERCFG_NAME_0="Home/Office Desk" +POWERCFG_DESC_0="This scheme is suited to most home or desktop computers that are left plugged in all the time." +POWERCFG_NAME_1="Portable/Laptop" +POWERCFG_DESC_1="This scheme is designed for extended battery life for portable computers on the road." +POWERCFG_NAME_2="Presentation" +POWERCFG_DESC_2="This scheme keeps the monitor on for doing presentations." +POWERCFG_NAME_3="Always On" +POWERCFG_DESC_3="This scheme keeps the computer running so that it can be accessed from the network. Use this scheme if you do not have network wakeup hardware." +POWERCFG_NAME_4="Minimal Power Management" +POWERCFG_DESC_4="This scheme keeps the computer on and optimizes it for high performance." +POWERCFG_NAME_5="Max Battery" +POWERCFG_DESC_5="This scheme is extremely aggressive for saving power." +DESKTOP_SCHEME_0="ReactOS Standard" +DESKTOP_SCHEME_1="Brick" +DESKTOP_SCHEME_2="Eggplant" +DESKTOP_SCHEME_3="Green Olive" +DESKTOP_SCHEME_4="High Contrast 1" +DESKTOP_SCHEME_5="High Contrast 2" +DESKTOP_SCHEME_6="High Contrast Black" +DESKTOP_SCHEME_7="High Contrast White" +DESKTOP_SCHEME_8="Lilac" +DESKTOP_SCHEME_9="Maple" +DESKTOP_SCHEME_10="Marine" +DESKTOP_SCHEME_11="Plum" +DESKTOP_SCHEME_12="Pumpkin" +DESKTOP_SCHEME_13="Rainy Day" +DESKTOP_SCHEME_14="ReactOS Classic" +DESKTOP_SCHEME_15="Rose" +DESKTOP_SCHEME_16="Sand" +DESKTOP_SCHEME_17="Sky" +DESKTOP_SCHEME_18="Slate" +DESKTOP_SCHEME_19="Storm" +DESKTOP_SCHEME_20="Teal" +DESKTOP_SCHEME_21="Wheat" +DESKTOP_SCHEME_SIZE_0="Default size" +TEMP_DIR="%USERPROFILE%\Lokala inställningar\Temp" ; LANG_THAI SUBLANG_NEUTRAL

1 0

01/01: [NTOSKRNL] Implement ThreadHideFromDebugger in NtSetInformationThread()
by Pierre Schweitzer 24 Feb '18

24 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=62facb7a4976868f9356a… commit 62facb7a4976868f9356aaf03c224cfeac149a57 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Feb 24 22:06:18 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Feb 24 22:07:12 2018 +0100 [NTOSKRNL] Implement ThreadHideFromDebugger in NtSetInformationThread() --- ntoskrnl/ps/query.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/ntoskrnl/ps/query.c b/ntoskrnl/ps/query.c index ad281e63c0..40a365a253 100644 --- a/ntoskrnl/ps/query.c +++ b/ntoskrnl/ps/query.c @@ -2420,6 +2420,19 @@ NtSetInformationThread(IN HANDLE ThreadHandle, } break; + case ThreadHideFromDebugger: + + /* Check buffer length */ + if (ThreadInformationLength != 0) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + /* Set the flag */ + PspSetCrossThreadFlag(Thread, CT_HIDE_FROM_DEBUGGER_BIT); + break; + default: /* We don't implement it yet */ DPRINT1("Not implemented: %d\n", ThreadInformationClass);

1 0

04/04: [ACLAYERS] Add WIN8 and WIN81 VersionLie shims
by Mark Jansen 24 Feb '18

24 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ffc6846996748c7d81bd… commit 2ffc6846996748c7d81bd569ba44ffd8bf858bc4 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Feb 10 15:31:55 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Feb 24 19:33:56 2018 +0100 [ACLAYERS] Add WIN8 and WIN81 VersionLie shims --- dll/appcompat/shims/layer/versionlie.c | 11 +++++++++++ media/sdb/sysmain.xml | 28 ++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/dll/appcompat/shims/layer/versionlie.c b/dll/appcompat/shims/layer/versionlie.c index 704a8b8da1..38db1d0a19 100644 --- a/dll/appcompat/shims/layer/versionlie.c +++ b/dll/appcompat/shims/layer/versionlie.c @@ -48,6 +48,8 @@ VersionLieInfo g_WinVistaSP2 = { 0x17720006, 6, 0, 6002, VER_PLATFORM_WIN32_NT, VersionLieInfo g_Win7RTM = { 0x1db00106, 6, 1, 7600, VER_PLATFORM_WIN32_NT, 0, 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 }; /* Fill the OSVERSIONINFO[EX][W|A] struct with the info from the generic VersionLieInfo */ @@ -229,3 +231,12 @@ BOOL WINAPI SHIM_OBJ_NAME(APIHook_GetVersionExW)(LPOSVERSIONINFOEXA lpOsVersionI #include "versionlie.inl" +#define SHIM_NS Win8RTMVersionLie +#define VERSION_INFO g_Win8RTM +#include "versionlie.inl" + +#define SHIM_NS Win81RTMVersionLie +#define VERSION_INFO g_Win81RTM +#include "versionlie.inl" + + diff --git a/media/sdb/sysmain.xml b/media/sdb/sysmain.xml index 07a32edce6..a27542e38e 100644 --- a/media/sdb/sysmain.xml +++ b/media/sdb/sysmain.xml @@ -173,6 +173,24 @@ <EXCLUDE MODULE="oleaut32.dll" /> <DLLFILE>aclayers.dll</DLLFILE> </SHIM> + <SHIM NAME="Win8RTMVersionLie"> + <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="Win81RTMVersionLie"> + <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>  @@ -291,6 +309,16 @@ <SHIM_REF NAME="Win7RTMVersionLie" />  </LAYER> + <LAYER NAME="WIN8RTM"> + <SHIM_REF NAME="Win8RTMVersionLie" /> +  + </LAYER> + <LAYER NAME="WIN81RTM"> + <SHIM_REF NAME="Win81RTMVersionLie" /> +  + </LAYER> + +

1 0

03/04: [APPSHIM_APITEST] Add Win8 and Win81 versionlie tests
by Mark Jansen 24 Feb '18

24 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8e1f3429905776f604162… commit 8e1f3429905776f604162c93eb92f0b31ff4516f Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Feb 10 15:31:06 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Feb 24 19:33:50 2018 +0100 [APPSHIM_APITEST] Add Win8 and Win81 versionlie tests --- modules/rostests/apitests/appshim/versionlie.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/appshim/versionlie.c b/modules/rostests/apitests/appshim/versionlie.c index 5848f98aaf..43c9dc665c 100644 --- a/modules/rostests/apitests/appshim/versionlie.c +++ b/modules/rostests/apitests/appshim/versionlie.c @@ -196,7 +196,7 @@ static void verify_shim_imp(PHOOKAPI hook, const VersionLieInfo* info, PCSTR shi return; } ver = ((GETVERSIONPROC)hook->ReplacementFunction)(); - winetest_ok(info->FullVersion == ver, "Expected GetVersion to return %u, was: %u for %s\n", info->FullVersion, ver, shim); + winetest_ok(info->FullVersion == ver, "Expected GetVersion to return 0x%x, was: 0x%x for %s\n", info->FullVersion, ver, shim); } @@ -282,6 +282,10 @@ VersionLieInfo g_WinVistaSP2 = { 0x17720006, 6, 0, 6002, VER_PLATFORM_WIN32_NT, VersionLieInfo g_Win7RTM = { 0x1db00106, 6, 1, 7600, VER_PLATFORM_WIN32_NT, 0, 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 }; + + DWORD get_host_winver(void) { RTL_OSVERSIONINFOEXW rtlinfo = {0}; @@ -396,4 +400,6 @@ START_TEST(versionlie) run_test("VistaSP1VersionLie", &g_WinVistaSP1); run_test("VistaSP2VersionLie", &g_WinVistaSP2); run_test("Win7RTMVersionLie", &g_Win7RTM); + run_test("Win8RTMVersionLie", &g_Win8RTM); + run_test("Win81RTMVersionLie", &g_Win81RTM); }

1 0

02/04: [ACPPAGE] Enable version lies until Win7 + some cleanup
by Mark Jansen 24 Feb '18

24 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9b55e647fae5c899f2269… commit 9b55e647fae5c899f22699a6f432ae44e2c11146 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Feb 6 19:32:51 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Feb 24 19:33:42 2018 +0100 [ACPPAGE] Enable version lies until Win7 + some cleanup --- dll/shellext/acppage/ACPPage.cpp | 57 +++++++++++++++++++++---------- dll/shellext/acppage/CLayerStringList.hpp | 2 +- dll/shellext/acppage/CLayerUIPropPage.cpp | 4 +-- dll/shellext/acppage/CLayerUIPropPage.hpp | 2 +- 4 files changed, 42 insertions(+), 23 deletions(-) diff --git a/dll/shellext/acppage/ACPPage.cpp b/dll/shellext/acppage/ACPPage.cpp index 446d98d429..18d035fb9c 100644 --- a/dll/shellext/acppage/ACPPage.cpp +++ b/dll/shellext/acppage/ACPPage.cpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS Compatibility Layer Shell Extension * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: acppage entrypoint - * COPYRIGHT: Copyright 2015 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2015-2018 Mark Jansen (mark.jansen(a)reactos.org) */ #include "precomp.h" @@ -15,10 +15,6 @@ LONG g_ModuleRefCnt = 0; class CLayerUIPropPageModule : public CComModule { public: - void Term() - { - CComModule::Term(); - } }; BEGIN_OBJECT_MAP(ObjectMap) @@ -37,6 +33,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved) g_hModule = hInstance; gModule.Init(ObjectMap, hInstance, NULL); break; + case DLL_PROCESS_DETACH: + gModule.Term(); + break; } return(TRUE); @@ -62,10 +61,6 @@ STDAPI DllRegisterServer() if (FAILED(hr)) return hr; - hr = gModule.UpdateRegistryFromResource(IDR_ACPPAGE, TRUE, NULL); - if (FAILED(hr)) - return hr; - return S_OK; } @@ -77,10 +72,6 @@ STDAPI DllUnregisterServer() if (FAILED(hr)) return hr; - hr = gModule.UpdateRegistryFromResource(IDR_ACPPAGE, FALSE, NULL); - if (FAILED(hr)) - return hr; - return S_OK; } @@ -91,23 +82,53 @@ struct CCoInit HRESULT hres; }; +EXTERN_C +inline ULONG +Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...) +{ + char Buffer[512]; + char* Current = Buffer; + size_t Length = _countof(Buffer); + const char* fname = strrchr(filename, '\\'); + if (fname == NULL) + { + fname = strrchr(filename, '/'); + if (fname != NULL) + fname++; + } + else + fname++; + + if (fname == NULL) + fname = filename; + + StringCchPrintfExA(Current, Length, &Current, &Length, STRSAFE_NULL_ON_FAILURE, "%s:%d: ", fname, line); + va_list ArgList; + va_start(ArgList, lpFormat); + StringCchVPrintfExA(Current, Length, &Current, &Length, STRSAFE_NULL_ON_FAILURE, lpFormat, ArgList); + va_end(ArgList); + OutputDebugStringA(Buffer); + return 0; +} + + EXTERN_C BOOL WINAPI GetExeFromLnk(PCWSTR pszLnk, PWSTR pszExe, size_t cchSize) { CCoInit init; - if (FAILED(init.hres)) + if (FAILED_UNEXPECTEDLY(init.hres)) return FALSE; CComPtr<IShellLinkW> spShellLink; - if (FAILED(CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IShellLinkW, &spShellLink)))) + if (FAILED_UNEXPECTEDLY(CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IShellLinkW, &spShellLink)))) return FALSE; CComPtr<IPersistFile> spPersistFile; - if (FAILED(spShellLink->QueryInterface(IID_PPV_ARG(IPersistFile, &spPersistFile)))) + if (FAILED_UNEXPECTEDLY(spShellLink->QueryInterface(IID_PPV_ARG(IPersistFile, &spPersistFile)))) return FALSE; - if (FAILED(spPersistFile->Load(pszLnk, STGM_READ)) || FAILED(spShellLink->Resolve(NULL, SLR_NO_UI | SLR_NOUPDATE | SLR_NOSEARCH))) + if (FAILED_UNEXPECTEDLY(spPersistFile->Load(pszLnk, STGM_READ)) || FAILED_UNEXPECTEDLY(spShellLink->Resolve(NULL, SLR_NO_UI | SLR_NOUPDATE | SLR_NOSEARCH))) return FALSE; - return SUCCEEDED(spShellLink->GetPath(pszExe, cchSize, NULL, SLGP_RAWPATH)); + return !FAILED_UNEXPECTEDLY(spShellLink->GetPath(pszExe, cchSize, NULL, SLGP_RAWPATH)); } diff --git a/dll/shellext/acppage/CLayerStringList.hpp b/dll/shellext/acppage/CLayerStringList.hpp index af8c04fe95..2a0f5bfcf1 100644 --- a/dll/shellext/acppage/CLayerStringList.hpp +++ b/dll/shellext/acppage/CLayerStringList.hpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS Compatibility Layer Shell Extension * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: CLayerStringList implementation - * COPYRIGHT: Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2015-2018 Mark Jansen (mark.jansen(a)reactos.org) */ #pragma once diff --git a/dll/shellext/acppage/CLayerUIPropPage.cpp b/dll/shellext/acppage/CLayerUIPropPage.cpp index 812854e7f5..a60f03ef2f 100644 --- a/dll/shellext/acppage/CLayerUIPropPage.cpp +++ b/dll/shellext/acppage/CLayerUIPropPage.cpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS Compatibility Layer Shell Extension * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: CLayerUIPropPage implementation - * COPYRIGHT: Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2015-2018 Mark Jansen (mark.jansen(a)reactos.org) */ #include "precomp.h" @@ -33,13 +33,11 @@ static struct { { L"Windows XP (SP2)", L"WINXPSP2" }, { L"Windows XP (SP3)", L"WINXPSP3" }, { L"Windows Server 2003 (SP1)", L"WINSRV03SP1" }, -#if 0 { 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" }, -#endif { NULL, NULL } }; diff --git a/dll/shellext/acppage/CLayerUIPropPage.hpp b/dll/shellext/acppage/CLayerUIPropPage.hpp index c65a914d86..e86e8eb42a 100644 --- a/dll/shellext/acppage/CLayerUIPropPage.hpp +++ b/dll/shellext/acppage/CLayerUIPropPage.hpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS Compatibility Layer Shell Extension * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: CLayerUIPropPage definition - * COPYRIGHT: Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2015-2018 Mark Jansen (mark.jansen(a)reactos.org) */ #pragma once

1 0

01/04: [APPHELP] Set debug level in case of parse failure
by Mark Jansen 24 Feb '18

24 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0dd71438a4fdc7a0b076f… commit 0dd71438a4fdc7a0b076fa7415112175c1158e34 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Feb 6 19:32:26 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Feb 24 19:33:02 2018 +0100 [APPHELP] Set debug level in case of parse failure --- dll/appcompat/apphelp/apphelp.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dll/appcompat/apphelp/apphelp.c b/dll/appcompat/apphelp/apphelp.c index 3ea0945a51..4c04e5d80e 100644 --- a/dll/appcompat/apphelp/apphelp.c +++ b/dll/appcompat/apphelp/apphelp.c @@ -4,7 +4,7 @@ * PURPOSE: apphelp entrypoint / generic interface functions * COPYRIGHT: Copyright 2011 André Hentschel * Copyright 2013 Mislav Blaževic - * Copyright 2015-2017 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2015-2018 Mark Jansen (mark.jansen(a)reactos.org) */ #define WIN32_NO_STATUS @@ -42,7 +42,7 @@ void ApphelppInitDebugLevel(void) if (NT_SUCCESS(Status)) { if (!NT_SUCCESS(RtlUnicodeStringToInteger(&DebugValue, 10, &NewLevel))) - NewLevel = 0; + NewLevel = SHIM_ERR; } g_ShimDebugLevel = NewLevel; } @@ -52,10 +52,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { switch (reason) { -#ifndef __REACTOS__ - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ -#endif case DLL_PROCESS_ATTACH: g_hInstance = hinst; DisableThreadLibraryCalls( hinst ); @@ -244,4 +240,3 @@ ApphelpCheckRunAppEx( 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