November 2020 - Wine-commits

Jacek Caban : kernel32: Allow non-console handles in DuplicateConsoleHandle.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: 1335768f0a0e2e520c786edfddd2895a57bc4dcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=1335768f0a0e2e520c786edf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 11 20:06:39 2020 +0100 kernel32: Allow non-console handles in DuplicateConsoleHandle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 10 +++------- dlls/kernel32/tests/console.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 4b74c1183ca..8d5f8181ffe 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -113,13 +113,9 @@ BOOL WINAPI VerifyConsoleIoHandle(HANDLE handle) HANDLE WINAPI DuplicateConsoleHandle(HANDLE handle, DWORD access, BOOL inherit, DWORD options) { - HANDLE ret; - - if (!is_console_handle(handle) || - !DuplicateHandle(GetCurrentProcess(), wine_server_ptr_handle(console_handle_unmap(handle)), - GetCurrentProcess(), &ret, access, inherit, options)) - return INVALID_HANDLE_VALUE; - return console_handle_map(ret); + HANDLE ret; + return DuplicateHandle(GetCurrentProcess(), handle, GetCurrentProcess(), &ret, + access, inherit, options) ? ret : INVALID_HANDLE_VALUE; } /****************************************************************** diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 4a06a2b396e..69005bab5f1 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1506,6 +1506,34 @@ static void test_GetSetStdHandle(void) ok(error == 0xdeadbeef, "wrong GetLastError() %d\n", error); } +static void test_DuplicateConsoleHandle(void) +{ + HANDLE handle, event; + BOOL ret; + + if (skip_nt) return; + + event = CreateEventW(NULL, TRUE, FALSE, NULL); + + /* duplicate an event handle with DuplicateConsoleHandle */ + handle = DuplicateConsoleHandle(event, 0, FALSE, DUPLICATE_SAME_ACCESS); + ok(handle != NULL, "DuplicateConsoleHandle failed: %u\n", GetLastError()); + + ret = SetEvent(handle); + ok(ret, "SetEvent failed: %u\n", GetLastError()); + + ret = CloseConsoleHandle(handle); + todo_wine + ok(ret, "CloseConsoleHandle failed: %u\n", GetLastError()); + ret = CloseConsoleHandle(event); + todo_wine + ok(ret, "CloseConsoleHandle failed: %u\n", GetLastError()); + + handle = DuplicateConsoleHandle((HANDLE)0xdeadbeef, 0, FALSE, DUPLICATE_SAME_ACCESS); + ok(handle == INVALID_HANDLE_VALUE, "DuplicateConsoleHandle failed: %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "last error = %u\n", GetLastError()); +} + static void test_GetNumberOfConsoleInputEvents(HANDLE input_handle) { DWORD count; @@ -4387,6 +4415,7 @@ START_TEST(console) test_OpenCON(); test_VerifyConsoleIoHandle(hConOut); test_GetSetStdHandle(); + test_DuplicateConsoleHandle(); test_GetNumberOfConsoleInputEvents(hConIn); test_WriteConsoleInputA(hConIn); test_WriteConsoleInputW(hConIn);

1 0

Jacek Caban : kernel32: Allow non-console handles in CloseConsoleHandle.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: 5386b7e4c83f6e3a45409c21261622ace8451c62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5386b7e4c83f6e3a45409c21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 11 20:06:48 2020 +0100 kernel32: Allow non-console handles in CloseConsoleHandle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 7 +------ dlls/kernel32/kernel_private.h | 8 -------- dlls/kernel32/tests/console.c | 2 -- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 8d5f8181ffe..d55c589eaf7 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -125,12 +125,7 @@ HANDLE WINAPI DuplicateConsoleHandle(HANDLE handle, DWORD access, BOOL inherit, */ BOOL WINAPI CloseConsoleHandle(HANDLE handle) { - if (!is_console_handle(handle)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - return CloseHandle(wine_server_ptr_handle(console_handle_unmap(handle))); + return CloseHandle(handle); } /****************************************************************** diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index fe19e2ed5cb..fa1dd79d0c0 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -21,8 +21,6 @@ #ifndef __WINE_KERNEL_PRIVATE_H #define __WINE_KERNEL_PRIVATE_H -#include "wine/server.h" - NTSTATUS WINAPI BaseGetNamedObjectDirectory( HANDLE *dir ); BOOL CONSOLE_Init(RTL_USER_PROCESS_PARAMETERS *params) DECLSPEC_HIDDEN; @@ -37,12 +35,6 @@ static inline HANDLE console_handle_map(HANDLE h) return h != INVALID_HANDLE_VALUE ? (HANDLE)((UINT_PTR)h ^ 3) : INVALID_HANDLE_VALUE; } -/* map a kernel32 console handle onto a real wineserver handle */ -static inline obj_handle_t console_handle_unmap(HANDLE h) -{ - return wine_server_obj_handle( h != INVALID_HANDLE_VALUE ? (HANDLE)((UINT_PTR)h ^ 3) : INVALID_HANDLE_VALUE ); -} - static inline BOOL set_ntstatus( NTSTATUS status ) { if (status) SetLastError( RtlNtStatusToDosError( status )); diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 69005bab5f1..13e17e14e4c 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1523,10 +1523,8 @@ static void test_DuplicateConsoleHandle(void) ok(ret, "SetEvent failed: %u\n", GetLastError()); ret = CloseConsoleHandle(handle); - todo_wine ok(ret, "CloseConsoleHandle failed: %u\n", GetLastError()); ret = CloseConsoleHandle(event); - todo_wine ok(ret, "CloseConsoleHandle failed: %u\n", GetLastError()); handle = DuplicateConsoleHandle((HANDLE)0xdeadbeef, 0, FALSE, DUPLICATE_SAME_ACCESS);

1 0

Jacek Caban : conhost/tests: Initialize whole OVERLAPPED struct in fetch_console_output.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: 817ff31811dda0b4cadc9cc4f0c36b5cd5776917 URL: https://source.winehq.org/git/wine.git/?a=commit;h=817ff31811dda0b4cadc9cc4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 11 20:07:06 2020 +0100 conhost/tests: Initialize whole OVERLAPPED struct in fetch_console_output. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/tests/tty.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 1e2f9550727..4eb85a17a01 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -37,6 +37,7 @@ static void fetch_console_output_(unsigned int line) if (console_output_count == sizeof(console_output)) return; + memset(&o, 0, sizeof(o)); o.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); ret = ReadFile(console_pipe, console_output + console_output_count, sizeof(console_output) - console_output_count, NULL, &o);

1 0

Jacek Caban : conhost: Use console debug channel.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: 1f15ddce9c7d0ee71521d7b98c698488b76d3f01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f15ddce9c7d0ee71521d7b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 11 20:07:13 2020 +0100 conhost: Use console debug channel. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 2 +- programs/conhost/window.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 6985a9ca0b0..c7562974222 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -26,7 +26,7 @@ #include "wine/server.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(conhost); +WINE_DEFAULT_DEBUG_CHANNEL(console); static const char_info_t empty_char_info = { ' ', 0x0007 }; /* white on black space */ diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 5ec435a33ed..3d83632fabf 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -27,7 +27,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(conhost); +WINE_DEFAULT_DEBUG_CHANNEL(console); #define WM_UPDATE_CONFIG (WM_USER + 1)

1 0

Alexandre Julliard : setupapi: Add a few more dirids.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: 354aabd77e4ff3747446b2402de89d804001bd3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=354aabd77e4ff3747446b240… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 11:02:34 2020 +0100 setupapi: Add a few more dirids. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/dirid.c | 50 ++++++++++++++++++++++---------------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/dlls/setupapi/dirid.c b/dlls/setupapi/dirid.c index d1bffe9d01e..ec263d9f181 100644 --- a/dlls/setupapi/dirid.c +++ b/dlls/setupapi/dirid.c @@ -56,14 +56,13 @@ static const WCHAR *csidl_dirids[MAX_CSIDL_DIRID-MIN_CSIDL_DIRID+1]; static const WCHAR *get_unknown_dirid(void) { static WCHAR *unknown_dirid; - static const WCHAR unknown_str[] = {'\\','u','n','k','n','o','w','n',0}; if (!unknown_dirid) { - UINT len = GetSystemDirectoryW( NULL, 0 ) + lstrlenW(unknown_str); + UINT len = GetSystemDirectoryW( NULL, 0 ) + lstrlenW(L"\\unknown"); if (!(unknown_dirid = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return NULL; GetSystemDirectoryW( unknown_dirid, len ); - lstrcatW( unknown_dirid, unknown_str ); + lstrcatW( unknown_dirid, L"\\unknown" ); } return unknown_dirid; } @@ -73,17 +72,6 @@ static const WCHAR *get_csidl_dir(DWORD csidl); /* create the string for a system dirid */ static const WCHAR *create_system_dirid( int dirid ) { - static const WCHAR Null[] = {0}; - static const WCHAR C_Root[] = {'C',':','\\',0}; - static const WCHAR Drivers[] = {'\\','d','r','i','v','e','r','s',0}; - static const WCHAR Inf[] = {'\\','i','n','f',0}; - static const WCHAR Help[] = {'\\','h','e','l','p',0}; - static const WCHAR Fonts[] = {'\\','f','o','n','t','s',0}; - static const WCHAR Viewers[] = {'\\','v','i','e','w','e','r','s',0}; - static const WCHAR System[] = {'\\','s','y','s','t','e','m',0}; - static const WCHAR Spool[] = {'\\','s','p','o','o','l',0}; - static const WCHAR UserProfile[] = {'U','S','E','R','P','R','O','F','I','L','E',0}; - WCHAR buffer[MAX_PATH+32], *str; int len; DWORD needed; @@ -91,7 +79,7 @@ static const WCHAR *create_system_dirid( int dirid ) switch(dirid) { case DIRID_NULL: - return Null; + return L""; case DIRID_WINDOWS: GetWindowsDirectoryW( buffer, MAX_PATH ); break; @@ -100,45 +88,52 @@ static const WCHAR *create_system_dirid( int dirid ) break; case DIRID_DRIVERS: GetSystemDirectoryW( buffer, MAX_PATH ); - lstrcatW( buffer, Drivers ); + lstrcatW( buffer, L"\\drivers" ); break; case DIRID_INF: GetWindowsDirectoryW( buffer, MAX_PATH ); - lstrcatW( buffer, Inf ); + lstrcatW( buffer, L"\\inf" ); break; case DIRID_HELP: GetWindowsDirectoryW( buffer, MAX_PATH ); - lstrcatW( buffer, Help ); + lstrcatW( buffer, L"\\help" ); break; case DIRID_FONTS: GetWindowsDirectoryW( buffer, MAX_PATH ); - lstrcatW( buffer, Fonts ); + lstrcatW( buffer, L"\\fonts" ); break; case DIRID_VIEWERS: GetSystemDirectoryW( buffer, MAX_PATH ); - lstrcatW( buffer, Viewers ); + lstrcatW( buffer, L"\\viewers" ); + break; + case DIRID_COLOR: + GetSystemDirectoryW( buffer, MAX_PATH ); + lstrcatW( buffer, L"\\spool\\drivers\\color" ); break; case DIRID_APPS: - return C_Root; /* FIXME */ + return L"C:\\"; /* FIXME */ case DIRID_SHARED: GetWindowsDirectoryW( buffer, MAX_PATH ); break; case DIRID_BOOT: - return C_Root; /* FIXME */ + return L"C:\\"; /* FIXME */ case DIRID_SYSTEM16: GetWindowsDirectoryW( buffer, MAX_PATH ); - lstrcatW( buffer, System ); + lstrcatW( buffer, L"\\system" ); break; case DIRID_SPOOL: - case DIRID_SPOOLDRIVERS: /* FIXME */ GetWindowsDirectoryW( buffer, MAX_PATH ); - lstrcatW( buffer, Spool ); + lstrcatW( buffer, L"\\spool" ); + break; + case DIRID_SPOOLDRIVERS: + GetWindowsDirectoryW( buffer, MAX_PATH ); + lstrcatW( buffer, L"\\spool\\drivers" ); break; case DIRID_USERPROFILE: - if (GetEnvironmentVariableW( UserProfile, buffer, MAX_PATH )) break; + if (GetEnvironmentVariableW( L"USERPROFILE", buffer, MAX_PATH )) break; return get_csidl_dir(CSIDL_PROFILE); case DIRID_LOADER: - return C_Root; /* FIXME */ + return L"C:\\"; /* FIXME */ case DIRID_PRINTPROCESSOR: if (!GetPrintProcessorDirectoryW(NULL, NULL, 1, (LPBYTE)buffer, sizeof(buffer), &needed)) { @@ -146,7 +141,6 @@ static const WCHAR *create_system_dirid( int dirid ) return get_unknown_dirid(); } break; - case DIRID_COLOR: /* FIXME */ default: FIXME( "unknown dirid %d\n", dirid ); return get_unknown_dirid();

1 0

Alexandre Julliard : setupapi: Add an extension to support file copies from module resources.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: 5696c3c23d5be9f5ce57ef7e361d88722120da09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5696c3c23d5be9f5ce57ef7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 11:03:38 2020 +0100 setupapi: Add an extension to support file copies from module resources. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 65 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index eebfe971546..7ed66c298d3 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" @@ -151,8 +152,11 @@ static BOOL build_filepathsW( const struct file_op *op, FILEPATHS_W *paths ) unsigned int src_len = 1, dst_len = 1; WCHAR *source = (PWSTR)paths->Source, *target = (PWSTR)paths->Target; - if (op->media) src_len += lstrlenW(op->media->root) + 1; - if (op->src_path) src_len += lstrlenW(op->src_path) + 1; + if (op->src_file[0] != '@') + { + if (op->media) src_len += lstrlenW(op->media->root) + 1; + if (op->src_path) src_len += lstrlenW(op->src_path) + 1; + } if (op->src_file) src_len += lstrlenW(op->src_file) + 1; if (op->dst_path) dst_len += lstrlenW(op->dst_path) + 1; if (op->dst_file) dst_len += lstrlenW(op->dst_file) + 1; @@ -170,7 +174,10 @@ static BOOL build_filepathsW( const struct file_op *op, FILEPATHS_W *paths ) paths->Target = target = HeapAlloc( GetProcessHeap(), 0, dst_len ); } if (!source || !target) return FALSE; - concat_W( source, op->media ? op->media->root : NULL, op->src_path, op->src_file ); + if (op->src_file[0] != '@') + concat_W( source, op->media ? op->media->root : NULL, op->src_path, op->src_file ); + else + lstrcpyW( source, op->src_file ); concat_W( target, NULL, op->dst_path, op->dst_file ); paths->Win32Error = 0; paths->Flags = 0; @@ -1002,6 +1009,59 @@ static BOOL create_full_pathW(const WCHAR *path) return ret; } +static BOOL copy_file( LPCWSTR source, LPCWSTR target ) +{ + WCHAR module[MAX_PATH]; + HMODULE mod = NULL; + HRSRC res; + HGLOBAL data; + HANDLE handle; + DWORD size, written; + BOOL ret = FALSE; + int id = 0; + const WCHAR *p; + + TRACE( "%s -> %s\n", debugstr_w(source), debugstr_w(target) ); + + if (source[0] != '@') return CopyFileW( source, target, FALSE ); + + /* Wine extension: when the source of a file copy is in the format "@file.dll,-123" + * the source data is extracted from the corresponding file.dll resource */ + + source++; /* skip '@' */ + p = wcschr( source, ',' ); + if (!p || p - source >= MAX_PATH) + { + SetLastError( ERROR_RESOURCE_DATA_NOT_FOUND ); + return FALSE; + } + memcpy( module, source, (p - source) * sizeof(WCHAR) ); + module[p - source] = 0; + id = -wcstol( p + 1, NULL, 10 ); + if (id <= 0 || id > 0xffff || + !(mod = LoadLibraryExW( module, 0, LOAD_LIBRARY_AS_DATAFILE )) || + !(res = FindResourceW( mod, MAKEINTRESOURCEW(id), L"WINE_DATA_FILE" )) || + !(data = LoadResource( mod, res ))) + { + WARN( "failed to save %s #%d to %s\n", debugstr_w(module), -id, debugstr_w(target) ); + if (mod) FreeLibrary( mod ); + SetLastError( ERROR_RESOURCE_DATA_NOT_FOUND ); + return FALSE; + } + size = SizeofResource( mod, res ); + if ((handle = CreateFileW( target, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + CREATE_ALWAYS, 0, 0 )) == INVALID_HANDLE_VALUE) + { + WARN( "failed to save %s #%d to %s\n", debugstr_w(module), -id, debugstr_w(target) ); + if (mod) FreeLibrary( mod ); + return FALSE; + } + ret = WriteFile( handle, LockResource(data), size, &written, NULL ) && written == size; + CloseHandle( handle ); + if (!ret) DeleteFileW( target ); + return ret; +} + static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style, PSP_FILE_CALLBACK_W handler, PVOID context ) { @@ -1124,7 +1184,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style, if (docopy) { - rc = CopyFileW(source,target,FALSE); + rc = copy_file( source, target ); if (!rc && GetLastError() == ERROR_SHARING_VIOLATION && (style & SP_COPY_IN_USE_NEEDS_REBOOT)) { @@ -1134,7 +1194,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style, if (GetTempPathW(MAX_PATH, temp) && GetTempFileNameW(temp, L"SET", 0, temp_file)) { - rc = CopyFileW(source, temp_file, FALSE); + rc = copy_file( source, temp_file ); if (rc) rc = MoveFileExW(temp_file, target, MOVEFILE_DELAY_UNTIL_REBOOT); else

1 0

Alexandre Julliard : winebus.sys: Move winebus.inf into the module resources.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: 4650dff5c4a3998181e4516e1cc987852b0c3c57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4650dff5c4a3998181e4516e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 11:04:06 2020 +0100 winebus.sys: Move winebus.inf into the module resources. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/Makefile.in | 2 ++ .../winebus.inf.in => dlls/winebus.sys/winebus.inf | 0 dlls/winebus.sys/winebus.rc | 20 ++++++++++++++++++++ loader/Makefile.in | 1 - loader/wine.inf.in | 2 +- tools/make_makefiles | 10 ++-------- 6 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/winebus.sys/Makefile.in b/dlls/winebus.sys/Makefile.in index 3bdc1a5d58a..9011bbb6075 100644 --- a/dlls/winebus.sys/Makefile.in +++ b/dlls/winebus.sys/Makefile.in @@ -9,3 +9,5 @@ C_SRCS = \ bus_sdl.c \ bus_udev.c \ main.c + +RC_SRCS = winebus.rc diff --git a/loader/winebus.inf.in b/dlls/winebus.sys/winebus.inf similarity index 100% rename from loader/winebus.inf.in rename to dlls/winebus.sys/winebus.inf diff --git a/dlls/winebus.sys/winebus.rc b/dlls/winebus.sys/winebus.rc new file mode 100644 index 00000000000..4af55fb6f40 --- /dev/null +++ b/dlls/winebus.sys/winebus.rc @@ -0,0 +1,20 @@ +/* + * Copyright 2020 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: winebus.inf */ +1 WINE_DATA_FILE winebus.inf diff --git a/loader/Makefile.in b/loader/Makefile.in index e8c271f15d3..83aefa00861 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -9,7 +9,6 @@ SOURCES = \ wine.man.in \ wine.pl.UTF-8.man.in \ wine_info.plist.in \ - winebus.inf.in \ winehid.inf.in \ wineusb.inf.in diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 15f0634ca5c..e593117c83d 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -4059,7 +4059,7 @@ HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-SpiderSolitaire-EnableGa HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame",0x10001,0x00000001 [InfFiles] -winebus.inf +winebus.inf,"@winebus.sys,-1" winehid.inf wineusb.inf diff --git a/tools/make_makefiles b/tools/make_makefiles index a92987c2ab5..2d3c14cb2ec 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -73,7 +73,6 @@ my @source_vars = ( ); my (@makefiles, %makefiles); -my @inf_files; my @nls_files; sub dirname($) @@ -382,10 +381,6 @@ sub assign_sources_to_makefiles(@) { push @{${$make}{"=MANPAGES"}}, $name; } - elsif ($name =~ /\.inf\.in$/) - { - push @inf_files, $name unless $name eq "wine.inf.in"; - } elsif ($name =~ /\.in$/) { push @{${$make}{"=IN_SRCS"}}, $name; @@ -492,11 +487,10 @@ sub update_makefiles(@) sub update_wine_inf() { my @lines; - push @lines, "[InfFiles]", sort grep { s/\.in$//; } @inf_files; - push @lines, "\n[NlsFiles]", sort grep(!/^sort/, @nls_files); + push @lines, "[NlsFiles]", sort grep(!/^sort/, @nls_files); push @lines, "\n[SortFiles]", sort grep(/^sort/, @nls_files); push @lines, "\n[WineSourceDirs]\n"; - replace_in_file "loader/wine.inf.in", '^\[InfFiles\]', '^\[WineSourceDirs\]', join( "\n", @lines ); + replace_in_file "loader/wine.inf.in", '^\[NlsFiles\]', '^\[WineSourceDirs\]', join( "\n", @lines ); } my $git_dir = $ENV{GIT_DIR} || ".git";

1 0

Alexandre Julliard : winehid.sys: Move winehid.inf into the module resources.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: 6aa7704cf66e677a5b1a15bfc2335c8fc29db916 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6aa7704cf66e677a5b1a15bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 11:04:25 2020 +0100 winehid.sys: Move winehid.inf into the module resources. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winehid.sys/Makefile.in | 2 ++ .../winehid.inf.in => dlls/winehid.sys/winehid.inf | 0 dlls/winehid.sys/winehid.rc | 20 ++++++++++++++++++++ loader/Makefile.in | 1 - loader/wine.inf.in | 2 +- 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/winehid.sys/Makefile.in b/dlls/winehid.sys/Makefile.in index b2363e75659..f9c7fdbbe38 100644 --- a/dlls/winehid.sys/Makefile.in +++ b/dlls/winehid.sys/Makefile.in @@ -4,3 +4,5 @@ EXTRADLLFLAGS = -mno-cygwin -Wl,--subsystem,native C_SRCS = \ main.c + +RC_SRCS = winehid.rc diff --git a/loader/winehid.inf.in b/dlls/winehid.sys/winehid.inf similarity index 100% rename from loader/winehid.inf.in rename to dlls/winehid.sys/winehid.inf diff --git a/dlls/winehid.sys/winehid.rc b/dlls/winehid.sys/winehid.rc new file mode 100644 index 00000000000..a80fad837aa --- /dev/null +++ b/dlls/winehid.sys/winehid.rc @@ -0,0 +1,20 @@ +/* + * Copyright 2020 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: winehid.inf */ +1 WINE_DATA_FILE winehid.inf diff --git a/loader/Makefile.in b/loader/Makefile.in index 83aefa00861..99d4a8349e8 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -9,7 +9,6 @@ SOURCES = \ wine.man.in \ wine.pl.UTF-8.man.in \ wine_info.plist.in \ - winehid.inf.in \ wineusb.inf.in PROGRAMS = $(WINELOADER_PROGRAMS) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index e593117c83d..c273a2f2821 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -4060,7 +4060,7 @@ HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame" [InfFiles] winebus.inf,"@winebus.sys,-1" -winehid.inf +winehid.inf,"@winehid.sys,-1" wineusb.inf [NlsFiles]

1 0

Alexandre Julliard : wineusb.sys: Move wineusb.inf into the module resources.
by Alexandre Julliard 11 Nov '20

11 Nov '20

Module: wine Branch: master Commit: 7caa127746fd880a263715879c9931fa67053fe0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7caa127746fd880a26371587… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 11 11:04:40 2020 +0100 wineusb.sys: Move wineusb.inf into the module resources. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/Makefile.in | 2 ++ .../wineusb.inf.in => dlls/wineusb.sys/wineusb.inf | 0 dlls/wineusb.sys/wineusb.rc | 20 ++++++++++++++++++++ loader/Makefile.in | 3 +-- loader/wine.inf.in | 2 +- 5 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/wineusb.sys/Makefile.in b/dlls/wineusb.sys/Makefile.in index bac79f668e8..12441435eeb 100644 --- a/dlls/wineusb.sys/Makefile.in +++ b/dlls/wineusb.sys/Makefile.in @@ -6,3 +6,5 @@ EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ wineusb.c + +RC_SRCS = wineusb.rc diff --git a/loader/wineusb.inf.in b/dlls/wineusb.sys/wineusb.inf similarity index 100% rename from loader/wineusb.inf.in rename to dlls/wineusb.sys/wineusb.inf diff --git a/dlls/wineusb.sys/wineusb.rc b/dlls/wineusb.sys/wineusb.rc new file mode 100644 index 00000000000..f70eb0c6926 --- /dev/null +++ b/dlls/wineusb.sys/wineusb.rc @@ -0,0 +1,20 @@ +/* + * Copyright 2020 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: wineusb.inf */ +1 WINE_DATA_FILE wineusb.inf diff --git a/loader/Makefile.in b/loader/Makefile.in index 99d4a8349e8..7302c231915 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -8,8 +8,7 @@ SOURCES = \ wine.inf.in \ wine.man.in \ wine.pl.UTF-8.man.in \ - wine_info.plist.in \ - wineusb.inf.in + wine_info.plist.in PROGRAMS = $(WINELOADER_PROGRAMS) INSTALL_LIB = $(WINELOADER_PROGRAMS) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index c273a2f2821..da21245954e 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -4061,7 +4061,7 @@ HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame" [InfFiles] winebus.inf,"@winebus.sys,-1" winehid.inf,"@winehid.sys,-1" -wineusb.inf +wineusb.inf,"@wineusb.sys,-1" [NlsFiles] c_037.nls

1 0

Rémi Bernon : bcrypt: Implement 3DES cipher support.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 6b569a451f1259384d68ba882e536643c834445c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b569a451f1259384d68ba88… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 10 14:42:27 2020 +0100 bcrypt: Implement 3DES cipher support. This is used by CoD: WWII multiplayer mode to login to its servers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 1 + dlls/bcrypt/bcrypt_main.c | 65 +++++++++++++++++++++++++++++++++++++++++++ dlls/bcrypt/gnutls.c | 13 +++++++++ dlls/bcrypt/tests/bcrypt.c | 62 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 141 insertions(+) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index 463672db470..d5a54aad92b 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -113,6 +113,7 @@ struct object enum alg_id { /* cipher */ + ALG_ID_3DES, ALG_ID_AES, /* hash */ diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 85d06f6001e..380d9105e48 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -101,6 +101,7 @@ static const struct } builtin_algorithms[] = { + { BCRYPT_3DES_ALGORITHM, BCRYPT_CIPHER_INTERFACE, 522, 0, 0 }, { BCRYPT_AES_ALGORITHM, BCRYPT_CIPHER_INTERFACE, 654, 0, 0 }, { BCRYPT_SHA256_ALGORITHM, BCRYPT_HASH_INTERFACE, 286, 32, 512 }, { BCRYPT_SHA384_ALGORITHM, BCRYPT_HASH_INTERFACE, 382, 48, 1024 }, @@ -426,6 +427,7 @@ struct hash struct hash_impl inner; }; +#define BLOCK_LENGTH_3DES 8 #define BLOCK_LENGTH_AES 16 static NTSTATUS generic_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) @@ -467,6 +469,46 @@ static NTSTATUS generic_alg_property( enum alg_id id, const WCHAR *prop, UCHAR * return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS get_3des_property( enum mode_id mode, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) +{ + if (!wcscmp( prop, BCRYPT_BLOCK_LENGTH )) + { + *ret_size = sizeof(ULONG); + if (size < sizeof(ULONG)) return STATUS_BUFFER_TOO_SMALL; + if (buf) *(ULONG *)buf = BLOCK_LENGTH_3DES; + return STATUS_SUCCESS; + } + if (!wcscmp( prop, BCRYPT_CHAINING_MODE )) + { + const WCHAR *str; + switch (mode) + { + case MODE_ID_CBC: str = BCRYPT_CHAIN_MODE_CBC; break; + default: return STATUS_NOT_IMPLEMENTED; + } + + *ret_size = 64; + if (size < *ret_size) return STATUS_BUFFER_TOO_SMALL; + memcpy( buf, str, (lstrlenW(str) + 1) * sizeof(WCHAR) ); + return STATUS_SUCCESS; + } + if (!wcscmp( prop, BCRYPT_KEY_LENGTHS )) + { + BCRYPT_KEY_LENGTHS_STRUCT *key_lengths = (void *)buf; + *ret_size = sizeof(*key_lengths); + if (key_lengths && size < *ret_size) return STATUS_BUFFER_TOO_SMALL; + if (key_lengths) + { + key_lengths->dwMinLength = 192; + key_lengths->dwMaxLength = 192; + key_lengths->dwIncrement = 0; + } + return STATUS_SUCCESS; + } + FIXME( "unsupported property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS get_aes_property( enum mode_id mode, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) { if (!wcscmp( prop, BCRYPT_BLOCK_LENGTH )) @@ -556,6 +598,9 @@ static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop switch (alg->id) { + case ALG_ID_3DES: + return get_3des_property( alg->mode, prop, buf, size, ret_size ); + case ALG_ID_AES: return get_aes_property( alg->mode, prop, buf, size, ret_size ); @@ -577,6 +622,23 @@ static NTSTATUS set_alg_property( struct algorithm *alg, const WCHAR *prop, UCHA { switch (alg->id) { + case ALG_ID_3DES: + if (!wcscmp( prop, BCRYPT_CHAINING_MODE )) + { + if (!wcscmp( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC )) + { + alg->mode = MODE_ID_CBC; + return STATUS_SUCCESS; + } + else + { + FIXME( "unsupported mode %s\n", debugstr_w((WCHAR *)value) ); + return STATUS_NOT_SUPPORTED; + } + } + FIXME( "unsupported 3des algorithm property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; + case ALG_ID_AES: if (!wcscmp( prop, BCRYPT_CHAINING_MODE )) { @@ -624,6 +686,9 @@ static NTSTATUS get_key_property( const struct key *key, const WCHAR *prop, UCHA { switch (key->alg_id) { + case ALG_ID_3DES: + return get_3des_property( key->u.s.mode, prop, buf, size, ret_size ); + case ALG_ID_AES: if (!wcscmp( prop, BCRYPT_AUTH_TAG_LENGTH )) return STATUS_NOT_SUPPORTED; return get_aes_property( key->u.s.mode, prop, buf, size, ret_size ); diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 5ed51e8704c..e85085499ca 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -491,6 +491,7 @@ static NTSTATUS CDECL key_symmetric_init( struct key *key ) switch (key->alg_id) { + case ALG_ID_3DES: case ALG_ID_AES: return STATUS_SUCCESS; @@ -504,6 +505,18 @@ static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) { switch (key->alg_id) { + case ALG_ID_3DES: + WARN( "handle block size\n" ); + switch (key->u.s.mode) + { + case MODE_ID_CBC: + return GNUTLS_CIPHER_3DES_CBC; + default: + break; + } + FIXME( "3DES mode %u with key length %u not supported\n", key->u.s.mode, key->u.s.secret_len ); + return GNUTLS_CIPHER_UNKNOWN; + case ALG_ID_AES: WARN( "handle block size\n" ); switch (key->u.s.mode) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 0ae4b5dad53..456727d04a9 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -639,6 +639,67 @@ static void test_aes(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } +static void test_3des(void) +{ + BCRYPT_KEY_LENGTHS_STRUCT key_lengths; + BCRYPT_ALG_HANDLE alg; + ULONG size, len; + UCHAR mode[64]; + NTSTATUS ret; + + alg = NULL; + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_3DES_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(alg != NULL, "alg not set\n"); + + len = size = 0; + ret = pBCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(len, "expected non-zero len\n"); + ok(size == sizeof(len), "got %u\n", size); + + len = size = 0; + ret = pBCryptGetProperty(alg, BCRYPT_BLOCK_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(len == 8, "got %u\n", len); + ok(size == sizeof(len), "got %u\n", size); + + size = 0; + ret = pBCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, 0, &size, 0); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 64, "got %u\n", size); + + size = 0; + ret = pBCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode) - 1, &size, 0); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 64, "got %u\n", size); + + size = 0; + memset(mode, 0, sizeof(mode)); + ret = pBCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_CBC), "got %s\n", wine_dbgstr_w((const WCHAR *)mode)); + ok(size == 64, "got %u\n", size); + + size = 0; + memset(&key_lengths, 0, sizeof(key_lengths)); + ret = pBCryptGetProperty(alg, BCRYPT_KEY_LENGTHS, (UCHAR*)&key_lengths, sizeof(key_lengths), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == sizeof(key_lengths), "got %u\n", size); + ok(key_lengths.dwMinLength == 192, "Expected 192, got %d\n", key_lengths.dwMinLength); + ok(key_lengths.dwMaxLength == 192, "Expected 192, got %d\n", key_lengths.dwMaxLength); + ok(key_lengths.dwIncrement == 0, "Expected 0, got %d\n", key_lengths.dwIncrement); + + memcpy(mode, BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM)); + ret = pBCryptSetProperty(alg, BCRYPT_CHAINING_MODE, mode, 0, 0); + ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); + + test_alg_name(alg, L"3DES"); + + ret = pBCryptCloseAlgorithmProvider(alg, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); +} + static void test_BCryptGenerateSymmetricKey(void) { static UCHAR secret[] = @@ -2730,6 +2791,7 @@ START_TEST(bcrypt) test_BcryptHash(); test_BcryptDeriveKeyPBKDF2(); test_rng(); + test_3des(); test_aes(); test_BCryptGenerateSymmetricKey(); test_BCryptEncrypt();

1 0