- Wine-Commits - list.winehq.org

Alexandre Julliard : makedep: Pass the actual name of the module in the delay load flags.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: 020e2b6bb46b3bc39d2088d6ff668e64b2576aae URL: https://gitlab.winehq.org/wine/wine/-/commit/020e2b6bb46b3bc39d2088d6ff668e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 23 17:50:43 2022 +0100 makedep: Pass the actual name of the module in the delay load flags. --- tools/makedep.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index a3a665cc84a..893808930fb 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3323,8 +3323,10 @@ static void output_module( struct makefile *make, unsigned int arch ) if (delay_load_flags[arch]) { for (i = 0; i < make->delayimports.count; i++) - strarray_add( &all_libs, strmake( "%s%s%s", delay_load_flags[arch], make->delayimports.str[i], - strchr( make->delayimports.str[i], '.' ) ? "" : ".dll" )); + { + struct makefile *import = get_static_lib( make->delayimports.str[i], arch ); + if (import) strarray_add( &all_libs, strmake( "%s%s", delay_load_flags[arch], import->module )); + } } } else module_name = strmake( "%s%s", arch_pe_dirs[arch], make->module );

1 0

Alexandre Julliard : win32u: Use int instead of long types for monitor index and flags.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: d38a4a23fb9f54aec728506d4e152a670f649cea URL: https://gitlab.winehq.org/wine/wine/-/commit/d38a4a23fb9f54aec728506d4e152a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 23 16:02:16 2022 +0100 win32u: Use int instead of long types for monitor index and flags. To avoid typecasts in debug traces. --- dlls/win32u/sysparams.c | 18 +++++++++--------- dlls/win32u/win32u_private.h | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index db6d07110e3..bd5f521eb0d 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -438,7 +438,7 @@ static void adapter_release( struct adapter *adapter ) C_ASSERT(sizeof(DEVMODEW) - offsetof(DEVMODEW, dmFields) == 0x94); -static BOOL write_adapter_mode( HKEY adapter_key, DWORD index, const DEVMODEW *mode ) +static BOOL write_adapter_mode( HKEY adapter_key, UINT index, const DEVMODEW *mode ) { WCHAR bufferW[MAX_PATH] = {0}; char buffer[MAX_PATH]; @@ -448,7 +448,7 @@ static BOOL write_adapter_mode( HKEY adapter_key, DWORD index, const DEVMODEW *m return set_reg_value( adapter_key, bufferW, REG_BINARY, &mode->dmFields, sizeof(*mode) - offsetof(DEVMODEW, dmFields) ); } -static BOOL read_adapter_mode( HKEY adapter_key, DWORD index, DEVMODEW *mode ) +static BOOL read_adapter_mode( HKEY adapter_key, UINT index, DEVMODEW *mode ) { char value_buf[offsetof(KEY_VALUE_PARTIAL_INFORMATION, Data[sizeof(*mode)])]; KEY_VALUE_PARTIAL_INFORMATION *value = (void *)value_buf; @@ -712,7 +712,7 @@ static BOOL read_display_adapter_settings( unsigned int index, struct adapter *i return TRUE; } -static BOOL read_monitor_settings( struct adapter *adapter, DWORD index, struct monitor *monitor ) +static BOOL read_monitor_settings( struct adapter *adapter, UINT index, struct monitor *monitor ) { char buffer[4096]; KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; @@ -1998,7 +1998,7 @@ LONG WINAPI NtUserGetDisplayConfigBufferSizes( UINT32 flags, UINT32 *num_path_in } /* display_lock mutex must be held */ -static struct display_device *find_monitor_device( struct display_device *adapter, DWORD index ) +static struct display_device *find_monitor_device( struct display_device *adapter, UINT index ) { struct monitor *monitor; @@ -2011,7 +2011,7 @@ static struct display_device *find_monitor_device( struct display_device *adapte } /* display_lock mutex must be held */ -static struct display_device *find_adapter_device_by_id( DWORD index ) +static struct display_device *find_adapter_device_by_id( UINT index ) { struct adapter *adapter; @@ -2571,7 +2571,7 @@ LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devm return ret; } -static BOOL adapter_enum_display_settings( const struct adapter *adapter, DWORD index, DEVMODEW *devmode, DWORD flags ) +static BOOL adapter_enum_display_settings( const struct adapter *adapter, UINT index, DEVMODEW *devmode, UINT flags ) { DEVMODEW current_mode = {.dmSize = sizeof(DEVMODEW)}; const DEVMODEW *adapter_mode; @@ -2777,7 +2777,7 @@ BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info ) return FALSE; } -HMONITOR monitor_from_rect( const RECT *rect, DWORD flags, UINT dpi ) +HMONITOR monitor_from_rect( const RECT *rect, UINT flags, UINT dpi ) { HMONITOR primary = 0, nearest = 0, ret = 0; UINT max_area = 0, min_distance = ~0u; @@ -2843,7 +2843,7 @@ HMONITOR monitor_from_rect( const RECT *rect, DWORD flags, UINT dpi ) return ret; } -HMONITOR monitor_from_point( POINT pt, DWORD flags, UINT dpi ) +HMONITOR monitor_from_point( POINT pt, UINT flags, UINT dpi ) { RECT rect; SetRect( &rect, pt.x, pt.y, pt.x + 1, pt.y + 1 ); @@ -2851,7 +2851,7 @@ HMONITOR monitor_from_point( POINT pt, DWORD flags, UINT dpi ) } /* see MonitorFromWindow */ -HMONITOR monitor_from_window( HWND hwnd, DWORD flags, UINT dpi ) +HMONITOR monitor_from_window( HWND hwnd, UINT flags, UINT dpi ) { RECT rect; WINDOWPLACEMENT wp; diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index bc64bedb22b..3824918a055 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -351,9 +351,9 @@ extern BOOL message_beep( UINT i ) DECLSPEC_HIDDEN; extern POINT point_phys_to_win_dpi( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; extern POINT point_thread_to_win_dpi( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; extern RECT rect_thread_to_win_dpi( HWND hwnd, RECT rect ) DECLSPEC_HIDDEN; -extern HMONITOR monitor_from_point( POINT pt, DWORD flags, UINT dpi ) DECLSPEC_HIDDEN; -extern HMONITOR monitor_from_rect( const RECT *rect, DWORD flags, UINT dpi ) DECLSPEC_HIDDEN; -extern HMONITOR monitor_from_window( HWND hwnd, DWORD flags, UINT dpi ) DECLSPEC_HIDDEN; +extern HMONITOR monitor_from_point( POINT pt, UINT flags, UINT dpi ) DECLSPEC_HIDDEN; +extern HMONITOR monitor_from_rect( const RECT *rect, UINT flags, UINT dpi ) DECLSPEC_HIDDEN; +extern HMONITOR monitor_from_window( HWND hwnd, UINT flags, UINT dpi ) DECLSPEC_HIDDEN; extern void user_lock(void) DECLSPEC_HIDDEN; extern void user_unlock(void) DECLSPEC_HIDDEN; extern void user_check_not_lock(void) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : win32u: Use int instead of long types for font sizes and flags.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: 8bab39d946dccd5830a399d69abc34c1b96c56fa URL: https://gitlab.winehq.org/wine/wine/-/commit/8bab39d946dccd5830a399d69abc34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 23 12:29:38 2022 +0100 win32u: Use int instead of long types for font sizes and flags. To avoid typecasts in debug traces. --- dlls/win32u/font.c | 8 +++---- dlls/win32u/freetype.c | 55 ++++++++++++++++++++++----------------------- dlls/win32u/ntgdi_private.h | 17 +++++++------- 3 files changed, 39 insertions(+), 41 deletions(-)

