December 2019 - Wine-Commits

Michael Stefaniuc : dmloader: Get rid of single use debugstr_dmreturn().
by Alexandre Julliard Dec. 13, 2019

Dec. 13, 2019

Module: wine Branch: master Commit: 8320b40077dbd504e5fa3431d7f4a45d0caa2ce6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8320b40077dbd504e5fa3431… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Dec 13 00:47:16 2019 +0100 dmloader: Get rid of single use debugstr_dmreturn(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/debug.c | 148 ------------------------------------------------- dlls/dmloader/debug.h | 2 - dlls/dmloader/loader.c | 2 +- 3 files changed, 1 insertion(+), 151 deletions(-) diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index 0d274394aa..398ce690d1 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -43,154 +43,6 @@ const char *resolve_STREAM_SEEK (DWORD flag) { } } -/* returns name of given error code */ -const char *debugstr_dmreturn (DWORD code) { - static const flag_info codes[] = { - FE(S_OK), - FE(S_FALSE), - FE(DMUS_S_PARTIALLOAD), - FE(DMUS_S_PARTIALDOWNLOAD), - FE(DMUS_S_REQUEUE), - FE(DMUS_S_FREE), - FE(DMUS_S_END), - FE(DMUS_S_STRING_TRUNCATED), - FE(DMUS_S_LAST_TOOL), - FE(DMUS_S_OVER_CHORD), - FE(DMUS_S_UP_OCTAVE), - FE(DMUS_S_DOWN_OCTAVE), - FE(DMUS_S_NOBUFFERCONTROL), - FE(DMUS_S_GARBAGE_COLLECTED), - FE(E_NOTIMPL), - FE(E_NOINTERFACE), - FE(E_POINTER), - FE(CLASS_E_NOAGGREGATION), - FE(CLASS_E_CLASSNOTAVAILABLE), - FE(REGDB_E_CLASSNOTREG), - FE(E_OUTOFMEMORY), - FE(E_FAIL), - FE(E_INVALIDARG), - FE(DMUS_E_DRIVER_FAILED), - FE(DMUS_E_PORTS_OPEN), - FE(DMUS_E_DEVICE_IN_USE), - FE(DMUS_E_INSUFFICIENTBUFFER), - FE(DMUS_E_BUFFERNOTSET), - FE(DMUS_E_BUFFERNOTAVAILABLE), - FE(DMUS_E_NOTADLSCOL), - FE(DMUS_E_INVALIDOFFSET), - FE(DMUS_E_ALREADY_LOADED), - FE(DMUS_E_INVALIDPOS), - FE(DMUS_E_INVALIDPATCH), - FE(DMUS_E_CANNOTSEEK), - FE(DMUS_E_CANNOTWRITE), - FE(DMUS_E_CHUNKNOTFOUND), - FE(DMUS_E_INVALID_DOWNLOADID), - FE(DMUS_E_NOT_DOWNLOADED_TO_PORT), - FE(DMUS_E_ALREADY_DOWNLOADED), - FE(DMUS_E_UNKNOWN_PROPERTY), - FE(DMUS_E_SET_UNSUPPORTED), - FE(DMUS_E_GET_UNSUPPORTED), - FE(DMUS_E_NOTMONO), - FE(DMUS_E_BADARTICULATION), - FE(DMUS_E_BADINSTRUMENT), - FE(DMUS_E_BADWAVELINK), - FE(DMUS_E_NOARTICULATION), - FE(DMUS_E_NOTPCM), - FE(DMUS_E_BADWAVE), - FE(DMUS_E_BADOFFSETTABLE), - FE(DMUS_E_UNKNOWNDOWNLOAD), - FE(DMUS_E_NOSYNTHSINK), - FE(DMUS_E_ALREADYOPEN), - FE(DMUS_E_ALREADYCLOSED), - FE(DMUS_E_SYNTHNOTCONFIGURED), - FE(DMUS_E_SYNTHACTIVE), - FE(DMUS_E_CANNOTREAD), - FE(DMUS_E_DMUSIC_RELEASED), - FE(DMUS_E_BUFFER_EMPTY), - FE(DMUS_E_BUFFER_FULL), - FE(DMUS_E_PORT_NOT_CAPTURE), - FE(DMUS_E_PORT_NOT_RENDER), - FE(DMUS_E_DSOUND_NOT_SET), - FE(DMUS_E_ALREADY_ACTIVATED), - FE(DMUS_E_INVALIDBUFFER), - FE(DMUS_E_WAVEFORMATNOTSUPPORTED), - FE(DMUS_E_SYNTHINACTIVE), - FE(DMUS_E_DSOUND_ALREADY_SET), - FE(DMUS_E_INVALID_EVENT), - FE(DMUS_E_UNSUPPORTED_STREAM), - FE(DMUS_E_ALREADY_INITED), - FE(DMUS_E_INVALID_BAND), - FE(DMUS_E_TRACK_HDR_NOT_FIRST_CK), - FE(DMUS_E_TOOL_HDR_NOT_FIRST_CK), - FE(DMUS_E_INVALID_TRACK_HDR), - FE(DMUS_E_INVALID_TOOL_HDR), - FE(DMUS_E_ALL_TOOLS_FAILED), - FE(DMUS_E_ALL_TRACKS_FAILED), - FE(DMUS_E_NOT_FOUND), - FE(DMUS_E_NOT_INIT), - FE(DMUS_E_TYPE_DISABLED), - FE(DMUS_E_TYPE_UNSUPPORTED), - FE(DMUS_E_TIME_PAST), - FE(DMUS_E_TRACK_NOT_FOUND), - FE(DMUS_E_TRACK_NO_CLOCKTIME_SUPPORT), - FE(DMUS_E_NO_MASTER_CLOCK), - FE(DMUS_E_LOADER_NOCLASSID), - FE(DMUS_E_LOADER_BADPATH), - FE(DMUS_E_LOADER_FAILEDOPEN), - FE(DMUS_E_LOADER_FORMATNOTSUPPORTED), - FE(DMUS_E_LOADER_FAILEDCREATE), - FE(DMUS_E_LOADER_OBJECTNOTFOUND), - FE(DMUS_E_LOADER_NOFILENAME), - FE(DMUS_E_INVALIDFILE), - FE(DMUS_E_ALREADY_EXISTS), - FE(DMUS_E_OUT_OF_RANGE), - FE(DMUS_E_SEGMENT_INIT_FAILED), - FE(DMUS_E_ALREADY_SENT), - FE(DMUS_E_CANNOT_FREE), - FE(DMUS_E_CANNOT_OPEN_PORT), - FE(DMUS_E_CANNOT_CONVERT), - FE(DMUS_E_DESCEND_CHUNK_FAIL), - FE(DMUS_E_NOT_LOADED), - FE(DMUS_E_SCRIPT_LANGUAGE_INCOMPATIBLE), - FE(DMUS_E_SCRIPT_UNSUPPORTED_VARTYPE), - FE(DMUS_E_SCRIPT_ERROR_IN_SCRIPT), - FE(DMUS_E_SCRIPT_CANTLOAD_OLEAUT32), - FE(DMUS_E_SCRIPT_LOADSCRIPT_ERROR), - FE(DMUS_E_SCRIPT_INVALID_FILE), - FE(DMUS_E_INVALID_SCRIPTTRACK), - FE(DMUS_E_SCRIPT_VARIABLE_NOT_FOUND), - FE(DMUS_E_SCRIPT_ROUTINE_NOT_FOUND), - FE(DMUS_E_SCRIPT_CONTENT_READONLY), - FE(DMUS_E_SCRIPT_NOT_A_REFERENCE), - FE(DMUS_E_SCRIPT_VALUE_NOT_SUPPORTED), - FE(DMUS_E_INVALID_SEGMENTTRIGGERTRACK), - FE(DMUS_E_INVALID_LYRICSTRACK), - FE(DMUS_E_INVALID_PARAMCONTROLTRACK), - FE(DMUS_E_AUDIOVBSCRIPT_SYNTAXERROR), - FE(DMUS_E_AUDIOVBSCRIPT_RUNTIMEERROR), - FE(DMUS_E_AUDIOVBSCRIPT_OPERATIONFAILURE), - FE(DMUS_E_AUDIOPATHS_NOT_VALID), - FE(DMUS_E_AUDIOPATHS_IN_USE), - FE(DMUS_E_NO_AUDIOPATH_CONFIG), - FE(DMUS_E_AUDIOPATH_INACTIVE), - FE(DMUS_E_AUDIOPATH_NOBUFFER), - FE(DMUS_E_AUDIOPATH_NOPORT), - FE(DMUS_E_NO_AUDIOPATH), - FE(DMUS_E_INVALIDCHUNK), - FE(DMUS_E_AUDIOPATH_NOGLOBALFXBUFFER), - FE(DMUS_E_INVALID_CONTAINER_OBJECT) - }; - - unsigned int i; - for (i = 0; i < ARRAY_SIZE(codes); i++) { - if (code == codes[i].val) - return codes[i].name; - } - - /* if we didn't find it, return value */ - return wine_dbg_sprintf("0x%08X", code); -} - - /* generic flag-dumping function */ static const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){ static char buffer[128] = "", *ptr = &buffer[0]; diff --git a/dlls/dmloader/debug.h b/dlls/dmloader/debug.h index fec35cfbff..43f48e832c 100644 --- a/dlls/dmloader/debug.h +++ b/dlls/dmloader/debug.h @@ -39,8 +39,6 @@ typedef struct { extern BOOL IS_VALID_DMFORM (FOURCC chunkID) DECLSPEC_HIDDEN; /* translate STREAM_SEEK flag to string */ extern const char *resolve_STREAM_SEEK (DWORD flag) DECLSPEC_HIDDEN; -/* returns name of given error code */ -extern const char *debugstr_dmreturn (DWORD code) DECLSPEC_HIDDEN; extern const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeader) DECLSPEC_HIDDEN; extern const char *debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER (LPDMUS_IO_CONTAINED_OBJECT_HEADER pHeader) DECLSPEC_HIDDEN; diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 60dd6f844b..a267d2d6b2 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -396,7 +396,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac /* load */ result = IPersistStream_Load (pPersistStream, pStream); if (result != S_OK) { - WARN(": failed to (completely) load object (%s)\n", debugstr_dmreturn(result)); + WARN(": failed to (completely) load object (%08x)\n", result); return result; } /* get descriptor */

1 0

Michael Stefaniuc : dswave: Use the debug functions provided by dmobject.[ch].
by Alexandre Julliard Dec. 13, 2019

Dec. 13, 2019

Module: wine Branch: master Commit: 3ef5436074296610c35de8d5706c5620486fc295 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ef5436074296610c35de8d5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Dec 13 00:29:07 2019 +0100 dswave: Use the debug functions provided by dmobject.[ch]. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dswave/dmobject.c | 247 ++++++++++++++++++++++++++++++++++++++- dlls/dswave/dmobject.h | 14 ++- dlls/dswave/dswave.c | 3 +- dlls/dswave/dswave_main.c | 271 +------------------------------------------ dlls/dswave/dswave_private.h | 21 ---- 5 files changed, 256 insertions(+), 300 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3ef5436074296610c35d…

1 0

Michael Stefaniuc : dmusic: Use the debug functions provided by dmobject.[ch].
by Alexandre Julliard Dec. 13, 2019

Dec. 13, 2019

Module: wine Branch: master Commit: 7e69bdafea21ef80f9f5d46c592fdfa9eb14d4ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e69bdafea21ef80f9f5d46c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Dec 13 00:29:06 2019 +0100 dmusic: Use the debug functions provided by dmobject.[ch]. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/buffer.c | 1 + dlls/dmusic/clock.c | 1 + dlls/dmusic/dmobject.c | 247 +++++++++++++++++++++++++++++++++++++++++-- dlls/dmusic/dmobject.h | 14 ++- dlls/dmusic/dmusic.c | 1 + dlls/dmusic/dmusic_main.c | 239 +---------------------------------------- dlls/dmusic/dmusic_private.h | 12 --- dlls/dmusic/download.c | 1 + dlls/dmusic/instrument.c | 1 + dlls/dmusic/port.c | 1 + 10 files changed, 260 insertions(+), 258 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e69bdafea21ef80f9f5…

1 0

Michael Stefaniuc : dmstyle: Use the debug functions provided by dmobject.[ch].
by Alexandre Julliard Dec. 13, 2019

Dec. 13, 2019

Module: wine Branch: master Commit: bcd88ea3ea791b4ed31f6b008e1921fd27dafd33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcd88ea3ea791b4ed31f6b00… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Dec 13 00:29:05 2019 +0100 dmstyle: Use the debug functions provided by dmobject.[ch]. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/dmobject.c | 247 +++++++++++++++++++++++++++++++++++- dlls/dmstyle/dmobject.h | 14 +- dlls/dmstyle/dmstyle_main.c | 1 + dlls/dmstyle/dmutils.c | 302 +------------------------------------------- dlls/dmstyle/dmutils.h | 26 ---- 5 files changed, 255 insertions(+), 335 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bcd88ea3ea791b4ed31f…

1 0

Michael Stefaniuc : dmscript: Use the debug functions provided by dmobject.[ch].
by Alexandre Julliard Dec. 13, 2019

Dec. 13, 2019

Module: wine Branch: master Commit: eb60619ead22e3470c5e4ef5f485a943cbc71ee5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb60619ead22e3470c5e4ef5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Dec 13 00:29:04 2019 +0100 dmscript: Use the debug functions provided by dmobject.[ch]. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmscript/dmobject.c | 247 ++++++++++++++++++++++++++++++++++- dlls/dmscript/dmobject.h | 14 +- dlls/dmscript/dmscript_main.c | 272 +-------------------------------------- dlls/dmscript/dmscript_private.h | 21 --- dlls/dmscript/script.c | 3 +- dlls/dmscript/scripttrack.c | 1 + 6 files changed, 257 insertions(+), 301 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eb60619ead22e3470c5e…

1 0

Alexandre Julliard : kernel32: Disable relay trace for __wine_start_process().
by Alexandre Julliard Dec. 13, 2019

Dec. 13, 2019

Module: wine Branch: master Commit: 4cb8497c8fba7e99138dc3fcb45cb4a22063f0c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cb8497c8fba7e99138dc3fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 13 08:37:12 2019 +0100 kernel32: Disable relay trace for __wine_start_process(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48273 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 5ba9729086..408ea41540 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1686,4 +1686,4 @@ @ cdecl wine_get_dos_file_name(str) # Init code -@ cdecl __wine_start_process() +@ cdecl -norelay -private __wine_start_process()

1 0

Hans Leidekker : msado15: Implement Fields_get_Item.
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

Module: wine Branch: master Commit: a9452acbfafb7e72e3a5099de78c2fa7383e1684 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9452acbfafb7e72e3a5099d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 12 17:12:22 2019 +0100 msado15: Implement Fields_get_Item. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 42 ++++++++++++++++++++++++++++++++++++++++-- dlls/msado15/tests/msado15.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 80 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index a20d5920da..ff06b8789a 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -433,10 +433,48 @@ static HRESULT WINAPI fields_Refresh( Fields *iface ) return E_NOTIMPL; } +static HRESULT map_index( struct fields *fields, VARIANT *index, ULONG *ret ) +{ + ULONG i; + + if (V_VT( index ) != VT_BSTR) + { + FIXME( "variant type %u not supported\n", V_VT( index ) ); + return E_INVALIDARG; + } + + for (i = 0; i < fields->count; i++) + { + BSTR name; + BOOL match; + HRESULT hr; + + if ((hr = Field_get_Name( fields->field[i], &name )) != S_OK) return hr; + match = !wcsicmp( V_BSTR( index ), name ); + SysFreeString( name ); + if (match) + { + *ret = i; + return S_OK; + } + } + + return E_INVALIDARG; +} + static HRESULT WINAPI fields_get_Item( Fields *iface, VARIANT index, Field **obj ) { - FIXME( "%p, %s, %p\n", iface, debugstr_variant(&index), obj ); - return E_NOTIMPL; + struct fields *fields = impl_from_Fields( iface ); + HRESULT hr; + ULONG i; + + TRACE( "%p, %s, %p\n", fields, debugstr_variant(&index), obj ); + + if ((hr = map_index( fields, &index, &i )) != S_OK) return hr; + + Field_AddRef( fields->field[i] ); + *obj = fields->field[i]; + return S_OK; } static BOOL resize_fields( struct fields *fields, ULONG count ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 03b2828d9f..800eb236fe 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -25,6 +25,12 @@ #define MAKE_ADO_HRESULT( err ) MAKE_HRESULT( SEVERITY_ERROR, FACILITY_CONTROL, err ) +static LONG get_refs_field( Field *field ) +{ + Field_AddRef( field ); + return Field_Release( field ); +} + static LONG get_refs_fields( Fields *fields ) { Fields_AddRef( fields ); @@ -92,9 +98,10 @@ static void test_Fields(void) { _Recordset *recordset; Fields *fields; - VARIANT val; + Field *field, *field2; + VARIANT val, index; BSTR name; - LONG count; + LONG refs, count; HRESULT hr; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); @@ -127,6 +134,37 @@ static void test_Fields(void) hr = Fields_get_Count( fields, &count ); ok( count == 2, "got %d\n", count ); + /* handing out field object doesn't add reference to fields or recordset object */ + name = SysAllocString( L"field" ); + V_VT( &index ) = VT_BSTR; + V_BSTR( &index ) = name; + refs = get_refs_recordset( recordset ); + ok( refs == 2, "got %d\n", refs ); + refs = get_refs_fields( fields ); + ok( refs == 1, "got %d\n", refs ); + hr = Fields_get_Item( fields, index, &field ); + ok( hr == S_OK, "got %08x\n", hr ); + refs = get_refs_field( field ); + ok( refs == 1, "got %d\n", refs ); + refs = get_refs_recordset( recordset ); + ok( refs == 2, "got %d\n", refs ); + refs = get_refs_fields( fields ); + ok( refs == 1, "got %d\n", refs ); + + /* calling get_Item again returns the same object and adds reference */ + hr = Fields_get_Item( fields, index, &field2 ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( field2 == field, "expected same object\n" ); + refs = get_refs_field( field2 ); + ok( refs == 2, "got %d\n", refs ); + refs = get_refs_recordset( recordset ); + ok( refs == 2, "got %d\n", refs ); + refs = get_refs_fields( fields ); + ok( refs == 1, "got %d\n", refs ); + Field_Release( field2 ); + SysFreeString( name ); + + Field_Release( field ); Fields_Release( fields ); _Recordset_Release( recordset ); }

1 0

Henri Verbeet : wined3d: Pass a pointer to the counter buffer to wined3d_view_gl_destroy().
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

Module: wine Branch: master Commit: 5d4d5c593d7526214bfa688122dcdd36a3a0a802 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d4d5c593d7526214bfa6881… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 12 21:21:01 2019 +0330 wined3d: Pass a pointer to the counter buffer to wined3d_view_gl_destroy(). If adapter_gl_destroy_unordered_access_view() is called before wined3d_unordered_access_view_gl_cs_init() has finished executing, the "counter_bo" field may still be 0. More generally, we shouldn't access the "counter_bo" field from outside the CS thread. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index a8a8e93c0b..7e6f8a2817 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4801,7 +4801,7 @@ struct wined3d_view_gl_destroy_ctx { struct wined3d_device *device; const struct wined3d_gl_view *gl_view; - GLuint counter_bo; + GLuint *counter_bo; void *object; struct wined3d_view_gl_destroy_ctx *free; }; @@ -4825,7 +4825,7 @@ static void wined3d_view_gl_destroy_object(void *object) gl_info->gl_ops.gl.p_glDeleteTextures(1, &ctx->gl_view->name); } if (ctx->counter_bo) - GL_EXTCALL(glDeleteBuffers(1, &ctx->counter_bo)); + GL_EXTCALL(glDeleteBuffers(1, ctx->counter_bo)); checkGLcall("delete resources"); context_release(context); } @@ -4835,7 +4835,7 @@ static void wined3d_view_gl_destroy_object(void *object) } static void wined3d_view_gl_destroy(struct wined3d_device *device, - const struct wined3d_gl_view *gl_view, GLuint counter_bo, void *object) + const struct wined3d_gl_view *gl_view, GLuint *counter_bo, void *object) { struct wined3d_view_gl_destroy_ctx *ctx, c; @@ -4867,7 +4867,7 @@ static void adapter_gl_destroy_rendertarget_view(struct wined3d_rendertarget_vie if (swapchain_count) wined3d_device_incref(device); wined3d_rendertarget_view_cleanup(&view_gl->v); - wined3d_view_gl_destroy(device, &view_gl->gl_view, 0, view_gl); + wined3d_view_gl_destroy(device, &view_gl->gl_view, NULL, view_gl); if (swapchain_count) wined3d_device_decref(device); } @@ -4913,7 +4913,7 @@ static void adapter_gl_destroy_shader_resource_view(struct wined3d_shader_resour if (swapchain_count) wined3d_device_incref(device); wined3d_shader_resource_view_cleanup(&view_gl->v); - wined3d_view_gl_destroy(device, &view_gl->gl_view, 0, view_gl); + wined3d_view_gl_destroy(device, &view_gl->gl_view, NULL, view_gl); if (swapchain_count) wined3d_device_decref(device); } @@ -4959,7 +4959,7 @@ static void adapter_gl_destroy_unordered_access_view(struct wined3d_unordered_ac if (swapchain_count) wined3d_device_incref(device); wined3d_unordered_access_view_cleanup(&view_gl->v); - wined3d_view_gl_destroy(device, &view_gl->gl_view, view_gl->counter_bo, view_gl); + wined3d_view_gl_destroy(device, &view_gl->gl_view, &view_gl->counter_bo, view_gl); if (swapchain_count) wined3d_device_decref(device); }

1 0

Andrey Gusev : ntoskrnl.exe/tests: Fix typos in ok() messages.
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

Module: wine Branch: master Commit: 8cd122549700df441a515eb5efc8aa88af0491ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cd122549700df441a515eb5… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Dec 12 17:55:11 2019 +0200 ntoskrnl.exe/tests: Fix typos in ok() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 6827b74a3c..10f3865515 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -800,7 +800,7 @@ static void test_call_driver(DEVICE_OBJECT *device) ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); - ok(!irpsp->CompletionRoutine, "CompletionRouptine = %p\n", irpsp->CompletionRoutine); + ok(!irpsp->CompletionRoutine, "CompletionRoutine = %p\n", irpsp->CompletionRoutine); status = IoCallDriver(device, irp); ok(status == STATUS_PENDING, "IoCallDriver returned %#x\n", status); @@ -824,7 +824,7 @@ static void test_call_driver(DEVICE_OBJECT *device) ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); - ok(!irpsp->CompletionRoutine, "CompletionRouptine = %p\n", irpsp->CompletionRoutine); + ok(!irpsp->CompletionRoutine, "CompletionRoutine = %p\n", irpsp->CompletionRoutine); status = wait_single(&event, 0); ok(status == STATUS_TIMEOUT, "got %#x\n", status);

1 0

Hans Leidekker : msado15: Implement Field_get_Name and Field_get_Type.
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

Module: wine Branch: master Commit: c4be51d77146b0b3dac2b10f98d38f7667034e86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4be51d77146b0b3dac2b10f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 12 17:12:21 2019 +0100 msado15: Implement Field_get_Name and Field_get_Type. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 78d13d1577..a20d5920da 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -159,14 +159,24 @@ static HRESULT WINAPI field_get_DefinedSize( Field *iface, LONG *size ) static HRESULT WINAPI field_get_Name( Field *iface, BSTR *str ) { - FIXME( "%p, %p\n", iface, str ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + BSTR name; + + TRACE( "%p, %p\n", field, str ); + + if (!(name = SysAllocString( field->name ))) return E_OUTOFMEMORY; + *str = name; + return S_OK; } static HRESULT WINAPI field_get_Type( Field *iface, DataTypeEnum *type ) { - FIXME( "%p, %p\n", iface, type ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + + TRACE( "%p, %p\n", field, type ); + + *type = field->type; + return S_OK; } static HRESULT WINAPI field_get_Value( Field *iface, VARIANT *val )

1 0