January 2020 - Wine-Commits

Zebediah Figura : d3d8: Apply the device state before executing a draw call.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 2ff6b5ec6f7c9f6f25b419f679f00bd4a56db153 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ff6b5ec6f7c9f6f25b419f6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 22:45:10 2020 -0600 d3d8: Apply the device state before executing a draw call. 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/d3d8/device.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index bcd25e9245..0721d2a501 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1606,6 +1606,7 @@ static HRESULT WINAPI d3d8_device_Clear(IDirect3DDevice8 *iface, DWORD rect_coun } wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_clear(device->wined3d_device, rect_count, (const RECT *)rects, flags, &c, z, stencil); wined3d_mutex_unlock(); @@ -2287,6 +2288,7 @@ static HRESULT WINAPI d3d8_device_ValidateDevice(IDirect3DDevice8 *iface, DWORD TRACE("iface %p, pass_count %p.\n", iface, pass_count); wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_validate_device(device->wined3d_device, pass_count); wined3d_mutex_unlock(); @@ -2417,6 +2419,7 @@ static HRESULT WINAPI d3d8_device_DrawPrimitive(IDirect3DDevice8 *iface, vertex_count = vertex_count_from_primitive_count(primitive_type, primitive_count); wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); d3d8_device_upload_sysmem_vertex_buffers(device, start_vertex, vertex_count); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); hr = wined3d_device_draw_primitive(device->wined3d_device, start_vertex, vertex_count); @@ -2439,6 +2442,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, index_count = vertex_count_from_primitive_count(primitive_type, primitive_count); wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); base_vertex_index = wined3d_device_get_base_vertex_index(device->wined3d_device); d3d8_device_upload_sysmem_vertex_buffers(device, base_vertex_index + min_vertex_idx, vertex_count); d3d8_device_upload_sysmem_index_buffer(device, start_idx, index_count); @@ -2509,6 +2513,7 @@ static HRESULT WINAPI d3d8_device_DrawPrimitiveUP(IDirect3DDevice8 *iface, } wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d8_device_prepare_vertex_buffer(device, size); if (FAILED(hr)) goto done; @@ -2610,6 +2615,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d8_device_prepare_vertex_buffer(device, vtx_size); if (FAILED(hr)) goto done; @@ -2689,6 +2695,8 @@ static HRESULT WINAPI d3d8_device_ProcessVertices(IDirect3DDevice8 *iface, UINT wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); + /* Note that an alternative approach would be to simply create these * buffers with WINED3D_RESOURCE_ACCESS_MAP_R and update them here like we * do for draws. In some regards that would be easier, but it seems less

1 0

Gerald Pfeifer : msi: Properly declare variables in msi/tests/utils.h as extern.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: ea032bb7f8daddfe308f86f52c54db5f657b658a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea032bb7f8daddfe308f86f5… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Jan 28 22:40:25 2020 +0100 msi: Properly declare variables in msi/tests/utils.h as extern. Omitting the extern storage qualifier when declaring a global variable in a header file is mistake. If that header is included by several files it results in multiple definitions of the same variable (unless -fcommon is specified or assumed, the latter being the case for GCC 9.x and earlier). This fixes building with GCC 10. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/utils.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/utils.h b/dlls/msi/tests/utils.h index f16e2d5ff5..0880553863 100644 --- a/dlls/msi/tests/utils.h +++ b/dlls/msi/tests/utils.h @@ -16,12 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -char PROG_FILES_DIR[MAX_PATH]; -char PROG_FILES_DIR_NATIVE[MAX_PATH]; -char COMMON_FILES_DIR[MAX_PATH]; -char APP_DATA_DIR[MAX_PATH]; -char WINDOWS_DIR[MAX_PATH]; -char CURR_DIR[MAX_PATH]; +extern char PROG_FILES_DIR[MAX_PATH]; +extern char PROG_FILES_DIR_NATIVE[MAX_PATH]; +extern char COMMON_FILES_DIR[MAX_PATH]; +extern char APP_DATA_DIR[MAX_PATH]; +extern char WINDOWS_DIR[MAX_PATH]; +extern char CURR_DIR[MAX_PATH]; BOOL get_system_dirs(void); BOOL get_user_dirs(void);

1 0

Zebediah Figura : d3d8: Stop setting the device state when setting the default ZENABLE and POINTSIZE_MIN states.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 23de061d2f8347d8131909bc137c9b4a536d58e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23de061d2f8347d8131909bc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 22:45:13 2020 -0600 d3d8: Stop setting the device state when setting the default ZENABLE and POINTSIZE_MIN states. 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/d3d8/device.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index b0a0491890..71717852bb 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -927,9 +927,6 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, wined3d_stateblock_set_render_state(device->state, WINED3D_RS_POINTSIZE_MIN, 0); wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, - !!swapchain_desc.enable_auto_depth_stencil); device_reset_viewport_state(device); device->device_state = D3D8_DEVICE_STATE_OK; } @@ -3769,9 +3766,6 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); wined3d_stateblock_set_render_state(device->state, WINED3D_RS_POINTSIZE_MIN, 0); - wined3d_device_set_render_state(device->wined3d_device, - WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); device_reset_viewport_state(device); wined3d_mutex_unlock();

1 0

Alexandre Julliard : libwine: Make the debug functions obsolete.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: c1dadbcfb1776b9ed33dcbf849d6c0aa43ab9913 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1dadbcfb1776b9ed33dcbf8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 29 10:49:04 2020 +0100 libwine: Make the debug functions obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/debug.c | 52 +++++++++++++++++++++++++++------------------------- libs/wine/wine.map | 16 ++++++++-------- 2 files changed, 35 insertions(+), 33 deletions(-) diff --git a/libs/wine/debug.c b/libs/wine/debug.c index 0e710223a2..f2b03b76e8 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -20,6 +20,9 @@ #include "config.h" #include "wine/port.h" +#include "wine/asm.h" + +#ifdef __ASM_OBSOLETE #include <stdlib.h> #include <stdio.h> @@ -30,12 +33,6 @@ # include <sys/stat.h> #endif -#define __wine_dbg_get_channel_flags __wine_dbg_get_channel_flags_inline -#define wine_dbg_sprintf wine_dbg_sprintf_inline -#define wine_dbg_printf wine_dbg_printf_inline -#define wine_dbg_log wine_dbg_log_inline -#define wine_dbgstr_an wine_dbgstr_an_inline -#define wine_dbgstr_wn wine_dbgstr_wn_inline #include "wine/debug.h" #include "wine/library.h" @@ -70,8 +67,7 @@ static int cmp_name( const void *p1, const void *p2 ) } /* get the flags to use for a given channel, possibly setting them too in case of lazy init */ -#undef __wine_dbg_get_channel_flags -unsigned char __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ) +unsigned char __wine_dbg_get_channel_flags_obsolete( struct __wine_debug_channel *channel ) { if (nb_debug_options == -1) debug_init(); @@ -87,8 +83,8 @@ unsigned char __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel } /* set the flags to use for a given channel; return 0 if the channel is not available to set */ -int __wine_dbg_set_channel_flags( struct __wine_debug_channel *channel, - unsigned char set, unsigned char clear ) +int __wine_dbg_set_channel_flags_obsolete( struct __wine_debug_channel *channel, + unsigned char set, unsigned char clear ) { if (nb_debug_options == -1) debug_init(); @@ -228,8 +224,7 @@ static void debug_init(void) } /* varargs wrapper for funcs.dbg_vprintf */ -#undef wine_dbg_printf -int wine_dbg_printf( const char *format, ... ) +int wine_dbg_printf_obsolete( const char *format, ... ) { int ret; va_list valist; @@ -241,8 +236,7 @@ int wine_dbg_printf( const char *format, ... ) } /* printf with temp buffer allocation */ -#undef wine_dbg_sprintf -const char *wine_dbg_sprintf( const char *format, ... ) +const char *wine_dbg_sprintf_obsolete( const char *format, ... ) { static const int max_size = 200; char *ret; @@ -260,14 +254,13 @@ const char *wine_dbg_sprintf( const char *format, ... ) /* varargs wrapper for funcs.dbg_vlog */ -#undef wine_dbg_log -int wine_dbg_log( enum __wine_debug_class cls, struct __wine_debug_channel *channel, - const char *func, const char *format, ... ) +int wine_dbg_log_obsolete( enum __wine_debug_class cls, struct __wine_debug_channel *channel, + const char *func, const char *format, ... ) { int ret; va_list valist; - if (!(__wine_dbg_get_channel_flags( channel ) & (1 << cls))) return -1; + if (!(__wine_dbg_get_channel_flags_obsolete( channel ) & (1 << cls))) return -1; va_start(valist, format); ret = funcs.dbg_vlog( cls, channel, func, format, valist ); @@ -424,7 +417,7 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch int ret = 0; if (cls < ARRAY_SIZE(debug_classes)) - ret += wine_dbg_printf( "%s:%s:%s ", debug_classes[cls], channel->name, func ); + ret += wine_dbg_printf_obsolete( "%s:%s:%s ", debug_classes[cls], channel->name, func ); if (format) ret += funcs.dbg_vprintf( format, args ); return ret; @@ -432,20 +425,18 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch /* wrappers to use the function pointers */ -#undef wine_dbgstr_an -const char *wine_dbgstr_an( const char * s, int n ) +const char *wine_dbgstr_an_obsolete( const char * s, int n ) { return funcs.dbgstr_an(s, n); } -#undef wine_dbgstr_wn -const char *wine_dbgstr_wn( const WCHAR *s, int n ) +const char *wine_dbgstr_wn_obsolete( const WCHAR *s, int n ) { return funcs.dbgstr_wn(s, n); } -void __wine_dbg_set_functions( const struct __wine_debug_functions *new_funcs, - struct __wine_debug_functions *old_funcs, size_t size ) +void __wine_dbg_set_functions_obsolete( const struct __wine_debug_functions *new_funcs, + struct __wine_debug_functions *old_funcs, size_t size ) { if (old_funcs) memcpy( old_funcs, &funcs, min(sizeof(funcs),size) ); if (new_funcs) memcpy( &funcs, new_funcs, min(sizeof(funcs),size) ); @@ -460,3 +451,14 @@ static struct __wine_debug_functions funcs = default_dbg_vprintf, default_dbg_vlog }; + +__ASM_OBSOLETE(__wine_dbg_get_channel_flags); +__ASM_OBSOLETE(__wine_dbg_set_channel_flags); +__ASM_OBSOLETE(__wine_dbg_set_functions); +__ASM_OBSOLETE(wine_dbg_log); +__ASM_OBSOLETE(wine_dbg_printf); +__ASM_OBSOLETE(wine_dbg_sprintf); +__ASM_OBSOLETE(wine_dbgstr_an); +__ASM_OBSOLETE(wine_dbgstr_wn); + +#endif /* __ASM_OBSOLETE */ diff --git a/libs/wine/wine.map b/libs/wine/wine.map index 83ef3a0f60..50ae479788 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -1,9 +1,6 @@ WINE_1.0 { global: - __wine_dbg_get_channel_flags; - __wine_dbg_set_channel_flags; - __wine_dbg_set_functions; __wine_dll_register; __wine_main_argc; __wine_main_argv; @@ -19,11 +16,6 @@ WINE_1.0 wine_cp_wcstombs; wine_cpsymbol_mbstowcs; wine_cpsymbol_wcstombs; - wine_dbg_log; - wine_dbg_printf; - wine_dbg_sprintf; - wine_dbgstr_an; - wine_dbgstr_wn; wine_dlclose; wine_dll_enum_load_path; wine_dll_get_owner; @@ -76,6 +68,9 @@ WINE_1.0 /* the following functions are obsolete and only exported for backwards compatibility */ + __wine_dbg_get_channel_flags; + __wine_dbg_set_channel_flags; + __wine_dbg_set_functions; atoiW; atolW; get_char_typeW; @@ -117,6 +112,11 @@ WINE_1.0 vsnprintfW; vsprintfW; wine_call_on_stack; + wine_dbg_log; + wine_dbg_printf; + wine_dbg_sprintf; + wine_dbgstr_an; + wine_dbgstr_wn; wine_pthread_get_functions; wine_pthread_set_functions; wine_switch_to_stack;