1 0

Alexandre Julliard : win32: Fix int/long type mismatches.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: 7eb1e94299913a9084c95e065874e2a5ada86bf4 URL: https://gitlab.winehq.org/wine/wine/-/commit/7eb1e94299913a9084c95e065874e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 23 12:02:27 2022 +0100 win32: Fix int/long type mismatches. --- dlls/win32u/class.c | 4 ++-- dlls/win32u/clipboard.c | 4 +++- dlls/win32u/dibdrv/bitblt.c | 4 ++-- dlls/win32u/dibdrv/objects.c | 4 ++-- dlls/win32u/sysparams.c | 2 +- dlls/win32u/win32u_private.h | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index 28eabcc1f51..b18fd69edfc 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -241,9 +241,9 @@ DLGPROC get_dialog_proc( DLGPROC ret, BOOL ansi ) { WINDOWPROC *proc; - if (!(proc = get_winproc_ptr( ret ))) return ret; + if (!(proc = get_winproc_ptr( (WNDPROC)ret ))) return ret; if (proc == WINPROC_PROC16) return WINPROC_PROC16; - return ansi ? proc->procA : proc->procW; + return (DLGPROC)(ansi ? proc->procA : proc->procW); } static void init_user(void) diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c index 23d83863bbb..a3004dd032a 100644 --- a/dlls/win32u/clipboard.c +++ b/dlls/win32u/clipboard.c @@ -570,6 +570,7 @@ void release_clipboard_owner( HWND hwnd ) NTSTATUS WINAPI NtUserSetClipboardData( UINT format, HANDLE data, struct set_clipboard_params *params ) { struct cached_format *cache = NULL, *prev = NULL; + LCID lcid; void *ptr = NULL; data_size_t size = 0; NTSTATUS status = STATUS_SUCCESS; @@ -603,13 +604,14 @@ NTSTATUS WINAPI NtUserSetClipboardData( UINT format, HANDLE data, struct set_cli make_gdi_object_system( cache->handle, TRUE ); } } + NtQueryDefaultLocale( TRUE, &lcid ); pthread_mutex_lock( &clipboard_mutex ); SERVER_START_REQ( set_clipboard_data ) { req->format = format; - NtQueryDefaultLocale( TRUE, &req->lcid ); + req->lcid = lcid; wine_server_add_data( req, ptr, size ); if (!(status = wine_server_call( req ))) { diff --git a/dlls/win32u/dibdrv/bitblt.c b/dlls/win32u/dibdrv/bitblt.c index 131100b01b0..76c46e723a6 100644 --- a/dlls/win32u/dibdrv/bitblt.c +++ b/dlls/win32u/dibdrv/bitblt.c @@ -1111,8 +1111,8 @@ update_format: */ static DWORD calc_1d_stretch_params( INT dst_start, INT dst_length, INT dst_vis_start, INT dst_vis_end, INT src_start, INT src_length, INT src_vis_start, INT src_vis_end, - INT *dst_clipped_start, INT *src_clipped_start, - INT *dst_clipped_end, INT *src_clipped_end, + LONG *dst_clipped_start, LONG *src_clipped_start, + LONG *dst_clipped_end, LONG *src_clipped_end, struct stretch_params *stretch_params, BOOL *stretch ) { bres_params bres_params; diff --git a/dlls/win32u/dibdrv/objects.c b/dlls/win32u/dibdrv/objects.c index d9979a05fa6..a6f5e8d2e3d 100644 --- a/dlls/win32u/dibdrv/objects.c +++ b/dlls/win32u/dibdrv/objects.c @@ -229,11 +229,11 @@ static inline void get_color_masks( DC *dc, const dib_info *dib, UINT rop, COLOR calc_rop_masks( rop, color, bg_mask ); } -static inline void order_end_points(int *s, int *e) +static inline void order_end_points(LONG *s, LONG *e) { if(*s > *e) { - int tmp; + LONG tmp; tmp = *s + 1; *s = *e + 1; *e = tmp; diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 85595c0cb9a..db6d07110e3 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -5337,7 +5337,7 @@ BOOL WINAPI NtUserSetSysColors( INT count, const INT *colors, const COLORREF *va } -static DPI_AWARENESS dpi_awareness; +static LONG dpi_awareness; /*********************************************************************** * NtUserSetProcessDpiAwarenessContext (win32u.@) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index e8ff02ffb75..caab312482e 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -138,7 +138,7 @@ struct unix_funcs INT width, INT height, HBITMAP mask, INT x_mask, INT y_mask, DWORD bk_color ); BOOL (WINAPI *pNtGdiPolyDraw)(HDC hdc, const POINT *points, const BYTE *types, DWORD count ); - ULONG (WINAPI *pNtGdiPolyPolyDraw)( HDC hdc, const POINT *points, const UINT *counts, + ULONG (WINAPI *pNtGdiPolyPolyDraw)( HDC hdc, const POINT *points, const ULONG *counts, DWORD count, UINT function ); BOOL (WINAPI *pNtGdiPtVisible)( HDC hdc, INT x, INT y ); BOOL (WINAPI *pNtGdiRectVisible)( HDC hdc, const RECT *rect );

