March 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : wine.inf: Fix 64-bit driver installation.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: 36cec2c7df5a3c7742ae55f578d7b1399c1f7528 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36cec2c7df5a3c7742ae55f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 12:48:35 2021 +0100 wine.inf: Fix 64-bit driver installation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index aaed4cf6824..52c2297fb2f 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2710,7 +2710,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16427,System\OLE DB,msdaps.dll 16427,System\ADO,msado15.dll 66000,3,wineps.drv -12,,*.sys,- +12,,*.sys 11,,* [SystemIni]

1 0

Huw Davies : riched20: Don't invalidate while inside TxDraw().
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: aae4fa9b1cdf0012a3fc07c553b08ea211fa03b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aae4fa9b1cdf0012a3fc07c5… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 25 09:10:27 2021 +0000 riched20: Don't invalidate while inside TxDraw(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 2 +- dlls/riched20/txtsrv.c | 2 +- dlls/riched20/wrap.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 929e10a3179..bf713880f8f 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -202,7 +202,7 @@ void ME_DestroyContext(ME_Context *c) DECLSPEC_HIDDEN; BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) DECLSPEC_HIDDEN; void para_range_invalidate( ME_TextEditor *editor, ME_Paragraph *start_para, ME_Paragraph *last_para ) DECLSPEC_HIDDEN; void ME_SendRequestResize(ME_TextEditor *editor, BOOL force) DECLSPEC_HIDDEN; -BOOL wrap_marked_paras_dc( ME_TextEditor *editor, HDC hdc ) DECLSPEC_HIDDEN; +BOOL wrap_marked_paras_dc( ME_TextEditor *editor, HDC hdc, BOOL invalidate ) DECLSPEC_HIDDEN; /* para.c */ void editor_get_selection_paras(ME_TextEditor *editor, ME_Paragraph **para, ME_Paragraph **para_end ) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 6ef7b7ef029..79ade0f6117 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -192,7 +192,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxDraw( ITextServices *iface, DWORD if (rewrap) { editor_mark_rewrap_all( services->editor ); - wrap_marked_paras_dc( services->editor, dc ); + wrap_marked_paras_dc( services->editor, dc, FALSE ); } editor_draw( services->editor, dc, update ); diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 468b267ceae..9456d54d815 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -1020,7 +1020,7 @@ static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_ran } } -BOOL wrap_marked_paras_dc( ME_TextEditor *editor, HDC hdc ) +BOOL wrap_marked_paras_dc( ME_TextEditor *editor, HDC hdc, BOOL invalidate ) { ME_Paragraph *para, *next; struct wine_rb_entry *entry, *next_entry = NULL; @@ -1086,7 +1086,7 @@ BOOL wrap_marked_paras_dc( ME_TextEditor *editor, HDC hdc ) ME_DestroyContext(&c); - if (repaint.start || editor->nTotalLength < editor->nLastTotalLength) + if (invalidate && (repaint.start || editor->nTotalLength < editor->nLastTotalLength)) para_range_invalidate( editor, repaint.start, repaint.end); return !!repaint.start; } @@ -1094,7 +1094,7 @@ BOOL wrap_marked_paras_dc( ME_TextEditor *editor, HDC hdc ) BOOL ME_WrapMarkedParagraphs( ME_TextEditor *editor ) { HDC hdc = ITextHost_TxGetDC( editor->texthost ); - BOOL ret = wrap_marked_paras_dc( editor, hdc ); + BOOL ret = wrap_marked_paras_dc( editor, hdc, TRUE ); ITextHost_TxReleaseDC( editor->texthost, hdc ); return ret; }

1 0

