December 2019 - Wine-Commits

Henri Verbeet : wined3d: Unload resources in wined3d_device_uninit_3d().
by Alexandre Julliard Dec. 6, 2019

Dec. 6, 2019

Module: wine Branch: master Commit: ac245040345e2039252b26f5c44841fc730f0854 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac245040345e2039252b26f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 6 23:11:48 2019 +0330 wined3d: Unload resources in wined3d_device_uninit_3d(). Instead of in wined3d_device_delete_opengl_contexts_cs(), which is specific to the GL backend. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 90c0887650..0ae841d4e3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -939,7 +939,6 @@ static void device_init_swapchain_state(struct wined3d_device *device, struct wi void wined3d_device_delete_opengl_contexts_cs(void *object) { - struct wined3d_resource *resource, *cursor; struct wined3d_swapchain_gl *swapchain_gl; struct wined3d_device *device = object; struct wined3d_context_gl *context_gl; @@ -949,12 +948,6 @@ void wined3d_device_delete_opengl_contexts_cs(void *object) device_gl = wined3d_device_gl(device); - LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) - { - TRACE("Unloading resource %p.\n", resource); - wined3d_cs_emit_unload_resource(device->cs, resource); - } - LIST_FOR_EACH_ENTRY(shader, &device->shaders, struct wined3d_shader, shader_list_entry) { device->shader_backend->shader_destroy(shader); @@ -1106,6 +1099,7 @@ static void device_free_sampler(struct wine_rb_entry *entry, void *context) void wined3d_device_uninit_3d(struct wined3d_device *device) { BOOL no3d = device->wined3d->flags & WINED3D_NO3D; + struct wined3d_resource *resource, *cursor; struct wined3d_rendertarget_view *view; struct wined3d_texture *texture; unsigned int i; @@ -1145,6 +1139,12 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) wine_rb_clear(&device->samplers, device_free_sampler, NULL); + LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) + { + TRACE("Unloading resource %p.\n", resource); + wined3d_cs_emit_unload_resource(device->cs, resource); + } + device->adapter->adapter_ops->adapter_uninit_3d(device); device->d3d_initialized = FALSE; @@ -5298,6 +5298,12 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_cs_emit_reset_state(device->cs); state_cleanup(&device->state); + LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) + { + TRACE("Unloading resource %p.\n", resource); + wined3d_cs_emit_unload_resource(device->cs, resource); + } + if (device->d3d_initialized) device->adapter->adapter_ops->adapter_uninit_3d(device);

1 0

Henri Verbeet : wined3d: Unload buffer resources through buffer ops.
by Alexandre Julliard Dec. 6, 2019

Dec. 6, 2019