1 0

Alexandre Julliard : kernel32/tests: Don't filter out the WINELOADER variable.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: b00a831d3d02e77c07dcc0afda23717c9e4fa51b URL: https://gitlab.winehq.org/wine/wine/-/commit/b00a831d3d02e77c07dcc0afda2371… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 23 11:07:30 2022 +0100 kernel32/tests: Don't filter out the WINELOADER variable. --- dlls/kernel32/tests/process.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index b582727f93b..0d877f715aa 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1374,14 +1374,12 @@ static void test_Environment(void) strcpy(ptr, "BAR=FOOBAR"); ptr += strlen(ptr) + 1; /* copy all existing variables except: - * - WINELOADER * - PATH (already set above) * - the directory definitions (=[A-Z]:=) */ for (ptr2 = env; *ptr2; ptr2 += strlen(ptr2) + 1) { if (strncmp(ptr2, "PATH=", 5) != 0 && - strncmp(ptr2, "WINELOADER=", 11) != 0 && !is_str_env_drive_dir(ptr2)) { strcpy(ptr, ptr2); @@ -1420,7 +1418,7 @@ static void test_SuspendFlag(void) ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &startup, &info), "CreateProcess\n"); ok(GetExitCodeThread(info.hThread, &exit_status) && exit_status == STILL_ACTIVE, "thread still running\n"); - Sleep(1000); + Sleep(100); ok(GetExitCodeThread(info.hThread, &exit_status) && exit_status == STILL_ACTIVE, "thread still running\n"); ok(ResumeThread(info.hThread) == 1, "Resuming thread\n");

