March 2022 - Wine-commits - list.winehq.org

Huw Davies : winealsa: Move MIDM_OPEN and MIDM_CLOSE to the unixlib.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: 33d7dd9268fda79047275f5e6bcaeeb0bd5366e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33d7dd9268fda79047275f5e… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 25 08:42:17 2022 +0000 winealsa: Move MIDM_OPEN and MIDM_CLOSE to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/Makefile.in | 2 +- dlls/winealsa.drv/alsa.c | 4 - dlls/winealsa.drv/alsamidi.c | 231 ++++++++++++++++++++++++++++++---- dlls/winealsa.drv/midi.c | 287 ------------------------------------------ dlls/winealsa.drv/unixlib.h | 33 ----- 5 files changed, 206 insertions(+), 351 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=33d7dd9268fda7904727…

1 0

Huw Davies : winealsa: Move DRVM_INIT to the unixlib.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: a6211e590fd373773c5356e110dde90bddb3aa6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6211e590fd373773c5356e1… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 25 08:42:18 2022 +0000 winealsa: Move DRVM_INIT to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/alsa.c | 1 - dlls/winealsa.drv/alsamidi.c | 25 ++++++++++++------------- dlls/winealsa.drv/midi.c | 27 --------------------------- dlls/winealsa.drv/unixlib.h | 7 ------- 4 files changed, 12 insertions(+), 48 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index e068f6608f3..e5f755b69ed 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2444,7 +2444,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = set_event_handle, is_started, get_prop_value, - midi_init, midi_release, midi_out_message, midi_in_message, diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 8ec646281d2..476ea383a25 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -400,27 +400,22 @@ static void port_add(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* pinfo, u } } -NTSTATUS midi_init(void *args) +static UINT midi_init(void) { - struct midi_init_params *params = args; static BOOL init_done; snd_seq_client_info_t *cinfo; snd_seq_port_info_t *pinfo; snd_seq_t *seq; - if (init_done) { - *params->err = ERROR_ALREADY_INITIALIZED; - return STATUS_SUCCESS; - } + if (init_done) + return ERROR_ALREADY_INITIALIZED; TRACE("Initializing the MIDI variables.\n"); init_done = TRUE; /* try to open device */ - if (!(seq = seq_open(NULL))) { - *params->err = ERROR_OPEN_FAILED; - return STATUS_SUCCESS; - } + if (!(seq = seq_open(NULL))) + return ERROR_OPEN_FAILED; cinfo = calloc( 1, snd_seq_client_info_sizeof() ); pinfo = calloc( 1, snd_seq_port_info_sizeof() ); @@ -454,11 +449,9 @@ NTSTATUS midi_init(void *args) free( cinfo ); free( pinfo ); - *params->err = NOERROR; - TRACE("End\n"); - return STATUS_SUCCESS; + return NOERROR; } NTSTATUS midi_release(void *args) @@ -1369,6 +1362,9 @@ NTSTATUS midi_out_message(void *args) switch (params->msg) { + case DRVM_INIT: + *params->err = midi_init(); + break; case DRVM_EXIT: case DRVM_ENABLE: case DRVM_DISABLE: @@ -1424,6 +1420,9 @@ NTSTATUS midi_in_message(void *args) switch (params->msg) { + case DRVM_INIT: + *params->err = midi_init(); + break; case DRVM_EXIT: case DRVM_ENABLE: case DRVM_DISABLE: diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index b768517e655..4db38537dd0 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -59,22 +59,6 @@ static void notify_client(struct notify_context *notify) * MIDI entry points * *======================================================================*/ -/************************************************************************** - * ALSA_MidiInit [internal] - * - * Initializes the MIDI devices information variables - */ -static BOOL ALSA_MidiInit(void) -{ - struct midi_init_params params; - UINT err; - - params.err = &err; - ALSA_CALL(midi_init, &params); - - return TRUE; -} - /************************************************************************** * midMessage (WINEALSA.@) */ @@ -87,11 +71,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - switch (wMsg) { - case DRVM_INIT: - ALSA_MidiInit(); - return 0; - } params.dev_id = wDevID; params.msg = wMsg; @@ -123,12 +102,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - switch (wMsg) { - case DRVM_INIT: - ALSA_MidiInit(); - return 0; - } - params.dev_id = wDevID; params.msg = wMsg; params.user = dwUser; diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index ad8865a0988..7d7be1e140d 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -207,11 +207,6 @@ struct get_prop_value_params unsigned int *buffer_size; }; -struct midi_init_params -{ - UINT *err; -}; - struct notify_context { BOOL send_notify; @@ -278,14 +273,12 @@ enum alsa_funcs alsa_set_event_handle, alsa_is_started, alsa_get_prop_value, - alsa_midi_init, alsa_midi_release, alsa_midi_out_message, alsa_midi_in_message, alsa_midi_notify_wait, }; -NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_release(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_in_message(void *args) DECLSPEC_HIDDEN;

1 0

Huw Davies : winealsa: Build with msvcrt.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: 67e53fc98cd7bb49264f94c81a036577bc521b74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67e53fc98cd7bb49264f94c8… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 25 08:42:19 2022 +0000 winealsa: Build with msvcrt. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/Makefile.in | 2 -- dlls/winealsa.drv/midi.c | 9 --------- dlls/winealsa.drv/mmdevdrv.c | 17 ++++++----------- 3 files changed, 6 insertions(+), 22 deletions(-) diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in index 2113594fbe3..1349f6f9dab 100644 --- a/dlls/winealsa.drv/Makefile.in +++ b/dlls/winealsa.drv/Makefile.in @@ -5,8 +5,6 @@ IMPORTS = uuid ole32 advapi32 DELAYIMPORTS = winmm EXTRALIBS = $(ALSA_LIBS) $(PTHREAD_LIBS) -EXTRADLLFLAGS = -mcygwin - C_SRCS = \ alsa.c \ alsamidi.c \ diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 4db38537dd0..fc2205de6f6 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -22,17 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <string.h> #include <stdarg.h> -#include <stdio.h> -#include <unistd.h> -#include <fcntl.h> -#include <errno.h> -#include "ntstatus.h" -#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 389c40b47de..7dc01940dc9 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -18,23 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION #define COBJMACROS -#include "config.h" #include <stdarg.h> -#include <stdio.h> -#include <math.h> #include "windef.h" #include "winbase.h" #include "winnls.h" #include "winreg.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "wine/list.h" -#include "wine/unixlib.h" - +#include "winternl.h" #include "propsys.h" #include "initguid.h" #include "ole2.h" @@ -44,11 +36,14 @@ #include "mmsystem.h" #include "dsound.h" -#include "initguid.h" #include "endpointvolume.h" #include "audioclient.h" #include "audiopolicy.h" +#include "wine/debug.h" +#include "wine/list.h" +#include "wine/unixlib.h" + #include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(alsa); @@ -371,7 +366,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **gu } for(i = 0; i < params.num; i++){ - unsigned int size = (strlenW(params.endpoints[i].name) + 1) * sizeof(WCHAR); + unsigned int size = (wcslen(params.endpoints[i].name) + 1) * sizeof(WCHAR); ids[i] = HeapAlloc(GetProcessHeap(), 0, size); if(!ids[i]){ params.result = E_OUTOFMEMORY;

1 0

Jan Sikorski : wined3d: Reuse deferred uploads heaps.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: eae36aab813a8627cb250d57a5bef0cf25bfb85c URL: https://source.winehq.org/git/wine.git/?a=commit;h=eae36aab813a8627cb250d57… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Mar 25 12:31:09 2022 +0100 wined3d: Reuse deferred uploads heaps. Avoids needing to fault-in the memory on each recording. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 63d6ed4c123..cf7debe4256 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -49,13 +49,15 @@ struct wined3d_command_list SIZE_T data_size; void *data; - HANDLE upload_heap; SIZE_T resource_count; struct wined3d_resource **resources; SIZE_T upload_count; struct wined3d_deferred_upload *uploads; + HANDLE upload_heap; + LONG *upload_heap_refcount; + /* List of command lists queued for execution on this command list. We might * be the only thing holding a pointer to another command list, so we need * to hold a reference here (and in wined3d_deferred_context) as well. */ @@ -3960,7 +3962,6 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) struct wined3d_deferred_context { struct wined3d_device_context c; - HANDLE upload_heap; SIZE_T data_size, data_capacity; void *data; @@ -3971,6 +3972,9 @@ struct wined3d_deferred_context SIZE_T upload_count, uploads_capacity; struct wined3d_deferred_upload *uploads; + HANDLE upload_heap; + LONG *upload_heap_refcount; + /* List of command lists queued for execution on this context. A command * list can be the only thing holding a pointer to another command list, so * we need to hold a reference here and in wined3d_command_list as well. */ @@ -4090,12 +4094,22 @@ static bool wined3d_deferred_context_map_upload_bo(struct wined3d_device_context deferred->upload_count + 1, sizeof(*deferred->uploads))) return false; - if (!deferred->upload_heap) - deferred->upload_heap = HeapCreate(HEAP_NO_SERIALIZE, 0, 0); if (!deferred->upload_heap) { - ERR("Failed to create upload heap.\n"); - return false; + if (!(deferred->upload_heap = HeapCreate(0, 0, 0))) + { + ERR("Failed to create upload heap.\n"); + return false; + } + + if (!(deferred->upload_heap_refcount = heap_alloc(sizeof(*deferred->upload_heap_refcount)))) + { + HeapDestroy(deferred->upload_heap); + deferred->upload_heap = 0; + return false; + } + + *deferred->upload_heap_refcount = 1; } if (!(sysmem = HeapAlloc(deferred->upload_heap, 0, size + RESOURCE_ALIGNMENT - 1))) @@ -4243,9 +4257,20 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte heap_free(deferred->resources); for (i = 0; i < deferred->upload_count; ++i) + { wined3d_resource_decref(deferred->uploads[i].resource); + HeapFree(deferred->upload_heap, 0, deferred->uploads[i].resource); + } + if (deferred->upload_heap) - HeapDestroy(deferred->upload_heap); + { + if (!InterlockedDecrement(deferred->upload_heap_refcount)) + { + HeapDestroy(deferred->upload_heap); + heap_free(deferred->upload_heap_refcount); + } + } + heap_free(deferred->uploads); for (i = 0; i < deferred->command_list_count; ++i) @@ -4331,7 +4356,8 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->query_count = 0; object->upload_heap = deferred->upload_heap; - deferred->upload_heap = 0; + if ((object->upload_heap_refcount = deferred->upload_heap_refcount)) + InterlockedIncrement(object->upload_heap_refcount); /* This is in fact recorded into a subsequent command list. */ if (restore) @@ -4349,11 +4375,22 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device static void wined3d_command_list_destroy_object(void *object) { struct wined3d_command_list *list = object; + unsigned int i; TRACE("list %p.\n", list); + for (i = 0; i < list->upload_count; ++i) + HeapFree(list->upload_heap, 0, list->uploads[i].sysmem); + if (list->upload_heap) - HeapDestroy(list->upload_heap); + { + if (!InterlockedDecrement(list->upload_heap_refcount)) + { + HeapDestroy(list->upload_heap); + heap_free(list->upload_heap_refcount); + } + } + heap_free(list); }

1 0

Paul Gofman : wined3d: Add full dirty region at texture creation.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: 2ce72c6872d1658694753aacc1d9bc109446aca7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ce72c6872d1658694753aac… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 25 14:56:40 2022 +0300 wined3d: Add full dirty region at texture creation. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 20 +++++++++++++++++--- dlls/d3d9/tests/visual.c | 20 +++++++++++++++++--- dlls/wined3d/texture.c | 12 ++++++++---- 3 files changed, 42 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index b7f6dd62e9c..41fc0cbf16a 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5531,9 +5531,6 @@ static void add_dirty_rect_test(void) hr = IDirect3DTexture8_GetSurfaceLevel(tex_dynamic, 0, &surface_dynamic); ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); - fill_surface(surface_src_red, 0x00ff0000, 0); - fill_surface(surface_src_green, 0x0000ff00, 0); - hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_TEX1); ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); @@ -5543,6 +5540,23 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MIPFILTER, D3DTEXF_POINT); ok(SUCCEEDED(hr), "Failed to set mip filter, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)tex_dst2); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)tex_src_red, + (IDirect3DBaseTexture8 *)tex_dst2); + fill_surface(surface_src_green, 0x00000080, D3DLOCK_NO_DIRTY_UPDATE); + hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)tex_src_green, + (IDirect3DBaseTexture8 *)tex_dst2); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x00000080, 1), "Unexpected colour 0x%08x.\n", color); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + + fill_surface(surface_src_red, 0x00ff0000, 0); + fill_surface(surface_src_green, 0x0000ff00, 0); + hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)tex_src_green, (IDirect3DBaseTexture8 *)tex_dst1); ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 89f9e9cf2c6..9f9055483b1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19394,9 +19394,6 @@ static void add_dirty_rect_test(void) hr = IDirect3DTexture9_GetSurfaceLevel(tex_dynamic, 0, &surface_dynamic); ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); - fill_surface(surface_src_red, 0x00ff0000, 0); - fill_surface(surface_src_green, 0x0000ff00, 0); - hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); @@ -19406,6 +19403,23 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_POINT); ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)tex_dst2); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)tex_src_red, + (IDirect3DBaseTexture9 *)tex_dst2); + fill_surface(surface_src_green, 0x00000080, D3DLOCK_NO_DIRTY_UPDATE); + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)tex_src_green, + (IDirect3DBaseTexture9 *)tex_dst2); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x00000080, 1), "Unexpected colour 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + + fill_surface(surface_src_red, 0x00ff0000, 0); + fill_surface(surface_src_green, 0x0000ff00, 0); + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)tex_src_green, (IDirect3DBaseTexture9 *)tex_dst1); ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ebe770af0d2..c495de171d5 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3895,11 +3895,15 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->flags |= WINED3D_TEXTURE_GENERATE_MIPMAPS; } - if (flags & WINED3D_TEXTURE_CREATE_RECORD_DIRTY_REGIONS - && !(texture->dirty_regions = heap_calloc(texture->layer_count, sizeof(*texture->dirty_regions)))) + if (flags & WINED3D_TEXTURE_CREATE_RECORD_DIRTY_REGIONS) { - wined3d_texture_cleanup_sync(texture); - return E_OUTOFMEMORY; + if (!(texture->dirty_regions = heap_calloc(texture->layer_count, sizeof(*texture->dirty_regions)))) + { + wined3d_texture_cleanup_sync(texture); + return E_OUTOFMEMORY; + } + for (i = 0; i < texture->layer_count; ++i) + wined3d_texture_dirty_region_add(texture, i, NULL); } /* Precalculated scaling for 'faked' non power of two texture coords. */