Alexandre Julliard : ntdll: Use start /exec to support absolute Unix paths.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: 50e33a213d7382906594e565b5813a41d87117fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=50e33a213d7382906594e565… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 11:31:46 2021 +0100 ntdll: Use start /exec to support absolute Unix paths. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50858 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index f7ba8ce8ab5..256ea40cc87 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1880,12 +1880,11 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) if (status) /* try launching it through start.exe */ { - static const WCHAR slashwW[] = {'/','w',0}; - static const WCHAR slashbW[] = {'/','b',0}; - const WCHAR *args[] = { NULL, slashwW, slashbW }; + static const WCHAR execW[] = {'/','e','x','e','c',0}; + const WCHAR *args[] = { NULL, execW }; free( image ); - prepend_main_wargv( args, 3 ); + prepend_main_wargv( args, 2 ); load_start_exe( &image, &module, &image_info ); }

1 0

Alexandre Julliard : ntdll: Check the main image for Unix path only the first time around.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: 967100258fb1da850668e620c1c5095630576840 URL: https://source.winehq.org/git/wine.git/?a=commit;h=967100258fb1da850668e620… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 11:24:35 2021 +0100 ntdll: Check the main image for Unix path only the first time around. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50858 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 6 +++--- dlls/ntdll/unix/loader.c | 8 ++++---- dlls/ntdll/unix/unix_private.h | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index e4932473fcc..07b9f0fc384 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1871,7 +1871,7 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) add_registry_environment( &env, &env_pos, &env_size ); env[env_pos++] = 0; - status = load_main_exe( main_wargv[0], curdir, &image, &module, &image_info ); + status = load_main_exe( main_wargv[0], main_argv[0], curdir, &image, &module, &image_info ); if (!status && image_info.Machine != current_machine) /* need to restart for Wow64 */ { NtUnmapViewOfSection( GetCurrentProcess(), module ); @@ -1888,7 +1888,7 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) free( image ); prepend_main_wargv( args, 3 ); - if ((status = load_main_exe( startW, curdir, &image, &module, &image_info ))) + if ((status = load_main_exe( startW, NULL, curdir, &image, &module, &image_info ))) { MESSAGE( "wine: failed to start %s\n", debugstr_w(main_wargv[2]) ); NtTerminateProcess( GetCurrentProcess(), status ); @@ -2042,7 +2042,7 @@ void init_startup_info(void) free( info ); NtCurrentTeb()->Peb->ProcessParameters = params; - status = load_main_exe( params->ImagePathName.Buffer, params->CommandLine.Buffer, + status = load_main_exe( params->ImagePathName.Buffer, NULL, params->CommandLine.Buffer, &image, &module, &image_info ); if (status) { diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index a8b06d690a6..24cc546c300 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1500,8 +1500,8 @@ static NTSTATUS open_main_image( WCHAR *image, void **module, SECTION_IMAGE_INFO /*********************************************************************** * load_main_exe */ -NTSTATUS load_main_exe( const WCHAR *name, const WCHAR *curdir, WCHAR **image, void **module, - SECTION_IMAGE_INFORMATION *image_info ) +NTSTATUS load_main_exe( const WCHAR *name, const char *unix_name, const WCHAR *curdir, + WCHAR **image, void **module, SECTION_IMAGE_INFORMATION *image_info ) { UNICODE_STRING nt_name; NTSTATUS status; @@ -1510,9 +1510,9 @@ NTSTATUS load_main_exe( const WCHAR *name, const WCHAR *curdir, WCHAR **image, v const WCHAR *p; /* special case for Unix file name */ - if (main_argv[0][0] == '/' && !stat( main_argv[0], &st )) + if (unix_name && unix_name[0] == '/' && !stat( unix_name, &st )) { - if ((status = unix_to_nt_file_name( main_argv[0], image ))) goto failed; + if ((status = unix_to_nt_file_name( unix_name, image ))) goto failed; status = open_main_image( *image, module, image_info ); if (status != STATUS_DLL_NOT_FOUND) return status; free( *image ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 8e491a3f2a4..a486a2ff0f4 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -143,8 +143,8 @@ extern char **build_envp( const WCHAR *envW ) DECLSPEC_HIDDEN; extern NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_info ) DECLSPEC_HIDDEN; extern NTSTATUS load_builtin( const pe_image_info_t *image_info, const WCHAR *filename, void **addr_ptr, SIZE_T *size_ptr ) DECLSPEC_HIDDEN; -extern NTSTATUS load_main_exe( const WCHAR *name, const WCHAR *curdir, WCHAR **image, void **module, - SECTION_IMAGE_INFORMATION *image_info ) DECLSPEC_HIDDEN; +extern NTSTATUS load_main_exe( const WCHAR *name, const char *unix_name, const WCHAR *curdir, WCHAR **image, + void **module, SECTION_IMAGE_INFORMATION *image_info ) DECLSPEC_HIDDEN; extern void start_server( BOOL debug ) DECLSPEC_HIDDEN; extern ULONG_PTR get_image_address(void) DECLSPEC_HIDDEN;