1 0

Alexandre Julliard : win32u: Add a debug helper to print color values.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: 3ae7035afdaa09eade10e33fc3f3609fadfebfdf URL: https://gitlab.winehq.org/wine/wine/-/commit/3ae7035afdaa09eade10e33fc3f360… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 23 12:02:51 2022 +0100 win32u: Add a debug helper to print color values. --- dlls/win32u/brush.c | 4 ++-- dlls/win32u/dibdrv/graphics.c | 6 +++--- dlls/win32u/palette.c | 4 ++-- dlls/win32u/pen.c | 2 +- dlls/win32u/win32u_private.h | 9 +++++++++ dlls/win32u/window.c | 2 +- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/win32u/brush.c b/dlls/win32u/brush.c index f9b718b4d2e..c5a9eb91d7b 100644 --- a/dlls/win32u/brush.c +++ b/dlls/win32u/brush.c @@ -222,7 +222,7 @@ HBRUSH WINAPI NtGdiCreateHatchBrushInternal( INT style, COLORREF color, BOOL pen { LOGBRUSH logbrush; - TRACE( "%d %06x\n", style, color ); + TRACE( "%d %s\n", style, debugstr_color(color) ); logbrush.lbStyle = BS_HATCHED; logbrush.lbColor = color; @@ -282,7 +282,7 @@ HBRUSH WINAPI NtGdiCreateSolidBrush( COLORREF color, HBRUSH brush ) { LOGBRUSH logbrush; - TRACE("%06x\n", color ); + TRACE("%s\n", debugstr_color(color) ); logbrush.lbStyle = BS_SOLID; logbrush.lbColor = color; diff --git a/dlls/win32u/dibdrv/graphics.c b/dlls/win32u/dibdrv/graphics.c index 32d98572801..1eda7d2256a 100644 --- a/dlls/win32u/dibdrv/graphics.c +++ b/dlls/win32u/dibdrv/graphics.c @@ -1056,7 +1056,7 @@ BOOL CDECL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT RECT row; HRGN rgn; - TRACE( "(%p, %d, %d, %08x, %d)\n", pdev, x, y, color, type ); + TRACE( "(%p, %d, %d, %s, %d)\n", pdev, x, y, debugstr_color(color), type ); if (x < 0 || x >= pdev->dib.rect.right - pdev->dib.rect.left || y < 0 || y >= pdev->dib.rect.bottom - pdev->dib.rect.top) return FALSE; @@ -1097,7 +1097,7 @@ COLORREF CDECL dibdrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DC *dc = get_physdev_dc( dev ); DWORD pixel; - TRACE( "(%p, %08x)\n", dev, color ); + TRACE( "(%p, %s)\n", dev, debugstr_color(color) ); pixel = get_pixel_color( dc, &pdev->dib, color, FALSE ); return pdev->dib.funcs->pixel_to_colorref( &pdev->dib, pixel ); @@ -1575,7 +1575,7 @@ COLORREF CDECL dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) POINT pt; DWORD pixel; - TRACE( "(%p, %d, %d, %08x)\n", dev, x, y, color ); + TRACE( "(%p, %d, %d, %s)\n", dev, x, y, debugstr_color(color) ); pt.x = x; pt.y = y; diff --git a/dlls/win32u/palette.c b/dlls/win32u/palette.c index e8fd51dba22..6d5d1feb292 100644 --- a/dlls/win32u/palette.c +++ b/dlls/win32u/palette.c @@ -384,7 +384,7 @@ UINT WINAPI NtGdiGetNearestPaletteIndex( HPALETTE hpalette, COLORREF color ) } GDI_ReleaseObj( hpalette ); } - TRACE("(%p,%06x): returning %d\n", hpalette, color, index ); + TRACE("(%p,%s): returning %d\n", hpalette, debugstr_color(color), index ); return index; } @@ -413,7 +413,7 @@ COLORREF CDECL nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) if (!get_palette_entries( hpal, index, 1, &entry )) { - WARN("RGB(%x) : idx %d is out of bounds, assuming NULL\n", color, index ); + WARN("%s: idx %d is out of bounds, assuming NULL\n", debugstr_color(color), index ); if (!get_palette_entries( hpal, 0, 1, &entry )) return CLR_INVALID; } color = RGB( entry.peRed, entry.peGreen, entry.peBlue ); diff --git a/dlls/win32u/pen.c b/dlls/win32u/pen.c index 551c4438f3c..f45d7bb1c4e 100644 --- a/dlls/win32u/pen.c +++ b/dlls/win32u/pen.c @@ -59,7 +59,7 @@ HPEN create_pen( INT style, INT width, COLORREF color ) PENOBJ *penPtr; HPEN hpen; - TRACE( "%d %d %06x\n", style, width, color ); + TRACE( "%d %d %s\n", style, width, debugstr_color(color) ); switch (style) { diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index caab312482e..bc64bedb22b 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -506,4 +506,13 @@ static inline const char *debugstr_us( const UNICODE_STRING *us ) return debugstr_wn( us->Buffer, us->Length / sizeof(WCHAR) ); } +static inline const char *debugstr_color( COLORREF color ) +{ + if (color & (1 << 24)) /* PALETTEINDEX */ + return wine_dbg_sprintf( "PALETTEINDEX(%u)", LOWORD(color) ); + if (color >> 16 == 0x10ff) /* DIBINDEX */ + return wine_dbg_sprintf( "DIBINDEX(%u)", LOWORD(color) ); + return wine_dbg_sprintf( "RGB(%02x,%02x,%02x)", GetRValue(color), GetGValue(color), GetBValue(color) ); +} + #endif /* __WINE_WIN32U_PRIVATE */ diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index d92c09689ed..e9328cee55b 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -2066,7 +2066,7 @@ BOOL WINAPI NtUserSetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alph { BOOL ret; - TRACE( "(%p,%08x,%d,%x)\n", hwnd, key, alpha, flags ); + TRACE( "(%p,%s,%d,%x)\n", hwnd, debugstr_color(key), alpha, flags ); SERVER_START_REQ( set_window_layered_info ) {

