February 2019 - Wine-commits

Alexandre Julliard : ntdll: Also create the initial process parameters with RtlCreateProcessParametersEx ().
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: wine Branch: master Commit: 50f0ed75efc16d4fd3f0e786242829808407fce0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50f0ed75efc16d4fd3f0e786… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 13 12:48:36 2019 +0100 ntdll: Also create the initial process parameters with RtlCreateProcessParametersEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 35 +++++++++++++++++++++++++++++------ dlls/ntdll/thread.c | 23 +---------------------- 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index bf57ab9..d2b40bd 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -22,6 +22,9 @@ #include <assert.h> #include <stdarg.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -34,6 +37,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(environ); +static WCHAR empty[] = {0}; +static const UNICODE_STRING empty_str = { 0, sizeof(empty), empty }; +static const UNICODE_STRING null_str = { 0, 0, NULL }; + /****************************************************************************** * NtQuerySystemEnvironmentValue [NTDLL.@] */ @@ -454,10 +461,6 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu const UNICODE_STRING *RuntimeInfo, ULONG flags ) { - static WCHAR empty[] = {0}; - static const UNICODE_STRING empty_str = { 0, sizeof(empty), empty }; - static const UNICODE_STRING null_str = { 0, 0, NULL }; - UNICODE_STRING curdir; const RTL_USER_PROCESS_PARAMETERS *cur_params; SIZE_T size, env_size = 0; @@ -479,7 +482,7 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu curdir.MaximumLength = MAX_PATH * sizeof(WCHAR); if (!CommandLine) CommandLine = ImagePathName; - if (!Environment) Environment = cur_params->Environment; + if (!Environment && cur_params) Environment = cur_params->Environment; if (!WindowTitle) WindowTitle = &empty_str; if (!Desktop) Desktop = &empty_str; if (!ShellInfo) ShellInfo = &empty_str; @@ -509,7 +512,7 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu params->AllocationSize = size; params->Size = size; params->Flags = PROCESS_PARAMS_FLAG_NORMALIZED; - params->ConsoleFlags = cur_params->ConsoleFlags; + if (cur_params) params->ConsoleFlags = cur_params->ConsoleFlags; /* all other fields are zero */ ptr = params + 1; @@ -584,6 +587,26 @@ void init_user_process_params( SIZE_T data_size ) RTL_USER_PROCESS_PARAMETERS *params = NULL; UNICODE_STRING curdir, dllpath, imagepath, cmdline, title, desktop, shellinfo, runtime; + if (!data_size) + { + if (RtlCreateProcessParametersEx( &params, &null_str, &null_str, &empty_str, &null_str, NULL, + &null_str, &null_str, &null_str, &null_str, + PROCESS_PARAMS_FLAG_NORMALIZED )) + return; + + NtCurrentTeb()->Peb->ProcessParameters = params; + if (isatty(0) || isatty(1) || isatty(2)) + params->ConsoleHandle = (HANDLE)2; /* see kernel32/kernel_private.h */ + if (!isatty(0)) + wine_server_fd_to_handle( 0, GENERIC_READ|SYNCHRONIZE, OBJ_INHERIT, &params->hStdInput ); + if (!isatty(1)) + wine_server_fd_to_handle( 1, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params->hStdOutput ); + if (!isatty(2)) + wine_server_fd_to_handle( 2, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params->hStdError ); + params->wShowWindow = 1; /* SW_SHOWNORMAL */ + return; + } + if (!(info = RtlAllocateHeap( GetProcessHeap(), 0, data_size ))) return; SERVER_START_REQ( get_startup_info ) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 8dc903a..9f4a08f 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -67,8 +67,6 @@ struct startup_info static PEB *peb; static PEB_LDR_DATA ldr; -static RTL_USER_PROCESS_PARAMETERS params; /* default parameters if no parent */ -static WCHAR current_dir[MAX_PATH]; static RTL_BITMAP tls_bitmap; static RTL_BITMAP tls_expansion_bitmap; static RTL_BITMAP fls_bitmap; @@ -192,7 +190,6 @@ void thread_init(void) peb = addr; peb->FastPebLock = &peb_lock; - peb->ProcessParameters = &params; peb->TlsBitmap = &tls_bitmap; peb->TlsExpansionBitmap = &tls_expansion_bitmap; peb->FlsBitmap = &fls_bitmap; @@ -201,9 +198,6 @@ void thread_init(void) peb->OSMinorVersion = 1; peb->OSBuildNumber = 0xA28; peb->OSPlatformId = VER_PLATFORM_WIN32_NT; - params.CurrentDirectory.DosPath.Buffer = current_dir; - params.CurrentDirectory.DosPath.MaximumLength = sizeof(current_dir); - params.wShowWindow = 1; /* SW_SHOWNORMAL */ ldr.Length = sizeof(ldr); ldr.Initialized = TRUE; RtlInitializeBitMap( &tls_bitmap, peb->TlsBitmapBits, sizeof(peb->TlsBitmapBits) * 8 ); @@ -257,22 +251,7 @@ void thread_init(void) exit(1); } - /* allocate user parameters */ - if (info_size) - { - init_user_process_params( info_size ); - } - else - { - if (isatty(0) || isatty(1) || isatty(2)) - params.ConsoleHandle = (HANDLE)2; /* see kernel32/kernel_private.h */ - if (!isatty(0)) - wine_server_fd_to_handle( 0, GENERIC_READ|SYNCHRONIZE, OBJ_INHERIT, &params.hStdInput ); - if (!isatty(1)) - wine_server_fd_to_handle( 1, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params.hStdOutput ); - if (!isatty(2)) - wine_server_fd_to_handle( 2, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params.hStdError ); - } + init_user_process_params( info_size ); /* initialize time values in user_shared_data */ NtQuerySystemTime( &now );