1 0

Alexandre Julliard : libwine: Make some loader functions obsolete.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: c599ec149431a447084a347d381e7897b2102b72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c599ec149431a447084a347d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 29 10:49:40 2020 +0100 libwine: Make some loader functions obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- include/wine/library.h | 5 -- libs/wine/loader.c | 183 ++++++++++++++++++++++++++----------------------- libs/wine/wine.map | 8 +-- 4 files changed, 101 insertions(+), 97 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c599ec149431a447084a…

1 0

Chip Davis : msvcrt: Fix the btowc() function.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 0216290675db25da4266497ef14a623d237ac3c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0216290675db25da4266497e… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Tue Jan 28 16:08:13 2020 -0600 msvcrt: Fix the btowc() function. This function returns WEOF on conversion failure. It should only operate on single-byte characters in the C locale. Finally, it should use the current locale's codepage, instead of the current locale itself, to do conversions. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 10 ++++-- dlls/msvcrt/tests/string.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index ae9f7c9c21..72a52a20a9 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -786,9 +786,13 @@ MSVCRT_wint_t CDECL MSVCRT_btowc(int c) unsigned char letter = c; MSVCRT_wchar_t ret; - if(!MultiByteToWideChar(get_locinfo()->lc_handle[MSVCRT_LC_CTYPE], - 0, (LPCSTR)&letter, 1, &ret, 1)) - return 0; + if(c == MSVCRT_EOF) + return MSVCRT_WEOF; + if(!get_locinfo()->lc_codepage) + return c & 255; + if(!MultiByteToWideChar(get_locinfo()->lc_codepage, + MB_ERR_INVALID_CHARS, (LPCSTR)&letter, 1, &ret, 1)) + return MSVCRT_WEOF; return ret; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index da0400fa83..8f97d8959e 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -90,6 +90,7 @@ static int (__cdecl *p_wcslwr_s)(wchar_t*,size_t); static errno_t (__cdecl *p_mbsupr_s)(unsigned char *str, size_t numberOfElements); static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements); static int (__cdecl *p_wctob)(wint_t); +static wint_t (__cdecl *p_btowc)(int); static size_t (__cdecl *p_wcrtomb)(char*, wchar_t, mbstate_t*); static int (__cdecl *p_wcrtomb_s)(size_t*, char*, size_t, wchar_t, mbstate_t*); static int (__cdecl *p_tolower)(int); @@ -2880,6 +2881,82 @@ static void test_wctob(void) _setmbcp(cp); } +static void test_btowc(void) +{ + wint_t ret; + int cp = _getmbcp(); + + if(!p_btowc || !setlocale(LC_ALL, "chinese-traditional")) { + win_skip("Skipping btowc tests\n"); + return; + } + + ret = p_btowc(EOF); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == WEOF, "ret = %x\n", ret); + + _setmbcp(1250); + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == WEOF, "ret = %x\n", ret); + + if(!setlocale(LC_CTYPE, ".1250")) { + win_skip("No codepage 1250 support\n"); + setlocale(LC_ALL, "C"); + _setmbcp(cp); + return; + } + + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == 0x81, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == 0x155, "ret = %x\n", ret); + + ret = p_btowc(0x100); + ok(ret == 0x00, "ret = %x\n", ret); + + ret = p_btowc(0x1e0); + ok(ret == 0x155, "ret = %x\n", ret); + + setlocale(LC_ALL, "C"); + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == 0x81, "ret = %x\n", ret); + + ret = p_btowc(0x9f); + ok(ret == 0x9f, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == 0xe0, "ret = %x\n", ret); + + ret = p_btowc(0x100); + ok(ret == 0x00, "ret = %x\n", ret); + + ret = p_btowc(0x1e0); + ok(ret == 0xe0, "ret = %x\n", ret); + + _setmbcp(cp); +} + static void test_wctomb(void) { mbstate_t state; @@ -4127,6 +4204,7 @@ START_TEST(string) p_wcslwr_s = (void*)GetProcAddress(hMsvcrt, "_wcslwr_s"); p_mbsupr_s = (void*)GetProcAddress(hMsvcrt, "_mbsupr_s"); p_mbslwr_s = (void*)GetProcAddress(hMsvcrt, "_mbslwr_s"); + p_btowc = (void*)GetProcAddress(hMsvcrt, "btowc"); p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob"); p_wcrtomb = (void*)GetProcAddress(hMsvcrt, "wcrtomb"); p_wcrtomb_s = (void*)GetProcAddress(hMsvcrt, "wcrtomb_s"); @@ -4204,6 +4282,7 @@ START_TEST(string) test__mbsupr_s(); test__mbslwr_s(); test_wctob(); + test_btowc(); test_wctomb(); test__atodbl(); test__stricmp();

1 0

Zebediah Figura : strmbase: Merge enumpins.c into filter.c.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: c36641536070e943f5b0eb4281f4f767f696ebf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c36641536070e943f5b0eb42… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 23:36:53 2020 -0600 strmbase: Merge enumpins.c into filter.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/Makefile.in | 1 - dlls/strmbase/Makefile.in | 1 - dlls/strmbase/enumpins.c | 212 --------------------------------------- dlls/strmbase/filter.c | 176 ++++++++++++++++++++++++++++++++ dlls/strmbase/strmbase_private.h | 1 - dlls/winegstreamer/Makefile.in | 1 - dlls/wineqtdecoder/Makefile.in | 1 - 7 files changed, 176 insertions(+), 217 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c36641536070e943f5b0…

1 0