1 0

Fabian Maurer : imm32: Prevent deadlock on unload.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: 5be2a01ce69c19fa89c0dea0165ffe185c69e326 URL: https://gitlab.winehq.org/wine/wine/-/commit/5be2a01ce69c19fa89c0dea0165ffe… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Nov 20 01:04:49 2022 +0100 imm32: Prevent deadlock on unload. ole32 is delay loaded, which can cause race conditions against krnl386.exe when unloading. This is because imm32 tries to get the loader lock while holding the win16 mutex, and kernel386 does the opposite. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52511 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/imm32/imm.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 780d544c0e9..fa2e0705db1 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -80,6 +80,9 @@ typedef struct _tagImmHkl{ DWORD (WINAPI *pImeGetImeMenuItems)(HIMC, DWORD, DWORD, IMEMENUITEMINFOW *, IMEMENUITEMINFOW *, DWORD); } ImmHkl; +static HRESULT (WINAPI *pCoRevokeInitializeSpy)(ULARGE_INTEGER cookie); +static void (WINAPI *pCoUninitialize)(void); + typedef struct tagInputContextData { HIMC handle; @@ -249,7 +252,7 @@ static void imm_couninit_thread(BOOL cleanup) if (cleanup && spy->cookie.QuadPart) { - CoRevokeInitializeSpy(spy->cookie); + pCoRevokeInitializeSpy(spy->cookie); spy->cookie.QuadPart = 0; } @@ -261,7 +264,7 @@ static void imm_couninit_thread(BOOL cleanup) { spy->apt_flags &= ~IMM_APT_CREATED; if (spy->apt_flags & IMM_APT_CAN_FREE) - CoUninitialize(); + pCoUninitialize(); } if (cleanup) spy->apt_flags = 0; @@ -359,10 +362,19 @@ static const IInitializeSpyVtbl InitializeSpyVtbl = InitializeSpy_PostUninitialize, }; +static BOOL WINAPI init_ole32_funcs( INIT_ONCE *once, void *param, void **context ) +{ + HMODULE module_ole32 = GetModuleHandleA("ole32"); + pCoRevokeInitializeSpy = (void*)GetProcAddress(module_ole32, "CoRevokeInitializeSpy"); + pCoUninitialize = (void*)GetProcAddress(module_ole32, "CoUninitialize"); + return TRUE; +} + static void imm_coinit_thread(void) { struct coinit_spy *spy; HRESULT hr; + static INIT_ONCE init_ole32_once = INIT_ONCE_STATIC_INIT; TRACE("implicit COM initialization\n"); @@ -391,6 +403,8 @@ static void imm_coinit_thread(void) hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); if (SUCCEEDED(hr)) spy->apt_flags |= IMM_APT_CREATED; + + InitOnceExecuteOnce(&init_ole32_once, init_ole32_funcs, NULL, NULL); } static BOOL IMM_IsDefaultContext(HIMC imc)

