February 2019 - Wine-devel - list.winehq.org

[PATCH] webservices/tests: Add a missing closesocket call (Coverity).
by Sven Baars 11 Feb '19

11 Feb '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/webservices/tests/proxy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/webservices/tests/proxy.c b/dlls/webservices/tests/proxy.c index f5297796b3..3fe92367e9 100644 --- a/dlls/webservices/tests/proxy.c +++ b/dlls/webservices/tests/proxy.c @@ -708,6 +708,7 @@ static DWORD CALLBACK server_proc( void *arg ) closesocket( c ); if (quit) break; } + closesocket( s ); return 0; } -- 2.17.1

2 1

[PATCH] wineboot: Fix PROCESSOR_ARCHITECTURE reg value
by Brendan McGrath 11 Feb '19

11 Feb '19

On my Windows machine, PROCESSOR_ARCHITECTURE has the value "AMD64", but under wine (since 4.1) the value is "Intel64". It appears some games implement the Detection Logic defined here: https://blogs.msdn.microsoft.com/david.wang/2006/03/27/howto-detect-process… That is, they expect PROCESSOR_ARCHITECTURE to be AMD64 for 64-bit machines. This patch ensures the PROCESSOR_ARCHITECTURE and PROCESSOR_IDENTIFIER are the same in wine as they are in Windows. For example, on my machine this is: "PROCESSOR_ARCHITECTURE"="AMD64" "PROCESSOR_IDENTIFIER"="Intel64 Family 6 Model 42 Stepping 7, GenuineIntel" Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- programs/wineboot/wineboot.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 32e4225491..b85a3b6b6e 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -422,7 +422,7 @@ static void create_environment_registry_keys( void ) HKEY env_key; SYSTEM_CPU_INFORMATION sci; WCHAR buffer[60], vendorid[13]; - const WCHAR *arch; + const WCHAR *arch, *parch; if (RegCreateKeyW( HKEY_LOCAL_MACHINE, EnvironW, &env_key )) return; @@ -435,12 +435,13 @@ static void create_environment_registry_keys( void ) switch (sci.Architecture) { case PROCESSOR_ARCHITECTURE_AMD64: - arch = !strcmpW(vendorid, authenticamdW) ? amd64W : intel64W; + arch = amd64W; + parch = !strcmpW(vendorid, authenticamdW) ? amd64W : intel64W; break; case PROCESSOR_ARCHITECTURE_INTEL: default: - arch = x86W; + arch = parch = x86W; break; } set_reg_value( env_key, ProcArchW, arch ); @@ -455,7 +456,7 @@ static void create_environment_registry_keys( void ) case PROCESSOR_ARCHITECTURE_AMD64: case PROCESSOR_ARCHITECTURE_INTEL: default: - get_identifier( buffer, arch ); + get_identifier( buffer, parch ); strcatW( buffer, commaW ); strcatW( buffer, vendorid ); break; -- 2.17.1

2 1

[PATCH 1/5] user32/listbox: Check for out of bounds using the index when painting the item
by Gabriel Ivăncescu 11 Feb '19

11 Feb '19