1 0

Francois Gouget : win32u: Make some functions static.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: af915de2126cb1d0732ab3ea9bf2e114cfe8ad56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af915de2126cb1d0732ab3ea… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 24 19:16:42 2022 +0100 win32u: Make some functions static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/sysparams.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 6e6300c502b..f22f6604454 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1347,7 +1347,7 @@ static void unlock_display_devices(void) pthread_mutex_unlock( &display_lock ); } -HDC get_display_dc(void) +static HDC get_display_dc(void) { pthread_mutex_lock( &display_dc_lock ); if (!display_dc) @@ -1365,7 +1365,7 @@ HDC get_display_dc(void) return display_dc; } -void release_display_dc( HDC hdc ) +static void release_display_dc( HDC hdc ) { pthread_mutex_unlock( &display_dc_lock ); }

1 0

Jacek Caban : win32u: Move menu handle management from user32.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: 27c0b997f0ed937536261f21856e071dd7e87ccd URL: https://source.winehq.org/git/wine.git/?a=commit;h=27c0b997f0ed937536261f21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 12:19:05 2022 +0100 win32u: Move menu handle management from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/controls.h | 1 + dlls/user32/defdlg.c | 2 +- dlls/user32/dialog.c | 2 +- dlls/user32/edit.c | 2 +- dlls/user32/mdi.c | 2 +- dlls/user32/menu.c | 91 +++++++++----------------------------------- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 2 +- dlls/user32/win.c | 20 +--------- dlls/win32u/gdiobj.c | 1 + dlls/win32u/menu.c | 42 +++++++++++++++++++- dlls/win32u/ntuser_private.h | 31 ++++++++++++++- dlls/win32u/sysparams.c | 6 +-- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 + dlls/win32u/wrappers.c | 6 +++ include/ntuser.h | 3 +- 17 files changed, 108 insertions(+), 109 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=27c0b997f0ed93753626…

