April 2022 - Wine-Commits - list.winehq.org

Jacek Caban : winex11: Return selection data as a single buffer from import_xdnd_selection.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: fa9e9b5c562a6bd2263a06490e5bb047b72140aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa9e9b5c562a6bd2263a0649… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 14:01:15 2022 +0100 winex11: Return selection data as a single buffer from import_xdnd_selection. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 29 +++++++++++++++++------------ dlls/winex11.drv/x11drv.h | 14 +++++++++++--- dlls/winex11.drv/xdnd.c | 26 ++++++++++++++++++++++++-- 3 files changed, 52 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index ec69778fc3c..92284d436dd 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1096,21 +1096,21 @@ static void *import_selection( Display *display, Window win, Atom selection, /************************************************************************** - * X11DRV_CLIPBOARD_ImportSelection + * import_xdnd_selection * * Import the X selection into the clipboard format registered for the given X target. */ -void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom selection, - Atom *targets, UINT count, - void (*callback)( UINT, HANDLE )) +struct format_entry *import_xdnd_selection( Display *display, Window win, Atom selection, + Atom *targets, UINT count, size_t *ret_size ) { + size_t size, buf_size = 0, entry_size; UINT i; - HANDLE handle; void *data; - size_t size; struct clipboard_format *format; + struct format_entry *ret = NULL, *entry; register_x11_formats( targets, count ); + *ret_size = 0; for (i = 0; i < count; i++) { @@ -1118,16 +1118,21 @@ void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom select if (!format->id) continue; if (!(data = import_selection( display, win, selection, format, &size ))) continue; - if ((handle = GlobalAlloc( GMEM_FIXED, size ))) + entry_size = (FIELD_OFFSET( struct format_entry, data[size] ) + 7) & ~7; + if (buf_size < size + entry_size) { - void *ptr; - ptr = GlobalLock( handle ); - memcpy( ptr, data, size ); - GlobalUnlock( handle ); - callback( format->id, handle ); + if (!(ret = realloc( ret, *ret_size + entry_size + 1024 ))) continue; + buf_size = *ret_size + entry_size + 1024; /* extra space for following entries */ } + entry = (struct format_entry *)((char *)ret + *ret_size); + entry->format = format->id; + entry->size = size; + if (size) memcpy( entry->data, data, size ); + *ret_size += entry_size; free( data ); } + + return ret; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a8d2f78aa6b..f6d28122fc3 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -297,9 +297,17 @@ extern void X11DRV_XDND_EnterEvent( HWND hWnd, XClientMessageEvent *event ) DECL extern void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; extern void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; extern void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; -extern void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom selection, - Atom *targets, UINT count, - void (*callback)( UINT, HANDLE )) DECLSPEC_HIDDEN; + +struct format_entry +{ + UINT format; + UINT size; + char data[1]; +}; + +extern struct format_entry *import_xdnd_selection( Display *display, Window win, Atom selection, + Atom *targets, UINT count, + size_t *size ) DECLSPEC_HIDDEN; /************************************************************************** * X11 GDI driver diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index b9bba1ff872..aa46467f6f7 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -79,6 +79,12 @@ static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION xdnd_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; +static struct format_entry *next_format( struct format_entry *entry ) +{ + return (struct format_entry *)&entry->data[(entry->size + 7) & ~7]; +} + + /* Based on functions in dlls/ole32/ole2.c */ static HANDLE get_droptarget_local_handle(HWND hwnd) { @@ -523,15 +529,31 @@ void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event ) static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom *types, unsigned long count) { + struct format_entry *formats, *formats_end, *iter; XDNDDATA *current, *next; BOOL haveHDROP = FALSE; + size_t size; TRACE("count(%ld)\n", count); X11DRV_XDND_FreeDragDropOp(); /* Clear previously cached data */ - X11DRV_CLIPBOARD_ImportSelection( display, xwin, x11drv_atom(XdndSelection), - types, count, X11DRV_XDND_InsertXDNDData ); + formats = import_xdnd_selection( display, xwin, x11drv_atom(XdndSelection), types, count, &size ); + if (formats) + { + formats_end = (struct format_entry *)((char *)formats + size); + for (iter = formats; iter < formats_end; iter = next_format( iter )) + { + HANDLE handle; + if ((handle = GlobalAlloc( GMEM_FIXED, iter->size ))) + { + void *ptr = GlobalLock( handle ); + memcpy( ptr, iter->data, iter->size ); + GlobalUnlock( handle ); + X11DRV_XDND_InsertXDNDData( iter->format, handle ); + } + } + } /* On Windows when there is a CF_HDROP, there are no other CF_ formats. * foobar2000 relies on this (spaces -> %20's without it).

1 0

Jacek Caban : winex11: Directly use ntdll in clipboard.c.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: 0e5ad562c51ef5f46fd3ada0d5d9920ed8bc747d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e5ad562c51ef5f46fd3ada0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 14:01:14 2022 +0100 winex11: Directly use ntdll in clipboard.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index b36b9a002a3..ec69778fc3c 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -191,7 +191,7 @@ static Window selection_window; static Window import_window; static Atom current_selection; static UINT rendered_formats; -static ULONG64 last_clipboard_update; +static ULONG last_clipboard_update; static struct clipboard_format **current_x11_formats; static unsigned int nb_current_x11_formats; static BOOL use_xfixes; @@ -281,6 +281,14 @@ static struct clipboard_format *find_x11_format( Atom atom ) } +static ATOM register_clipboard_format( const WCHAR *name ) +{ + ATOM atom; + if (NtAddAtom( name, lstrlenW( name ) * sizeof(WCHAR), &atom )) return 0; + return atom; +} + + /************************************************************************** * register_builtin_formats */ @@ -294,7 +302,7 @@ static void register_builtin_formats(void) for (i = 0; i < ARRAY_SIZE(builtin_formats); i++) { if (builtin_formats[i].name) - formats[i].id = RegisterClipboardFormatW( builtin_formats[i].name ); + formats[i].id = register_clipboard_format( builtin_formats[i].name ); else formats[i].id = builtin_formats[i].id; @@ -398,7 +406,7 @@ static void register_x11_formats( const Atom *atoms, UINT size ) for (i = pos = 0; i < count; i++) { if (MultiByteToWideChar( CP_UNIXCP, 0, names[i], -1, buffer, 256 ) && - (ids[pos] = RegisterClipboardFormatW( buffer ))) + (ids[pos] = register_clipboard_format( buffer ))) new_atoms[pos++] = new_atoms[i]; XFree( names[i] ); } @@ -1915,7 +1923,7 @@ static BOOL request_selection_contents( Display *display, BOOL changed ) last_type = type; last_data = data; last_size = size; - last_clipboard_update = GetTickCount64(); + last_clipboard_update = NtGetTickCount(); NtUserCloseClipboard(); if (!use_xfixes) NtUserSetTimer( clipboard_hwnd, 1, SELECTION_UPDATE_DELAY, NULL, TIMERV_DEFAULT_COALESCING ); @@ -1933,7 +1941,7 @@ BOOL update_clipboard( HWND hwnd ) if (use_xfixes) return TRUE; if (hwnd != clipboard_hwnd) return TRUE; if (!is_clipboard_owner) return TRUE; - if (GetTickCount64() - last_clipboard_update <= SELECTION_UPDATE_DELAY) return TRUE; + if (NtGetTickCount() - last_clipboard_update <= SELECTION_UPDATE_DELAY) return TRUE; return request_selection_contents( thread_display(), FALSE ); } @@ -2131,7 +2139,7 @@ void X11DRV_UpdateClipboard(void) if (use_xfixes) return; if (GetCurrentThreadId() == clipboard_thread_id) return; - now = GetTickCount(); + now = NtGetTickCount(); if ((int)(now - last_update) <= SELECTION_UPDATE_DELAY) return; if (SendMessageTimeoutW( GetClipboardOwner(), WM_X11DRV_UPDATE_CLIPBOARD, 0, 0, SMTO_ABORTIFHUNG, 5000, &ret ) && ret)

