May 2019 - Wine-Commits - list.winehq.org

Zebediah Figura : setupapi: Copy the INF file to C:/windows/inf/ and record it in the driver key.
by Alexandre Julliard May 27, 2019

May 27, 2019

Module: wine Branch: master Commit: d4c18c89d5437845a781c7e2a70301f05f0b82ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4c18c89d5437845a781c7e2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 24 23:33:53 2019 -0500 setupapi: Copy the INF file to C:/windows/inf/ and record it in the driver key. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index f60fd53..9d0cb99 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4684,7 +4684,10 @@ BOOL WINAPI SetupDiInstallDriverFiles(HDEVINFO devinfo, SP_DEVINFO_DATA *device_ */ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) { - WCHAR section[LINE_LEN], section_ext[LINE_LEN]; + static const WCHAR infpathW[] = {'I','n','f','P','a','t','h',0}; + static const WCHAR infsectionW[] = {'I','n','f','S','e','c','t','i','o','n',0}; + static const WCHAR infsectionextW[] = {'I','n','f','S','e','c','t','i','o','n','E','x','t',0}; + WCHAR section[LINE_LEN], section_ext[LINE_LEN], inf_path[MAX_PATH], *extptr, *filepart; UINT install_flags = SPINST_ALL; struct device *device; struct driver *driver; @@ -4711,7 +4714,7 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) SetupFindFirstLineW(hinf, driver->mfg_key, driver->description, &ctx); SetupGetStringFieldW(&ctx, 1, section, ARRAY_SIZE(section), NULL); - SetupDiGetActualSectionToInstallW(hinf, section, section_ext, ARRAY_SIZE(section_ext), NULL, NULL); + SetupDiGetActualSectionToInstallW(hinf, section, section_ext, ARRAY_SIZE(section_ext), NULL, &extptr); if ((l = create_driver_key(device, &driver_key))) { @@ -4730,6 +4733,15 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) SetupTermDefaultQueueCallback(callback_ctx); SetupCloseInfFile(hinf); + + SetupCopyOEMInfW(driver->inf_path, NULL, SPOST_NONE, 0, inf_path, ARRAY_SIZE(inf_path), NULL, &filepart); + TRACE("Copied INF file %s to %s.\n", debugstr_w(driver->inf_path), debugstr_w(inf_path)); + + RegSetValueExW(driver_key, infpathW, 0, REG_SZ, (BYTE *)filepart, strlenW(filepart) * sizeof(WCHAR)); + RegSetValueExW(driver_key, infsectionW, 0, REG_SZ, (BYTE *)section, strlenW(section) * sizeof(WCHAR)); + if (extptr) + RegSetValueExW(driver_key, infsectionextW, 0, REG_SZ, (BYTE *)extptr, strlenW(extptr) * sizeof(WCHAR)); + RegCloseKey(driver_key); return TRUE; }

1 0

Jacek Caban : ntoskrnl.exe: Reuse IRP input buffer if it wasn't used.
by Alexandre Julliard May 27, 2019

May 27, 2019

