January 2020 - Wine-Commits

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

Jan. 29, 2020

Module: wine Branch: master Commit: 39138478fdd93cc0dfc1e83b85784bc468e8d237 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39138478fdd93cc0dfc1e83b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 29 10:48:39 2020 +0100 libwine: Make some functions obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_powerpc.c | 16 +++++++- include/wine/asm.h | 6 +++ include/wine/library.h | 5 --- libs/wine/port.c | 70 +++++++++++++++------------------- libs/wine/wine.map | 91 +++++++++++++++++++++++---------------------- 5 files changed, 96 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=39138478fdd93cc0dfc1…

1 0

Zebediah Figura : strmbase: Remove some no longer used callbacks.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 38291846f306dd5c6bd8bc5ed6a1634022d1dd2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=38291846f306dd5c6bd8bc5e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 23:36:52 2020 -0600 strmbase: Remove some no longer used callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/transform.c | 28 ++++++---------------------- include/wine/strmbase.h | 4 ---- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 74be6b107e..2c75156c1b 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -38,14 +38,6 @@ static inline TransformFilter *impl_from_sink_IPin(IPin *iface) static HRESULT sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *pmt) { - TransformFilter *pTransform = impl_from_sink_IPin(&iface->IPin_iface); - - TRACE("%p\n", iface); - - if (pTransform->pFuncsTable->pfnCheckInputType) - return pTransform->pFuncsTable->pfnCheckInputType(pTransform, pmt); - /* Assume OK if there's no query method (the connection will fail if - needed) */ return S_OK; } @@ -239,13 +231,9 @@ static HRESULT sink_eos(struct strmbase_sink *iface) static HRESULT sink_begin_flush(struct strmbase_sink *iface) { TransformFilter *filter = impl_from_sink_IPin(&iface->pin.IPin_iface); - HRESULT hr = S_OK; - - if (filter->pFuncsTable->pfnBeginFlush) - hr = filter->pFuncsTable->pfnBeginFlush(filter); - if (SUCCEEDED(hr) && filter->source.pin.peer) - hr = IPin_BeginFlush(filter->source.pin.peer); - return hr; + if (filter->source.pin.peer) + return IPin_BeginFlush(filter->source.pin.peer); + return S_OK; } static HRESULT sink_end_flush(struct strmbase_sink *iface) @@ -264,13 +252,9 @@ static HRESULT sink_new_segment(struct strmbase_sink *iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate) { TransformFilter *filter = impl_from_sink_IPin(&iface->pin.IPin_iface); - HRESULT hr = S_OK; - - if (filter->pFuncsTable->pfnNewSegment) - hr = filter->pFuncsTable->pfnNewSegment(filter, start, stop, rate); - if (SUCCEEDED(hr) && filter->source.pin.peer) - hr = IPin_NewSegment(filter->source.pin.peer, start, stop, rate); - return hr; + if (filter->source.pin.peer) + return IPin_NewSegment(filter->source.pin.peer, start, stop, rate); + return S_OK; } static const struct strmbase_sink_ops sink_ops = diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 48d7638ae1..abb04a8384 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -195,13 +195,9 @@ typedef struct TransformFilterFuncTable { TransformFilter_StartStreaming pfnStartStreaming; TransformFilter_Receive pfnReceive; TransformFilter_StopStreaming pfnStopStreaming; - TransformFilter_CheckInputType pfnCheckInputType; HRESULT (*transform_connect_sink)(TransformFilter *filter, const AM_MEDIA_TYPE *mt); TransformFilter_BreakConnect pfnBreakConnect; - TransformFilter_EndOfStream pfnEndOfStream; - TransformFilter_BeginFlush pfnBeginFlush; TransformFilter_EndFlush pfnEndFlush; - TransformFilter_NewSegment pfnNewSegment; TransformFilter_Notify pfnNotify; } TransformFilterFuncTable;

1 0

Zebediah Figura : strmbase: Return S_FALSE from IEnumPins::Next() when the pin count changes.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 0820b125e29b5bfde9a6615e96cbd93efa56932f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0820b125e29b5bfde9a6615e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 23:36:54 2020 -0600 strmbase: Return S_FALSE from IEnumPins::Next() when the pin count changes. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 1 - dlls/quartz/tests/filesource.c | 1 - dlls/quartz/tests/mpegsplit.c | 1 - dlls/quartz/tests/waveparser.c | 1 - dlls/strmbase/filter.c | 2 +- 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 31cb767b60..4af101767d 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -353,7 +353,6 @@ static void test_enum_pins(void) graph = connect_input(filter, filename); hr = IEnumPins_Next(enum1, 1, pins, NULL); -todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IEnumPins_Reset(enum1); diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 3e571fa0e3..918605da6d 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -526,7 +526,6 @@ static void test_enum_pins(void) load_file(filter, filename); hr = IEnumPins_Next(enum1, 1, pins, NULL); -todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IEnumPins_Reset(enum1); diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index c45f982a02..67dd6d312d 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -347,7 +347,6 @@ static void test_enum_pins(void) graph = connect_input(filter, filename); hr = IEnumPins_Next(enum1, 1, pins, NULL); -todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IEnumPins_Reset(enum1); diff --git a/dlls/quartz/tests/waveparser.c b/dlls/quartz/tests/waveparser.c index 61ba2018e4..e9540bc0f5 100644 --- a/dlls/quartz/tests/waveparser.c +++ b/dlls/quartz/tests/waveparser.c @@ -351,7 +351,6 @@ static void test_enum_pins(void) graph = connect_input(filter, filename); hr = IEnumPins_Next(enum1, 1, pins, NULL); -todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IEnumPins_Reset(enum1); diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index a7e5fcd3f0..43da4b3fb9 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -122,7 +122,7 @@ static HRESULT WINAPI enum_pins_Next(IEnumPins *iface, ULONG count, IPin **pins, *ret_count = 0; if (enum_pins->version != enum_pins->filter->pin_version) - return VFW_E_ENUM_OUT_OF_SYNC; + return S_FALSE; for (i = 0; i < count; ++i) {

1 0

Zebediah Figura : strmbase: Move the IEnumMediaTypes implementation to pin.c.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 85d411aa24a58647341a6c14a75bd2a61dd6a877 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85d411aa24a58647341a6c14… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 23:36:55 2020 -0600 strmbase: Move the IEnumMediaTypes implementation to pin.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/mediatype.c | 170 ------------------------------------- dlls/strmbase/pin.c | 176 +++++++++++++++++++++++++++++++++++++++ dlls/strmbase/strmbase_private.h | 2 - 3 files changed, 176 insertions(+), 172 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=85d411aa24a58647341a…

1 0

Zebediah Figura : winegstreamer: Get rid of the mp3 decoder.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: d263c4a366fbdb9bc05ef5ae77cd0677d76f5624 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d263c4a366fbdb9bc05ef5ae… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 23:36:51 2020 -0600 winegstreamer: Get rid of the mp3 decoder. In the unlikely event that we are hotplugging not from an IAsyncReader, we already have the ACM wrapper and l3codeca.acm available to do the same thing. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 4 +- dlls/winegstreamer/gst_cbs.c | 24 -- dlls/winegstreamer/gst_cbs.h | 13 - dlls/winegstreamer/gst_guids.h | 1 - dlls/winegstreamer/gst_private.h | 7 - dlls/winegstreamer/gstdemux.c | 14 +- dlls/winegstreamer/gsttffilter.c | 628 --------------------------------------- dlls/winegstreamer/main.c | 35 --- 8 files changed, 2 insertions(+), 724 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d263c4a366fbdb9bc05e…

1 0

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