Module: wine Branch: master Commit: 3bc8bde91b74c97c331d414e8f1de46827f21e92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bc8bde91b74c97c331d414e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 6 23:11:46 2019 +0330 wined3d: Unload buffer resources through buffer ops. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 17 +----------- dlls/wined3d/buffer.c | 59 +++++++++++++++++++++++++++++++++++++----- dlls/wined3d/wined3d_private.h | 4 +-- 3 files changed, 55 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index eb9965723a..3408439660 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4699,21 +4699,6 @@ static HRESULT adapter_gl_create_buffer(struct wined3d_device *device, return hr; } -static void wined3d_buffer_gl_destroy_object(void *object) -{ - struct wined3d_buffer_gl *buffer_gl = object; - struct wined3d_context *context; - - if (buffer_gl->b.buffer_object) - { - context = context_acquire(buffer_gl->b.resource.device, NULL, 0); - wined3d_buffer_gl_destroy_buffer_object(buffer_gl, wined3d_context_gl(context)); - context_release(context); - } - - heap_free(buffer_gl); -} - static void adapter_gl_destroy_buffer(struct wined3d_buffer *buffer) { struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); @@ -4729,7 +4714,7 @@ static void adapter_gl_destroy_buffer(struct wined3d_buffer *buffer) if (swapchain_count) wined3d_device_incref(device); wined3d_buffer_cleanup(&buffer_gl->b); - wined3d_cs_destroy_object(device->cs, wined3d_buffer_gl_destroy_object, buffer_gl); + wined3d_cs_destroy_object(device->cs, heap_free, buffer_gl); if (swapchain_count) wined3d_device_decref(device); } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 95fcdff7ef..89dab8ebfd 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -139,7 +139,7 @@ static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct w } /* Context activation is done by the caller. */ -void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *buffer_gl, +static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context_gl *context_gl) { const struct wined3d_gl_info *gl_info = context_gl->gl_info; @@ -602,6 +602,12 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, return buffer->buffer_ops->buffer_prepare_location(buffer, context, location); } +static void wined3d_buffer_unload_location(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location) +{ + buffer->buffer_ops->buffer_unload_location(buffer, context, location); +} + BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) { @@ -699,7 +705,7 @@ DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, return 0; } -static void buffer_unload(struct wined3d_resource *resource) +static void buffer_resource_unload(struct wined3d_resource *resource) { struct wined3d_buffer *buffer = buffer_from_resource(resource); @@ -713,7 +719,7 @@ static void buffer_unload(struct wined3d_resource *resource) wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_BUFFER); - wined3d_buffer_gl_destroy_buffer_object(wined3d_buffer_gl(buffer), wined3d_context_gl(context)); + wined3d_buffer_unload_location(buffer, context, WINED3D_LOCATION_BUFFER); buffer_clear_dirty_areas(buffer); context_release(context); @@ -731,21 +737,28 @@ static void buffer_unload(struct wined3d_resource *resource) static void wined3d_buffer_drop_bo(struct wined3d_buffer *buffer) { buffer->flags &= ~WINED3D_BUFFER_USE_BO; - buffer_unload(&buffer->resource); + buffer_resource_unload(&buffer->resource); } static void wined3d_buffer_destroy_object(void *object) { struct wined3d_buffer *buffer = object; + struct wined3d_context *context; + if (buffer->buffer_object) + { + context = context_acquire(buffer->resource.device, NULL, 0); + wined3d_buffer_unload_location(buffer, context, WINED3D_LOCATION_BUFFER); + context_release(context); + } heap_free(buffer->conversion_map); heap_free(buffer->maps); } void wined3d_buffer_cleanup(struct wined3d_buffer *buffer) { - resource_cleanup(&buffer->resource); wined3d_cs_destroy_object(buffer->resource.device->cs, wined3d_buffer_destroy_object, buffer); + resource_cleanup(&buffer->resource); } ULONG CDECL wined3d_buffer_decref(struct wined3d_buffer *buffer) @@ -1264,7 +1277,7 @@ static const struct wined3d_resource_ops buffer_resource_ops = buffer_resource_incref, buffer_resource_decref, buffer_resource_preload, - buffer_unload, + buffer_resource_unload, buffer_resource_sub_resource_map, buffer_resource_sub_resource_unmap, }; @@ -1382,7 +1395,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d if (!(buffer->maps = heap_alloc(sizeof(*buffer->maps)))) { ERR("Out of memory.\n"); - buffer_unload(resource); + buffer_resource_unload(resource); resource_cleanup(resource); wined3d_resource_wait_idle(resource); return E_OUTOFMEMORY; @@ -1406,6 +1419,12 @@ static BOOL wined3d_buffer_no3d_prepare_location(struct wined3d_buffer *buffer, return FALSE; } +static void wined3d_buffer_no3d_unload_location(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location) +{ + TRACE("buffer %p, context %p, location %s.\n", buffer, context, wined3d_debug_location(location)); +} + static void wined3d_buffer_no3d_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) { @@ -1421,6 +1440,7 @@ static void wined3d_buffer_no3d_download_ranges(struct wined3d_buffer *buffer, s static const struct wined3d_buffer_ops wined3d_buffer_no3d_ops = { wined3d_buffer_no3d_prepare_location, + wined3d_buffer_no3d_unload_location, wined3d_buffer_no3d_upload_ranges, wined3d_buffer_no3d_download_ranges, }; @@ -1463,6 +1483,23 @@ static BOOL wined3d_buffer_gl_prepare_location(struct wined3d_buffer *buffer, } } +static void wined3d_buffer_gl_unload_location(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location) +{ + TRACE("buffer %p, context %p, location %s.\n", buffer, context, wined3d_debug_location(location)); + + switch (location) + { + case WINED3D_LOCATION_BUFFER: + wined3d_buffer_gl_destroy_buffer_object(wined3d_buffer_gl(buffer), wined3d_context_gl(context)); + break; + + default: + ERR("Unhandled location %s.\n", wined3d_debug_location(location)); + break; + } +} + /* Context activation is done by the caller. */ static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) @@ -1506,6 +1543,7 @@ static void wined3d_buffer_gl_download_ranges(struct wined3d_buffer *buffer, str static const struct wined3d_buffer_ops wined3d_buffer_gl_ops = { wined3d_buffer_gl_prepare_location, + wined3d_buffer_gl_unload_location, wined3d_buffer_gl_upload_ranges, wined3d_buffer_gl_download_ranges, }; @@ -1542,6 +1580,12 @@ static BOOL wined3d_buffer_vk_prepare_location(struct wined3d_buffer *buffer, } } +static void wined3d_buffer_vk_unload_location(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location) +{ + FIXME("buffer %p, context %p, location %s.\n", buffer, context, wined3d_debug_location(location)); +} + static void wined3d_buffer_vk_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) { @@ -1557,6 +1601,7 @@ static void wined3d_buffer_vk_download_ranges(struct wined3d_buffer *buffer, str static const struct wined3d_buffer_ops wined3d_buffer_vk_ops = { wined3d_buffer_vk_prepare_location, + wined3d_buffer_vk_unload_location, wined3d_buffer_vk_upload_ranges, wined3d_buffer_vk_download_ranges, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0fc633ad4a..7d3b709a97 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4120,6 +4120,8 @@ struct wined3d_buffer_ops { BOOL (*buffer_prepare_location)(struct wined3d_buffer *buffer, struct wined3d_context *context, unsigned int location); + void (*buffer_unload_location)(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location); void (*buffer_upload_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges); void (*buffer_download_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, void *data, @@ -4187,8 +4189,6 @@ static inline struct wined3d_buffer_gl *wined3d_buffer_gl(struct wined3d_buffer GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *gl_info, uint32_t bind_flags) DECLSPEC_HIDDEN; -void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *buffer_gl, - struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard Dec. 6, 2019

Dec. 6, 2019

Module: wine Branch: master Commit: 918c9496f4b3ea743caf019ffd6b07793ad48a83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=918c9496f4b3ea743caf019f… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Dec 6 16:25:50 2019 +0100 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 54 +++++++++++++++++------------------------------------- 1 file changed, 17 insertions(+), 37 deletions(-) diff --git a/po/de.po b/po/de.po index af631ce783..1077a5ce1f 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-05-10 10:54+0200\n" +"PO-Revision-Date: 2019-12-06 16:25+0100\n" "Last-Translator: Julian Rüger <jr98(a)gmx.net>\n" "Language-Team: German\n" "Language: de\n" @@ -627,7 +627,7 @@ msgstr "Selbs&t definierte Farben:" #: comdlg32.rc:289 msgid "|S&olid" -msgstr "" +msgstr "|Bas&is" #: comdlg32.rc:290 msgid "&Red:" @@ -657,18 +657,16 @@ msgstr "H&ell:" #: comdlg32.rc:310 msgid "&Add to Custom Colors" -msgstr "Farbe hin&zufügen" +msgstr "Farbe &hinzufügen" #: comdlg32.rc:311 msgid "&Define Custom Colors >>" msgstr "Farben &definieren >>" #: comdlg32.rc:312 -#, fuzzy -#| msgid "&No" msgctxt "Solid" msgid "&o" -msgstr "&Nein" +msgstr "&i" #: comdlg32.rc:318 regedit.rc:275 regedit.rc:285 msgid "Find" @@ -6835,10 +6833,8 @@ msgid "Begin request has already been made.\n" msgstr "Startanfrage wurde bereits gestellt.\n" #: mferror.mc:599 -#, fuzzy -#| msgid "Object is not initialized.\n" msgid "Sink has not been finalized.\n" -msgstr "Objekt nicht initialisiert.\n" +msgstr "Ausgang wurde nicht finalisiert.\n" #: mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -7114,68 +7110,52 @@ msgid "Unsupported media source characteristics.\n" msgstr "Nicht unterstützte Medienquellen-Charakteristik.\n" #: mferror.mc:536 -#, fuzzy -#| msgid "Rate change was preempted.\n" msgid "Stream sink was removed.\n" -msgstr "Ratenänderung wurde blockiert.\n" +msgstr "Datenstromausgang wurde entfernt.\n" #: mferror.mc:543 msgid "Stream sinks are out of sync.\n" -msgstr "" +msgstr "Datenstromausgänge nicht mehr synchron.\n" #: mferror.mc:550 -#, fuzzy -#| msgid "Media stream has no duration set.\n" msgid "Media sink stream sinks set is fixed.\n" -msgstr "Für den Medienstrom wurde keine Dauer gesetzt.\n" +msgstr "Datenstrom-Ausgangssatz des Medienausgangs ist nicht änderbar.\n" #: mferror.mc:557 -#, fuzzy -#| msgid "Domain already exists.\n" msgid "Stream sink already exists.\n" -msgstr "Domäne existiert bereits.\n" +msgstr "Datenstromausgang existiert bereits.\n" #: mferror.mc:564 -#, fuzzy -#| msgid "Operation was cancelled.\n" msgid "Sample allocation was canceled.\n" -msgstr "Vorgang wurde abgebrochen.\n" +msgstr "Allokation des Abtastwerts wurde abgebrochen.\n" #: mferror.mc:571 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Sample allocator is empty.\n" -msgstr "Verzeichnis ist nicht leer.\n" +msgstr "Abtastwert-Allokator ist leer.\n" #: mferror.mc:578 -#, fuzzy -#| msgid "Clock state was already set.\n" msgid "Sink was already stopped.\n" -msgstr "Zeitgeberstatus wurde bereits gesetzt.\n" +msgstr "Ausgang wurde bereits gestoppt.\n" #: mferror.mc:585 msgid "Bitrate was unknown for ASF file sink.\n" -msgstr "" +msgstr "Unbekannte Bitrate für ASF-Dateiausgang.\n" #: mferror.mc:592 -#, fuzzy -#| msgid "No media streams were selected.\n" msgid "No streams were selected for the sink.\n" -msgstr "Keine Medienströme ausgewählt.\n" +msgstr "Keine Datenströme für den Ausgang gewählt.\n" #: mferror.mc:606 -#, fuzzy -#| msgid "File name is too long.\n" msgid "Metadata was too long.\n" -msgstr "Dateiname zu lang.\n" +msgstr "Metadaten waren zu lang.\n" #: mferror.mc:613 msgid "No samples were processed by the sink.\n" -msgstr "" +msgstr "Es wurden keine Abtastwerte durch den Ausgang verarbeitet.\n" #: mferror.mc:620 msgid "Sink was not provided with required headers.\n" -msgstr "" +msgstr "Ausgang wurde nicht mit den nötigen Headern bereitgestellt.\n" #: mferror.mc:627 msgid "Optional node is invalid.\n"

1 0

Zebediah Figura : d3d8: Update the primary stateblock in d3d8_device_MultiplyTransform().
by Alexandre Julliard Dec. 6, 2019

Dec. 6, 2019

Module: wine Branch: master Commit: 3f53d75362a9a7c82555729c3cc10e75c171b111 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f53d75362a9a7c82555729c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 3 22:23:25 2019 -0600 d3d8: Update the primary stateblock in d3d8_device_MultiplyTransform(). 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 62c75baae0..d4fc80272e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1662,6 +1662,7 @@ static HRESULT WINAPI d3d8_device_MultiplyTransform(IDirect3DDevice8 *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); + wined3d_stateblock_multiply_transform(device->state, state, (const struct wined3d_matrix *)matrix); wined3d_device_multiply_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock();

1 0

Zebediah Figura : d3d9: Update the primary stateblock in d3d9_device_MultiplyTransform().
by Alexandre Julliard Dec. 6, 2019

Dec. 6, 2019

Module: wine Branch: master Commit: 5b9a5ec4005ff537161f3f936e5f410cb04ed864 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b9a5ec4005ff537161f3f93… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 3 22:23:24 2019 -0600 d3d9: Update the primary stateblock in d3d9_device_MultiplyTransform(). 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/d3d9/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 174cdc5bf4..82fba25ce7 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2120,6 +2120,7 @@ static HRESULT WINAPI d3d9_device_MultiplyTransform(IDirect3DDevice9Ex *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); + wined3d_stateblock_multiply_transform(device->state, state, (const struct wined3d_matrix *)matrix); wined3d_device_multiply_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock();

1 0

Henri Verbeet : wined3d: Unload texture resources through texture ops.
by Alexandre Julliard Dec. 6, 2019

Dec. 6, 2019

Module: wine Branch: master Commit: ca0c3f770ae4fe4d535f59f2d54b4c0a531e800f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca0c3f770ae4fe4d535f59f2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 6 23:11:47 2019 +0330 wined3d: Unload texture resources through texture ops. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 57 +----------- dlls/wined3d/device.c | 3 +- dlls/wined3d/texture.c | 200 +++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 3 +- 4 files changed, 125 insertions(+), 138 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ca0c3f770ae4fe4d535f…

1 0

Jeff Smith : kernel32/tests: Allow for differing fpu_cw returned on Windows XP.
by Alexandre Julliard Dec. 6, 2019

Dec. 6, 2019

Module: wine Branch: master Commit: 7cbabed51f3c0e242897435a646291642b045ac0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cbabed51f3c0e242897435a… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Dec 5 23:47:42 2019 -0600 kernel32/tests: Allow for differing fpu_cw returned on Windows XP. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 9a8ad9151c..8c27024cf2 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1745,14 +1745,16 @@ static unsigned int get_thread_fpu_cw( unsigned long *fpu_cw ) static void test_thread_fpu_cw(void) { - static const struct { unsigned int cw; unsigned long fpu_cw; } expected_cw[6] = + static const struct { + unsigned int cw; unsigned long fpu_cw; unsigned long fpu_cw_broken; + } expected_cw[6] = { #ifdef __i386__ { _MCW_EM | _PC_53, MAKELONG( 0x27f, 0x1f80 ) }, { _MCW_EM | _PC_53, MAKELONG( 0x27f, 0x1f80 ) }, - { _EM_INEXACT | _RC_CHOP | _PC_24, MAKELONG( 0xc60, 0x7000 ) }, + { _EM_INEXACT | _RC_CHOP | _PC_24, MAKELONG( 0xc60, 0x7000 ), MAKELONG( 0xc60, 0x1f80 ) }, { _MCW_EM | _PC_53, MAKELONG( 0x27f, 0x1f80 ) }, - { _EM_INEXACT | _RC_CHOP | _PC_24, MAKELONG( 0xc60, 0x7000 ) }, + { _EM_INEXACT | _RC_CHOP | _PC_24, MAKELONG( 0xc60, 0x7000 ), MAKELONG( 0xc60, 0x1f80 ) }, { _MCW_EM | _PC_53, MAKELONG( 0x27f, 0x1f80 ) } #elif defined(__x86_64__) { _MCW_EM | _PC_64, MAKELONG( 0x27f, 0x1f80 ) }, @@ -1788,7 +1790,9 @@ static void test_thread_fpu_cw(void) cw = _control87( 0, 0 ); fpu_cw = get_fpu_cw(); ok(cw == expected_cw[2].cw, "expected %#x got %#x\n", expected_cw[2].cw, cw); - ok(fpu_cw == expected_cw[2].fpu_cw, "expected %#lx got %#lx\n", expected_cw[2].fpu_cw, fpu_cw); + ok(fpu_cw == expected_cw[2].fpu_cw || + broken(expected_cw[2].fpu_cw_broken && fpu_cw == expected_cw[2].fpu_cw_broken), + "expected %#lx got %#lx\n", expected_cw[2].fpu_cw, fpu_cw); cw = get_thread_fpu_cw( &fpu_cw ); ok(cw == expected_cw[3].cw, "expected %#x got %#x\n", expected_cw[3].cw, cw); @@ -1797,7 +1801,9 @@ static void test_thread_fpu_cw(void) cw = _control87( 0, 0 ); fpu_cw = get_fpu_cw(); ok(cw == expected_cw[4].cw, "expected %#x got %#x\n", expected_cw[4].cw, cw); - ok(fpu_cw == expected_cw[4].fpu_cw, "expected %#lx got %#lx\n", expected_cw[4].fpu_cw, fpu_cw); + ok(fpu_cw == expected_cw[4].fpu_cw || + broken(expected_cw[4].fpu_cw_broken && fpu_cw == expected_cw[4].fpu_cw_broken), + "expected %#lx got %#lx\n", expected_cw[4].fpu_cw, fpu_cw); _control87( initial_cw, _MCW_EM | _MCW_RC | _MCW_PC ); cw = _control87( 0, 0 );

1 0

Gabriel Ivăncescu : vbscript/tests: Add initial tests for the script TypeInfo.
by Alexandre Julliard Dec. 6, 2019

Dec. 6, 2019

Module: wine Branch: master Commit: 46ccea7649703b5fe4a0e6b5c47cd7809241b715 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46ccea7649703b5fe4a0e6b5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 6 13:46:37 2019 +0100 vbscript/tests: Add initial tests for the script TypeInfo. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/vbscript.c | 271 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 271 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=46ccea7649703b5fe4a0…

1 0

Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_GetIDsOfNames.
by Alexandre Julliard Dec. 6, 2019

Dec. 6, 2019

Module: wine Branch: master Commit: cde38841d30ca9380ffd0881b6afb9be5bb782a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cde38841d30ca9380ffd0881… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 6 13:46:13 2019 +0100 vbscript: Implement ScriptTypeInfo_GetIDsOfNames. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbdisp.c | 45 +++++++++++++++++++++++++++++++++++++++++-- dlls/vbscript/vbscript.h | 1 + dlls/vbscript/vbscript_main.c | 25 ++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index d19107fd81..c031b80166 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -723,10 +723,51 @@ static HRESULT WINAPI ScriptTypeInfo_GetIDsOfNames(ITypeInfo *iface, LPOLESTR *r MEMBERID *pMemId) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + ITypeInfo *disp_typeinfo; + const WCHAR *name; + HRESULT hr = S_OK; + int i, j, arg; - FIXME("(%p)->(%p %u %p)\n", This, rgszNames, cNames, pMemId); + TRACE("(%p)->(%p %u %p)\n", This, rgszNames, cNames, pMemId); - return E_NOTIMPL; + if (!rgszNames || !cNames || !pMemId) return E_INVALIDARG; + + for (i = 0; i < cNames; i++) pMemId[i] = MEMBERID_NIL; + name = rgszNames[0]; + + for (i = 0; i < This->num_funcs; i++) + { + function_t *func = This->funcs[i].func; + + if (wcsicmp(name, func->name)) continue; + pMemId[0] = This->funcs[i].memid; + + for (j = 1; j < cNames; j++) + { + name = rgszNames[j]; + for (arg = func->arg_cnt; --arg >= 0;) + if (!wcsicmp(name, func->args[arg].name)) + break; + if (arg >= 0) + pMemId[j] = arg; + else + hr = DISP_E_UNKNOWNNAME; + } + return hr; + } + + for (i = 0; i < This->num_vars; i++) + { + if (wcsicmp(name, This->disp->global_vars[i]->name)) continue; + pMemId[0] = i + 1; + return S_OK; + } + + /* Look into the inherited IDispatch */ + hr = get_dispatch_typeinfo(&disp_typeinfo); + if (FAILED(hr)) return hr; + + return ITypeInfo_GetIDsOfNames(disp_typeinfo, rgszNames, cNames, pMemId); } static HRESULT WINAPI ScriptTypeInfo_Invoke(ITypeInfo *iface, PVOID pvInstance, MEMBERID memid, WORD wFlags, diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index d14b73ce82..d79be9e6e7 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -374,6 +374,7 @@ void detach_global_objects(script_ctx_t*) DECLSPEC_HIDDEN; HRESULT get_builtin_id(BuiltinDisp*,const WCHAR*,DISPID*) DECLSPEC_HIDDEN; void release_regexp_typelib(void) DECLSPEC_HIDDEN; +HRESULT get_dispatch_typeinfo(ITypeInfo**) DECLSPEC_HIDDEN; static inline BOOL is_int32(double d) { diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index 6e6f386755..6dbf56d29a 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -34,6 +34,7 @@ WINE_DECLARE_DEBUG_CHANNEL(heap); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static HINSTANCE vbscript_hinstance; +static ITypeInfo *dispatch_typeinfo; BSTR get_vbscript_string(int id) { @@ -180,6 +181,29 @@ heap_pool_t *heap_pool_mark(heap_pool_t *heap) return heap; } +HRESULT get_dispatch_typeinfo(ITypeInfo **out) +{ + ITypeInfo *typeinfo; + ITypeLib *typelib; + HRESULT hr; + + if (!dispatch_typeinfo) + { + hr = LoadRegTypeLib(&IID_StdOle, STDOLE_MAJORVERNUM, STDOLE_MINORVERNUM, STDOLE_LCID, &typelib); + if (FAILED(hr)) return hr; + + hr = ITypeLib_GetTypeInfoOfGuid(typelib, &IID_IDispatch, &typeinfo); + ITypeLib_Release(typelib); + if (FAILED(hr)) return hr; + + if (InterlockedCompareExchangePointer((void**)&dispatch_typeinfo, typeinfo, NULL)) + ITypeInfo_Release(typeinfo); + } + + *out = dispatch_typeinfo; + return S_OK; +} + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -256,6 +280,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) break; case DLL_PROCESS_DETACH: if (lpv) break; + if (dispatch_typeinfo) ITypeInfo_Release(dispatch_typeinfo); release_regexp_typelib(); }

1 0

Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_GetVarDesc.
by Alexandre Julliard Dec. 6, 2019

Dec. 6, 2019

Module: wine Branch: master Commit: efab3751f660a5fd011a9f0b7e7ee5907d487e53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efab3751f660a5fd011a9f0b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 6 13:46:06 2019 +0100 vbscript: Implement ScriptTypeInfo_GetVarDesc. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbdisp.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 99d7dc5f5b..d19107fd81 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -673,10 +673,22 @@ static HRESULT WINAPI ScriptTypeInfo_GetFuncDesc(ITypeInfo *iface, UINT index, F static HRESULT WINAPI ScriptTypeInfo_GetVarDesc(ITypeInfo *iface, UINT index, VARDESC **ppVarDesc) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + VARDESC *desc; - FIXME("(%p)->(%u %p)\n", This, index, ppVarDesc); + TRACE("(%p)->(%u %p)\n", This, index, ppVarDesc); - return E_NOTIMPL; + if (!ppVarDesc) return E_INVALIDARG; + if (index >= This->num_vars) return TYPE_E_ELEMENTNOTFOUND; + + desc = heap_alloc_zero(sizeof(*desc)); + if (!desc) return E_OUTOFMEMORY; + + desc->memid = index + 1; + desc->varkind = VAR_DISPATCH; + desc->elemdescVar.tdesc.vt = VT_VARIANT; + + *ppVarDesc = desc; + return S_OK; } static HRESULT WINAPI ScriptTypeInfo_GetNames(ITypeInfo *iface, MEMBERID memid, BSTR *rgBstrNames, @@ -815,7 +827,9 @@ static void WINAPI ScriptTypeInfo_ReleaseVarDesc(ITypeInfo *iface, VARDESC *pVar { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); - FIXME("(%p)->(%p)\n", This, pVarDesc); + TRACE("(%p)->(%p)\n", This, pVarDesc); + + heap_free(pVarDesc); } static const ITypeInfoVtbl ScriptTypeInfoVtbl = {

1 0