Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [SYSSETUP] Initialize the property sheet page dialog and implement the Defaults button
by Eric Kohl 22 Apr '18

22 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=065e70048daa70bbe2db1… commit 065e70048daa70bbe2db15175441c627782ad11d Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Apr 22 23:59:28 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Apr 23 00:00:46 2018 +0200 [SYSSETUP] Initialize the property sheet page dialog and implement the Defaults button --- dll/win32/syssetup/proppage.c | 80 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/dll/win32/syssetup/proppage.c b/dll/win32/syssetup/proppage.c index 6cab3faab1..d200a841ea 100644 --- a/dll/win32/syssetup/proppage.c +++ b/dll/win32/syssetup/proppage.c @@ -110,6 +110,81 @@ MouseOnDialogInit( (LPARAM)szBuffer); } + /* Set the input buffer length range: 100-300 */ + SendDlgItemMessageW(hwndDlg, + IDC_PS2MOUSEINPUTUPDN, + UDM_SETRANGE32, + 100, + 300); + + SendDlgItemMessageW(hwndDlg, + IDC_PS2MOUSEINPUTUPDN, + UDM_SETPOS32, + 0, + 100); +} + + +static +VOID +MouseOnCommand( + HWND hwndDlg, + WPARAM wParam, + LPARAM lParam) +{ + switch (LOWORD(wParam)) + { + case IDC_PS2MOUSESAMPLERATE: + case IDC_PS2MOUSEWHEEL: + case IDC_PS2MOUSEINPUTLEN: + case IDC_PS2MOUSEFASTINIT: + if (HIWORD(wParam) == CBN_SELCHANGE || + HIWORD(wParam) == CBN_EDITCHANGE) + { + /* Enable the Apply button */ + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + + case IDC_PS2MOUSEDEFAULTS: + if (HIWORD(wParam) == BN_CLICKED) + { + /* Sample rate: 100 */ + SendDlgItemMessageW(hwndDlg, + IDC_PS2MOUSESAMPLERATE, + CB_SETCURSEL, + 4, + 0); + + /* Wheel detection: Assume wheel present */ + SendDlgItemMessageW(hwndDlg, + IDC_PS2MOUSEWHEEL, + CB_SETCURSEL, + 2, + 0); + + /* Input buffer length: 100 packets */ + SendDlgItemMessageW(hwndDlg, + IDC_PS2MOUSEINPUTUPDN, + UDM_SETPOS32, + 0, + 100); + + /* Fast Initialization: Checked */ + SendDlgItemMessage(hwndDlg, + IDC_PS2MOUSEFASTINIT, + BM_SETCHECK, + (WPARAM)BST_CHECKED, + (LPARAM)0); + + /* Enable the Apply button */ + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + + default: + break; + } } @@ -129,6 +204,11 @@ MouseDlgProc( case WM_INITDIALOG: MouseOnDialogInit(hwndDlg, lParam); return TRUE; + + case WM_COMMAND: + MouseOnCommand(hwndDlg, wParam, lParam); + break; + } return FALSE;

1 0

01/01: [WIN32K] Implement UOI_FLAGS in NtUserGetObjectInformation(). Based from a patch by Jérôme Gardou. CORE-13447 CORE-14422
by Hermès Bélusca-Maïto 22 Apr '18

22 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a55d7c692ba0215e97663… commit a55d7c692ba0215e976630df88782c1ca20e792e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 22 22:56:16 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 22 23:00:55 2018 +0200 [WIN32K] Implement UOI_FLAGS in NtUserGetObjectInformation(). Based from a patch by Jérôme Gardou. CORE-13447 CORE-14422 This fixes closing nLite 1.4.9.3 (.NET2) application, as well as any other program that expects that the interactive window station is reported as being visible. I thank Mark Jansen and Joachim Henze for help and testing. --- win32ss/user/ntuser/winsta.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/win32ss/user/ntuser/winsta.c b/win32ss/user/ntuser/winsta.c index 1187e44055..d9ca3ca999 100644 --- a/win32ss/user/ntuser/winsta.c +++ b/win32ss/user/ntuser/winsta.c @@ -717,22 +717,49 @@ NtUserGetObjectInformation( goto Exit; } - TRACE("WinSta or Desktop opened!!\n"); + TRACE("WinSta or Desktop opened!\n"); /* Get data */ switch (nIndex) { case UOI_FLAGS: { - /* This is a default implementation that does almost nothing */ - ObjectFlags.fInherit = FALSE; + OBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleInfo; + ULONG BytesWritten; + ObjectFlags.fReserved = FALSE; + + /* Check whether this handle is inheritable */ + Status = ZwQueryObject(hObject, + ObjectHandleFlagInformation, + &HandleInfo, + sizeof(OBJECT_HANDLE_ATTRIBUTE_INFORMATION), + &BytesWritten); + if (!NT_SUCCESS(Status)) + { + ERR("ZwQueryObject failed, Status 0x%08lx\n", Status); + break; + } + ObjectFlags.fInherit = HandleInfo.Inherit; + ObjectFlags.dwFlags = 0; + if (WinStaObject != NULL) + { + if (!(WinStaObject->Flags & WSS_NOIO)) + ObjectFlags.dwFlags |= WSF_VISIBLE; + } + else if (DesktopObject != NULL) + { + FIXME("Setting DF_ALLOWOTHERACCOUNTHOOK is unimplemented.\n"); + } + else + { + ERR("No associated WinStaObject nor DesktopObject!\n"); + } pvData = &ObjectFlags; nDataSize = sizeof(ObjectFlags); Status = STATUS_SUCCESS; - ERR("UOI_FLAGS unimplemented!\n"); break; }

1 0

01/01: [CPL][CONSOLE] Mistake corrections
by Bișoc George 22 Apr '18

22 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e445b305bb8afdd80a8da… commit e445b305bb8afdd80a8da5aadddd642563337b4a Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Fri Apr 13 18:11:47 2018 +0200 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Sun Apr 22 22:52:48 2018 +0200 [CPL][CONSOLE] Mistake corrections --- dll/cpl/console/lang/it-IT.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/cpl/console/lang/it-IT.rc b/dll/cpl/console/lang/it-IT.rc index b9bbfc769e..0677e07d1a 100644 --- a/dll/cpl/console/lang/it-IT.rc +++ b/dll/cpl/console/lang/it-IT.rc @@ -148,9 +148,9 @@ END STRINGTABLE BEGIN - IDS_CPLNAME "Consola" - IDS_CPLDESCRIPTION "Configura le proprietà della consola." + IDS_CPLNAME "Console" + IDS_CPLDESCRIPTION "Configura le proprietà della console." IDS_APPLY_SHORTCUT_ALL "Modifica il collegamento che ha attivato questa finestra" - IDS_RASTERFONTS "Font a Raster" + IDS_RASTERFONTS "Font Raster" IDS_GROUPBOX_FONT_NAME "Font Selezionate: " END

1 0

01/01: [NULL] Additions for the Null driver.
by Hermès Bélusca-Maïto 22 Apr '18

22 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da5dcdcbf285fe7c6acad… commit da5dcdcbf285fe7c6acad9623fec3732e216d719 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 22 22:13:52 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 22 22:23:54 2018 +0200 [NULL] Additions for the Null driver. - Allow the driver to be unloaded, as on Windows. - Use a static fast IO dispatch table, instead of allocating one and risking any potential memory allocation failure. - Update the file header. --- drivers/base/null/null.c | 64 +++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/drivers/base/null/null.c b/drivers/base/null/null.c index 610e886ddd..0d4ed541de 100644 --- a/drivers/base/null/null.c +++ b/drivers/base/null/null.c @@ -1,16 +1,19 @@ /* - * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/base/null/null.c - * PURPOSE: Null Device Driver - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - * David Welch (welch(a)mcmail.com) + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Null Device Driver + * COPYRIGHT: Copyright 1998-2018 David Welch (welch(a)mcmail.com) + * Copyright 2007-2018 Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES ******************************************************************/ #include <wdm.h> +/* GLOBALS *******************************************************************/ + +FAST_IO_DISPATCH FastIoDispatch; + /* FUNCTIONS *****************************************************************/ NTSTATUS @@ -20,6 +23,7 @@ NullQueryFileInformation(OUT PVOID Buffer, IN FILE_INFORMATION_CLASS InformationClass) { PFILE_STANDARD_INFORMATION StandardInfo = Buffer; + PAGED_CODE(); /* We only support one class */ @@ -81,10 +85,11 @@ NTAPI NullDispatch(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PIO_STACK_LOCATION IoStack = IoGetCurrentIrpStackLocation(Irp); NTSTATUS Status; + PIO_STACK_LOCATION IoStack = IoGetCurrentIrpStackLocation(Irp); PFILE_OBJECT FileObject; ULONG Length; + PAGED_CODE(); /* Get the file object and check what kind of request this is */ @@ -150,21 +155,33 @@ NullDispatch(IN PDEVICE_OBJECT DeviceObject, return Status; } +VOID +NTAPI +NullUnload(IN PDRIVER_OBJECT DriverObject) +{ + PDEVICE_OBJECT DeviceObject = DriverObject->DeviceObject; + + /* Delete the Null device */ + IoDeleteDevice(DeviceObject); +} + NTSTATUS NTAPI DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { + NTSTATUS Status; PDEVICE_OBJECT DeviceObject; UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\Null"); - NTSTATUS Status; - PFAST_IO_DISPATCH FastIoDispatch; + PAGED_CODE(); + UNREFERENCED_PARAMETER(RegistryPath); + /* Page the driver */ MmPageEntireDriver(DriverEntry); - /* Create null device */ + /* Create the Null device */ Status = IoCreateDevice(DriverObject, 0, &DeviceName, @@ -172,7 +189,8 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, 0, FALSE, &DeviceObject); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + return Status; /* Register driver routines */ DriverObject->MajorFunction[IRP_MJ_CLOSE] = NullDispatch; @@ -181,26 +199,16 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, DriverObject->MajorFunction[IRP_MJ_READ] = NullDispatch; DriverObject->MajorFunction[IRP_MJ_LOCK_CONTROL] = NullDispatch; DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = NullDispatch; + DriverObject->DriverUnload = NullUnload; - /* Allocate the fast I/O dispatch table */ - FastIoDispatch = ExAllocatePoolWithTag(NonPagedPool, - sizeof(FAST_IO_DISPATCH), - 'llun'); - if (!FastIoDispatch) - { - /* Failed, cleanup */ - IoDeleteDevice(DeviceObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Initialize it */ - RtlZeroMemory(FastIoDispatch, sizeof(FAST_IO_DISPATCH)); - FastIoDispatch->SizeOfFastIoDispatch = sizeof(FAST_IO_DISPATCH); + /* Initialize the fast I/O dispatch table */ + RtlZeroMemory(&FastIoDispatch, sizeof(FastIoDispatch)); + FastIoDispatch.SizeOfFastIoDispatch = sizeof(FastIoDispatch); /* Setup our pointers */ - FastIoDispatch->FastIoRead = NullRead; - FastIoDispatch->FastIoWrite = NullWrite; - DriverObject->FastIoDispatch = FastIoDispatch; + FastIoDispatch.FastIoRead = NullRead; + FastIoDispatch.FastIoWrite = NullWrite; + DriverObject->FastIoDispatch = &FastIoDispatch; /* Return success */ return STATUS_SUCCESS;

1 0

05/05: [SDB] Add a fix for Globulation 2 unloading / reloading an aux dll. Reported in https://savannah.nongnu.org/bugs/?53219
by Mark Jansen 22 Apr '18

22 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63b6df6bc5978afd29073… commit 63b6df6bc5978afd290736491d4e97ec08f47328 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Feb 24 14:58:40 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Apr 22 18:56:44 2018 +0200 [SDB] Add a fix for Globulation 2 unloading / reloading an aux dll. Reported in https://savannah.nongnu.org/bugs/?53219 --- media/sdb/sysmain.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/media/sdb/sysmain.xml b/media/sdb/sysmain.xml index 03b9b16982..1dd096d2b0 100644 --- a/media/sdb/sysmain.xml +++ b/media/sdb/sysmain.xml @@ -361,5 +361,20 @@ <FLAG_REF NAME="GetDiskFreeSpace2GB" /> </LAYER> +  + +  + <EXE NAME="glob2.exe" APP_NAME="Globulation 2" VENDOR="Globulation 2 authors"> + <MATCHING_FILE NAME="*"> + <SIZE>0x471e00</SIZE> + <CHECKSUM>0x89bf7c2a</CHECKSUM> + <MODULE_TYPE>0x3</MODULE_TYPE> + <PE_CHECKSUM>0x4793cf</PE_CHECKSUM> + <LINKER_VERSION>0x10000</LINKER_VERSION> + <LINK_DATE>0x4a9b2979</LINK_DATE> + </MATCHING_FILE> + <SHIM_REF NAME="IgnoreFreeLibrary" COMMAND_LINE="libpng12.dll" /> + </EXE> + </DATABASE> </SDB> \ No newline at end of file

1 0

04/05: [SDK][ACGENRAL] Add the shim IgnoreFreeLibrary
by Mark Jansen 22 Apr '18

22 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8b15a5ecd703433de03e5… commit 8b15a5ecd703433de03e58f6354b18f490a7e0bc Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Feb 24 14:57:56 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Apr 22 18:52:00 2018 +0200 [SDK][ACGENRAL] Add the shim IgnoreFreeLibrary --- dll/appcompat/shims/genral/CMakeLists.txt | 1 + dll/appcompat/shims/genral/ignorefreelib.c | 132 +++++++++++++++++++++++++++++ media/sdb/sysmain.xml | 3 + 3 files changed, 136 insertions(+) diff --git a/dll/appcompat/shims/genral/CMakeLists.txt b/dll/appcompat/shims/genral/CMakeLists.txt index 725a2d85f6..86db9bbc91 100644 --- a/dll/appcompat/shims/genral/CMakeLists.txt +++ b/dll/appcompat/shims/genral/CMakeLists.txt @@ -5,6 +5,7 @@ spec2def(acgenral.dll genral.spec) list(APPEND SOURCE ignoredbgout.c + ignorefreelib.c main.c themes.c genral.spec) diff --git a/dll/appcompat/shims/genral/ignorefreelib.c b/dll/appcompat/shims/genral/ignorefreelib.c new file mode 100644 index 0000000000..b0c7ebb991 --- /dev/null +++ b/dll/appcompat/shims/genral/ignorefreelib.c @@ -0,0 +1,132 @@ +/* + * PROJECT: ReactOS 'General' Shim library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Ignore FreeLibrary calls + * COPYRIGHT: Copyright 2018 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <shimlib.h> +#include <strsafe.h> + + +#define SHIM_NS IgnoreFreeLibrary +#include <setup_shim.inl> + +typedef BOOL(WINAPI* FREELIBRARYPROC)(HMODULE); + +const char** g_Names; +static int g_NameCount; + +BOOL WINAPI SHIM_OBJ_NAME(FreeLibrary)(HMODULE hModule) +{ + char Buffer[MAX_PATH], *Ptr = Buffer; + DWORD len, wanted = ARRAYSIZE(Buffer); + for (;;) + { + len = GetModuleFileNameA(hModule, Ptr, wanted); + if (len < wanted) + break; + + wanted *= 2; + if (Ptr != Buffer) + ShimLib_ShimFree(Ptr); + + Ptr = ShimLib_ShimMalloc(wanted); + if (!Ptr) + break; + } + + if (Ptr && len) + { + char* ModuleName = NULL; + int n; + for (; len; len--) + { + ModuleName = Ptr + len; + if (ModuleName[-1] == '/' || ModuleName[-1] == '\\') + break; + } + for (n = 0; n < g_NameCount; ++n) + { + if (!stricmp(g_Names[n], ModuleName)) + { + SHIM_INFO("Prevented unload of %s\n", ModuleName); + if (Ptr && Ptr != Buffer) + ShimLib_ShimFree(Ptr); + return TRUE; + } + } + } + + if (Ptr && Ptr != Buffer) + ShimLib_ShimFree(Ptr); + + return CALL_SHIM(0, FREELIBRARYPROC)(hModule); +} + +static VOID InitIgnoreFreeLibrary(PCSTR CommandLine) +{ + PCSTR prev, cur; + int count = 1, n = 0; + const char** names; + + if (!CommandLine || !*CommandLine) + return; + + prev = CommandLine; + while ((cur = strchr(prev, ';'))) + { + count++; + prev = cur + 1; + } + + names = ShimLib_ShimMalloc(sizeof(char*) * count); + if (!names) + { + SHIM_WARN("Unable to allocate %u bytes\n", sizeof(char*) * count); + return; + } + + prev = CommandLine; + while ((cur = strchr(prev, ';'))) + { + names[n] = ShimLib_StringNDuplicateA(prev, cur - prev + 1); + if (!names[n]) + { + SHIM_WARN("Unable to allocate %u bytes\n", cur - prev + 2); + return; + } + n++; + prev = cur + 1; + } + names[n] = ShimLib_StringDuplicateA(prev); + if (!names[n]) + { + SHIM_WARN("Unable to allocate last string\n"); + return; + } + + g_Names = names; + g_NameCount = count; +} + +BOOL WINAPI SHIM_OBJ_NAME(Notify)(DWORD fdwReason, PVOID ptr) +{ + if (fdwReason == SHIM_NOTIFY_ATTACH) + { + SHIM_MSG("IgnoreFreeLibrary(%s)\n", SHIM_OBJ_NAME(g_szCommandLine)); + InitIgnoreFreeLibrary(SHIM_OBJ_NAME(g_szCommandLine)); + } + return TRUE; +} + + +#define SHIM_NOTIFY_FN SHIM_OBJ_NAME(Notify) +#define SHIM_NUM_HOOKS 1 +#define SHIM_SETUP_HOOKS \ + SHIM_HOOK(0, "KERNEL32.DLL", "FreeLibrary", SHIM_OBJ_NAME(FreeLibrary)) + +#include <implement_shim.inl> diff --git a/media/sdb/sysmain.xml b/media/sdb/sysmain.xml index c451c28d50..03b9b16982 100644 --- a/media/sdb/sysmain.xml +++ b/media/sdb/sysmain.xml @@ -206,6 +206,9 @@ <SHIM NAME="DisableThemes"> <DLLFILE>acgenral.dll</DLLFILE> </SHIM> + <SHIM NAME="IgnoreFreeLibrary"> + <DLLFILE>acgenral.dll</DLLFILE> + </SHIM> <SHIM NAME="VMHorizonSetup"> <DLLFILE>aclayers.dll</DLLFILE> </SHIM>

1 0

03/05: [XML2SDB] Add support for TAG_LINK_DATE and TAG_LINKER_VERSION.
by Mark Jansen 22 Apr '18

22 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3551953c846a165029ff1… commit 3551953c846a165029ff1ae85875d57f6b1f6744 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Feb 24 18:42:42 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Apr 22 18:51:53 2018 +0200 [XML2SDB] Add support for TAG_LINK_DATE and TAG_LINKER_VERSION. --- sdk/tools/xml2sdb/xml2sdb.cpp | 11 ++++------- sdk/tools/xml2sdb/xml2sdb.h | 6 +++--- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/sdk/tools/xml2sdb/xml2sdb.cpp b/sdk/tools/xml2sdb/xml2sdb.cpp index 3478e0561b..bba0335bfe 100644 --- a/sdk/tools/xml2sdb/xml2sdb.cpp +++ b/sdk/tools/xml2sdb/xml2sdb.cpp @@ -503,12 +503,12 @@ bool MatchingFile::fromXml(XMLHandle dbNode) ProductVersion = ReadStringNode(dbNode, "PRODUCT_VERSION"); FileVersion = ReadStringNode(dbNode, "FILE_VERSION"); BinFileVersion = ReadStringNode(dbNode, "BIN_FILE_VERSION"); - LinkDate = ReadStringNode(dbNode, "LINK_DATE"); + LinkDate = ReadDWordNode(dbNode, "LINK_DATE"); VerLanguage = ReadStringNode(dbNode, "VER_LANGUAGE"); FileDescription = ReadStringNode(dbNode, "FILE_DESCRIPTION"); OriginalFilename = ReadStringNode(dbNode, "ORIGINAL_FILENAME"); UptoBinFileVersion = ReadStringNode(dbNode, "UPTO_BIN_FILE_VERSION"); - LinkerVersion = ReadStringNode(dbNode, "LINKER_VERSION"); + LinkerVersion = ReadDWordNode(dbNode, "LINKER_VERSION"); return true; } @@ -526,17 +526,14 @@ bool MatchingFile::toSdb(PDB pdb, Database& db) db.WriteString(pdb, TAG_FILE_VERSION, FileVersion); if (!BinFileVersion.empty()) SHIM_ERR("TAG_BIN_FILE_VERSION Unimplemented\n"); //db.WriteQWord(pdb, TAG_BIN_FILE_VERSION, BinFileVersion); - if (!LinkDate.empty()) - SHIM_ERR("TAG_LINK_DATE Unimplemented\n"); //db.WriteDWord(pdb, TAG_LINK_DATE, LinkDate); + db.WriteDWord(pdb, TAG_LINK_DATE, LinkDate); if (!VerLanguage.empty()) SHIM_ERR("TAG_VER_LANGUAGE Unimplemented\n"); //db.WriteDWord(pdb, TAG_VER_LANGUAGE, VerLanguage); db.WriteString(pdb, TAG_FILE_DESCRIPTION, FileDescription); db.WriteString(pdb, TAG_ORIGINAL_FILENAME, OriginalFilename); if (!UptoBinFileVersion.empty()) SHIM_ERR("TAG_UPTO_BIN_FILE_VERSION Unimplemented\n"); //db.WriteQWord(pdb, TAG_UPTO_BIN_FILE_VERSION, UptoBinFileVersion); - if (!LinkerVersion.empty()) - SHIM_ERR("TAG_LINKER_VERSION Unimplemented\n"); //db.WriteDWord(pdb, TAG_LINKER_VERSION, LinkerVersion); - + db.WriteDWord(pdb, TAG_LINKER_VERSION, LinkerVersion); return !!db.EndWriteListTag(pdb, tagid); } diff --git a/sdk/tools/xml2sdb/xml2sdb.h b/sdk/tools/xml2sdb/xml2sdb.h index df9e391b44..9958bc5155 100644 --- a/sdk/tools/xml2sdb/xml2sdb.h +++ b/sdk/tools/xml2sdb/xml2sdb.h @@ -123,7 +123,7 @@ struct Layer struct MatchingFile { - MatchingFile() : Size(0), Checksum(0) {;} + MatchingFile() : Size(0), Checksum(0), LinkDate(0), LinkerVersion(0) {;} bool fromXml(XMLHandle dbNode); bool toSdb(PDB pdb, Database& db); @@ -137,12 +137,12 @@ struct MatchingFile std::string ProductVersion; std::string FileVersion; std::string BinFileVersion; - std::string LinkDate; + DWORD LinkDate; std::string VerLanguage; std::string FileDescription; std::string OriginalFilename; std::string UptoBinFileVersion; - std::string LinkerVersion; + DWORD LinkerVersion; }; struct Exe

1 0

02/05: [SHIMLIB] Update helper functions, add ShimLib_StringNDuplicateA
by Mark Jansen 22 Apr '18

22 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2eaf5264848f5fa9b9e0a… commit 2eaf5264848f5fa9b9e0a35ff589cb6c086bc8de Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Feb 24 14:57:00 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Apr 22 18:51:48 2018 +0200 [SHIMLIB] Update helper functions, add ShimLib_StringNDuplicateA --- dll/appcompat/shims/shimlib/shimlib.c | 11 ++++++++--- dll/appcompat/shims/shimlib/shimlib.h | 17 +++++++++-------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dll/appcompat/shims/shimlib/shimlib.c b/dll/appcompat/shims/shimlib/shimlib.c index 54d64799d1..b9c2652ab6 100644 --- a/dll/appcompat/shims/shimlib/shimlib.c +++ b/dll/appcompat/shims/shimlib/shimlib.c @@ -50,11 +50,16 @@ void ShimLib_ShimFree(PVOID pData) HeapFree(g_ShimLib_Heap, 0, pData); } +PCSTR ShimLib_StringNDuplicateA(PCSTR szString, SIZE_T stringLengthIncludingNullTerm) +{ + PSTR NewString = ShimLib_ShimMalloc(stringLengthIncludingNullTerm); + StringCchCopyA(NewString, stringLengthIncludingNullTerm, szString); + return NewString; +} + PCSTR ShimLib_StringDuplicateA(PCSTR szString) { - SIZE_T Length = lstrlenA(szString); - PSTR NewString = ShimLib_ShimMalloc(Length+1); - return lstrcpyA(NewString, szString); + return ShimLib_StringNDuplicateA(szString, lstrlenA(szString) + 1); } BOOL ShimLib_StrAEqualsW(PCSTR szString, PCWSTR wszString) diff --git a/dll/appcompat/shims/shimlib/shimlib.h b/dll/appcompat/shims/shimlib/shimlib.h index b6a6743e7b..5eaf1853ab 100644 --- a/dll/appcompat/shims/shimlib/shimlib.h +++ b/dll/appcompat/shims/shimlib/shimlib.h @@ -2,7 +2,7 @@ * PROJECT: ReactOS Shim helper library * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: ReactOS Shim Engine common functions / structures - * COPYRIGHT: Copyright 2016,2017 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2016-2018 Mark Jansen (mark.jansen(a)reactos.org) */ #pragma once @@ -17,16 +17,17 @@ typedef struct tagHOOKAPI } HOOKAPI, *PHOOKAPI; -PVOID ShimLib_ShimMalloc(SIZE_T); -void ShimLib_ShimFree(PVOID); -PCSTR ShimLib_StringDuplicateA(PCSTR); -BOOL ShimLib_StrAEqualsW(PCSTR, PCWSTR); +PVOID ShimLib_ShimMalloc(SIZE_T dwSize); +VOID ShimLib_ShimFree(PVOID pData); +PCSTR ShimLib_StringDuplicateA(PCSTR szString); +PCSTR ShimLib_StringNDuplicateA(PCSTR szString, SIZE_T stringLength); +BOOL ShimLib_StrAEqualsW(PCSTR szString, PCWSTR wszString); /* Forward events to generic handlers */ -void ShimLib_Init(HINSTANCE); -void ShimLib_Deinit(void); -PHOOKAPI WINAPI ShimLib_GetHookAPIs(LPCSTR,LPCWSTR,PDWORD); +VOID ShimLib_Init(HINSTANCE hInstance); +VOID ShimLib_Deinit(VOID); +PHOOKAPI WINAPI ShimLib_GetHookAPIs(LPCSTR szCommandLine,LPCWSTR wszShimName,PDWORD pdwHookCount); BOOL WINAPI ShimLib_NotifyShims(DWORD fdwReason, PVOID ptr);

1 0

01/05: [APPSHIM_APITEST] Add a test for the shim IgnoreFreeLibrary
by Mark Jansen 22 Apr '18

22 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0a5a0a3501ec1371b55b2… commit 0a5a0a3501ec1371b55b28cfc983656a30ef32ea Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Feb 24 14:55:11 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Apr 22 18:51:21 2018 +0200 [APPSHIM_APITEST] Add a test for the shim IgnoreFreeLibrary --- modules/rostests/apitests/appshim/CMakeLists.txt | 1 + modules/rostests/apitests/appshim/ignorefreelib.c | 138 ++++++++++++++++++++++ modules/rostests/apitests/appshim/testlist.c | 2 + 3 files changed, 141 insertions(+) diff --git a/modules/rostests/apitests/appshim/CMakeLists.txt b/modules/rostests/apitests/appshim/CMakeLists.txt index 8884ce2606..b48600ceaa 100644 --- a/modules/rostests/apitests/appshim/CMakeLists.txt +++ b/modules/rostests/apitests/appshim/CMakeLists.txt @@ -4,6 +4,7 @@ add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE dispmode.c genral_hooks.c + ignorefreelib.c layer_hooks.c versionlie.c testlist.c diff --git a/modules/rostests/apitests/appshim/ignorefreelib.c b/modules/rostests/apitests/appshim/ignorefreelib.c new file mode 100644 index 0000000000..29b55449ce --- /dev/null +++ b/modules/rostests/apitests/appshim/ignorefreelib.c @@ -0,0 +1,138 @@ +/* + * PROJECT: appshim_apitest + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Tests for IgnoreFreeLibrary shim + * COPYRIGHT: Copyright 2018 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include <ntstatus.h> +#define WIN32_NO_STATUS +#include <windows.h> +#include "wine/test.h" + +#include "appshim_apitest.h" + +static tGETHOOKAPIS pGetHookAPIs; + +typedef BOOL(WINAPI* FREELIBRARYPROC)(HMODULE); + + +static void test_IgnoreFreeLibrary(VOID) +{ + DWORD num_shims = 0; + PHOOKAPI hook; + HMODULE avifil32, esent, msi; + FREELIBRARYPROC freeProc; + + // Show that: + // * partial names (both start + end) do not work. + // * wildcards do not work + // * comparison is case insensitive + // * multiple dlls can be specified + hook = pGetHookAPIs("AvIFiL32.Dll;esent;esent*;ent.dll;msi.dll", L"IgnoreFreeLibrary", &num_shims); + + ok(hook != NULL, "Expected hook to be a valid pointer\n"); + ok(num_shims == 1, "Expected num_shims to be 1, was: %u\n", num_shims); + + if (!hook || !num_shims) + return; + + ok_str(hook->LibraryName, "KERNEL32.DLL"); + ok_str(hook->FunctionName, "FreeLibrary"); + + avifil32 = LoadLibraryA("avifil32.dll"); + ok(avifil32 != NULL, "Unable to load avifil32\n"); + + esent = LoadLibraryA("esent.dll"); + ok(esent != NULL, "Unable to load esent\n"); + + msi = LoadLibraryA("msi.dll"); + ok(msi != NULL, "Unable to load msi\n"); + + hook->OriginalFunction = FreeLibrary; + freeProc = hook->ReplacementFunction; + + ok(freeProc != NULL, "\n"); + + if (!freeProc) + return; + + // Not unloading + ok(freeProc(avifil32), "Unable to unload avifil32\n"); + avifil32 = GetModuleHandleA("avifil32.dll"); + ok(avifil32 != NULL, "avifil32 should not unload\n"); + + // Unloading + ok(freeProc(esent), "Unable to unload esent\n"); + esent = GetModuleHandleA("esent.dll"); + ok(esent == NULL, "esent should be unloaded\n"); + + // Not unloading + ok(freeProc(msi), "Unable to unload msi\n"); + msi = GetModuleHandleA("msi.dll"); + ok(msi != NULL, "msi should not unload\n"); +} + + +START_TEST(ignorefreelib) +{ + HMODULE avifil32, esent, msi; + LONG initial; + + pGetHookAPIs = LoadShimDLL2(L"acgenral.dll"); + + if (!pGetHookAPIs) + return; + + /* Ensure that we can freely load / unload avifil32, esent and msi */ + + initial = winetest_get_failures(); + + avifil32 = GetModuleHandleA("avifil32.dll"); + ok_ptr(avifil32, NULL); + esent = GetModuleHandleA("esent.dll"); + ok_ptr(esent, NULL); + msi = GetModuleHandleA("msi.dll"); + ok_ptr(msi, NULL); + + avifil32 = LoadLibraryA("avifil32.dll"); + ok(avifil32 != NULL, "Unable to load avifil32\n"); + esent = GetModuleHandleA("esent.dll"); + ok_ptr(esent, NULL); + msi = GetModuleHandleA("msi.dll"); + ok_ptr(msi, NULL); + + ok(FreeLibrary(avifil32), "Unable to unload avifil32\n"); + avifil32 = GetModuleHandleA("avifil32.dll"); + ok_ptr(avifil32, NULL); + + esent = LoadLibraryA("esent.dll"); + ok(esent != NULL, "Unable to load esent\n"); + avifil32 = GetModuleHandleA("avifil32.dll"); + ok_ptr(avifil32, NULL); + msi = GetModuleHandleA("msi.dll"); + ok_ptr(msi, NULL); + + ok(FreeLibrary(esent), "Unable to unload esent\n"); + esent = GetModuleHandleA("esent.dll"); + ok_ptr(esent, NULL); + + msi = LoadLibraryA("msi.dll"); + ok(msi != NULL, "Unable to load msi\n"); + avifil32 = GetModuleHandleA("avifil32.dll"); + ok_ptr(avifil32, NULL); + esent = GetModuleHandleA("esent.dll"); + ok_ptr(esent, NULL); + + ok(FreeLibrary(msi), "Unable to unload msi\n"); + msi = GetModuleHandleA("msi.dll"); + ok_ptr(msi, NULL); + + if (initial != winetest_get_failures()) + { + // We cannot continue, one or more of our target dll's does not behave as expected + return; + } + + test_IgnoreFreeLibrary(); +} diff --git a/modules/rostests/apitests/appshim/testlist.c b/modules/rostests/apitests/appshim/testlist.c index 45275de5cd..a3e7b7132d 100644 --- a/modules/rostests/apitests/appshim/testlist.c +++ b/modules/rostests/apitests/appshim/testlist.c @@ -5,6 +5,7 @@ extern void func_dispmode(void); extern void func_genral_hooks(void); +extern void func_ignorefreelib(void); extern void func_layer_hooks(void); extern void func_versionlie(void); @@ -12,6 +13,7 @@ const struct test winetest_testlist[] = { { "dispmode", func_dispmode }, { "genral_hooks", func_genral_hooks }, + { "ignorefreelib", func_ignorefreelib }, { "layer_hooks", func_layer_hooks }, { "versionlie", func_versionlie }, { 0, 0 }

1 0

01/01: [ZIPFLDR] Fix russian translation
by Eric Kohl 22 Apr '18

22 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4970f92d6c8d94edb61ea… commit 4970f92d6c8d94edb61ea84a3c640593ed1cea23 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Apr 22 17:42:20 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Apr 22 17:43:05 2018 +0200 [ZIPFLDR] Fix russian translation --- dll/shellext/zipfldr/lang/ru-RU.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/shellext/zipfldr/lang/ru-RU.rc b/dll/shellext/zipfldr/lang/ru-RU.rc index 2bd50f0149..7e7a38ed62 100644 --- a/dll/shellext/zipfldr/lang/ru-RU.rc +++ b/dll/shellext/zipfldr/lang/ru-RU.rc @@ -28,7 +28,7 @@ BEGIN LTEXT "Все файлы были извлечены в следующую директорию:",IDC_STATIC,6,12,222,18 LTEXT "Целевой путь",IDC_DESTDIR,6,36,222,8 CONTROL "Показать извлечённые файлы",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,118,10 - LTEXT "Нажмите \"Готово\" чтобы продолжить.",IDC_STATIC,6,84,174,8 + LTEXT "Нажмите ""Готово"" чтобы продолжить.",IDC_STATIC,6,84,174,8 END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56

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