Francois Gouget : testbot: Lower the priority of long running mailing list jobs.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: tools Branch: master Commit: 98990095c322bda80a416744f76bc14f0bfdc31f URL: https://source.winehq.org/git/tools.git/?a=commit;h=98990095c322bda80a41674… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 29 12:54:23 2020 +0100 testbot: Lower the priority of long running mailing list jobs. This helps get as many patches tested as possible when a patch (series) requires full rebuilds and keeps the TestBot busy for a long time. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Patches.pm | 11 ++++++++--- testbot/web/Submit.pl | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index d021f9c..ca8d57f 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -152,7 +152,8 @@ sub Submit($$$) # Create a new job for this patch my $Jobs = CreateJobs(); my $NewJob = $Jobs->Add(); - $NewJob->Priority(6); + my $Priority = 5; + $NewJob->Priority($Priority); my $PropertyDescriptor = $Jobs->GetPropertyDescriptorByName("Remarks"); my $Subject = $self->Subject; $Subject =~ s/\[PATCH[^\]]*]//i; @@ -282,8 +283,11 @@ sub Submit($$$) my $Task = $Tasks->Add(); $Task->VM($VM); - $Task->Timeout(GetBuildTimeout($Impacts, $TaskMissions) + - GetTestTimeout($Impacts, $TaskMissions)); + my $Timeout = GetBuildTimeout($Impacts, $TaskMissions) + + GetTestTimeout($Impacts, $TaskMissions); + # Let short-running jobs run first + $Priority = 6 if ($Timeout >= $WineBuildTimeout); + $Task->Timeout($Timeout); $Task->Missions($TaskMissions->{Statement}); } } @@ -320,6 +324,7 @@ sub Submit($$$) # Switch Status to staging to indicate we are done setting up the job $NewJob->Status("staging"); + $NewJob->Priority($Priority); ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 1943b42..f76ca6e 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -1088,7 +1088,7 @@ sub _SubmitJob($$) my $Jobs = CreateJobs(); my $NewJob = $Jobs->Add(); $NewJob->User($self->GetCurrentSession()->User); - $NewJob->Priority(5); + $NewJob->Priority(4); $NewJob->Remarks($self->{Remarks} || $self->{CmdLineArg} || ""); my $Branch = CreateBranches()->GetItem($self->{Branch}); $NewJob->Branch($Branch) if (defined $Branch);

1 0

Francois Gouget : testbot: Share code to access the latest reference WineTest reports.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: tools Branch: master Commit: e8596e5b7a7d9710e367dfa3952cfca99992cd77 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e8596e5b7a7d9710e367dfa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 29 04:00:13 2020 +0100 testbot: Share code to access the latest reference WineTest reports. Also take the latest WineTest reports snapshot when the corresponding task completes rather than when the build task they depend on completes. This way the snapshot is taken closest to when the reference reports are needed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 12 ++--- testbot/bin/WineRunBuild.pl | 31 ----------- testbot/bin/WineRunTask.pl | 34 +++++------- testbot/bin/WineRunWineTest.pl | 65 ++++------------------ testbot/lib/WineTestBot/LogUtils.pm | 104 +++++++++++++++++++++++++++++++++++- testbot/lib/WineTestBot/Tasks.pm | 30 +++++++++++ 6 files changed, 160 insertions(+), 116 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=e8596e5b7a7d9710e36…

1 0

Francois Gouget : testbot/UpdateTaskLogs: Delete reference reports that are not supposed to exist.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: tools Branch: master Commit: f8b184aac20305cab757b7b4682e2b39c4867761 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f8b184aac20305cab757b7b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 29 04:01:47 2020 +0100 testbot/UpdateTaskLogs: Delete reference reports that are not supposed to exist. WineRunBuild used to take a snapshot of the reference logs for all the other tasks even if the build failed. Thus there could be reference logs even when the matching log does not exist. This patch ensures that 'UpdateTaskLogs --delete' still finds and deletes those. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 5f858de..93b6504 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -256,11 +256,16 @@ sub ProcessTaskLogs($$$) if (($OptDelete or $OptRebuild) and !$CollectOnly) { - # Save / delete the task's reference reports - foreach my $ReportName (@{GetLogFileNames($TaskDir)}) + # Save / delete the task's reference reports... all of them, + # even if they were not supposed to exist (e.g. failed builds). + my ($ErrMessage, $ReportNames, $_TaskMissions) = $Task->GetReportNames(); + if ($ErrMessage) + { + Error "$ErrMessage\n"; + $Rc = 1; + } + foreach my $ReportName (@$ReportNames) { - next if ($ReportName !~ /\.report$/); - my $RefReportName = $Task->GetRefReportName($ReportName); my $RefReportPath = "$StepDir/$RefReportName";

1 0

Jacek Caban : mshtml/tests: Get rid of strstr_wa.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: d5bd667390adfede12ad93979f94eb641496cbf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5bd667390adfede12ad9397… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 28 16:41:37 2020 +0100 mshtml/tests: Get rid of strstr_wa. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/style.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 37a1426270..ac898dffca 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -81,22 +81,6 @@ static BSTR a2bstr(const char *str) return ret; } -static const WCHAR *strstr_wa(const WCHAR *str, const char *suba) -{ - BSTR sub; - const WCHAR *ret = NULL; - sub = a2bstr(suba); - while (*str) - { - const WCHAR *p1 = str, *p2 = sub; - while (*p1 && *p2 && *p1 == *p2) { p1++; p2++; } - if (!*p2) {ret = str; break;} - str++; - } - SysFreeString(sub); - return ret; -} - #define test_var_bstr(a,b) _test_var_bstr(__LINE__,a,b) static void _test_var_bstr(unsigned line, const VARIANT *v, const char *expect) { @@ -2920,14 +2904,13 @@ static void test_body_style(IHTMLStyle *style) if (hres != E_INVALIDARG) { hres = IHTMLStyle_get_listStyle(style, &str); ok(hres == S_OK, "get_listStyle failed: %08x\n", hres); - ok(strstr_wa(str, "decimal-leading-zero") && - strstr_wa(str, "inside") != NULL, + ok(wcsstr(str, L"decimal-leading-zero") && wcsstr(str, L"inside"), "listStyle = %s\n", wine_dbgstr_w(str)); if(compat_mode < COMPAT_IE9) - ok(strstr_wa(str, "none") != NULL, "listStyle = %s\n", wine_dbgstr_w(str)); + ok(wcsstr(str, L"none") != NULL, "listStyle = %s\n", wine_dbgstr_w(str)); else todo_wine - ok(!strstr_wa(str, "none"), "listStyle = %s\n", wine_dbgstr_w(str)); + ok(!wcsstr(str, L"none"), "listStyle = %s\n", wine_dbgstr_w(str)); SysFreeString(str); } else {

1 0

Alexandre Julliard : unicode: Try harder to reuse subsequences when compressing data arrays.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: f17a228d450beb666470840ae503d4bd9d9e34e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f17a228d450beb666470840a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 27 20:23:54 2020 +0100 unicode: Try harder to reuse subsequences when compressing data arrays. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/bracket.c | 142 ++- dlls/dwrite/direction.c | 779 ++++++-------- dlls/dwrite/linebreak.c | 1282 ++++++++++------------- dlls/dwrite/mirror.c | 346 +++---- dlls/dwrite/scripts.c | 1113 +++++++++----------- dlls/gdi32/direction.c | 779 ++++++-------- dlls/gdi32/vertical.c | 305 +++--- dlls/kernel32/nameprep.c | 771 ++++++-------- dlls/kernelbase/collation.c | 2349 +++++++++++++++++++++---------------------- dlls/kernelbase/digitmap.c | 165 ++- dlls/kernelbase/wctype.c | 1369 +++++++++++-------------- dlls/usp10/bracket.c | 142 ++- dlls/usp10/direction.c | 779 ++++++-------- dlls/usp10/indicsyllable.c | 640 ++++++------ dlls/usp10/linebreak.c | 1282 ++++++++++------------- dlls/usp10/mirror.c | 346 +++---- dlls/usp10/shaping.c | 532 ++++------ dlls/wineps.drv/vertical.c | 305 +++--- libs/port/collation.c | 2349 +++++++++++++++++++++---------------------- libs/port/combclass.c | 359 +++---- libs/port/digitmap.c | 167 ++- libs/port/wctype.c | 1159 ++++++++++----------- loader/l_intl.nls | Bin 6566 -> 5432 bytes tools/make_unicode | 34 +- 24 files changed, 7796 insertions(+), 9698 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f17a228d450beb666470…

1 0