1 0

Alexandre Julliard : ntdll: Recreate the process parameters structure once everything has been initialized.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: wine Branch: master Commit: a95d7f6c4fc17d5bb3b83ef6c7e307b1ce06d554 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a95d7f6c4fc17d5bb3b83ef6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 13 14:39:11 2019 +0100 ntdll: Recreate the process parameters structure once everything has been initialized. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/loader.c | 4 +--- dlls/ntdll/ntdll_misc.h | 1 + 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index d2b40bd..367d083 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -669,3 +669,44 @@ void init_user_process_params( SIZE_T data_size ) done: RtlFreeHeap( GetProcessHeap(), 0, info ); } + + +/*********************************************************************** + * update_user_process_params + * + * Rebuild the RTL_USER_PROCESS_PARAMETERS structure once we have initialized all the fields. + */ +void update_user_process_params( const UNICODE_STRING *image ) +{ + RTL_USER_PROCESS_PARAMETERS *params, *cur_params = NtCurrentTeb()->Peb->ProcessParameters; + UNICODE_STRING title = cur_params->WindowTitle; + WCHAR *env = cur_params->Environment; + + cur_params->Environment = NULL; /* avoid copying it */ + if (!title.Buffer) title = *image; + if (RtlCreateProcessParametersEx( &params, image, &cur_params->DllPath, NULL, + &cur_params->CommandLine, NULL, &title, &cur_params->Desktop, + &cur_params->ShellInfo, &cur_params->RuntimeInfo, + PROCESS_PARAMS_FLAG_NORMALIZED )) + return; + + params->DebugFlags = cur_params->DebugFlags; + params->ConsoleHandle = cur_params->ConsoleHandle; + params->ConsoleFlags = cur_params->ConsoleFlags; + params->hStdInput = cur_params->hStdInput; + params->hStdOutput = cur_params->hStdOutput; + params->hStdError = cur_params->hStdError; + params->dwX = cur_params->dwX; + params->dwY = cur_params->dwY; + params->dwXSize = cur_params->dwXSize; + params->dwYSize = cur_params->dwYSize; + params->dwXCountChars = cur_params->dwXCountChars; + params->dwYCountChars = cur_params->dwYCountChars; + params->dwFillAttribute = cur_params->dwFillAttribute; + params->dwFlags = cur_params->dwFlags; + params->wShowWindow = cur_params->wShowWindow; + params->Environment = env; + + RtlFreeHeap( GetProcessHeap(), 0, cur_params ); + NtCurrentTeb()->Peb->ProcessParameters = params; +} diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 56a6c2d..6becb44 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3398,9 +3398,7 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, } peb->LoaderLock = &loader_section; - peb->ProcessParameters->ImagePathName = wm->ldr.FullDllName; - if (!peb->ProcessParameters->WindowTitle.Buffer) - peb->ProcessParameters->WindowTitle = wm->ldr.FullDllName; + update_user_process_params( &wm->ldr.FullDllName ); version_init( wm->ldr.FullDllName.Buffer ); virtual_set_large_address_space(); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index bad7d96..5a93ede 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -81,6 +81,7 @@ extern void virtual_init_threading(void) DECLSPEC_HIDDEN; extern void fill_cpu_info(void) DECLSPEC_HIDDEN; extern void heap_set_debug_flags( HANDLE handle ) DECLSPEC_HIDDEN; extern void init_user_process_params( SIZE_T data_size ) DECLSPEC_HIDDEN; +extern void update_user_process_params( const UNICODE_STRING *image ) DECLSPEC_HIDDEN; /* server support */ extern timeout_t server_start_time DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll/tests: Add tests for initial process parameters layout.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: wine Branch: master Commit: 12a9b6d4078951f4d0c2473378d6b4531b09106a URL: https://source.winehq.org/git/wine.git/?a=commit;h=12a9b6d4078951f4d0c24733… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 13 16:20:05 2019 +0100 ntdll/tests: Add tests for initial process parameters layout. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/env.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 67 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 0c864fb..4e2ef82 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -37,6 +37,8 @@ static NTSTATUS (WINAPI *pRtlCreateProcessParameters)(RTL_USER_PROCESS_PARAMETER const UNICODE_STRING*, const UNICODE_STRING*); static void (WINAPI *pRtlDestroyProcessParameters)(RTL_USER_PROCESS_PARAMETERS *); +static void *initial_env; + static WCHAR small_env[] = {'f','o','o','=','t','o','t','o',0, 'f','o','=','t','i','t','i',0, 'f','o','o','o','=','t','u','t','u',0, @@ -289,17 +291,21 @@ static WCHAR *get_params_string( RTL_USER_PROCESS_PARAMETERS *params, UNICODE_ST static UINT_PTR check_string_( int line, RTL_USER_PROCESS_PARAMETERS *params, UNICODE_STRING *str, const UNICODE_STRING *expect, UINT_PTR pos ) { - ok_(__FILE__,line)( str->Length == expect->Length, "wrong length %u/%u\n", - str->Length, expect->Length ); - ok_(__FILE__,line)( str->MaximumLength == expect->MaximumLength || - broken( str->MaximumLength == 1 && expect->MaximumLength == 2 ), /* winxp */ - "wrong maxlength %u/%u\n", str->MaximumLength, expect->MaximumLength ); + if (expect) + { + ok_(__FILE__,line)( str->Length == expect->Length, "wrong length %u/%u\n", + str->Length, expect->Length ); + ok_(__FILE__,line)( str->MaximumLength == expect->MaximumLength || + broken( str->MaximumLength == 1 && expect->MaximumLength == 2 ), /* winxp */ + "wrong maxlength %u/%u\n", str->MaximumLength, expect->MaximumLength ); + } if (!str->MaximumLength) { ok_(__FILE__,line)( str->Buffer == NULL, "buffer not null %p\n", str->Buffer ); return pos; } ok_(__FILE__,line)( (UINT_PTR)str->Buffer == ((pos + sizeof(void*) - 1) & ~(sizeof(void *) - 1)) || + (!expect && (UINT_PTR)str->Buffer == pos) || /* initial params are not aligned */ broken( (UINT_PTR)str->Buffer == ((pos + 3) & ~3) ), "wrong buffer %lx/%lx\n", (UINT_PTR)str->Buffer, pos ); if (str->Length < str->MaximumLength) @@ -453,12 +459,68 @@ static void test_process_params(void) } else ok( broken(TRUE), "environment not inside block\n" ); /* <= win2k3 */ pRtlDestroyProcessParameters( params ); + + /* also test the actual parameters of the current process */ + + ok( cur_params->Flags & PROCESS_PARAMS_FLAG_NORMALIZED, "current params not normalized\n" ); + if (VirtualQuery( cur_params, &info, sizeof(info) ) && info.AllocationBase == cur_params) + { + ok( broken(TRUE), "not a heap block %p\n", cur_params ); /* winxp */ + ok( cur_params->AllocationSize == info.RegionSize, + "wrong AllocationSize %x/%lx\n", cur_params->AllocationSize, info.RegionSize ); + } + else + { + size = HeapSize( GetProcessHeap(), 0, cur_params ); + ok( size != ~0UL, "not a heap block %p\n", cur_params ); + ok( cur_params->AllocationSize == cur_params->Size, + "wrong AllocationSize %x/%x\n", cur_params->AllocationSize, cur_params->Size ); + ok( cur_params->Size == size, "wrong Size %x/%lx\n", cur_params->Size, size ); + } + + /* CurrentDirectory points outside the params, and DllPath may be null */ + pos = (UINT_PTR)cur_params->DllPath.Buffer; + if (!pos) pos = (UINT_PTR)cur_params->ImagePathName.Buffer; + pos = check_string( cur_params, &cur_params->DllPath, NULL, pos ); + pos = check_string( cur_params, &cur_params->ImagePathName, NULL, pos ); + pos = check_string( cur_params, &cur_params->CommandLine, NULL, pos ); + pos = check_string( cur_params, &cur_params->WindowTitle, NULL, pos ); + pos = check_string( cur_params, &cur_params->Desktop, NULL, pos ); + pos = check_string( cur_params, &cur_params->ShellInfo, NULL, pos ); + pos = check_string( cur_params, &cur_params->RuntimeInfo, NULL, pos ); + /* environment may follow */ + str = (WCHAR *)pos; + if (pos - (UINT_PTR)cur_params < cur_params->Size) + { + while (*str) str += lstrlenW(str) + 1; + str++; + } + ok( (char *)str == (char *)cur_params + cur_params->Size, + "wrong end ptr %p/%p\n", str, (char *)cur_params + cur_params->Size ); + + /* initial environment is a separate block */ + + ok( (char *)initial_env < (char *)cur_params || (char *)initial_env >= (char *)cur_params + size, + "initial environment inside block %p / %p\n", cur_params, initial_env ); + + if (VirtualQuery( initial_env, &info, sizeof(info) ) && info.AllocationBase == initial_env) + { + todo_wine + ok( broken(TRUE), "env not a heap block %p / %p\n", cur_params, initial_env ); /* winxp */ + } + else + { + size = HeapSize( GetProcessHeap(), 0, initial_env ); + ok( size != ~0UL, "env is not a heap block %p / %p\n", cur_params, initial_env ); + } } START_TEST(env) { HMODULE mod = GetModuleHandleA("ntdll.dll"); + initial_env = NtCurrentTeb()->Peb->ProcessParameters->Environment; + pRtlMultiByteToUnicodeN = (void *)GetProcAddress(mod,"RtlMultiByteToUnicodeN"); pRtlCreateEnvironment = (void*)GetProcAddress(mod, "RtlCreateEnvironment"); pRtlDestroyEnvironment = (void*)GetProcAddress(mod, "RtlDestroyEnvironment");