Module: wine Branch: master Commit: 0138da5025a117bc598f85b98b644ec0820255c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0138da5025a117bc598f85b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 27 13:38:59 2019 +0200 ntoskrnl.exe: Reuse IRP input buffer if it wasn't used. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c355c88..c9b56b7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -633,7 +633,6 @@ static NTSTATUS dispatch_create( struct dispatch_context *context ) irp->Flags |= IRP_CREATE_OPERATION; dispatch_irp( device, irp, context ); - HeapFree( GetProcessHeap(), 0, context->in_buff ); return STATUS_SUCCESS; } @@ -671,7 +670,6 @@ static NTSTATUS dispatch_close( struct dispatch_context *context ) irp->Flags |= IRP_CLOSE_OPERATION; dispatch_irp( device, irp, context ); - HeapFree( GetProcessHeap(), 0, context->in_buff ); return STATUS_SUCCESS; } @@ -714,7 +712,6 @@ static NTSTATUS dispatch_read( struct dispatch_context *context ) irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate out_buff */ dispatch_irp( device, irp, context ); - HeapFree( GetProcessHeap(), 0, context->in_buff ); return STATUS_SUCCESS; } @@ -738,6 +735,7 @@ static NTSTATUS dispatch_write( struct dispatch_context *context ) if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_WRITE, device, context->in_buff, context->in_size, &offset, NULL, NULL ))) return STATUS_NO_MEMORY; + context->in_buff = NULL; irp->Tail.Overlay.OriginalFileObject = file; irp->RequestorMode = UserMode; @@ -779,7 +777,6 @@ static NTSTATUS dispatch_flush( struct dispatch_context *context ) dispatch_irp( device, irp, context ); - HeapFree( GetProcessHeap(), 0, context->in_buff ); return STATUS_SUCCESS; } @@ -841,6 +838,7 @@ static NTSTATUS dispatch_ioctl( struct dispatch_context *context ) irp->Tail.Overlay.OriginalFileObject = file; irp->RequestorMode = UserMode; irp->AssociatedIrp.SystemBuffer = context->in_buff; + context->in_buff = NULL; irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate in_buff */ dispatch_irp( device, irp, context ); @@ -981,8 +979,7 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) if (status == STATUS_SUCCESS) { context.handle = 0; /* status reported by IoCompleteRequest */ - context.in_size = 4096; - context.in_buff = NULL; + if (!context.in_buff) context.in_size = 4096; } break; case STATUS_BUFFER_OVERFLOW:

1 0

Alexandre Julliard : Wine release 4.9
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: website Branch: master Commit: 121024804f1458e53461f344f50a9bfd2c704bd1 URL: https://source.winehq.org/git/website.git/?a=commit;h=121024804f1458e53461f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 22:46:51 2019 +0200 Wine release 4.9 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019052401.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2019052401.xml b/news/en/2019052401.xml new file mode 100644 index 0000000..ce821e9 --- /dev/null +++ b/news/en/2019052401.xml @@ -0,0 +1,17 @@ +<news> +<date>May 24, 2019</date> +<title>Wine 4.9 Released</title> +<body> + The Wine development release 4.9 is now available. + <a href="{$root}/announce/4.9">What's new</a> in this release: +<ul> + <li>Initial support for installing Plug and Play drivers.</li> + <li>Support for building 16-bit modules in PE format.</li> + <li>A lot of code moved to the new KernelBase DLL.</li> + <li>Various game controller fixes.</li> + <li>Use higher performance system clocks if available.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.9.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-4.9 : Alexandre Julliard : Release 4.9
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: wine Branch: refs/tags/wine-4.9 Tag: aaad2d41795e85ea24498c870bb961b4c147349e URL: https://source.winehq.org/git/wine.git/?a=tag;h=aaad2d41795e85ea24498c870bb… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 22:45:05 2019 +0200 Release 4.9

1 0

Alexandre Julliard : Release 4.9.
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: wine Branch: master Commit: fc8174a36483d9ddbcc1a82c1c7d1334b2efc702 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc8174a36483d9ddbcc1a82c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 22:45:04 2019 +0200 Release 4.9. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 909 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 487 insertions(+), 445 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fc8174a36483d9ddbcc1…

1 0

Nikolay Sivov : mfplat: Add timestamp support for system time source.
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: wine Branch: master Commit: 7b014ff049254fa3b382ee6776c25a67647bdde8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b014ff049254fa3b382ee67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 24 18:02:36 2019 +0300 mfplat: Add timestamp support for system time source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 81 +++++++++++++++++++----- dlls/mfplat/tests/mfplat.c | 152 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 216 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b014ff049254fa3b382…

1 0