Needed for LBS_NODATA. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- user32 versions of the comctl32 patchset. dlls/user32/listbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 594c956..821da60 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -533,7 +533,7 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, RECT r; HRGN hrgn; - if (!item) + if (index >= descr->nb_items) { if (action == ODA_FOCUS) DrawFocusRect( hdc, rect ); -- 2.19.1

3 13

[PATCH v2] gdi32/dibdrv: Clip segment points to dib rect in wide_line_segment().
by Sergio Gómez Del Real 11 Feb '19

11 Feb '19

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/gdi32/dibdrv/objects.c | 43 ++++++++++++++++++++++++++++--------- dlls/gdi32/gdi_private.h | 8 +++++++ 2 files changed, 41 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index f95475a662..26710dd1aa 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1334,15 +1334,21 @@ static void add_join( dibdrv_physdev *pdev, HRGN region, HRGN round_cap, const P { HRGN join; POINT pts[4]; + RECT rect; switch (pdev->pen_join) { default: FIXME( "Unknown line join %x\n", pdev->pen_join ); /* fall through */ case PS_JOIN_ROUND: - OffsetRgn( round_cap, pt->x, pt->y ); - CombineRgn( region, region, round_cap, RGN_OR ); - OffsetRgn( round_cap, -pt->x, -pt->y ); + GetRgnBox( round_cap, &rect ); + offset_rect( &rect, pt->x, pt->y ); + if (clip_rect_to_dib( &pdev->dib, &rect )) + { + OffsetRgn( round_cap, pt->x, pt->y ); + CombineRgn( region, region, round_cap, RGN_OR ); + OffsetRgn( round_cap, -pt->x, -pt->y ); + } return; case PS_JOIN_MITER: @@ -1358,7 +1364,9 @@ static void add_join( dibdrv_physdev *pdev, HRGN region, HRGN round_cap, const P break; } - CombineRgn( region, region, join, RGN_OR ); + GetRgnBox( join, &rect ); + if (clip_rect_to_dib( &pdev->dib, &rect )) + CombineRgn( region, region, join, RGN_OR ); DeleteObject( join ); return; } @@ -1367,7 +1375,7 @@ static BOOL wide_line_segment( dibdrv_physdev *pdev, HRGN total, const POINT *pt_1, const POINT *pt_2, int dx, int dy, BOOL need_cap_1, BOOL need_cap_2, struct face *face_1, struct face *face_2 ) { - RECT rect; + RECT rect, clip_rect; BOOL sq_cap_1 = need_cap_1 && (pdev->pen_endcap == PS_ENDCAP_SQUARE); BOOL sq_cap_2 = need_cap_2 && (pdev->pen_endcap == PS_ENDCAP_SQUARE); @@ -1381,7 +1389,9 @@ static BOOL wide_line_segment( dibdrv_physdev *pdev, HRGN total, rect.bottom = rect.top + pdev->pen_width; if ((sq_cap_1 && dx > 0) || (sq_cap_2 && dx < 0)) rect.left -= pdev->pen_width / 2; if ((sq_cap_2 && dx > 0) || (sq_cap_1 && dx < 0)) rect.right += pdev->pen_width / 2; - add_rect_to_region( total, &rect ); + clip_rect = rect; + if (clip_rect_to_dib( &pdev->dib, &clip_rect )) + add_rect_to_region( total, &clip_rect ); if (dx > 0) { face_1->start.x = face_1->end.x = rect.left; @@ -1405,7 +1415,9 @@ static BOOL wide_line_segment( dibdrv_physdev *pdev, HRGN total, rect.right = rect.left + pdev->pen_width; if ((sq_cap_1 && dy > 0) || (sq_cap_2 && dy < 0)) rect.top -= pdev->pen_width / 2; if ((sq_cap_2 && dy > 0) || (sq_cap_1 && dy < 0)) rect.bottom += pdev->pen_width / 2; - add_rect_to_region( total, &rect ); + clip_rect = rect; + if (clip_rect_to_dib( &pdev->dib, &clip_rect )) + add_rect_to_region( total, &clip_rect ); if (dy > 0) { face_1->start.x = face_2->end.x = rect.left; @@ -1475,9 +1487,20 @@ static BOOL wide_line_segment( dibdrv_physdev *pdev, HRGN total, seg_pts[3].y += wide_half.x; } - segment = CreatePolygonRgn( seg_pts, 4, ALTERNATE ); - CombineRgn( total, total, segment, RGN_OR ); - DeleteObject( segment ); + if (dx > 0 && dy > 0) + set_rect( &clip_rect, seg_pts[0].x, seg_pts[1].y, seg_pts[2].x, seg_pts[3].y ); + else if (dx > 0 && dy < 0) + set_rect( &clip_rect, seg_pts[1].x, seg_pts[2].y, seg_pts[3].x, seg_pts[0].y ); + else if (dx < 0 && dy > 0) + set_rect( &clip_rect, seg_pts[3].x, seg_pts[0].y, seg_pts[1].x, seg_pts[2].y ); + else + set_rect( &clip_rect, seg_pts[2].x, seg_pts[3].y, seg_pts[0].x, seg_pts[1].y ); + if (clip_rect_to_dib( &pdev->dib, &clip_rect )) + { + segment = CreatePolygonRgn( seg_pts, 4, ALTERNATE ); + CombineRgn( total, total, segment, RGN_OR ); + DeleteObject( segment ); + } face_1->start = seg_pts[0]; face_1->end = seg_pts[1]; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 920cd1e7bf..01473dd7e2 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -521,6 +521,14 @@ static inline void offset_rect( RECT *rect, int offset_x, int offset_y ) rect->bottom += offset_y; } +static inline void set_rect( RECT *rect, int left, int top, int right, int bottom ) +{ + rect->left = left; + rect->top = top; + rect->right = right; + rect->bottom = bottom; +} + static inline void order_rect( RECT *rect ) { if (rect->left > rect->right) -- 2.17.1

2 1

[PATCH 2/3] kernel32: Store command line inside the process parameters block.
by Dmitry Timoshkov 11 Feb '19

11 Feb '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/process.c | 50 ++++++++++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 26c576e4f0..14615a568e 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -934,14 +934,11 @@ static void update_library_argv0( const WCHAR *argv0 ) * 'a\b' == 'a\b' * 'a\\b' == 'a\\b' */ -static BOOL build_command_line( WCHAR **argv ) +static WCHAR *build_command_line( WCHAR **argv ) { int len; - WCHAR **arg; + WCHAR **arg, *cmd_line; LPWSTR p; - RTL_USER_PROCESS_PARAMETERS* rupp = NtCurrentTeb()->Peb->ProcessParameters; - - if (rupp->CommandLine.Buffer) return TRUE; /* already got it from the server */ len = 0; for (arg = argv; *arg; arg++) @@ -975,12 +972,10 @@ static BOOL build_command_line( WCHAR **argv ) len+=2+bcount; /* for the quotes and doubling of '\' preceding the closing quote */ } - if (!(rupp->CommandLine.Buffer = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR)))) - return FALSE; + if (!(cmd_line = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + return NULL; - p = rupp->CommandLine.Buffer; - rupp->CommandLine.Length = (len - 1) * sizeof(WCHAR); - rupp->CommandLine.MaximumLength = len * sizeof(WCHAR); + p = cmd_line; for (arg = argv; *arg; arg++) { BOOL has_space,has_quote; @@ -1043,11 +1038,11 @@ static BOOL build_command_line( WCHAR **argv ) } *p++=' '; } - if (p > rupp->CommandLine.Buffer) + if (p > cmd_line) p--; /* remove last space */ *p = '\0'; - return TRUE; + return cmd_line; } @@ -1395,6 +1390,8 @@ void CDECL __wine_kernel_init(void) else { BOOL is_64bit; + WCHAR *cmd_line; + RTL_USER_PROCESS_PARAMETERS *params = NtCurrentTeb()->Peb->ProcessParameters; if (!SearchPathW( NULL, __wine_main_wargv[0], exeW, MAX_PATH, main_exe_name, NULL ) && !get_builtin_path( __wine_main_wargv[0], exeW, main_exe_name, MAX_PATH, &is_64bit )) @@ -1403,7 +1400,34 @@ void CDECL __wine_kernel_init(void) ExitProcess( GetLastError() ); } update_library_argv0( main_exe_name ); - if (!build_command_line( __wine_main_wargv )) goto error; + if (!params->CommandLine.Buffer) /* haven't already got it from the server */ + { + SIZE_T size; + char *ptr; + + if (!(cmd_line = build_command_line( __wine_main_wargv ))) goto error; + + size = sizeof(*params); + size += params->CurrentDirectory.DosPath.MaximumLength; + /* some apps try to append custom parameters to the command line, so we need more space */ + size += max(lstrlenW(cmd_line) + 1, MAX_PATH) * sizeof(WCHAR); + /* everything else is empty at this point */ + + if (!(params = HeapReAlloc( GetProcessHeap(), 0, params, size ))) goto error; + + params->AllocationSize = size; + params->Size = size; + + ptr = (char *)(params + 1); + ptr += params->CurrentDirectory.DosPath.MaximumLength; + strcpyW( (WCHAR *)ptr, cmd_line ); + RtlInitUnicodeString( &params->CommandLine, (WCHAR *)ptr ); + + NtCurrentTeb()->Peb->ProcessParameters = params; + + HeapFree( GetProcessHeap(), 0, cmd_line ); + } + start_wineboot( boot_events ); } -- 2.20.1

1 0

[PATCH 1/3] ntdll: Allocate default process parameters from the heap.
by Dmitry Timoshkov 11 Feb '19

11 Feb '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/thread.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index c4e02dacb1..7ee6b92a15 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -67,7 +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; @@ -307,7 +306,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; @@ -316,9 +314,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 ); @@ -379,14 +374,25 @@ void thread_init(void) } else { + RTL_USER_PROCESS_PARAMETERS *params = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*params) ); + + params->AllocationSize = sizeof(*params); + params->Size = sizeof(*params); + params->Flags = PROCESS_PARAMS_FLAG_NORMALIZED; + params->CurrentDirectory.DosPath.Buffer = current_dir; + params->CurrentDirectory.DosPath.MaximumLength = sizeof(current_dir); + params->wShowWindow = 1; /* SW_SHOWNORMAL */ + if (isatty(0) || isatty(1) || isatty(2)) - params.ConsoleHandle = (HANDLE)2; /* see kernel32/kernel_private.h */ + 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 ); + 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 ); + 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 ); + wine_server_fd_to_handle( 2, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params->hStdError ); + + peb->ProcessParameters = params; } /* initialize time values in user_shared_data */ -- 2.20.1

1 0

[PATCH] httpapi: Add stub for HttpCloseServerSession
by Yussur Oraji 11 Feb '19

11 Feb '19

Signed-off-by: Yussur-Mustafa Oraji <yussur.oraji(a)hotmail.de> --- dlls/httpapi/httpapi.spec | 1 + dlls/httpapi/httpapi_main.c | 9 +++++++++ include/http.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index cdab28d9f8..5690327cb5 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(ptr) @ 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 1b35cd656f..c49df92660 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( "(%p): stub!\n", id); + return ERROR_INVALID_PARAMETER; +} diff --git a/include/http.h b/include/http.h index b8ce811e01..60f79014a4 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(PHTTP_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); -- 2.20.1

3 2

[PATCH 1/4] wined3d: Get rid of apply_lights() helper.
by Zebediah Figura 11 Feb '19

11 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/stateblock.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 9e3eb23cc9..a6a6a284b3 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -990,24 +990,6 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) TRACE("Capture done.\n"); } -static void apply_lights(struct wined3d_device *device, const struct wined3d_state *state) -{ - UINT i; - - for (i = 0; i < LIGHTMAP_SIZE; ++i) - { - struct list *e; - - LIST_FOR_EACH(e, &state->light_map[i]) - { - const struct wined3d_light_info *light = LIST_ENTRY(e, struct wined3d_light_info, entry); - - wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); - wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); - } - } -} - void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) { struct wined3d_stateblock_state *state = &stateblock->device->stateblock_state; @@ -1047,7 +1029,16 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) 1, &stateblock->stateblock_state.vs_consts_b[stateblock->contained_vs_consts_b[i]]); } - apply_lights(device, &stateblock->state); + for (i = 0; i < ARRAY_SIZE(stateblock->state.light_map); ++i) + { + const struct wined3d_light_info *light; + + LIST_FOR_EACH_ENTRY(light, &stateblock->state.light_map[i], struct wined3d_light_info, entry) + { + wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); + wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); + } + } if (stateblock->changed.pixelShader) { -- 2.20.1

1 3

[PATCH] oleaut32: Register non-dual dispinterfaces using the correct proxy.
by Zebediah Figura 11 Feb '19

11 Feb '19

Fixes a bug where NetLinx Studio 4 would fail to compile files. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/oleaut32/tests/typelib.c | 22 +++++++++++++++++++++- dlls/oleaut32/typelib.c | 20 +++++++++++++++----- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 90f0cb256e..857100e884 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4963,6 +4963,7 @@ static void test_register_typelib(BOOL system_registration) HKEY hkey; REGSAM opposite = (sizeof(void*) == 8 ? KEY_WOW64_32KEY : KEY_WOW64_64KEY); BOOL is_wow64 = FALSE; + LONG size; struct { TYPEKIND kind; @@ -5071,7 +5072,26 @@ static void test_register_typelib(BOOL system_registration) ret = RegOpenKeyExA(HKEY_CLASSES_ROOT, key_name, 0, KEY_READ, &hkey); ok(ret == expect_ret, "%d: got %d\n", i, ret); - if(ret == ERROR_SUCCESS) RegCloseKey(hkey); + if (ret == ERROR_SUCCESS) + { + size = sizeof(uuid); + ret = RegQueryValueA(hkey, "ProxyStubClsid32", uuid, &size); + ok(!ret, "Failed to get proxy GUID, error %u.\n", ret); + + if (attrs[i].kind == TKIND_INTERFACE || (attrs[i].flags & TYPEFLAG_FDUAL)) + { + ok(!strcasecmp(uuid, "{00020424-0000-0000-c000-000000000046}"), + "Got unexpected proxy CLSID %s.\n", uuid); + } + else + { + ok(!strcasecmp(uuid, "{00020420-0000-0000-c000-000000000046}"), + "Got unexpected proxy CLSID %s.\n", uuid); + } + + RegCloseKey(hkey); + } + /* 32-bit typelibs should be registered into both registry bit modes */ if (is_win64 || is_wow64) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f17a9267b7..acd4d07c89 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -578,14 +578,24 @@ static void TLB_register_interface(TLIBATTR *libattr, LPOLESTR name, TYPEATTR *t WCHAR keyName[60]; HKEY key, subKey; - static const WCHAR PSOA[] = {'{','0','0','0','2','0','4','2','4','-', - '0','0','0','0','-','0','0','0','0','-','C','0','0','0','-', - '0','0','0','0','0','0','0','0','0','0','4','6','}',0}; + static const WCHAR typelib_proxy_clsid[] = {'{','0','0','0','2','0','4','2','4','-', + '0','0','0','0','-','0','0','0','0','-','C','0','0','0','-', + '0','0','0','0','0','0','0','0','0','0','4','6','}',0}; + static const WCHAR dispatch_proxy_clsid[] = {'{','0','0','0','2','0','4','2','0','-', + '0','0','0','0','-','0','0','0','0','-','C','0','0','0','-', + '0','0','0','0','0','0','0','0','0','0','4','6','}',0}; get_interface_key( &tattr->guid, keyName ); if (RegCreateKeyExW(HKEY_CLASSES_ROOT, keyName, 0, NULL, 0, KEY_WRITE | flag, NULL, &key, NULL) == ERROR_SUCCESS) { + const WCHAR *proxy_clsid; + + if (tattr->typekind == TKIND_INTERFACE || (tattr->wTypeFlags & TYPEFLAG_FDUAL)) + proxy_clsid = typelib_proxy_clsid; + else + proxy_clsid = dispatch_proxy_clsid; + if (name) RegSetValueExW(key, NULL, 0, REG_SZ, (BYTE *)name, (strlenW(name)+1) * sizeof(OLECHAR)); @@ -593,14 +603,14 @@ static void TLB_register_interface(TLIBATTR *libattr, LPOLESTR name, TYPEATTR *t if (RegCreateKeyExW(key, ProxyStubClsidW, 0, NULL, 0, KEY_WRITE | flag, NULL, &subKey, NULL) == ERROR_SUCCESS) { RegSetValueExW(subKey, NULL, 0, REG_SZ, - (const BYTE *)PSOA, sizeof PSOA); + (const BYTE *)proxy_clsid, sizeof(typelib_proxy_clsid)); RegCloseKey(subKey); } if (RegCreateKeyExW(key, ProxyStubClsid32W, 0, NULL, 0, KEY_WRITE | flag, NULL, &subKey, NULL) == ERROR_SUCCESS) { RegSetValueExW(subKey, NULL, 0, REG_SZ, - (const BYTE *)PSOA, sizeof PSOA); + (const BYTE *)proxy_clsid, sizeof(typelib_proxy_clsid)); RegCloseKey(subKey); } -- 2.20.1

1 1

[PATCH] windowscodecs/tests: Add IWICBitmapEncoderInfo test
by Alistair Leslie-Hughes 11 Feb '19

11 Feb '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/windowscodecs/tests/converter.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 1cfa29b..d3142b3 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -1217,6 +1217,8 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls if (hglobal && SUCCEEDED(hr)) { + IWICBitmapEncoderInfo *info = NULL; + if (palette) { hr = IWICBitmapEncoder_SetPalette(encoder, palette); @@ -1233,6 +1235,20 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls hr = S_OK; } + hr = IWICBitmapEncoder_GetEncoderInfo(encoder, &info); + ok(hr == S_OK || hr == WINCODEC_ERR_COMPONENTNOTFOUND, "wrong error %#x\n", hr); + if (SUCCEEDED(hr)) + { + CLSID clsid; + + hr = IWICBitmapEncoderInfo_GetCLSID(info, &clsid); + ok(hr == S_OK, "wrong error %#x\n", hr); + ok(!IsEqualGUID(&clsid_encoder, &clsid), "wrong CLSID %s (%s)\n", + wine_dbgstr_guid(clsid_encoder), wine_dbgstr_guid(&clsid)); + + IWICBitmapEncoderInfo_Release(info); + } + i=0; while (SUCCEEDED(hr) && srcs[i]) { -- 1.9.1

2 1