1 0

Jacek Caban : windowscodecs: Use nameless unions.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: 909b2ced71f1151c29fa7a9e24f1a42d6cdd81ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=909b2ced71f1151c29fa7a9e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 24 18:37:50 2021 +0100 windowscodecs: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 1 - dlls/windowscodecs/gifformat.c | 110 +++++++++++++++--------------- dlls/windowscodecs/metadatahandler.c | 126 +++++++++++++++++------------------ dlls/windowscodecs/metadataquery.c | 40 +++++------ dlls/windowscodecs/pngformat.c | 12 ++-- 5 files changed, 144 insertions(+), 145 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=909b2ced71f1151c29fa…

1 0

Paul Gofman : ws2_32: Copy send buffer data for async send in WS2_ConnectEx().
by Alexandre Julliard March 24, 2021

March 24, 2021

Module: wine Branch: master Commit: 904f7cfbae6542e9d0b3e00cc65427f8979b1770 URL: https://source.winehq.org/git/wine.git/?a=commit;h=904f7cfbae6542e9d0b3e00c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Mar 24 18:51:13 2021 +0100 ws2_32: Copy send buffer data for async send in WS2_ConnectEx(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50738 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 11 +++++++++-- dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 28b14e71c9c..715c96097fc 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3447,14 +3447,18 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n else if (ret == WSAEINPROGRESS) { struct ws2_async *wsa; + DWORD size; + ULONG_PTR cvalue = (((ULONG_PTR)ov->hEvent & 1) == 0) ? (ULONG_PTR)ov : 0; _enable_event(SOCKET2HANDLE(s), FD_CONNECT|FD_READ|FD_WRITE, FD_CONNECT, FD_WINE_CONNECTED|FD_WINE_LISTENING); + size = offsetof( struct ws2_async, iovec[1] ) + sendBufLen; + /* Indirectly call WSASend */ - if (!(wsa = (struct ws2_async *)alloc_async_io( offsetof( struct ws2_async, iovec[1] ), WS2_async_send ))) + if (!(wsa = (struct ws2_async *)alloc_async_io( size, WS2_async_send ))) { SetLastError(WSAEFAULT); } @@ -3473,9 +3477,12 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n wsa->n_iovecs = sendBuf ? 1 : 0; wsa->first_iovec = 0; wsa->completion_func = NULL; - wsa->iovec[0].iov_base = sendBuf; + wsa->iovec[0].iov_base = &wsa->iovec[1]; wsa->iovec[0].iov_len = sendBufLen; + if (sendBufLen) + memcpy( wsa->iovec[0].iov_base, sendBuf, sendBufLen ); + status = register_async( ASYNC_TYPE_WRITE, wsa->hSocket, &wsa->io, ov->hEvent, NULL, (void *)cvalue, iosb ); if (status != STATUS_PENDING) HeapFree(GetProcessHeap(), 0, wsa); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index cab25baf1d1..cedbf423d97 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7296,6 +7296,7 @@ static void test_ConnectEx(void) buffer[1] = '2'; buffer[2] = '3'; bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, buffer, 3, &bytesReturned, &overlapped); + memset(buffer, 0, 3); ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "ConnectEx failed: " "returned %d + errno %d\n", bret, WSAGetLastError()); dwret = WaitForSingleObject(overlapped.hEvent, 15000);

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_set_index_buffer().
by Alexandre Julliard March 24, 2021