1 0

Huw Davies : mountmgr: Fix long type warnings on macOS.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: 1c04073772254fa452f90aa27ea9945b53a49ad9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c04073772254fa452f90aa2… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 25 12:13:10 2022 +0000 mountmgr: Fix long type warnings on macOS. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/diskarb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 50a32bef079..462ff82c691 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -229,7 +229,7 @@ void run_diskarbitration_loop(void) #if defined(HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H) && defined(HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H) -static UInt8 map_option( ULONG option ) +static UInt8 map_option( unsigned int option ) { switch (option) { @@ -314,7 +314,7 @@ NTSTATUS dhcp_request( void *args ) case OPTION_ROUTER_ADDRESS: case OPTION_BROADCAST_ADDRESS: { - DWORD *ptr = (DWORD *)(params->buffer + params->offset); + unsigned int *ptr = (unsigned int *)(params->buffer + params->offset); if (len == sizeof(*ptr) && params->size >= sizeof(*ptr)) { CFDataGetBytes( value, CFRangeMake(0, len), (UInt8 *)ptr ); @@ -341,7 +341,7 @@ NTSTATUS dhcp_request( void *args ) break; } default: - FIXME( "option %u not supported\n", params->req->id ); + FIXME( "option %u not supported\n", (unsigned int)params->req->id ); break; }