1 0

Yussur-Mustafa Oraji : httpapi: Add stub for HttpCloseServerSession.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: wine Branch: master Commit: 776e74549da066ff9d35219117d4612808de4cfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=776e74549da066ff9d352191… Author: Yussur-Mustafa Oraji <yussur.oraji(a)hotmail.de> Date: Mon Feb 11 10:07:31 2019 +0000 httpapi: Add stub for HttpCloseServerSession. Signed-off-by: Yussur-Mustafa Oraji <yussur.oraji(a)hotmail.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi.spec | 1 + dlls/httpapi/httpapi_main.c | 9 +++++++++ dlls/httpapi/tests/httpapi.c | 7 +++++++ include/http.h | 1 + 4 files changed, 18 insertions(+) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index cdab28d..1d8fcd8 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -7,6 +7,7 @@ @ stub HttpCreateFilter @ stdcall HttpCreateHttpHandle(ptr long) @ stdcall HttpCreateServerSession(long ptr long) +@ stdcall HttpCloseServerSession(int64) @ stub HttpDeleteConfigGroup @ stdcall HttpDeleteServiceConfiguration(ptr long ptr long ptr) @ stub HttpFilterAccept diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 1b35cd6..3ab0399 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -192,3 +192,12 @@ ULONG WINAPI HttpCreateServerSession( HTTPAPI_VERSION version, HTTP_SERVER_SESSI FIXME( "({%d,%d}, %p, %d): stub!\n", version.HttpApiMajorVersion, version.HttpApiMinorVersion, id, reserved ); return ERROR_ACCESS_DENIED; } + +/*********************************************************************** + * HttpCloseServerSession (HTTPAPI.@) + */ +ULONG WINAPI HttpCloseServerSession( HTTP_SERVER_SESSION_ID id ) +{ + FIXME( "(%s): stub!\n", wine_dbgstr_longlong(id)); + return ERROR_INVALID_PARAMETER; +} diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index 47df226..e143755 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -92,30 +92,37 @@ static void test_HttpCreateServerSession(void) version.HttpApiMajorVersion = 1; version.HttpApiMinorVersion = 0; ret = pHttpCreateServerSession(version, NULL, 0); +todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %u.\n", ret); version.HttpApiMajorVersion = 1; version.HttpApiMinorVersion = 1; ret = pHttpCreateServerSession(version, &session, 0); +todo_wine ok(ret == ERROR_REVISION_MISMATCH, "Unexpected return value %u.\n", ret); version.HttpApiMajorVersion = 3; version.HttpApiMinorVersion = 0; ret = pHttpCreateServerSession(version, &session, 0); +todo_wine ok(ret == ERROR_REVISION_MISMATCH, "Unexpected return value %u.\n", ret); version.HttpApiMajorVersion = 2; version.HttpApiMinorVersion = 0; ret = pHttpCreateServerSession(version, &session, 0); +todo_wine ok(!ret, "Unexpected return value %u.\n", ret); ret = pHttpCloseServerSession(session); +todo_wine ok(!ret, "Unexpected return value %u.\n", ret); version.HttpApiMajorVersion = 1; version.HttpApiMinorVersion = 0; ret = pHttpCreateServerSession(version, &session, 0); +todo_wine ok(!ret, "Unexpected return value %u.\n", ret); ret = pHttpCloseServerSession(session); +todo_wine ok(!ret, "Unexpected return value %u.\n", ret); ret = pHttpCloseServerSession(0xdead); diff --git a/include/http.h b/include/http.h index b8ce811..8f284a8 100644 --- a/include/http.h +++ b/include/http.h @@ -60,6 +60,7 @@ ULONG WINAPI HttpTerminate(ULONG,PVOID); ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID); ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG); ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION,PHTTP_SERVER_SESSION_ID,ULONG); +ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID); ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED); ULONG WINAPI HttpSetServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED);