March 24, 2021

Module: wine Branch: master Commit: b21a9e41beecadc2afa9098695856c315aa89bfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=b21a9e41beecadc2afa90986… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 23 10:39:17 2021 -0500 wined3d: Introduce wined3d_device_context_set_index_buffer(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 49 ++++++++++++++++++++++++++++------------------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 32 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e6bfa90e026..c3ad3dae3fe 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1536,29 +1536,10 @@ static void wined3d_device_set_material(struct wined3d_device *device, const str void CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer *buffer, enum wined3d_format_id format_id, unsigned int offset) { - struct wined3d_state *state = device->cs->c.state; - enum wined3d_format_id prev_format; - struct wined3d_buffer *prev_buffer; - unsigned int prev_offset; - TRACE("device %p, buffer %p, format %s, offset %u.\n", device, buffer, debug_d3dformat(format_id), offset); - prev_buffer = state->index_buffer; - prev_format = state->index_format; - prev_offset = state->index_offset; - - if (prev_buffer == buffer && prev_format == format_id && prev_offset == offset) - return; - - if (buffer) - wined3d_buffer_incref(buffer); - state->index_buffer = buffer; - state->index_format = format_id; - state->index_offset = offset; - wined3d_device_context_emit_set_index_buffer(&device->cs->c, buffer, format_id, offset); - if (prev_buffer) - wined3d_buffer_decref(prev_buffer); + wined3d_device_context_set_index_buffer(&device->cs->c, buffer, format_id, offset); } struct wined3d_buffer * CDECL wined3d_device_get_index_buffer(const struct wined3d_device *device, @@ -2372,6 +2353,34 @@ HRESULT CDECL wined3d_device_context_set_stream_source(struct wined3d_device_con return WINED3D_OK; } +void CDECL wined3d_device_context_set_index_buffer(struct wined3d_device_context *context, + struct wined3d_buffer *buffer, enum wined3d_format_id format_id, unsigned int offset) +{ + struct wined3d_state *state = context->state; + enum wined3d_format_id prev_format; + struct wined3d_buffer *prev_buffer; + unsigned int prev_offset; + + TRACE("context %p, buffer %p, format %s, offset %u.\n", + context, buffer, debug_d3dformat(format_id), offset); + + prev_buffer = state->index_buffer; + prev_format = state->index_format; + prev_offset = state->index_offset; + + if (prev_buffer == buffer && prev_format == format_id && prev_offset == offset) + return; + + if (buffer) + wined3d_buffer_incref(buffer); + state->index_buffer = buffer; + state->index_format = format_id; + state->index_offset = offset; + wined3d_device_context_emit_set_index_buffer(context, buffer, format_id, offset); + if (prev_buffer) + wined3d_buffer_decref(prev_buffer); +} + void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { TRACE("device %p, shader %p.\n", device, shader); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index cac0c19bab4..54d4ef4c23c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -170,6 +170,7 @@ @ cdecl wined3d_device_context_set_constant_buffer(ptr long long ptr) @ cdecl wined3d_device_context_set_depth_stencil_state(ptr ptr long) @ cdecl wined3d_device_context_set_depth_stencil_view(ptr ptr) +@ cdecl wined3d_device_context_set_index_buffer(ptr ptr long long) @ cdecl wined3d_device_context_set_predication(ptr ptr long) @ cdecl wined3d_device_context_set_rasterizer_state(ptr ptr) @ cdecl wined3d_device_context_set_rendertarget_view(ptr long ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3f29b78044e..3937f1f5be2 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2563,6 +2563,8 @@ void __cdecl wined3d_device_context_set_depth_stencil_state(struct wined3d_devic struct wined3d_depth_stencil_state *depth_stencil_state, unsigned int stencil_ref); HRESULT __cdecl wined3d_device_context_set_depth_stencil_view(struct wined3d_device_context *context, struct wined3d_rendertarget_view *view); +void __cdecl wined3d_device_context_set_index_buffer(struct wined3d_device_context *context, + struct wined3d_buffer *buffer, enum wined3d_format_id format_id, unsigned int offset); void __cdecl wined3d_device_context_set_predication(struct wined3d_device_context *context, struct wined3d_query *predicate, BOOL value); void __cdecl wined3d_device_context_set_rasterizer_state(struct wined3d_device_context *context,

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_stream_source().
by Alexandre Julliard March 24, 2021

March 24, 2021

Module: wine Branch: master Commit: b41850979f8c4bdc13fde311aa009a0945cb3348 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b41850979f8c4bdc13fde311… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 23 10:39:13 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_stream_source(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 8 ++++---- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index f7b682b627e..f32699c40cd 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1304,19 +1304,19 @@ static void wined3d_cs_exec_set_stream_source(struct wined3d_cs *cs, const void device_invalidate_state(cs->c.device, STATE_STREAMSRC); } -void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, - struct wined3d_buffer *buffer, UINT offset, UINT stride) +void wined3d_device_context_emit_set_stream_source(struct wined3d_device_context *context, unsigned int stream_idx, + struct wined3d_buffer *buffer, unsigned int offset, unsigned int stride) { struct wined3d_cs_set_stream_source *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_STREAM_SOURCE; op->stream_idx = stream_idx; op->buffer = buffer; op->offset = offset; op->stride = stride; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_stream_source_freq(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9d70eb62eaa..d02845737dc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1299,7 +1299,7 @@ HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UI stream->offset = offset; if (buffer) wined3d_buffer_incref(buffer); - wined3d_cs_emit_set_stream_source(device->cs, stream_idx, buffer, offset, stride); + wined3d_device_context_emit_set_stream_source(&device->cs->c, stream_idx, buffer, offset, stride); if (prev_buffer) wined3d_buffer_decref(prev_buffer); @@ -1825,7 +1825,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 for (i = 0; i < WINED3D_MAX_STREAMS; ++i) { - wined3d_cs_emit_set_stream_source(device->cs, i, state->streams[i].buffer, + wined3d_device_context_emit_set_stream_source(context, i, state->streams[i].buffer, state->streams[i].offset, state->streams[i].stride); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ac1e7a3e4ab..e3c165716e1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4765,8 +4765,6 @@ void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_output(struct wined3d_cs *cs, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, - struct wined3d_buffer *buffer, UINT offset, UINT stride) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx, UINT frequency, UINT flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined3d_texture *texture) DECLSPEC_HIDDEN; @@ -4822,6 +4820,8 @@ void wined3d_device_context_emit_set_shader(struct wined3d_device_context *conte void wined3d_device_context_emit_set_shader_resource_view(struct wined3d_device_context *context, enum wined3d_shader_type type, unsigned int view_idx, struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_stream_source(struct wined3d_device_context *context, unsigned int stream_idx, + struct wined3d_buffer *buffer, unsigned int offset, unsigned int stride) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_unordered_access_view(struct wined3d_device_context *context, enum wined3d_pipeline pipeline, unsigned int view_idx, struct wined3d_unordered_access_view *view, unsigned int initial_count) DECLSPEC_HIDDEN;

1 0

Jacek Caban : winealsa: Use nameless unions.
by Alexandre Julliard March 24, 2021

March 24, 2021

Module: wine Branch: master Commit: 1610c80a397c351da10005107fe7f80a6ada66c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1610c80a397c351da1000510… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 24 18:37:41 2021 +0100 winealsa: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/Makefile.in | 1 - dlls/winealsa.drv/mmdevdrv.c | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in index d14a0628076..3158371a64f 100644 --- a/dlls/winealsa.drv/Makefile.in +++ b/dlls/winealsa.drv/Makefile.in @@ -2,7 +2,6 @@ MODULE = winealsa.drv IMPORTS = uuid ole32 advapi32 DELAYIMPORTS = winmm EXTRALIBS = $(ALSA_LIBS) -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION C_SRCS = \ midi.c \ diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index cf2edcc7454..5f7d277ce9a 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -4324,15 +4324,15 @@ HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARI serial_number = (guid->Data4[4] << 24) | (guid->Data4[5] << 16) | (guid->Data4[6] << 8) | guid->Data4[7]; out->vt = VT_LPWSTR; - out->u.pwszVal = CoTaskMemAlloc(128 * sizeof(WCHAR)); + out->pwszVal = CoTaskMemAlloc(128 * sizeof(WCHAR)); - if(!out->u.pwszVal) + if(!out->pwszVal) return E_OUTOFMEMORY; if(connection == AudioDeviceConnectionType_USB) - sprintfW( out->u.pwszVal, usbformatW, vendor_id, product_id, device, serial_number); + sprintfW( out->pwszVal, usbformatW, vendor_id, product_id, device, serial_number); else if(connection == AudioDeviceConnectionType_PCI) - sprintfW( out->u.pwszVal, pciformatW, vendor_id, product_id, device, serial_number); + sprintfW( out->pwszVal, pciformatW, vendor_id, product_id, device, serial_number); return S_OK; } @@ -4356,15 +4356,15 @@ HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARI out->vt = VT_UI4; if (num_speakers > 6) - out->u.ulVal = KSAUDIO_SPEAKER_STEREO; + out->ulVal = KSAUDIO_SPEAKER_STEREO; else if (num_speakers == 6) - out->u.ulVal = KSAUDIO_SPEAKER_5POINT1; + out->ulVal = KSAUDIO_SPEAKER_5POINT1; else if (num_speakers >= 4) - out->u.ulVal = KSAUDIO_SPEAKER_QUAD; + out->ulVal = KSAUDIO_SPEAKER_QUAD; else if (num_speakers >= 2) - out->u.ulVal = KSAUDIO_SPEAKER_STEREO; + out->ulVal = KSAUDIO_SPEAKER_STEREO; else if (num_speakers == 1) - out->u.ulVal = KSAUDIO_SPEAKER_MONO; + out->ulVal = KSAUDIO_SPEAKER_MONO; return S_OK; }

1 0

Jacek Caban : winepulse: Use nameless unions.
by Alexandre Julliard March 24, 2021

March 24, 2021

Module: wine Branch: master Commit: ac23adbdece2cf6c38bf1db96d101e3f62af8d49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac23adbdece2cf6c38bf1db9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 24 18:37:20 2021 +0100 winepulse: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/Makefile.in | 1 - dlls/winepulse.drv/mmdevdrv.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in index 3082ed8a69e..d6600632360 100644 --- a/dlls/winepulse.drv/Makefile.in +++ b/dlls/winepulse.drv/Makefile.in @@ -2,7 +2,6 @@ MODULE = winepulse.drv IMPORTS = dxguid uuid winmm user32 advapi32 ole32 EXTRALIBS = $(PULSE_LIBS) $(PTHREAD_LIBS) EXTRAINCL = $(PULSE_CFLAGS) -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION C_SRCS = \ mmdevdrv.c diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 10b01868a9d..ea739affb2f 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -3704,9 +3704,9 @@ HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARI if (IsEqualGUID(guid, &pulse_render_guid) && IsEqualPropertyKey(*prop, PKEY_AudioEndpoint_PhysicalSpeakers)) { out->vt = VT_UI4; - out->u.ulVal = g_phys_speakers_mask; + out->ulVal = g_phys_speakers_mask; - return out->u.ulVal ? S_OK : E_FAIL; + return out->ulVal ? S_OK : E_FAIL; } return E_NOTIMPL;

1 0