1 0

Nikolay Sivov : vbscript/tests: Fix redim tests.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: 131aa5135ba9f6aaab3a705f8010a3070ef4b604 URL: https://gitlab.winehq.org/wine/wine/-/commit/131aa5135ba9f6aaab3a705f8010a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 23 06:50:17 2022 +0300 vbscript/tests: Fix redim tests. --- dlls/vbscript/tests/lang.vbs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 990d830234d..529f995e764 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1562,7 +1562,8 @@ sub TestReDimList end sub call TestReDimList -dim rx(4) +dim rx +redim rx(4) sub TestReDimByRef(byref x) ok ubound(x) = 4, "ubound(x) = " & ubound(x) redim x(6)

1 0

Ziqing Hui : mf/tests: Test IMediaObject_GetInputType for WMV decoder.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: 8844d42428caf0520a20ee8e2e9ca2c9fc84b13f URL: https://gitlab.winehq.org/wine/wine/-/commit/8844d42428caf0520a20ee8e2e9ca2… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 17 20:08:28 2022 +0800 mf/tests: Test IMediaObject_GetInputType for WMV decoder. --- dlls/mf/tests/transform.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index cc8914ff17b..972e01331b7 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -33,6 +33,7 @@ #include "propvarutil.h" #include "uuids.h" #include "wmcodecdsp.h" +#include "mediaerr.h" #include "mf_test.h" @@ -1047,6 +1048,33 @@ DWORD check_mf_sample_collection_(const char *file, int line, IMFCollection *sam return ctx.diff / count; } +#define check_dmo_media_type(a, b) check_dmo_media_type_(__LINE__, a, b) +static void check_dmo_media_type_(int line, DMO_MEDIA_TYPE *media_type, const DMO_MEDIA_TYPE *expected) +{ + ok_(__FILE__, line)(IsEqualGUID(&media_type->majortype, &expected->majortype), + "Got unexpected majortype %s, expected %s.\n", + debugstr_guid(&media_type->majortype), debugstr_guid(&expected->majortype)); + ok_(__FILE__, line)(IsEqualGUID(&media_type->subtype, &expected->subtype), + "Got unexpected subtype %s, expected %s.\n", + debugstr_guid(&media_type->subtype), debugstr_guid(&expected->subtype)); + ok_(__FILE__, line)(media_type->bFixedSizeSamples == expected->bFixedSizeSamples, + "Got unexpected bFixedSizeSamples %d, expected %d.\n", + media_type->bFixedSizeSamples, expected->bFixedSizeSamples); + ok_(__FILE__, line)(media_type->bTemporalCompression == expected->bTemporalCompression, + "Got unexpected bTemporalCompression %d, expected %d.\n", + media_type->bTemporalCompression, expected->bTemporalCompression); + ok_(__FILE__, line)(media_type->lSampleSize == expected->lSampleSize, + "Got unexpected lSampleSize %lu, expected %lu.\n", + media_type->lSampleSize, expected->lSampleSize); + + ok_(__FILE__, line)(IsEqualGUID(&media_type->formattype, &GUID_NULL), + "Got unexpected formattype %s.\n", + debugstr_guid(&media_type->formattype)); + ok_(__FILE__, line)(media_type->pUnk == NULL, "Got unexpected pUnk %p.\n", media_type->pUnk); + ok_(__FILE__, line)(media_type->cbFormat == 0, "Got unexpected cbFormat %lu.\n", media_type->cbFormat); + ok_(__FILE__, line)(media_type->pbFormat == NULL, "Got unexpected pbFormat %p.\n", media_type->pbFormat); +} + static HRESULT WINAPI test_unk_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -4478,10 +4506,23 @@ failed: static void test_wmv_decoder_media_object(void) { const GUID *const class_id = &CLSID_CWMVDecMediaObject; + const DMO_MEDIA_TYPE expected_input_types[] = + { + {MFMediaType_Video, MFVideoFormat_WMV1, FALSE, TRUE, FALSE}, + {MFMediaType_Video, MFVideoFormat_WMV2, FALSE, TRUE, FALSE}, + {MFMediaType_Video, MEDIASUBTYPE_WMVA, FALSE, TRUE, FALSE}, + {MFMediaType_Video, MEDIASUBTYPE_WMVP, FALSE, TRUE, FALSE}, + {MFMediaType_Video, MEDIASUBTYPE_WVP2, FALSE, TRUE, FALSE}, + {MFMediaType_Video, MFVideoFormat_WMV_Unknown, FALSE, TRUE, FALSE}, + {MFMediaType_Video, MFVideoFormat_WVC1, FALSE, TRUE, FALSE}, + {MFMediaType_Video, MFVideoFormat_WMV3, FALSE, TRUE, FALSE}, + {MFMediaType_Video, MFVideoFormat_VC1S, FALSE, TRUE, FALSE}, + }; IMediaObject *media_object; + DMO_MEDIA_TYPE media_type; DWORD in_count, out_count; + ULONG ret, i; HRESULT hr; - ULONG ret; winetest_push_context("wmvdec"); @@ -4514,6 +4555,40 @@ static void test_wmv_decoder_media_object(void) ok(hr == E_POINTER, "GetStreamCount returned %#lx.\n", hr); ok(in_count == 0xdeadbeef, "Got unexpected in_count %lu.\n", in_count); + /* Test GetInputType. */ + i = -1; + while (SUCCEEDED(hr = IMediaObject_GetInputType(media_object, 0, ++i, &media_type))) + { + winetest_push_context("in %lu", i); + check_dmo_media_type(&media_type, &expected_input_types[i]); + winetest_pop_context(); + } + todo_wine + ok(i == ARRAY_SIZE(expected_input_types), "%lu input types.\n", i); + + /* Test GetInputType with invalid arguments. */ + hr = IMediaObject_GetInputType(media_object, 0, ARRAY_SIZE(expected_input_types) - 1, &media_type); + todo_wine + ok(hr == S_OK, "GetInputType returned unexpected hr %#lx.\n", hr); + hr = IMediaObject_GetInputType(media_object, 0, ARRAY_SIZE(expected_input_types), &media_type); + todo_wine + ok(hr == DMO_E_NO_MORE_ITEMS, "GetInputType returned unexpected hr %#lx.\n", hr); + hr = IMediaObject_GetInputType(media_object, 1, 0, &media_type); + todo_wine + ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetInputType returned unexpected hr %#lx.\n", hr); + hr = IMediaObject_GetInputType(media_object, 0, 0, NULL); + todo_wine + ok(hr == S_OK, "GetInputType returned unexpected hr %#lx.\n", hr); + hr = IMediaObject_GetInputType(media_object, 1, ARRAY_SIZE(expected_input_types), &media_type); + todo_wine + ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetInputType returned unexpected hr %#lx.\n", hr); + hr = IMediaObject_GetInputType(media_object, 0, ARRAY_SIZE(expected_input_types), NULL); + todo_wine + ok(hr == DMO_E_NO_MORE_ITEMS, "GetInputType returned unexpected hr %#lx.\n", hr); + hr = IMediaObject_GetInputType(media_object, 1, 0, NULL); + todo_wine + ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetInputType returned unexpected hr %#lx.\n", hr); + ret = IMediaObject_Release(media_object); ok(ret == 0, "Release returned %lu\n", ret); CoUninitialize();