Henri Verbeet : d2d1: Pass previous and next vectors to d2d_geometry_outline_add_join().
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 1fe3f60f68ae5bd47cf22914d15566a77d2e64a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fe3f60f68ae5bd47cf22914… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 27 15:55:27 2020 +0330 d2d1: Pass previous and next vectors to d2d_geometry_outline_add_join(). Instead of the points. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 90 +++++++++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 40 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index e2a44c30b6..a61ce692b9 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2090,7 +2090,7 @@ static BOOL d2d_path_geometry_add_figure(struct d2d_geometry *geometry) static BOOL d2d_geometry_outline_add_join(struct d2d_geometry *geometry, const D2D1_POINT_2F *prev, const D2D1_POINT_2F *p0, const D2D1_POINT_2F *next) { - D2D1_POINT_2F q_prev, q_next; + static const D2D1_POINT_2F origin = {0.0f, 0.0f}; struct d2d_outline_vertex *v; struct d2d_face *f; size_t base_idx; @@ -2113,35 +2113,29 @@ static BOOL d2d_geometry_outline_add_join(struct d2d_geometry *geometry, } f = &geometry->outline.faces[geometry->outline.face_count]; - d2d_point_subtract(&q_prev, p0, prev); - d2d_point_subtract(&q_next, next, p0); - - d2d_point_normalise(&q_prev); - d2d_point_normalise(&q_next); - - ccw = d2d_point_ccw(p0, prev, next); + ccw = d2d_point_ccw(&origin, prev, next); if (ccw == 0.0f) { - d2d_outline_vertex_set(&v[0], p0->x, p0->y, q_prev.x, q_prev.y, q_prev.x, q_prev.y); - d2d_outline_vertex_set(&v[1], p0->x, p0->y, -q_prev.x, -q_prev.y, -q_prev.x, -q_prev.y); - d2d_outline_vertex_set(&v[2], p0->x + 25.0f * q_prev.x, p0->y + 25.0f * q_prev.y, - -q_prev.x, -q_prev.y, -q_prev.x, -q_prev.y); - d2d_outline_vertex_set(&v[3], p0->x + 25.0f * q_prev.x, p0->y + 25.0f * q_prev.y, - q_prev.x, q_prev.y, q_prev.x, q_prev.y); + d2d_outline_vertex_set(&v[0], p0->x, p0->y, -prev->x, -prev->y, -prev->x, -prev->y); + d2d_outline_vertex_set(&v[1], p0->x, p0->y, prev->x, prev->y, prev->x, prev->y); + d2d_outline_vertex_set(&v[2], p0->x + 25.0f * -prev->x, p0->y + 25.0f * -prev->y, + prev->x, prev->y, prev->x, prev->y); + d2d_outline_vertex_set(&v[3], p0->x + 25.0f * -prev->x, p0->y + 25.0f * -prev->y, + -prev->x, -prev->y, -prev->x, -prev->y); } else if (ccw < 0.0f) { - d2d_outline_vertex_set(&v[0], p0->x, p0->y, q_next.x, q_next.y, q_prev.x, q_prev.y); - d2d_outline_vertex_set(&v[1], p0->x, p0->y, -q_next.x, -q_next.y, -q_next.x, -q_next.y); - d2d_outline_vertex_set(&v[2], p0->x, p0->y, -q_next.x, -q_next.y, -q_prev.x, -q_prev.y); - d2d_outline_vertex_set(&v[3], p0->x, p0->y, -q_prev.x, -q_prev.y, -q_prev.x, -q_prev.y); + d2d_outline_vertex_set(&v[0], p0->x, p0->y, next->x, next->y, -prev->x, -prev->y); + d2d_outline_vertex_set(&v[1], p0->x, p0->y, -next->x, -next->y, -next->x, -next->y); + d2d_outline_vertex_set(&v[2], p0->x, p0->y, -next->x, -next->y, prev->x, prev->y); + d2d_outline_vertex_set(&v[3], p0->x, p0->y, prev->x, prev->y, prev->x, prev->y); } else { - d2d_outline_vertex_set(&v[0], p0->x, p0->y, -q_prev.x, -q_prev.y, -q_next.x, -q_next.y); - d2d_outline_vertex_set(&v[1], p0->x, p0->y, q_prev.x, q_prev.y, q_prev.x, q_prev.y); - d2d_outline_vertex_set(&v[2], p0->x, p0->y, q_prev.x, q_prev.y, q_next.x, q_next.y); - d2d_outline_vertex_set(&v[3], p0->x, p0->y, q_next.x, q_next.y, q_next.x, q_next.y); + d2d_outline_vertex_set(&v[0], p0->x, p0->y, prev->x, prev->y, -next->x, -next->y); + d2d_outline_vertex_set(&v[1], p0->x, p0->y, -prev->x, -prev->y, -prev->x, -prev->y); + d2d_outline_vertex_set(&v[2], p0->x, p0->y, -prev->x, -prev->y, next->x, next->y); + d2d_outline_vertex_set(&v[3], p0->x, p0->y, next->x, next->y, next->x, next->y); } geometry->outline.vertex_count += 4; @@ -2304,11 +2298,21 @@ static BOOL d2d_geometry_add_figure_outline(struct d2d_geometry *geometry, else next = &figure->vertices[i + 1]; - if ((figure_end == D2D1_FIGURE_END_CLOSED || (i && i < figure->vertex_count - 1)) - && !d2d_geometry_outline_add_join(geometry, prev, p0, next)) + if (figure_end == D2D1_FIGURE_END_CLOSED || (i && i < figure->vertex_count - 1)) { - ERR("Failed to add join.\n"); - return FALSE; + D2D1_POINT_2F q_next, q_prev; + + d2d_point_subtract(&q_prev, prev, p0); + d2d_point_subtract(&q_next, next, p0); + + d2d_point_normalise(&q_prev); + d2d_point_normalise(&q_next); + + if (!d2d_geometry_outline_add_join(geometry, &q_prev, p0, &q_next)) + { + ERR("Failed to add join.\n"); + return FALSE; + } } if (type == D2D_VERTEX_TYPE_LINE && (figure_end == D2D1_FIGURE_END_CLOSED || i < figure->vertex_count - 1) @@ -4077,9 +4081,24 @@ static const struct ID2D1RectangleGeometryVtbl d2d_rectangle_geometry_vtbl = HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory, const D2D1_RECT_F *rect) { struct d2d_face *f; - D2D1_POINT_2F *v, v0p, v0n, v1p, v1n, v2p, v2n, v3p, v3n; + D2D1_POINT_2F *v; float l, r, t, b; + static const D2D1_POINT_2F prev[] = + { + { 1.0f, 0.0f}, + { 0.0f, -1.0f}, + {-1.0f, 0.0f}, + { 0.0f, 1.0f}, + }; + static const D2D1_POINT_2F next[] = + { + { 0.0f, 1.0f}, + { 1.0f, 0.0f}, + { 0.0f, -1.0f}, + {-1.0f, 0.0f}, + }; + d2d_geometry_init(geometry, factory, &identity, (ID2D1GeometryVtbl *)&d2d_rectangle_geometry_vtbl); geometry->u.rectangle.rect = *rect; @@ -4106,15 +4125,6 @@ HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory d2d_face_set(&f[1], 0, 2, 3); geometry->fill.face_count = 2; - d2d_point_set(&v0p, l+1.0f, t); - d2d_point_set(&v0n, l, t+1.0f); - d2d_point_set(&v1p, l, b-1.0f); - d2d_point_set(&v1n, l+1.0f, b); - d2d_point_set(&v2p, r-1.0f, b); - d2d_point_set(&v2n, r, b-1.0f); - d2d_point_set(&v3p, r, t+1.0f); - d2d_point_set(&v3n, r-1.0f, t); - if (!d2d_geometry_outline_add_line_segment(geometry, &v[0], &v[1])) goto fail; if (!d2d_geometry_outline_add_line_segment(geometry, &v[1], &v[2])) @@ -4124,13 +4134,13 @@ HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory if (!d2d_geometry_outline_add_line_segment(geometry, &v[3], &v[0])) goto fail; - if (!d2d_geometry_outline_add_join(geometry, &v0p, &v[0], &v0n)) + if (!d2d_geometry_outline_add_join(geometry, &prev[0], &v[0], &next[0])) goto fail; - if (!d2d_geometry_outline_add_join(geometry, &v1p, &v[1], &v1n)) + if (!d2d_geometry_outline_add_join(geometry, &prev[1], &v[1], &next[1])) goto fail; - if (!d2d_geometry_outline_add_join(geometry, &v2p, &v[2], &v2n)) + if (!d2d_geometry_outline_add_join(geometry, &prev[2], &v[2], &next[2])) goto fail; - if (!d2d_geometry_outline_add_join(geometry, &v3p, &v[3], &v3n)) + if (!d2d_geometry_outline_add_join(geometry, &prev[3], &v[3], &next[3])) goto fail; return S_OK;

1 0

Zebediah Figura : rpcrt4: Use a critical section for the context handle lock.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 76238898fc4ef41b6eb57c5e2589a7579ee6e3c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76238898fc4ef41b6eb57c5e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 27 17:04:11 2020 -0600 rpcrt4: Use a critical section for the context handle lock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_assoc.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/rpc_assoc.c b/dlls/rpcrt4/rpc_assoc.c index 504f4d66c8..ab865c2de1 100644 --- a/dlls/rpcrt4/rpc_assoc.c +++ b/dlls/rpcrt4/rpc_assoc.c @@ -24,7 +24,6 @@ #include "rpc.h" #include "rpcndr.h" -#include "winternl.h" #include "wine/debug.h" @@ -55,7 +54,7 @@ typedef struct _RpcContextHandle NDR_RUNDOWN rundown_routine; void *ctx_guard; UUID uuid; - RTL_RWLOCK rw_lock; + CRITICAL_SECTION lock; unsigned int refs; } RpcContextHandle; @@ -463,12 +462,13 @@ RPC_STATUS RpcServerAssoc_AllocateContextHandle(RpcAssoc *assoc, void *CtxGuard, return RPC_S_OUT_OF_MEMORY; context_handle->ctx_guard = CtxGuard; - RtlInitializeResource(&context_handle->rw_lock); + InitializeCriticalSection(&context_handle->lock); + context_handle->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcContextHandle.lock"); context_handle->refs = 1; /* lock here to mirror unmarshall, so we don't need to special-case the * freeing of a non-marshalled context handle */ - RtlAcquireResourceExclusive(&context_handle->rw_lock, TRUE); + EnterCriticalSection(&context_handle->lock); EnterCriticalSection(&assoc->cs); list_add_tail(&assoc->context_handle_list, &context_handle->entry); @@ -500,7 +500,7 @@ RPC_STATUS RpcServerAssoc_FindContextHandle(RpcAssoc *assoc, const UUID *uuid, { LeaveCriticalSection(&assoc->cs); TRACE("found %p\n", context_handle); - RtlAcquireResourceExclusive(&context_handle->rw_lock, TRUE); + EnterCriticalSection(&context_handle->lock); return RPC_S_OK; } } @@ -555,7 +555,8 @@ static void RpcContextHandle_Destroy(RpcContextHandle *context_handle) context_handle->rundown_routine(context_handle->user_context); } - RtlDeleteResource(&context_handle->rw_lock); + context_handle->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&context_handle->lock); HeapFree(GetProcessHeap(), 0, context_handle); } @@ -566,7 +567,7 @@ unsigned int RpcServerAssoc_ReleaseContextHandle(RpcAssoc *assoc, NDR_SCONTEXT S unsigned int refs; if (release_lock) - RtlReleaseResource(&context_handle->rw_lock); + LeaveCriticalSection(&context_handle->lock); EnterCriticalSection(&assoc->cs); refs = --context_handle->refs;

1 0

Zebediah Figura : kernelbase: Implement ReOpenFile().
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: c7019a8887a3b035ce6b1ff6b113a8b5c0cc5e04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7019a8887a3b035ce6b1ff6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 27 11:06:43 2020 -0600 kernelbase: Implement ReOpenFile(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47668 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 101 +++++++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/file.c | 80 ++++++++++++++++++++++++----------- 2 files changed, 158 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c7019a8887a3b035ce6b…

1 0

Chip Davis : setupapi: Implement CM_Get_DevNode_Property[_Ex]W().
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 4588f10f8d3895624a8a2087f2e5c3c1b51e576f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4588f10f8d3895624a8a2087… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Sun Jan 26 18:02:37 2020 -0600 setupapi: Implement CM_Get_DevNode_Property[_Ex]W(). Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-devices-config-l1-1-0.spec | 2 +- .../api-ms-win-devices-config-l1-1-1.spec | 2 +- dlls/cfgmgr32/cfgmgr32.spec | 2 + dlls/setupapi/devinst.c | 105 +++++++++++++++------ dlls/setupapi/setupapi.spec | 2 + 5 files changed, 83 insertions(+), 30 deletions(-) diff --git a/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec b/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec index 6fe5ee3b21..59004c997f 100644 --- a/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec +++ b/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec @@ -8,7 +8,7 @@ @ stub CM_Get_Class_Property_Keys @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth -@ stub CM_Get_DevNode_PropertyW +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) setupapi.CM_Get_DevNode_PropertyW @ stub CM_Get_DevNode_Property_Keys @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW @ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status diff --git a/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec index 33dad4eaac..e10352eda5 100644 --- a/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec +++ b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec @@ -8,7 +8,7 @@ @ stub CM_Get_Class_Property_Keys @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth -@ stub CM_Get_DevNode_PropertyW +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) setupapi.CM_Get_DevNode_PropertyW @ stub CM_Get_DevNode_Property_Keys @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW @ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 20ede7b13d..8360048421 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -57,6 +57,8 @@ @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) setupapi.CM_Get_DevNode_PropertyW +@ stdcall CM_Get_DevNode_Property_ExW(long ptr ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Property_ExW @ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyA @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExA diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 25d4040da0..f8a4e93efc 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4177,47 +4177,26 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, return (have_guid || have_name); } -/*********************************************************************** - * SetupDiGetDevicePropertyW (SETUPAPI.@) - */ -BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_data, - const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, BYTE *prop_buff, - DWORD prop_buff_size, DWORD *required_size, DWORD flags) +static LSTATUS get_device_property(struct device *device, const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, + BYTE *prop_buff, DWORD prop_buff_size, DWORD *required_size, DWORD flags) { - static const WCHAR formatW[] = {'\\', '%', '0', '4', 'X', 0}; - WCHAR key_path[55] = {'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\\'}; + WCHAR key_path[55] = L"Properties\\"; HKEY hkey; DWORD value_type; DWORD value_size = 0; LSTATUS ls; - struct device *device; - - TRACE("%p, %p, %p, %p, %p, %d, %p, %#x\n", devinfo, device_data, prop_key, prop_type, prop_buff, prop_buff_size, - required_size, flags); - - if (!(device = get_device(devinfo, device_data))) - return FALSE; if (!prop_key) - { - SetLastError(ERROR_INVALID_DATA); - return FALSE; - } + return ERROR_INVALID_DATA; if (!prop_type || (!prop_buff && prop_buff_size)) - { - SetLastError(ERROR_INVALID_USER_BUFFER); - return FALSE; - } + return ERROR_INVALID_USER_BUFFER; if (flags) - { - SetLastError(ERROR_INVALID_FLAGS); - return FALSE; - } + return ERROR_INVALID_FLAGS; SETUPDI_GuidToString(&prop_key->fmtid, key_path + 11); - swprintf(key_path + 49, ARRAY_SIZE(key_path) - 49, formatW, prop_key->pid); + swprintf(key_path + 49, ARRAY_SIZE(key_path) - 49, L"\\%04X", prop_key->pid); ls = RegOpenKeyExW(device->key, key_path, 0, KEY_QUERY_VALUE, &hkey); if (!ls) @@ -4248,10 +4227,80 @@ BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_ if (required_size) *required_size = value_size; + return ls; +} + +/*********************************************************************** + * SetupDiGetDevicePropertyW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_data, + const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, BYTE *prop_buff, + DWORD prop_buff_size, DWORD *required_size, DWORD flags) +{ + struct device *device; + LSTATUS ls; + + TRACE("%p, %p, %p, %p, %p, %d, %p, %#x\n", devinfo, device_data, prop_key, prop_type, prop_buff, prop_buff_size, + required_size, flags); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + ls = get_device_property(device, prop_key, prop_type, prop_buff, prop_buff_size, required_size, flags); + SetLastError(ls); return !ls; } +/*********************************************************************** + * CM_Get_DevNode_Property_ExW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Property_ExW(DEVINST devnode, const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, + BYTE *prop_buff, ULONG *prop_buff_size, ULONG flags, HMACHINE machine) +{ + struct device *device = get_devnode_device(devnode); + LSTATUS ls; + + TRACE("%u, %p, %p, %p, %p, %#x, %p\n", devnode, prop_key, prop_type, prop_buff, prop_buff_size, + flags, machine); + + if (machine) + return CR_MACHINE_UNAVAILABLE; + + if (!device) + return CR_NO_SUCH_DEVINST; + + if (!prop_buff_size) + return CR_INVALID_POINTER; + + ls = get_device_property(device, prop_key, prop_type, prop_buff, *prop_buff_size, prop_buff_size, flags); + switch (ls) + { + case NO_ERROR: + return CR_SUCCESS; + case ERROR_INVALID_DATA: + return CR_INVALID_DATA; + case ERROR_INVALID_USER_BUFFER: + return CR_INVALID_POINTER; + case ERROR_INVALID_FLAGS: + return CR_INVALID_FLAG; + case ERROR_INSUFFICIENT_BUFFER: + return CR_BUFFER_SMALL; + case ERROR_NOT_FOUND: + return CR_NO_SUCH_VALUE; + } + return CR_FAILURE; +} + +/*********************************************************************** + * CM_Get_DevNode_PropertyW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_PropertyW(DEVINST dev, const DEVPROPKEY *key, DEVPROPTYPE *type, + PVOID buf, PULONG len, ULONG flags) +{ + return CM_Get_DevNode_Property_ExW(dev, key, type, buf, len, flags, NULL); +} + /*********************************************************************** * SetupDiInstallDeviceInterfaces (SETUPAPI.@) */ diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 8c4ebcc101..74c252c6fd 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -67,6 +67,8 @@ @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) +@ stdcall CM_Get_DevNode_Property_ExW(long ptr ptr ptr ptr long ptr) @ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long) @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr)