1 0

Jacek Caban : winex11: Directly use win32u in import_image_bmp.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: bfa51809e44439586eb1cce1390162f17d3f164c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfa51809e44439586eb1cce1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 14:01:13 2022 +0100 winex11: Directly use win32u in import_image_bmp. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 45 +++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 7640308fadd..b36b9a002a3 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -511,7 +511,7 @@ static void *create_dib_from_bitmap( HBITMAP hBmp, size_t *size ) int nLinesCopied; char *ret; - if (!GetObjectW( hBmp, sizeof(bmp), &bmp )) return 0; + if (!NtGdiExtGetObjectW( hBmp, sizeof(bmp), &bmp )) return 0; /* * A packed DIB contains a BITMAPINFO structure followed immediately by @@ -551,15 +551,10 @@ static void *create_dib_from_bitmap( HBITMAP hBmp, size_t *size ) /* Retrieve the DIB bits from the bitmap and fill in the * DIB color table if present */ - hdc = GetDC( 0 ); - nLinesCopied = GetDIBits(hdc, /* Handle to device context */ - hBmp, /* Handle to bitmap */ - 0, /* First scan line to set in dest bitmap */ - bmp.bmHeight, /* Number of scan lines to copy */ - ret + OffsetBits, /* [out] Address of array for bitmap bits */ - (LPBITMAPINFO) pbmiHeader, /* [out] Address of BITMAPINFO structure */ - 0); /* RGB or palette index */ - ReleaseDC( 0, hdc ); + hdc = NtUserGetDCEx( 0, 0, DCX_CACHE | DCX_WINDOW ); + nLinesCopied = NtGdiGetDIBitsInternal( hdc, hBmp, 0, bmp.bmHeight, ret + OffsetBits, + (LPBITMAPINFO) pbmiHeader, 0, 0, 0 ); + NtUserReleaseDC( 0, hdc ); /* Cleanup if GetDIBits failed */ if (nLinesCopied != bmp.bmHeight) @@ -845,16 +840,36 @@ static void *import_image_bmp( Atom type, const void *data, size_t size, size_t bfh->bfType == 0x4d42 /* "BM" */) { const BITMAPINFO *bmi = (const BITMAPINFO *)(bfh + 1); + int width, height; HBITMAP hbmp; - HDC hdc = GetDC(0); + HDC hdc; - if ((hbmp = CreateDIBitmap( hdc, &bmi->bmiHeader, CBM_INIT, - (const BYTE *)data + bfh->bfOffBits, bmi, DIB_RGB_COLORS ))) + if (bmi->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)bmi; + width = core->bcWidth; + height = core->bcHeight; + } + else if (bmi->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) + { + const BITMAPINFOHEADER *header = &bmi->bmiHeader; + if (header->biCompression == BI_JPEG || header->biCompression == BI_PNG) return 0; + width = header->biWidth; + height = header->biHeight; + } + else return NULL; + if (!width || !height) return NULL; + + hdc = NtUserGetDCEx( 0, 0, DCX_CACHE | DCX_WINDOW ); + + if ((hbmp = NtGdiCreateDIBitmapInternal( hdc, width, height, CBM_INIT, + (const BYTE *)data + bfh->bfOffBits, bmi, + DIB_RGB_COLORS, 0, 0, 0, 0 ))) { ret = create_dib_from_bitmap( hbmp, ret_size ); - DeleteObject(hbmp); + NtGdiDeleteObjectApp( hbmp ); } - ReleaseDC(0, hdc); + NtUserReleaseDC(0, hdc); } return ret; }