1 0

Rémi Bernon : kernel32/tests: Use HeapAlloc function pointer to silent a warning.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: 1a1f471cc42e1a409c84e6dd2c11d75b88771439 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a1f471cc42e1a409c84e6dd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 25 13:47:59 2022 +0100 kernel32/tests: Use HeapAlloc function pointer to silent a warning. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index bc573050d16..c597ff9590b 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -898,7 +898,7 @@ static void test_heap_checks( DWORD flags ) if (flags & HEAP_PAGE_ALLOCS) return; /* no tests for that case yet */ trace( "testing heap flags %08lx\n", flags ); - p = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 17 ); + p = pHeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 17 ); ok( p != NULL, "HeapAlloc failed\n" ); ret = HeapValidate( GetProcessHeap(), 0, p );

1 0

Gabriel Ivăncescu : jscript: Implement Object.prototype.__defineGetter__.
by Alexandre Julliard 25 Mar '22

25 Mar '22

Module: wine Branch: master Commit: 8eac0fc60aaa364a4fc4522e15e33a452a700e81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8eac0fc60aaa364a4fc4522e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Mar 25 16:45:38 2022 +0200 jscript: Implement Object.prototype.__defineGetter__. 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/jscript/object.c | 44 ++++++++++++++++++++ dlls/mshtml/tests/documentmode.js | 88 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 9d4a747ea4e..d7650ffa7c5 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -294,6 +294,49 @@ done: return hres; } +static HRESULT Object_defineGetter(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +{ + property_desc_t desc; + const WCHAR *name; + jsstr_t *name_str; + jsdisp_t *jsthis; + HRESULT hres; + + TRACE("\n"); + + if(!is_object_instance(vthis) || !(jsthis = to_jsdisp(get_object(vthis)))) + goto done; + + if(argc < 2 || !is_object_instance(argv[1])) + return JS_E_FUNCTION_EXPECTED; + + desc.getter = to_jsdisp(get_object(argv[1])); + if(!desc.getter) { + FIXME("getter is not JS object\n"); + return E_NOTIMPL; + } + /* FIXME: Check IsCallable */ + + hres = to_flat_string(ctx, argv[0], &name_str, &name); + if(FAILED(hres)) + return hres; + + desc.flags = desc.mask = PROPF_CONFIGURABLE | PROPF_ENUMERABLE; + desc.explicit_getter = TRUE; + desc.explicit_setter = FALSE; + desc.explicit_value = FALSE; + desc.setter = NULL; + hres = jsdisp_define_property(jsthis, name, &desc); + + jsstr_release(name_str); + if(FAILED(hres)) + return hres; +done: + if(r) + *r = jsval_undefined(); + return S_OK; +} + HRESULT Object_get_proto_(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *jsthis; @@ -365,6 +408,7 @@ static void Object_destructor(jsdisp_t *dispex) } static const builtin_prop_t Object_props[] = { + {L"__defineGetter__", Object_defineGetter, PROPF_METHOD|PROPF_ES6|2}, {L"hasOwnProperty", Object_hasOwnProperty, PROPF_METHOD|1}, {L"isPrototypeOf", Object_isPrototypeOf, PROPF_METHOD|1}, {L"propertyIsEnumerable", Object_propertyIsEnumerable, PROPF_METHOD|1}, diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 29029023906..18dd65ec6d5 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1415,6 +1415,94 @@ sync_test("__proto__", function() { } }); +sync_test("__defineGetter__", function() { + var v = document.documentMode; + var r, x = 42; + + if(v < 11) { + ok(x.__defineGetter__ === undefined, "x.__defineGetter__ = " + x.__defineGetter__); + ok(!("__defineGetter__" in Object), "Object.__defineGetter__ = " + Object.__defineGetter__); + return; + } + ok(Object.prototype.hasOwnProperty("__defineGetter__"), "__defineGetter__ is not a property of Object.prototype"); + ok(Object.prototype.__defineGetter__.length === 2, "__defineGetter__.length = " + Object.prototype.__defineGetter__.length); + + function getter() { return "wine"; } + function setter(val) { } + + r = x.__defineGetter__("foo", getter); + ok(r === undefined, "__defineGetter__ on 42 returned " + r); + ok(x.foo === undefined, "42.foo = " + x.foo); + + x = {}; + r = x.__defineGetter__("foo", getter); + ok(r === undefined, "__defineGetter__ returned " + r); + ok(x.foo === "wine", "x.foo = " + x.foo); + r = Object.getOwnPropertyDescriptor(x, "foo"); + ok(r.value === undefined, "x.foo value = " + r.value); + ok(r.get === getter, "x.foo get = " + r.get); + ok(r.set === undefined, "x.foo set = " + r.set); + ok(r.writable === undefined, "x.foo writable = " + r.writable); + ok(r.enumerable === true, "x.foo enumerable = " + r.enumerable); + ok(r.configurable === true, "x.foo configurable = " + r.configurable); + + Object.defineProperty(x, "foo", { get: undefined, set: setter, configurable: false }); + r = Object.getOwnPropertyDescriptor(x, "foo"); + ok(r.value === undefined, "x.foo setter value = " + r.value); + ok(r.get === undefined, "x.foo setter get = " + r.get); + ok(r.set === setter, "x.foo setter set = " + r.set); + ok(r.writable === undefined, "x.foo setter writable = " + r.writable); + ok(r.enumerable === true, "x.foo setter enumerable = " + r.enumerable); + ok(r.configurable === false, "x.foo setter configurable = " + r.configurable); + try { + x.__defineGetter__("foo", getter); + ok(false, "expected exception calling __defineGetter__ on non-configurable property"); + }catch(e) { + ok(e.number === 0xa13d6 - 0x80000000, "__defineGetter__ on non-configurable property threw exception " + e.number); + } + + r = Object.prototype.__defineGetter__.call(undefined, "bar", getter); + ok(r === undefined, "__defineGetter__ on undefined returned " + r); + r = Object.prototype.__defineGetter__.call(null, "bar", getter); + ok(r === undefined, "__defineGetter__ on null returned " + r); + r = x.__defineGetter__(undefined, getter); + ok(r === undefined, "__defineGetter__ undefined prop returned " + r); + ok(x["undefined"] === "wine", "x.undefined = " + x["undefined"]); + r = x.__defineGetter__(false, getter); + ok(r === undefined, "__defineGetter__ undefined prop returned " + r); + ok(x["false"] === "wine", "x.false = " + x["false"]); + + try { + x.__defineGetter__("bar", "string"); + ok(false, "expected exception calling __defineGetter__ with string"); + }catch(e) { + ok(e.number === 0xa138a - 0x80000000, "__defineGetter__ with string threw exception " + e.number); + } + try { + x.__defineGetter__("bar", undefined); + ok(false, "expected exception calling __defineGetter__ with undefined"); + }catch(e) { + ok(e.number === 0xa138a - 0x80000000, "__defineGetter__ with undefined threw exception " + e.number); + } + try { + x.__defineGetter__("bar", null); + ok(false, "expected exception calling __defineGetter__ with null"); + }catch(e) { + ok(e.number === 0xa138a - 0x80000000, "__defineGetter__ with null threw exception " + e.number); + } + try { + Object.prototype.__defineGetter__.call(x, "bar"); + ok(false, "expected exception calling __defineGetter__ with only one arg"); + }catch(e) { + ok(e.number === 0xa138a - 0x80000000, "__defineGetter__ with only one arg threw exception " + e.number); + } + + x.bar = "test"; + ok(x.bar === "test", "x.bar = " + x.bar); + x.__defineGetter__("bar", getter); + ok(x.bar === "wine", "x.bar with getter = " + x.bar); +}); + async_test("postMessage", function() { var v = document.documentMode; var onmessage_called = false;

1 0