1 0

Alexandre Julliard : unicode: Use a standard two-level mapping table for the digit map.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 31360d4785fc889927039ea3721d20da873bcc45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31360d4785fc889927039ea3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 27 19:36:05 2020 +0100 unicode: Use a standard two-level mapping table for the digit map. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/digitmap.c | 893 ++++++--------------------------------------- dlls/kernelbase/locale.c | 5 +- libs/port/digitmap.c | 893 ++++++--------------------------------------- libs/port/fold.c | 3 +- tools/make_unicode | 2 +- 5 files changed, 235 insertions(+), 1561 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=31360d4785fc88992703…

1 0

Piotr Caban : msvcrt: Add support for quoted paths in _searchenv.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 1d0cca465ab6b185dd91db00f61d9ad5d272a766 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d0cca465ab6b185dd91db00… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 28 18:26:12 2020 +0100 msvcrt: Add support for quoted paths in _searchenv. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 21 ++++++++++++++++++--- dlls/msvcrt/tests/dir.c | 14 ++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index e8cba58ac7..d07fcd6c7d 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -1683,12 +1683,27 @@ void CDECL MSVCRT__searchenv(const char* file, const char* env, char *buf) for(; *penv; penv = (*end ? end + 1 : end)) { end = penv; - while(*end && *end != ';') end++; /* Find end of next path */ - path_len = end - penv; + path_len = 0; + while(*end && *end != ';' && path_len < MAX_PATH) + { + if (*end == '"') + { + end++; + while(*end && *end != '"' && path_len < MAX_PATH) + { + path[path_len++] = *end; + end++; + } + if (*end == '"') end++; + continue; + } + + path[path_len++] = *end; + end++; + } if (!path_len || path_len >= MAX_PATH) continue; - memcpy(path, penv, path_len); if (path[path_len - 1] != '/' && path[path_len - 1] != '\\') path[path_len++] = '\\'; if (path_len + fname_len >= MAX_PATH) diff --git a/dlls/msvcrt/tests/dir.c b/dlls/msvcrt/tests/dir.c index 210cf3983c..6c817dfb2e 100644 --- a/dlls/msvcrt/tests/dir.c +++ b/dlls/msvcrt/tests/dir.c @@ -597,6 +597,20 @@ static void test_searchenv(void) ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); } + strcpy(env1, "TEST_PATH="); + strcat(env1, tmppath); + strcat(env1, "\"\\search_env_test\\\"d\"i\"r\"1"); + putenv(env1); + strcpy(exp, tmppath); + strcat(exp, files[0]); + _searchenv("1.dat", "TEST_PATH", result); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + + strcat(env1, ";"); + putenv(env1); + _searchenv("1.dat", "TEST_PATH", result); + ok(!result[0], "got %s, expected ''\n", result); + putenv("TEST_PATH="); for (i=ARRAY_SIZE(files)-1; i>=0; i--) {

1 0

Alexandre Julliard : unicode: Use a standard two-level mapping table for the sortkeys map.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: bfeb0a97fe2f134ab427a36d5709294930aa4253 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfeb0a97fe2f134ab427a36d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 27 20:22:47 2020 +0100 unicode: Use a standard two-level mapping table for the sortkeys map. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/collation.c | 443 +++++++++++++------------------------------- dlls/kernelbase/locale.c | 10 +- libs/port/collation.c | 443 +++++++++++++------------------------------- libs/port/sortkey.c | 6 +- tools/make_unicode | 41 ++-- 5 files changed, 295 insertions(+), 648 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bfeb0a97fe2f134ab427…

1 0

Alexandre Julliard : unicode: Use a standard two-level mapping table for the mirror map.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: fb87398b99c57e858752527b091db53d3042749e URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb87398b99c57e858752527b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 27 19:38:50 2020 +0100 unicode: Use a standard two-level mapping table for the mirror map. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/bidi.c | 3 +- dlls/dwrite/mirror.c | 658 ++++++++++++++++----------------------------------- dlls/usp10/mirror.c | 658 ++++++++++++++++----------------------------------- dlls/usp10/usp10.c | 3 +- tools/make_unicode | 2 +- 5 files changed, 405 insertions(+), 919 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fb87398b99c57e858752…

1 0

Zebediah Figura : httpapi: Stub HttpSetRequestQueueProperty().
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: afe9217b57c9077dce20a6c9762ae27813d43b5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=afe9217b57c9077dce20a6c9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 27 10:56:39 2020 -0600 httpapi: Stub HttpSetRequestQueueProperty(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48514 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi.spec | 1 + dlls/httpapi/httpapi_main.c | 11 +++++++++++ include/http.h | 1 + 3 files changed, 13 insertions(+) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index c27d0c96b0..e1a16c39ab 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -51,6 +51,7 @@ @ stub HttpSetAppPoolInformation @ stub HttpSetConfigGroupInformation @ stub HttpSetControlChannelInformation +@ stdcall HttpSetRequestQueueProperty(ptr long ptr long long ptr) @ stub HttpSetServerContextInformation @ stdcall HttpSetServiceConfiguration(ptr long ptr long ptr) @ stdcall HttpSetUrlGroupProperty(int64 long ptr long) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 8adbd38be5..c24cadfaeb 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -760,3 +760,14 @@ ULONG WINAPI HttpCloseRequestQueue(HANDLE handle) return GetLastError(); return ERROR_SUCCESS; } + +/*********************************************************************** + * HttpSetRequestQueueProperty (HTTPAPI.@) + */ +ULONG WINAPI HttpSetRequestQueueProperty(HANDLE queue, HTTP_SERVER_PROPERTY property, + void *value, ULONG length, ULONG reserved1, void *reserved2) +{ + FIXME("queue %p, property %u, value %p, length %u, reserved1 %#x, reserved2 %p, stub!\n", + queue, property, value, length, reserved1, reserved2); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/http.h b/include/http.h index 394167fd68..f569c1ecb5 100644 --- a/include/http.h +++ b/include/http.h @@ -447,6 +447,7 @@ ULONG WINAPI HttpReceiveRequestEntityBody(HANDLE queue, HTTP_REQUEST_ID id, ULON ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url); ULONG WINAPI HttpRemoveUrlFromUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, ULONG flags); ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_RESPONSE *response, HTTP_CACHE_POLICY *cache_policy, ULONG *ret_size, void *reserved1, ULONG reserved2, OVERLAPPED *ovl, HTTP_LOG_DATA *log_data); +ULONG WINAPI HttpSetRequestQueueProperty(HANDLE queue, HTTP_SERVER_PROPERTY property, void *value, ULONG length, ULONG reserved1, void *reserved2); ULONG WINAPI HttpSetServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); ULONG WINAPI HttpSetUrlGroupProperty(HTTP_URL_GROUP_ID id, HTTP_SERVER_PROPERTY property, void *value, ULONG length);