Michael Stefaniuc : kernel32/tests: Use the ARRAY_SIZE() macro.
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: wine Branch: master Commit: 260e66ee8b46206ea5e684e2f40333c233d6fef2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=260e66ee8b46206ea5e684e2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri May 24 19:53:47 2019 +0200 kernel32/tests: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 8f55083..f15cc09 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1922,7 +1922,7 @@ static void test_SearchPathA(void) ret = GetCurrentDirectoryA(MAX_PATH, curdirA); ok(ret, "failed to obtain working directory.\n"); sprintf(pathA, "%s\\%s", tmpdirA, kernel32A); - ret = SearchPathA(NULL, kernel32A, NULL, sizeof(path2A)/sizeof(CHAR), path2A, NULL); + ret = SearchPathA(NULL, kernel32A, NULL, ARRAY_SIZE(path2A), path2A, NULL); ok(ret && ret == strlen(path2A), "got %d\n", ret); bret = CopyFileA(path2A, pathA, FALSE); ok(bret != 0, "failed to copy test executable to temp directory, %u\n", GetLastError());

1 0

Akihiro Sagawa : advapi32: Implement REG_MUI_STRING_TRUNCATE flag.
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: wine Branch: master Commit: 3c1359af10448a4e1f9ac49aeb01ef3a4dda3ac8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c1359af10448a4e1f9ac49a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri May 24 22:32:33 2019 +0900 advapi32: Implement REG_MUI_STRING_TRUNCATE flag. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 21 ++++++++++++++++----- dlls/advapi32/tests/registry.c | 12 ++++++------ 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index b779def..f889d3b 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3138,7 +3138,7 @@ static INT load_string(HINSTANCE hModule, UINT resId, LPWSTR *pResString) return *pString; } -static LONG load_mui_string(const WCHAR *file_name, UINT res_id, WCHAR *buffer, INT max_chars, INT *req_chars) +static LONG load_mui_string(const WCHAR *file_name, UINT res_id, WCHAR *buffer, INT max_chars, INT *req_chars, DWORD flags) { HMODULE hModule = NULL; WCHAR *string; @@ -3169,7 +3169,16 @@ static LONG load_mui_string(const WCHAR *file_name, UINT res_id, WCHAR *buffer, } /* Else copy over the string, respecting the buffer size. */ - max_chars = (size < max_chars) ? size : (max_chars - 1); + if (size < max_chars) + max_chars = size; + else { + if (flags & REG_MUI_STRING_TRUNCATE) + max_chars--; + else { + result = ERROR_MORE_DATA; + goto cleanup; + } + } if (max_chars >= 0) { memcpy(buffer, string, max_chars * sizeof(WCHAR)); buffer[max_chars] = '\0'; @@ -3195,7 +3204,7 @@ cleanup: * pszBuffer [O] Buffer to store the localized string in. * cbBuffer [I] Size of the destination buffer in bytes. * pcbData [O] Number of bytes written to pszBuffer (optional, may be NULL). - * dwFlags [I] None supported yet. + * dwFlags [I] Truncate output to fit the buffer if REG_MUI_STRING_TRUNCATE. * pszBaseDir [I] Base directory of loading path. If NULL, use the current directory. * * RETURNS @@ -3218,7 +3227,9 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer cbBuffer, pcbData, dwFlags, debugstr_w(pwszBaseDir)); /* Parameter sanity checks. */ - if (!hKey || (!pwszBuffer && cbBuffer) || (cbBuffer % sizeof(WCHAR))) + if (!hKey || (!pwszBuffer && cbBuffer) || (cbBuffer % sizeof(WCHAR)) + || ((dwFlags & REG_MUI_STRING_TRUNCATE) && pcbData) + || (dwFlags & ~REG_MUI_STRING_TRUNCATE)) return ERROR_INVALID_PARAMETER; /* Check for value existence and correctness of its type, allocate a buffer and load it. */ @@ -3293,7 +3304,7 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer /* Load specified string from the file */ reqChars = 0; - result = load_mui_string(pwszTempBuffer, uiStringId, pwszBuffer, cbBuffer/sizeof(WCHAR), &reqChars); + result = load_mui_string(pwszTempBuffer, uiStringId, pwszBuffer, cbBuffer/sizeof(WCHAR), &reqChars, dwFlags); if (pcbData && (result == ERROR_SUCCESS || result == ERROR_MORE_DATA)) *pcbData = reqChars * sizeof(WCHAR); } diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index ab8655a..c178e39 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3902,20 +3902,20 @@ static void test_RegLoadMUIString(void) size = 0xdeadbeef; memset(bufW, 0xff, sizeof(bufW)); ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, sizeof(WCHAR)*2, &size, 0, NULL); - todo_wine ok(ret == ERROR_MORE_DATA, "got %d, expected ERROR_MORE_DATA\n", ret); + ok(ret == ERROR_MORE_DATA, "got %d, expected ERROR_MORE_DATA\n", ret); ok(size == text_size || broken(size == text_size + sizeof(WCHAR) /* vista */), "got %u, expected %u\n", size, text_size); - todo_wine ok(bufW[0] == 0xffff, "got 0x%04x, expected 0xffff\n", bufW[0]); + ok(bufW[0] == 0xffff, "got 0x%04x, expected 0xffff\n", bufW[0]); memset(bufW, 0xff, sizeof(bufW)); ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, sizeof(WCHAR)*2, &size, REG_MUI_STRING_TRUNCATE, NULL); - todo_wine ok(ret == ERROR_INVALID_PARAMETER, "got %d, expected ERROR_INVALID_PARAMETER\n", ret); - todo_wine ok(bufW[0] == 0xffff, "got 0x%04x, expected 0xffff\n", bufW[0]); + ok(ret == ERROR_INVALID_PARAMETER, "got %d, expected ERROR_INVALID_PARAMETER\n", ret); + ok(bufW[0] == 0xffff, "got 0x%04x, expected 0xffff\n", bufW[0]); memset(bufW, 0xff, sizeof(bufW)); ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, sizeof(WCHAR)*2, NULL, 0xdeadbeef, NULL); - todo_wine ok(ret == ERROR_INVALID_PARAMETER, "got %d, expected ERROR_INVALID_PARAMETER\n", ret); - todo_wine ok(bufW[0] == 0xffff, "got 0x%04x, expected 0xffff\n", bufW[0]); + ok(ret == ERROR_INVALID_PARAMETER, "got %d, expected ERROR_INVALID_PARAMETER\n", ret); + ok(bufW[0] == 0xffff, "got 0x%04x, expected 0xffff\n", bufW[0]); memset(bufW, 0xff, sizeof(bufW)); ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, sizeof(WCHAR)*2, NULL, REG_MUI_STRING_TRUNCATE, NULL);

1 0

Alexandre Julliard : makefiles: Add install dependency for PE builtins.
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: wine Branch: master Commit: 0fc2f6384eda4ff21fac6a5e9b41d76455a1de1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fc2f6384eda4ff21fac6a5e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 18:01:19 2019 +0200 makefiles: Add install dependency for PE builtins. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/makedep.c b/tools/makedep.c index 23b3389..2c5c503 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2406,6 +2406,7 @@ static void output_install_rules( struct makefile *make, enum install_rules rule const char *file = files.str[i]; switch (*files.str[i + 1]) { + case 'c': /* cross-compiled program */ case 'd': /* data file */ case 'p': /* program file */ case 's': /* script */

1 0

Nikolay Sivov : kernelbase: Add some registry helpers from shlwapi.
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: wine Branch: master Commit: 110656072c127425f7e5e1733e4b006f7cb8beb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=110656072c127425f7e5e173… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 24 16:05:03 2019 +0300 kernelbase: Add some registry helpers from shlwapi. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/kernelbase.spec | 38 ++-- dlls/kernelbase/registry.c | 477 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 497 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=110656072c127425f7e5…

1 0