1 0

Ziqing Hui : winegstreamer: Implement media_object_GetInputType for WMV decoder.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: d596f972508d0f9899a911dfcc1bccdad0a340bc URL: https://gitlab.winehq.org/wine/wine/-/commit/d596f972508d0f9899a911dfcc1bcc… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 17 19:36:25 2022 +0800 winegstreamer: Implement media_object_GetInputType for WMV decoder. --- dlls/mf/tests/transform.c | 8 -------- dlls/winegstreamer/wmv_decoder.c | 37 +++++++++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 972e01331b7..82817724a78 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -4563,30 +4563,22 @@ static void test_wmv_decoder_media_object(void) check_dmo_media_type(&media_type, &expected_input_types[i]); winetest_pop_context(); } - todo_wine ok(i == ARRAY_SIZE(expected_input_types), "%lu input types.\n", i); /* Test GetInputType with invalid arguments. */ hr = IMediaObject_GetInputType(media_object, 0, ARRAY_SIZE(expected_input_types) - 1, &media_type); - todo_wine ok(hr == S_OK, "GetInputType returned unexpected hr %#lx.\n", hr); hr = IMediaObject_GetInputType(media_object, 0, ARRAY_SIZE(expected_input_types), &media_type); - todo_wine ok(hr == DMO_E_NO_MORE_ITEMS, "GetInputType returned unexpected hr %#lx.\n", hr); hr = IMediaObject_GetInputType(media_object, 1, 0, &media_type); - todo_wine ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetInputType returned unexpected hr %#lx.\n", hr); hr = IMediaObject_GetInputType(media_object, 0, 0, NULL); - todo_wine ok(hr == S_OK, "GetInputType returned unexpected hr %#lx.\n", hr); hr = IMediaObject_GetInputType(media_object, 1, ARRAY_SIZE(expected_input_types), &media_type); - todo_wine ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetInputType returned unexpected hr %#lx.\n", hr); hr = IMediaObject_GetInputType(media_object, 0, ARRAY_SIZE(expected_input_types), NULL); - todo_wine ok(hr == DMO_E_NO_MORE_ITEMS, "GetInputType returned unexpected hr %#lx.\n", hr); hr = IMediaObject_GetInputType(media_object, 1, 0, NULL); - todo_wine ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetInputType returned unexpected hr %#lx.\n", hr); ret = IMediaObject_Release(media_object); diff --git a/dlls/winegstreamer/wmv_decoder.c b/dlls/winegstreamer/wmv_decoder.c index fe9870e1bc3..96a2839660a 100644 --- a/dlls/winegstreamer/wmv_decoder.c +++ b/dlls/winegstreamer/wmv_decoder.c @@ -19,6 +19,7 @@ #include "mfapi.h" #include "mferror.h" +#include "mediaerr.h" #include "mfobjects.h" #include "mftransform.h" #include "wmcodecdsp.h" @@ -28,6 +29,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +extern const GUID MFVideoFormat_VC1S; + +DEFINE_GUID(MFVideoFormat_WMV_Unknown, 0x7ce12ca9,0xbfbf,0x43d9,0x9d,0x00,0x82,0xb8,0xed,0x54,0x31,0x6b); + +static const GUID *const wmv_decoder_input_types[] = +{ + &MFVideoFormat_WMV1, + &MFVideoFormat_WMV2, + &MEDIASUBTYPE_WMVA, + &MEDIASUBTYPE_WMVP, + &MEDIASUBTYPE_WVP2, + &MFVideoFormat_WMV_Unknown, + &MFVideoFormat_WVC1, + &MFVideoFormat_WMV3, + &MFVideoFormat_VC1S, +}; + struct wmv_decoder { IUnknown IUnknown_inner; @@ -345,8 +363,23 @@ static HRESULT WINAPI media_object_GetOutputStreamInfo(IMediaObject *iface, DWOR static HRESULT WINAPI media_object_GetInputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) { - FIXME("iface %p, index %lu, type_index %lu, type %p stub!\n", iface, index, type_index, type); - return E_NOTIMPL; + TRACE("iface %p, index %lu, type_index %lu, type %p.\n", iface, index, type_index, type); + + if (index > 0) + return DMO_E_INVALIDSTREAMINDEX; + if (type_index >= ARRAY_SIZE(wmv_decoder_input_types)) + return DMO_E_NO_MORE_ITEMS; + if (!type) + return S_OK; + + memset(type, 0, sizeof(*type)); + type->majortype = MFMediaType_Video; + type->subtype = *wmv_decoder_input_types[type_index]; + type->bFixedSizeSamples = FALSE; + type->bTemporalCompression = TRUE; + type->lSampleSize = 0; + + return S_OK; } static HRESULT WINAPI media_object_GetOutputType(IMediaObject *iface, DWORD index, DWORD type_index,

1 0