1 0

Alistair Leslie-Hughes : msado15: Implement _Connection get/put ConnectionString.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 765fc5cb319b199d1bd9fe145111ea5951c86696 URL: https://source.winehq.org/git/wine.git/?a=commit;h=765fc5cb319b199d1bd9fe14… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 28 11:36:03 2020 +0100 msado15: Implement _Connection get/put ConnectionString. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 24 ++++++++++++++++++++---- dlls/msado15/tests/msado15.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 73b225628c..2f0aa0c8df 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -37,6 +37,7 @@ struct connection LONG refs; ObjectStateEnum state; LONG timeout; + WCHAR *datasource; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -62,6 +63,7 @@ static ULONG WINAPI connection_Release( _Connection *iface ) if (!refs) { TRACE( "destroying %p\n", connection ); + heap_free( connection->datasource ); heap_free( connection ); } return refs; @@ -125,14 +127,27 @@ static HRESULT WINAPI connection_get_Properties( _Connection *iface, Properties static HRESULT WINAPI connection_get_ConnectionString( _Connection *iface, BSTR *str ) { - FIXME( "%p, %p\n", iface, str ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + BSTR source = NULL; + + TRACE( "%p, %p\n", connection, str ); + + if (connection->datasource && !(source = SysAllocString( connection->datasource ))) return E_OUTOFMEMORY; + *str = source; + return S_OK; } static HRESULT WINAPI connection_put_ConnectionString( _Connection *iface, BSTR str ) { - FIXME( "%p, %s\n", iface, debugstr_w(str) ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + WCHAR *source = NULL; + + TRACE( "%p, %s\n", connection, debugstr_w( !wcsstr( str, L"Password" ) ? L"<hidden>" : str ) ); + + if (str && !(source = strdupW( str ))) return E_OUTOFMEMORY; + heap_free( connection->datasource ); + connection->datasource = source; + return S_OK; } static HRESULT WINAPI connection_get_CommandTimeout( _Connection *iface, LONG *timeout ) @@ -392,6 +407,7 @@ HRESULT Connection_create( void **obj ) connection->refs = 1; connection->state = adStateClosed; connection->timeout = 30; + connection->datasource = NULL; *obj = &connection->Connection_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 917d131063..fb77936bba 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -667,6 +667,7 @@ static void test_Connection(void) IRunnableObject *runtime; ISupportErrorInfo *errorinfo; LONG state, timeout; + BSTR str, str2; hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); ok( hr == S_OK, "got %08x\n", hr ); @@ -702,6 +703,35 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(timeout == 300, "Unexpected timeout value %d\n", timeout); + str = (BSTR)0xdeadbeef; + hr = _Connection_get_ConnectionString(connection, &str); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(str == NULL, "got %p\n", str); + + str = SysAllocString(L"Provider=MSDASQL.1;Persist Security Info=False;Data Source=wine_test"); + hr = _Connection_put_ConnectionString(connection, str); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + +if (0) /* Crashes on windows */ +{ + hr = _Connection_get_ConnectionString(connection, NULL); + ok(hr == E_POINTER, "Failed, hr 0x%08x\n", hr); +} + + str2 = NULL; + hr = _Connection_get_ConnectionString(connection, &str2); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(!wcscmp(str, str2), "wrong string %s\n", wine_dbgstr_w(str2)); + SysFreeString(str); + SysFreeString(str2); + + hr = _Connection_put_ConnectionString(connection, NULL); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + + str = (BSTR)0xdeadbeef; + hr = _Connection_get_ConnectionString(connection, &str); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(str == NULL, "got %p\n", str); _Connection_Release(connection); }

1 0