1 0

Dmitry Timoshkov : wineps.drv: Add stubs for escapes required by Adobe PageMaker.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: wine Branch: master Commit: 7338641e8944403bb39b0cc0b2ad3da3e8e9928b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7338641e8944403bb39b0cc0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 13 11:40:29 2019 +0000 wineps.drv: Add stubs for escapes required by Adobe PageMaker. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/dc.c | 7 ------- dlls/wineps.drv/escape.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 3179c97..82cf200 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -1402,9 +1402,7 @@ static void print_something(HDC hdc) strcpy(buf, "deadbeef"); ret = ExtEscape(hdc, DOWNLOADHEADER, 0, NULL, sizeof(buf), buf ); -todo_wine ok(ret == 1, "DOWNLOADHEADER failed\n"); -todo_wine ok(strcmp(buf, "deadbeef") != 0, "DOWNLOADHEADER failed\n"); strcpy(buf + 2, "\n% ===> after DOWNLOADHEADER <===\n"); @@ -1464,22 +1462,18 @@ static void test_pscript_printer_dc(void) query = DOWNLOADFACE; ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); -todo_wine ok(ret == 1, "DOWNLOADFACE is not supported\n"); query = OPENCHANNEL; ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); -todo_wine ok(ret == 1, "OPENCHANNEL is not supported\n"); query = DOWNLOADHEADER; ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); -todo_wine ok(ret == 1, "DOWNLOADHEADER is not supported\n"); query = CLOSECHANNEL; ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); -todo_wine ok(ret == 1, "CLOSECHANNEL is not supported\n"); query = POSTSCRIPT_PASSTHROUGH; @@ -1487,7 +1481,6 @@ todo_wine ok(ret == 1, "POSTSCRIPT_PASSTHROUGH is not supported\n"); ret = ExtEscape(hdc, GETFACENAME, 0, NULL, sizeof(buf), buf); -todo_wine ok(ret == 1, "GETFACENAME failed\n"); trace("face name: %s\n", buf); diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 43bbe18..44d790b 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -97,14 +97,55 @@ INT PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, case CLIP_TO_PATH: case END_PATH: /*case DRAWPATTERNRECT:*/ + + /* PageMaker checks for it */ + case DOWNLOADHEADER: + + /* PageMaker doesn't check for DOWNLOADFACE and GETFACENAME but + * uses them, they are supposed to be supported by any PS printer. + */ + case DOWNLOADFACE: + + /* PageMaker checks for these as a part of process of detecting + * a "fully compatible" PS printer, but doesn't actually use them. + */ + case OPENCHANNEL: + case CLOSECHANNEL: return TRUE; + /* Windows PS driver reports 0, but still supports this escape */ + case GETFACENAME: + return FALSE; /* suppress the FIXME below */ + default: FIXME("QUERYESCSUPPORT(%d) - not supported.\n", num); return FALSE; } } + case OPENCHANNEL: + FIXME("OPENCHANNEL: stub\n"); + return 1; + + case CLOSECHANNEL: + FIXME("CLOSECHANNEL: stub\n"); + return 1; + + case DOWNLOADHEADER: + FIXME("DOWNLOADHEADER: stub\n"); + /* should return name of the downloaded procset */ + *(char *)out_data = 0; + return 1; + + case GETFACENAME: + FIXME("GETFACENAME: stub\n"); + lstrcpynA(out_data, "Courier", cbOutput); + return 1; + + case DOWNLOADFACE: + FIXME("DOWNLOADFACE: stub\n"); + return 1; + case MFCOMMENT: { FIXME("MFCOMMENT(%p, %d)\n", in_data, cbInput);

1 0

Dmitry Timoshkov : wineps.drv: PostScript header should be written by StartDoc instead of StartPage.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: wine Branch: master Commit: c4a54852952a59c3129beac78c08cad56643fe22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4a54852952a59c3129beac7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 13 11:40:30 2019 +0000 wineps.drv: PostScript header should be written by StartDoc instead of StartPage. Otherwise a being created file has wrong signature if an application directly injects PostScript code. This patch fixes printing from Adobe PageMaker. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/dc.c | 1 - dlls/wineps.drv/escape.c | 18 ++++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 82cf200..2d9ef1d 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -1433,7 +1433,6 @@ static void print_something(HDC hdc) while (*p == '\r' || *p == '\n') p++; } -todo_wine ok(p && !memcmp(p, psadobe, sizeof(psadobe)), "wrong signature: %.14s\n", p ? p : buf); DeleteFileA(file_name); diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 44d790b..b3eff68 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -397,15 +397,14 @@ INT PSDRV_StartPage( PHYSDEV dev ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); + TRACE("%p\n", dev->hdc); + if(!physDev->job.OutOfPage) { FIXME("Already started a page?\n"); return 1; } - if(physDev->job.PageNo++ == 0) { - if(!PSDRV_WriteHeader( dev, physDev->job.doc_name )) - return 0; - } + physDev->job.PageNo++; if(!PSDRV_WriteNewPage( dev )) return 0; @@ -421,6 +420,8 @@ INT PSDRV_EndPage( PHYSDEV dev ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); + TRACE("%p\n", dev->hdc); + if(physDev->job.OutOfPage) { FIXME("Already ended a page?\n"); return 1; @@ -483,6 +484,13 @@ INT PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) ClosePrinter(physDev->job.hprinter); return 0; } + + if (!PSDRV_WriteHeader( dev, doc->lpszDocName )) { + WARN("Failed to write header\n"); + ClosePrinter(physDev->job.hprinter); + return 0; + } + physDev->job.banding = FALSE; physDev->job.OutOfPage = TRUE; physDev->job.PageNo = 0; @@ -501,6 +509,8 @@ INT PSDRV_EndDoc( PHYSDEV dev ) PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); INT ret = 1; + TRACE("%p\n", dev->hdc); + if(!physDev->job.id) { FIXME("hJob == 0. Now what?\n"); return 0;

1 0

Jacek Caban : kernel32: Support MUI_LANGUAGE_ID flag in EnumUILanguages.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: wine Branch: master Commit: 5bb421239771d759d3a2ce1e584def62a4abdaee URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bb421239771d759d3a2ce1e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 13 13:47:58 2019 +0100 kernel32: Support MUI_LANGUAGE_ID flag in EnumUILanguages. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 4 ++-- dlls/kernel32/tests/locale.c | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 9f539dd..eedb0be 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4814,7 +4814,7 @@ BOOL WINAPI EnumUILanguagesA(UILANGUAGE_ENUMPROCA pUILangEnumProc, DWORD dwFlags SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if(dwFlags) { + if(dwFlags & ~MUI_LANGUAGE_ID) { SetLastError(ERROR_INVALID_FLAGS); return FALSE; } @@ -4843,7 +4843,7 @@ BOOL WINAPI EnumUILanguagesW(UILANGUAGE_ENUMPROCW pUILangEnumProc, DWORD dwFlags SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if(dwFlags) { + if(dwFlags & ~MUI_LANGUAGE_ID) { SetLastError(ERROR_INVALID_FLAGS); return FALSE; } diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 0c05311..126b08c 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3762,6 +3762,14 @@ static void test_EnumUILanguageA(void) SetLastError(ERROR_SUCCESS); ret = pEnumUILanguagesA(luilocale_proc2A, 0, 0); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + ok(enumCount == 1, "enumCount = %u\n", enumCount); + + enumCount = 0; + SetLastError(ERROR_SUCCESS); + ret = pEnumUILanguagesA(luilocale_proc2A, MUI_LANGUAGE_ID, 0); + ok(ret || broken(!ret && GetLastError() == ERROR_INVALID_FLAGS), /* winxp */ + "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + if (ret) ok(enumCount == 1, "enumCount = %u\n", enumCount); SetLastError(ERROR_SUCCESS); ret = pEnumUILanguagesA(NULL, 0, 0);

1 0

Hans Leidekker : bcrypt: Implement BCryptGenerate/ FinalizeKeyPair for ECDH P256.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: wine Branch: master Commit: 73b695f059740715ebd3ea0ce3ce88477977e628 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73b695f059740715ebd3ea0c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 13 10:21:15 2019 +0100 bcrypt: Implement BCryptGenerate/FinalizeKeyPair for ECDH P256. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46564 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt.spec | 4 +- dlls/bcrypt/bcrypt_internal.h | 7 +- dlls/bcrypt/bcrypt_main.c | 55 +++++++++++++- dlls/bcrypt/gnutls.c | 164 +++++++++++++++++++++++++++++++++++++++--- dlls/bcrypt/macos.c | 6 ++ dlls/bcrypt/tests/bcrypt.c | 87 ++++++++++++++-------- dlls/ncrypt/ncrypt.spec | 4 +- include/bcrypt.h | 12 +++- 8 files changed, 290 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=73b695f059740715ebd3…

1 0

Hans Leidekker : bcrypt: Add support for importing and exporting ECC public keys.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: wine Branch: master Commit: 5c2ac77ab77772e7d588ccef920a6fe91772d8b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c2ac77ab77772e7d588ccef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 13 10:21:16 2019 +0100 bcrypt: Add support for importing and exporting ECC public keys. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 16 +++++++++++++++- dlls/bcrypt/tests/bcrypt.c | 22 ++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index c41c409..0d504b8 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -813,6 +813,14 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U memcpy( output + sizeof(len), key->u.s.secret, key->u.s.secret_len ); return STATUS_SUCCESS; } + else if (!strcmpW( type, BCRYPT_ECCPUBLIC_BLOB )) + { + *size = key->u.a.pubkey_len; + if (output_len < key->u.a.pubkey_len) return STATUS_SUCCESS; + + memcpy( output, key->u.a.pubkey, key->u.a.pubkey_len ); + return STATUS_SUCCESS; + } FIXME( "unsupported key type %s\n", debugstr_w(type) ); return STATUS_NOT_IMPLEMENTED; @@ -1012,6 +1020,11 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP switch (alg->id) { + case ALG_ID_ECDH_P256: + key_size = 32; + magic = BCRYPT_ECDH_PUBLIC_P256_MAGIC; + break; + case ALG_ID_ECDSA_P256: key_size = 32; magic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; @@ -1028,7 +1041,8 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP } if (ecc_blob->dwMagic != magic) return STATUS_NOT_SUPPORTED; - if (ecc_blob->cbKey != key_size) return STATUS_INVALID_PARAMETER; + if (ecc_blob->cbKey != key_size || input_len < sizeof(*ecc_blob) + ecc_blob->cbKey * 2) + return STATUS_INVALID_PARAMETER; if (!(key = heap_alloc_zero( sizeof(*key) ))) return STATUS_NO_MEMORY; key->hdr.magic = MAGIC_KEY; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 7274516..819c1dc 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1659,9 +1659,12 @@ static void test_RSA(void) static void test_ECDH(void) { + BYTE *buf; + BCRYPT_ECCKEY_BLOB *ecckey; BCRYPT_ALG_HANDLE alg; BCRYPT_KEY_HANDLE key; NTSTATUS status; + ULONG size; status = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_ECDH_P256_ALGORITHM, NULL, 0); if (status) @@ -1678,6 +1681,25 @@ static void test_ECDH(void) status = pBCryptFinalizeKeyPair(key, 0); ok(status == STATUS_SUCCESS, "got %08x\n", status); + size = 0; + SetLastError(0xdeadbeef); + status = pBCryptExportKey(key, NULL, BCRYPT_ECCPUBLIC_BLOB, NULL, 0, &size, 0); + ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(size, "size not set\n"); + + buf = HeapAlloc(GetProcessHeap(), 0, size); + status = pBCryptExportKey(key, NULL, BCRYPT_ECCPUBLIC_BLOB, buf, size, &size, 0); + ok(status == STATUS_SUCCESS, "got %08x\n", status); + ecckey = (BCRYPT_ECCKEY_BLOB *)buf; + ok(ecckey->dwMagic == BCRYPT_ECDH_PUBLIC_P256_MAGIC, "got %08x\n", ecckey->dwMagic); + ok(ecckey->cbKey == 32, "got %u\n", ecckey->cbKey); + ok(size == sizeof(*ecckey) + ecckey->cbKey * 2, "got %u\n", size); + pBCryptDestroyKey(key); + + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buf, size, 0); + ok(status == STATUS_SUCCESS, "got %08x\n", status); + HeapFree(GetProcessHeap(), 0, buf); + pBCryptDestroyKey(key); pBCryptCloseAlgorithmProvider(alg, 0); }

1 0

Hans Leidekker : bcrypt: Add support for importing and exporting ECC private keys.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: wine Branch: master Commit: 158ce169e4aa60054956dd7dab20ff218d49f8fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=158ce169e4aa60054956dd7d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 13 10:21:17 2019 +0100 bcrypt: Add support for importing and exporting ECC private keys. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 2 + dlls/bcrypt/bcrypt_main.c | 55 +++++++++++++++++++ dlls/bcrypt/gnutls.c | 121 +++++++++++++++++++++++++++++++++++++++++- dlls/bcrypt/macos.c | 12 +++++ dlls/bcrypt/tests/bcrypt.c | 52 ++++++++++++++++-- 5 files changed, 237 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=158ce169e4aa60054956…

1 0