1 0

Jacek Caban : winex11: Use NtUserSetClipboardData to import clipboard data.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: 3c05f3b24704cb09389960b8c6ee584db9a61759 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c05f3b24704cb09389960b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 14:01:12 2022 +0100 winex11: Use NtUserSetClipboardData to import clipboard data. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 192 ++++++++++++++++++++++--------------------- 1 file changed, 100 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3c05f3b24704cb093899…

1 0

Alexandre Julliard : user32/tests: Use the standard INPUT type definition.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: b67d66f58304db1da73d0f7eda9027f5939178e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b67d66f58304db1da73d0f7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 27 15:37:30 2022 +0200 user32/tests: Use the standard INPUT type definition. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 132 +++++++++++++++++++++------------------------- dlls/user32/tests/menu.c | 37 +++++-------- 2 files changed, 72 insertions(+), 97 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b67d66f58304db1da73d…

1 0

Eric Pouech : d3dx9: Use correct integral type.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: fc67b16803a6f7793573b28d9cd69c7106468a6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc67b16803a6f7793573b28d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Apr 27 10:27:55 2022 +0200 d3dx9: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 3 ++- dlls/d3dx9_36/mesh.c | 2 +- dlls/d3dx9_36/shader.c | 21 +++++++++++---------- dlls/d3dx9_36/surface.c | 6 +++--- dlls/d3dx9_36/volume.c | 2 +- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 44bcda0271a..7ee754b104a 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -230,7 +230,8 @@ static inline BOOL is_param_type_sampler(D3DXPARAMETER_TYPE type) /* Returns the smallest power of 2 which is greater than or equal to num */ static inline uint32_t make_pow2(uint32_t num) { - uint32_t index; + DWORD index; + return BitScanReverse(&index, num - 1) ? 1u << (index + 1) : 1; } diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 6cfe97492f3..f74fba6e424 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -54,7 +54,7 @@ struct d3dx9_mesh IDirect3DVertexBuffer9 *vertex_buffer; IDirect3DIndexBuffer9 *index_buffer; DWORD *attrib_buffer; - int attrib_buffer_lock_count; + LONG attrib_buffer_lock_count; DWORD attrib_table_size; D3DXATTRIBUTERANGE *attrib_table; }; diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 2241455898e..eae01674c0a 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -281,7 +281,7 @@ static HRESULT WINAPI d3dx_include_from_file_open(ID3DXInclude *iface, D3DXINCLU if(!buffer) goto error; *buffer = pathname; - if(!ReadFile(file, buffer + 1, size, bytes, NULL)) + if (!ReadFile(file, buffer + 1, size, (DWORD *)bytes, NULL)) goto error; *data = buffer + 1; @@ -339,11 +339,11 @@ HRESULT WINAPI D3DXAssembleShaderFromFileA(const char *filename, const D3DXMACRO HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACRO *defines, ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages) { - const void *buffer; - DWORD len; - HRESULT hr; struct d3dx_include_from_file include_from_file; + const void *buffer; + unsigned int len; char *filename_a; + HRESULT hr; TRACE("filename %s, defines %p, include %p, flags %#x, shader %p, error_messages %p.\n", debugstr_w(filename), defines, include, flags, shader, error_messages); @@ -475,11 +475,12 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO ID3DXInclude *include, const char *entrypoint, const char *profile, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages, ID3DXConstantTable **constant_table) { - const void *buffer; - DWORD len, filename_len; - HRESULT hr; struct d3dx_include_from_file include_from_file; + unsigned int filename_len; + const void *buffer; char *filename_a; + HRESULT hr; + UINT len; TRACE("filename %s, defines %p, include %p, entrypoint %s, profile %s, " "flags %#x, shader %p, error_messages %p, constant_table %p.\n", @@ -603,11 +604,11 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileA(const char *filename, const D3DXMAC HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMACRO *defines, ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages) { - const void *buffer; - DWORD len; - HRESULT hr; struct d3dx_include_from_file include_from_file; + const void *buffer; char *filename_a; + HRESULT hr; + UINT len; TRACE("filename %s, defines %p, include %p, shader %p, error_messages %p.\n", debugstr_w(filename), defines, include, shader, error_messages); diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 2ca6f093b55..39733d3ef7e 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1391,7 +1391,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileW(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *dst_palette, const RECT *dst_rect, const WCHAR *src_file, const RECT *src_rect, DWORD filter, D3DCOLOR color_key, D3DXIMAGE_INFO *src_info) { - UINT data_size; + DWORD data_size; void *data; HRESULT hr; @@ -1417,7 +1417,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromResourceA(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *dst_palette, const RECT *dst_rect, HMODULE src_module, const char *resource, const RECT *src_rect, DWORD filter, D3DCOLOR color_key, D3DXIMAGE_INFO *src_info) { - UINT data_size; + DWORD data_size; HRSRC resinfo; void *data; @@ -1445,7 +1445,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromResourceW(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *dst_palette, const RECT *dst_rect, HMODULE src_module, const WCHAR *resource, const RECT *src_rect, DWORD filter, D3DCOLOR color_key, D3DXIMAGE_INFO *src_info) { - UINT data_size; + DWORD data_size; HRSRC resinfo; void *data; diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index 93afaa16b10..d601650cff5 100644 --- a/dlls/d3dx9_36/volume.c +++ b/dlls/d3dx9_36/volume.c @@ -60,9 +60,9 @@ HRESULT WINAPI D3DXLoadVolumeFromFileW(IDirect3DVolume9 *dst_volume, D3DCOLOR color_key, D3DXIMAGE_INFO *info) { + DWORD data_size; HRESULT hr; void *data; - UINT data_size; TRACE("(%p, %p, %p, %s, %p, %#x, %#x, %p)\n", dst_volume, dst_palette, dst_box, debugstr_w(filename), src_box,

1 0

Matteo Bruni : d3dx9/effect: Return a uint32_t from the bytecode read helper.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: 71091ed5d9a6fb567f5da8864e999ff34e0f6d74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71091ed5d9a6fb567f5da886… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 27 10:27:54 2022 +0200 d3dx9/effect: Return a uint32_t from the bytecode read helper. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 16 +-- dlls/d3dx9_36/effect.c | 268 +++++++++++++++++++++--------------------- 2 files changed, 141 insertions(+), 143 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=71091ed5d9a6fb567f5d…

1 0

Huw Davies : wineoss: Pass the time relative to the start time to the callback.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: 84ce144c3b72ca5a96a4b00603204bf47672bcf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84ce144c3b72ca5a96a4b006… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 27 08:03:17 2022 +0100 wineoss: Pass the time relative to the start time to the callback. This is equivalent to commits 01ad503004cf8ea6b0bd8f544ee131fc86abc580 and bce11840bd5f56c70e1290d302556c97ba3b1389 in the coreaudio and alsa drivers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/midi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index e796c9a7085..44491a98cfa 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -508,7 +508,7 @@ static DWORD midReset(WORD wDevID) MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); + MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime - MidiInDev[wDevID].startTime); } in_buffer_unlock();

1 0

Fabian Maurer : mfplay: Prevent usage of uninitialized pointer in error case (Coverity).
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: 312e0d518f37065fb566a7f17efd49cdaa3f3e27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=312e0d518f37065fb566a7f1… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Apr 27 14:44:40 2022 +0300 mfplay: Prevent usage of uninitialized pointer in error case (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 7d9a4da8649..c500717b8d0 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1378,7 +1378,6 @@ static HRESULT media_item_create_sink_node(IUnknown *sink, IMFTopologyNode **nod static HRESULT media_item_create_topology(struct media_player *player, struct media_item *item, IMFTopology **out) { - IMFTopologyNode *src_node, *sink_node; BOOL selected, video_added = FALSE; IMFStreamDescriptor *sd; IMFTopology *topology; @@ -1421,6 +1420,8 @@ static HRESULT media_item_create_topology(struct media_player *player, struct me if (sink) { + IMFTopologyNode *src_node = NULL, *sink_node = NULL; + hr = media_item_create_source_node(item, sd, &src_node); if (SUCCEEDED(hr)) hr = media_item_create_sink_node(sink, &sink_node);

1 0

Alexandre Julliard : kernel32/tests: Mark a failing test as broken.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: f68cccc82579ebedf6f9961f3bc30b2eb9307e63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f68cccc82579ebedf6f9961f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 27 16:13:39 2022 +0200 kernel32/tests: Mark a failing test as broken. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52861 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 48 +++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 8dc5814162a..65687313fbb 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4435,29 +4435,31 @@ static void test_GetCPInfo(void) ok( ret, "UnmapViewOfFile failed err %lu\n", GetLastError() ); status = pNtGetNlsSectionPtr( 11, 65001, NULL, &ptr, &size ); - ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "failed %lx\n", status ); - if (pRtlInitCodePageTable) - { - static USHORT utf8[20] = { 0, CP_UTF8 }; - - memset( &table, 0xcc, sizeof(table) ); - pRtlInitCodePageTable( utf8, &table ); - ok( table.CodePage == CP_UTF8, "wrong codepage %u\n", table.CodePage ); - if (table.MaximumCharacterSize) - { - ok( table.MaximumCharacterSize == 4, "wrong char size %u\n", table.MaximumCharacterSize ); - ok( table.DefaultChar == '?', "wrong default char %x\n", table.DefaultChar ); - ok( table.UniDefaultChar == 0xfffd, "wrong default char %x\n", table.UniDefaultChar ); - ok( table.TransDefaultChar == '?', "wrong default char %x\n", table.TransDefaultChar ); - ok( table.TransUniDefaultChar == '?', "wrong default char %x\n", table.TransUniDefaultChar ); - ok( !table.DBCSCodePage, "wrong dbcs %u\n", table.DBCSCodePage ); - ok( !table.MultiByteTable, "wrong mbtable %p\n", table.MultiByteTable ); - ok( !table.WideCharTable, "wrong wctable %p\n", table.WideCharTable ); - ok( !table.DBCSRanges, "wrong ranges %p\n", table.DBCSRanges ); - ok( !table.DBCSOffsets, "wrong offsets %p\n", table.DBCSOffsets ); - } - else win_skip( "utf-8 codepage not supported\n" ); - } + ok( status == STATUS_OBJECT_NAME_NOT_FOUND || broken(!status), /* win10 1709 */ + "failed %lx\n", status ); + if (!status) UnmapViewOfFile( ptr ); + if (pRtlInitCodePageTable) + { + static USHORT utf8[20] = { 0, CP_UTF8 }; + + memset( &table, 0xcc, sizeof(table) ); + pRtlInitCodePageTable( utf8, &table ); + ok( table.CodePage == CP_UTF8, "wrong codepage %u\n", table.CodePage ); + if (table.MaximumCharacterSize) + { + ok( table.MaximumCharacterSize == 4, "wrong char size %u\n", table.MaximumCharacterSize ); + ok( table.DefaultChar == '?', "wrong default char %x\n", table.DefaultChar ); + ok( table.UniDefaultChar == 0xfffd, "wrong default char %x\n", table.UniDefaultChar ); + ok( table.TransDefaultChar == '?', "wrong default char %x\n", table.TransDefaultChar ); + ok( table.TransUniDefaultChar == '?', "wrong default char %x\n", table.TransUniDefaultChar ); + ok( !table.DBCSCodePage, "wrong dbcs %u\n", table.DBCSCodePage ); + ok( !table.MultiByteTable, "wrong mbtable %p\n", table.MultiByteTable ); + ok( !table.WideCharTable, "wrong wctable %p\n", table.WideCharTable ); + ok( !table.DBCSRanges, "wrong ranges %p\n", table.DBCSRanges ); + ok( !table.DBCSOffsets, "wrong offsets %p\n", table.DBCSOffsets ); + } + else win_skip( "utf-8 codepage not supported\n" ); + } /* normalization tables */

1 0