Henri Verbeet : wined3d: Get rid of the "DirectDrawRenderer" setting.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 6e515efb715824a4811c40ee3833d48e460d5e67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e515efb715824a4811c40ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 28 16:35:40 2020 +0330 wined3d: Get rid of the "DirectDrawRenderer" setting. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 5d60a44ef6..05684aeb3b 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -374,8 +374,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) TRACE("Limiting PS shader model to %u.\n", wined3d_settings.max_sm_ps); if (!get_config_key_dword(hkey, appkey, "MaxShaderModelCS", &wined3d_settings.max_sm_cs)) TRACE("Limiting CS shader model to %u.\n", wined3d_settings.max_sm_cs); - if (!get_config_key(hkey, appkey, "renderer", buffer, size) - || !get_config_key(hkey, appkey, "DirectDrawRenderer", buffer, size)) + if (!get_config_key(hkey, appkey, "renderer", buffer, size)) { if (!strcmp(buffer, "vulkan")) {

1 0

Zebediah Figura : winegstreamer: Append an audioconvert element to raw audio streams.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 11b30ffc076126c6e75cb2c4bd026a9d468c18da URL: https://source.winehq.org/git/wine.git/?a=commit;h=11b30ffc076126c6e75cb2c4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 27 19:06:55 2020 -0600 winegstreamer: Append an audioconvert element to raw audio streams. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 155 +++++++++++++++++++++--------------------- 1 file changed, 78 insertions(+), 77 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 66557b63a5..8e36644030 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -85,10 +85,7 @@ struct gstdemux_source struct strmbase_source pin; IQualityControl IQualityControl_iface; - GstElement *flipfilter; - GstPad *flip_sink, *flip_src; - GstPad *their_src; - GstPad *my_sink; + GstPad *their_src, *post_sink, *post_src, *my_sink; AM_MEDIA_TYPE mt; HANDLE caps_event; GstSegment *segment; @@ -1004,11 +1001,10 @@ static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) if (pin->their_src == pad) { - if(pin->flipfilter) - gst_pad_unlink(pin->their_src, pin->flip_sink); + if (pin->post_sink) + gst_pad_unlink(pin->their_src, pin->post_sink); else gst_pad_unlink(pin->their_src, pin->my_sink); - gst_object_unref(pin->their_src); pin->their_src = NULL; return; @@ -1052,85 +1048,91 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * if (!strcmp(typename, "video/x-raw")) { - GstElement *vconv; - - TRACE("setting up videoflip filter for pin %p, my_sink: %p, their_src: %p\n", - pin, pin->my_sink, pad); + GstElement *vconv, *flip; - /* gstreamer outputs video top-down, but dshow expects bottom-up, so - * make new transform filter to invert video */ - vconv = gst_element_factory_make("videoconvert", NULL); - if(!vconv){ - ERR("Missing videoconvert filter?\n"); - ret = -1; - goto exit; + /* decodebin considers many YUV formats to be "raw", but some quartz + * filters can't handle those. Also, videoflip can't handle all "raw" + * formats either. Add a videoconvert to swap color spaces. */ + if (!(vconv = gst_element_factory_make("videoconvert", NULL))) + { + ERR("Failed to create videoconvert, are %u-bit GStreamer \"base\" plugins installed?\n", + 8 * (int)sizeof(void *)); + return; } - pin->flipfilter = gst_element_factory_make("videoflip", NULL); - if(!pin->flipfilter){ - ERR("Missing videoflip filter?\n"); - ret = -1; - goto exit; + /* GStreamer outputs video top-down, but DirectShow expects bottom-up. */ + if (!(flip = gst_element_factory_make("videoflip", NULL))) + { + ERR("Failed to create videoflip, are %u-bit GStreamer \"good\" plugins installed?\n", + 8 * (int)sizeof(void *)); + return; } - gst_util_set_object_arg(G_OBJECT(pin->flipfilter), "method", "vertical-flip"); + gst_util_set_object_arg(G_OBJECT(flip), "method", "vertical-flip"); gst_bin_add(GST_BIN(This->container), vconv); /* bin takes ownership */ gst_element_sync_state_with_parent(vconv); - gst_bin_add(GST_BIN(This->container), pin->flipfilter); /* bin takes ownership */ - gst_element_sync_state_with_parent(pin->flipfilter); + gst_bin_add(GST_BIN(This->container), flip); /* bin takes ownership */ + gst_element_sync_state_with_parent(flip); - gst_element_link (vconv, pin->flipfilter); + gst_element_link(vconv, flip); - pin->flip_sink = gst_element_get_static_pad(vconv, "sink"); - if(!pin->flip_sink){ - WARN("Couldn't find sink on flip filter\n"); - pin->flipfilter = NULL; - ret = -1; - goto exit; - } + pin->post_sink = gst_element_get_static_pad(vconv, "sink"); + pin->post_src = gst_element_get_static_pad(flip, "src"); + } + else if (!strcmp(typename, "audio/x-raw")) + { + GstElement *convert; - ret = gst_pad_link(pad, pin->flip_sink); - if(ret < 0){ - WARN("gst_pad_link failed: %d\n", ret); - gst_object_unref(pin->flip_sink); - pin->flip_sink = NULL; - pin->flipfilter = NULL; - goto exit; + /* Currently our dsound can't handle 64-bit formats or all + * surround-sound configurations. Native dsound can't always handle + * 64-bit formats either. Add an audioconvert to allow changing bit + * depth and channel count. */ + if (!(convert = gst_element_factory_make("audioconvert", NULL))) + { + ERR("Failed to create audioconvert, are %u-bit GStreamer \"base\" plugins installed?\n", + 8 * (int)sizeof(void *)); + return; } - pin->flip_src = gst_element_get_static_pad(pin->flipfilter, "src"); - if(!pin->flip_src){ - WARN("Couldn't find src on flip filter\n"); - gst_object_unref(pin->flip_sink); - pin->flip_sink = NULL; - pin->flipfilter = NULL; - ret = -1; - goto exit; + gst_bin_add(GST_BIN(This->container), convert); + gst_element_sync_state_with_parent(convert); + + pin->post_sink = gst_element_get_static_pad(convert, "sink"); + pin->post_src = gst_element_get_static_pad(convert, "src"); + } + + if (pin->post_sink) + { + if ((ret = gst_pad_link(pad, pin->post_sink)) < 0) + { + ERR("Failed to link decodebin source pad to post-processing elements, error %s.\n", + gst_pad_link_get_name(ret)); + gst_object_unref(pin->post_sink); + pin->post_sink = NULL; + return; } - ret = gst_pad_link(pin->flip_src, pin->my_sink); - if(ret < 0){ - WARN("gst_pad_link failed: %d\n", ret); - gst_object_unref(pin->flip_src); - pin->flip_src = NULL; - gst_object_unref(pin->flip_sink); - pin->flip_sink = NULL; - pin->flipfilter = NULL; - goto exit; + if ((ret = gst_pad_link(pin->post_src, pin->my_sink)) < 0) + { + ERR("Failed to link post-processing elements to our sink pad, error %s.\n", + gst_pad_link_get_name(ret)); + gst_object_unref(pin->post_src); + pin->post_src = NULL; + gst_object_unref(pin->post_sink); + pin->post_sink = NULL; + return; } - } else - ret = gst_pad_link(pad, pin->my_sink); + } + else if ((ret = gst_pad_link(pad, pin->my_sink)) < 0) + { + ERR("Failed to link decodebin source pad to our sink pad, error %s.\n", + gst_pad_link_get_name(ret)); + return; + } gst_pad_set_active(pin->my_sink, 1); - -exit: - TRACE("Linking: %i\n", ret); - - if (ret >= 0) { - pin->their_src = pad; - gst_object_ref(pin->their_src); - } + gst_object_ref(pin->their_src = pad); } static void existing_new_pad(GstElement *bin, GstPad *pad, gpointer user) @@ -1156,8 +1158,8 @@ static void existing_new_pad(GstElement *bin, GstPad *pad, gpointer user) if (!pin->their_src) { gst_segment_init(pin->segment, GST_FORMAT_TIME); - if (pin->flipfilter) - ret = gst_pad_link(pad, pin->flip_sink); + if (pin->post_sink) + ret = gst_pad_link(pad, pin->post_sink); else ret = gst_pad_link(pad, pin->my_sink); @@ -2136,14 +2138,13 @@ static void free_source_pin(struct gstdemux_source *pin) if (pin->their_src) { - if (pin->flipfilter) + if (pin->post_sink) { - gst_pad_unlink(pin->their_src, pin->flip_sink); - gst_pad_unlink(pin->flip_src, pin->my_sink); - gst_object_unref(pin->flip_src); - gst_object_unref(pin->flip_sink); - pin->flipfilter = NULL; - pin->flip_src = pin->flip_sink = NULL; + gst_pad_unlink(pin->their_src, pin->post_sink); + gst_pad_unlink(pin->post_src, pin->my_sink); + gst_object_unref(pin->post_src); + gst_object_unref(pin->post_sink); + pin->post_src = pin->post_sink = NULL; } else gst_pad_unlink(pin->their_src, pin->my_sink);

1 0

Zebediah Figura : winegstreamer: Get rid of the AudioConvert filter.
by Alexandre Julliard Jan. 28, 2020

Jan. 28, 2020

Module: wine Branch: master Commit: 943b6564f5b2a285f9964f1d1c0743340b2f0bd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=943b6564f5b2a285f9964f1d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 27 19:06:57 2020 -0600 winegstreamer: Get rid of the AudioConvert filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_guids.h | 1 - dlls/winegstreamer/gst_private.h | 1 - dlls/winegstreamer/gsttffilter.c | 120 --------------------------------------- dlls/winegstreamer/main.c | 35 ------------ 4 files changed, 157 deletions(-) diff --git a/dlls/winegstreamer/gst_guids.h b/dlls/winegstreamer/gst_guids.h index fe7b65e445..e50ecb4851 100644 --- a/dlls/winegstreamer/gst_guids.h +++ b/dlls/winegstreamer/gst_guids.h @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -DEFINE_GUID(CLSID_Gstreamer_AudioConvert, 0x334b2ec9, 0xf2b5, 0x40b9, 0x84, 0x32, 0x4a, 0x00, 0xe0, 0x03, 0x86, 0xa8); DEFINE_GUID(CLSID_Gstreamer_Mp3, 0x728dcf55, 0x128f, 0x4dd1, 0xad, 0x22, 0xbe, 0xcf, 0xa6, 0x6c, 0xe7, 0xaa); DEFINE_GUID(CLSID_Gstreamer_Splitter, 0xf9d8d64e, 0xa144, 0x47dc, 0x8e, 0xe0, 0xf5, 0x34, 0x98, 0x37, 0x2c, 0x29); DEFINE_GUID(WINESUBTYPE_Gstreamer, 0xffffffff, 0x128f, 0x4dd1, 0xad, 0x22, 0xbe, 0xcf, 0xa6, 0x6c, 0xe7, 0xaa); diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 37b19ea626..7108a32e40 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -37,7 +37,6 @@ IUnknown * CALLBACK avi_splitter_create(IUnknown *outer, HRESULT *phr) DECLSPEC_HIDDEN; IUnknown * CALLBACK mpeg_splitter_create(IUnknown *outer, HRESULT *phr) DECLSPEC_HIDDEN; -IUnknown * CALLBACK Gstreamer_AudioConvert_create(IUnknown *pUnkOuter, HRESULT *phr); IUnknown * CALLBACK Gstreamer_Mp3_create(IUnknown *pUnkOuter, HRESULT *phr); IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr); IUnknown * CALLBACK wave_parser_create(IUnknown *outer, HRESULT *phr) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 5d1a98b0f5..21feefe09d 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -626,123 +626,3 @@ IUnknown * CALLBACK Gstreamer_Mp3_create(IUnknown *punkouter, HRESULT *phr) return obj; } - -static HRESULT WINAPI Gstreamer_AudioConvert_QueryConnect(TransformFilter *iface, const AM_MEDIA_TYPE *amt) -{ - GstTfImpl *This = (GstTfImpl*)iface; - TRACE("%p %p\n", This, amt); - - if (!IsEqualGUID(&amt->majortype, &MEDIATYPE_Audio) || - !IsEqualGUID(&amt->subtype, &MEDIASUBTYPE_PCM) || - !IsEqualGUID(&amt->formattype, &FORMAT_WaveFormatEx)) - return S_FALSE; - return S_OK; -} - -static HRESULT audio_converter_connect_sink(TransformFilter *tf, const AM_MEDIA_TYPE *amt) -{ - GstTfImpl *This = (GstTfImpl*)tf; - GstCaps *capsin, *capsout; - AM_MEDIA_TYPE *outpmt = &This->tf.pmt; - WAVEFORMATEX *inwfe; - WAVEFORMATEX *outwfe; - WAVEFORMATEXTENSIBLE *outwfx; - GstAudioFormat format; - HRESULT hr; - BOOL inisfloat = FALSE; - int indepth; - - mark_wine_thread(); - - if (Gstreamer_AudioConvert_QueryConnect(&This->tf, amt) == S_FALSE || !amt->pbFormat) - return E_FAIL; - - FreeMediaType(outpmt); - *outpmt = *amt; - outpmt->pUnk = NULL; - outpmt->cbFormat = sizeof(WAVEFORMATEXTENSIBLE); - outpmt->pbFormat = CoTaskMemAlloc(outpmt->cbFormat); - - inwfe = (WAVEFORMATEX*)amt->pbFormat; - indepth = inwfe->wBitsPerSample; - if (inwfe->wFormatTag == WAVE_FORMAT_EXTENSIBLE) { - WAVEFORMATEXTENSIBLE *inwfx = (WAVEFORMATEXTENSIBLE*)inwfe; - inisfloat = IsEqualGUID(&inwfx->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT); - if (inwfx->Samples.wValidBitsPerSample) - indepth = inwfx->Samples.wValidBitsPerSample; - } else if (inwfe->wFormatTag == WAVE_FORMAT_IEEE_FLOAT) - inisfloat = TRUE; - - if (inisfloat) - format = inwfe->wBitsPerSample == 64 ? GST_AUDIO_FORMAT_F64LE : GST_AUDIO_FORMAT_F32LE; - else - format = gst_audio_format_build_integer(inwfe->wBitsPerSample != 8, G_LITTLE_ENDIAN, - inwfe->wBitsPerSample, indepth); - - capsin = gst_caps_new_simple("audio/x-raw", - "format", G_TYPE_STRING, gst_audio_format_to_string(format), - "channels", G_TYPE_INT, inwfe->nChannels, - "rate", G_TYPE_INT, inwfe->nSamplesPerSec, - NULL); - - outwfe = (WAVEFORMATEX*)outpmt->pbFormat; - outwfx = (WAVEFORMATEXTENSIBLE*)outwfe; - outwfe->wFormatTag = WAVE_FORMAT_EXTENSIBLE; - outwfe->nChannels = 2; - outwfe->nSamplesPerSec = inwfe->nSamplesPerSec; - outwfe->wBitsPerSample = 16; - outwfe->nBlockAlign = outwfe->nChannels * outwfe->wBitsPerSample / 8; - outwfe->nAvgBytesPerSec = outwfe->nBlockAlign * outwfe->nSamplesPerSec; - outwfe->cbSize = sizeof(*outwfx) - sizeof(*outwfe); - outwfx->Samples.wValidBitsPerSample = outwfe->wBitsPerSample; - outwfx->dwChannelMask = SPEAKER_FRONT_LEFT|SPEAKER_FRONT_RIGHT; - outwfx->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; - - capsout = gst_caps_new_simple("audio/x-raw", - "format", G_TYPE_STRING, "S16LE", - "channels", G_TYPE_INT, outwfe->nChannels, - "rate", G_TYPE_INT, outwfe->nSamplesPerSec, - NULL); - - - hr = Gstreamer_transform_ConnectInput(This, amt, capsin, capsout); - gst_caps_unref(capsin); - gst_caps_unref(capsout); - - This->cbBuffer = inwfe->nAvgBytesPerSec; - return hr; -} - -static const TransformFilterFuncTable Gstreamer_AudioConvert_vtbl = { - .pfnDecideBufferSize = Gstreamer_transform_DecideBufferSize, - .pfnStartStreaming = Gstreamer_transform_ProcessBegin, - .pfnReceive = Gstreamer_transform_ProcessData, - .pfnStopStreaming = Gstreamer_transform_ProcessEnd, - .pfnCheckInputType = Gstreamer_AudioConvert_QueryConnect, - .transform_connect_sink = audio_converter_connect_sink, - .pfnBreakConnect = Gstreamer_transform_Cleanup, - .pfnEndOfStream = Gstreamer_transform_EndOfStream, - .pfnBeginFlush = Gstreamer_transform_BeginFlush, - .pfnEndFlush = Gstreamer_transform_EndFlush, - .pfnNewSegment = Gstreamer_transform_NewSegment, - .pfnNotify = Gstreamer_transform_QOS, -}; - -IUnknown * CALLBACK Gstreamer_AudioConvert_create(IUnknown *punkouter, HRESULT *phr) -{ - IUnknown *obj = NULL; - - TRACE("%p %p\n", punkouter, phr); - - if (!init_gstreamer()) - { - *phr = E_FAIL; - return NULL; - } - - *phr = Gstreamer_transform_create(punkouter, &CLSID_Gstreamer_AudioConvert, "audioconvert", &Gstreamer_AudioConvert_vtbl, (LPVOID*)&obj); - - TRACE("returning %p\n", obj); - - return obj; -} diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index cdc3ba0ddc..3e0ef28afb 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -40,8 +40,6 @@ static const WCHAR wGstreamer_Splitter[] = {'G','S','t','r','e','a','m','e','r',' ','s','p','l','i','t','t','e','r',' ','f','i','l','t','e','r',0}; static const WCHAR wGstreamer_Mp3[] = {'G','S','t','r','e','a','m','e','r',' ','M','p','3',' ','f','i','l','t','e','r',0}; -static const WCHAR wGstreamer_AudioConvert[] = -{'G','S','t','r','e','a','m','e','r',' ','A','u','d','i','o','C','o','n','v','e','r','t',' ','f','i','l','t','e','r',0}; static const WCHAR wave_parserW[] = {'W','a','v','e',' ','P','a','r','s','e','r',0}; static const WCHAR avi_splitterW[] = @@ -122,32 +120,6 @@ AMOVIESETUP_FILTER const amfMp3 = amfMp3Pin }; -AMOVIESETUP_PIN amfAudioConvertPin[] = -{ { wNull, - FALSE, FALSE, FALSE, FALSE, - &GUID_NULL, - NULL, - 1, - amfMTaudio - }, - { - wNull, - FALSE, TRUE, FALSE, FALSE, - &GUID_NULL, - NULL, - 1, - amfMTaudio - }, -}; - -AMOVIESETUP_FILTER const amfAudioConvert = -{ &CLSID_Gstreamer_AudioConvert, - wGstreamer_AudioConvert, - MERIT_UNLIKELY, - 2, - amfAudioConvertPin -}; - static const AMOVIESETUP_MEDIATYPE wave_parser_sink_type_data[] = { {&MEDIATYPE_Stream, &MEDIASUBTYPE_WAVE}, @@ -295,13 +267,6 @@ FactoryTemplate const g_Templates[] = { NULL, &amfMp3, }, - { - wGstreamer_AudioConvert, - &CLSID_Gstreamer_AudioConvert, - Gstreamer_AudioConvert_create, - NULL, - &amfAudioConvert, - }, { wave_parserW, &CLSID_WAVEParser,

1 0