November 2023 - Wine-Commits

Alexandre Julliard : rpcrt4: Generate stubless thunks at compile time.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: 439ce3a3aed17fcb41013e7e3e0271e36e5df321 URL: https://gitlab.winehq.org/wine/wine/-/commit/439ce3a3aed17fcb41013e7e3e0271… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 9 10:27:07 2023 +0100 rpcrt4: Generate stubless thunks at compile time. --- dlls/rpcrt4/cproxy.c | 149 ++++++++++++--------------------------------------- dlls/rpcrt4/cpsf.h | 101 ++++++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+), 116 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index ea0d65db259..2fa064b1730 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -82,23 +82,13 @@ __ASM_GLOBAL_FUNC(call_stubless_func, "addl %edx,%esp\n\t" "jmp *%ecx" ); -#include "pshpack1.h" -struct thunk -{ - BYTE mov_eax; - DWORD index; - BYTE jmp; - LONG handler; -}; -#include "poppack.h" - -static inline void init_thunk( struct thunk *thunk, unsigned int index ) -{ - thunk->mov_eax = 0xb8; /* movl $n,%eax */ - thunk->index = index; - thunk->jmp = 0xe9; /* jmp */ - thunk->handler = (char *)call_stubless_func - (char *)(&thunk->handler + 1); -} +#define THUNK_ENTRY_SIZE 12 +#define THUNK_ENTRY(num) \ + ".balign 4\n\t" \ + "movl $("#num"),%eax\n\t" \ + ".byte 0xe9\n\t" /* jmp */ \ + ".long " __ASM_NAME("call_stubless_func") "-1f\n" \ + "1:\n\t" #elif defined(__x86_64__) @@ -128,30 +118,13 @@ __ASM_GLOBAL_FUNC(call_stubless_func, __ASM_CFI(".cfi_adjust_cfa_offset -0x38\n\t") "ret" ); -#include "pshpack1.h" -struct thunk -{ - BYTE mov_r10[3]; - DWORD index; - BYTE mov_rax[2]; - void *call_stubless; - BYTE jmp_rax[2]; -}; -#include "poppack.h" - -static const struct thunk thunk_template = -{ - { 0x49, 0xc7, 0xc2 }, 0, /* movq $index,%r10 */ - { 0x48, 0xb8 }, 0, /* movq $call_stubless_func,%rax */ - { 0xff, 0xe0 } /* jmp *%rax */ -}; - -static inline void init_thunk( struct thunk *thunk, unsigned int index ) -{ - *thunk = thunk_template; - thunk->index = index; - thunk->call_stubless = call_stubless_func; -} +#define THUNK_ENTRY_SIZE 12 +#define THUNK_ENTRY(num) \ + ".balign 4\n\t" \ + "movl $("#num"),%r10d\n\t" \ + ".byte 0xe9\n\t" /* jmp */ \ + ".long " __ASM_NAME("call_stubless_func") "-1f\n" \ + "1:\n\t" #elif defined(__arm__) @@ -180,21 +153,11 @@ __ASM_GLOBAL_FUNC(call_stubless_func, "add sp, #16\n\t" "bx lr" ); -struct thunk -{ - DWORD ldr_ip; /* ldr ip,[pc] */ - DWORD ldr_pc; /* ldr pc,[pc] */ - DWORD index; - void *func; -}; - -static inline void init_thunk( struct thunk *thunk, unsigned int index ) -{ - thunk->ldr_ip = 0xe59fc000; /* ldr ip,[pc] */ - thunk->ldr_pc = 0xe59ff000; /* ldr pc,[pc] */ - thunk->index = index * sizeof(unsigned short); - thunk->func = call_stubless_func; -} +#define THUNK_ENTRY_SIZE 12 +#define THUNK_ENTRY(num) \ + "ldr ip,1f\n\t" \ + "b.w " __ASM_NAME("call_stubless_func") "\n" \ + "1:\t.long "#num"\n\t" #elif defined(__aarch64__) @@ -225,83 +188,37 @@ __ASM_GLOBAL_FUNC( call_stubless_func, "ldp x29, x30, [sp], #0x90\n\t" "ret" ) -struct thunk -{ - DWORD ldr_index; /* ldr w16, index */ - DWORD ldr_func; /* ldr x17, func */ - DWORD br; /* br x17 */ - DWORD index; - void *func; -}; - -static inline void init_thunk( struct thunk *thunk, unsigned int index ) -{ - thunk->ldr_index = 0x18000070; /* ldr w16,index */ - thunk->ldr_func = 0x58000071; /* ldr x17,func */ - thunk->br = 0xd61f0220; /* br x17 */ - thunk->index = index; - thunk->func = call_stubless_func; -} +#define THUNK_ENTRY_SIZE 8 +#define THUNK_ENTRY(num) \ + "mov w16,#("#num")\n\t" \ + "b " __ASM_NAME("call_stubless_func") "\n\t" #else /* __i386__ */ #warning You must implement stubless proxies for your CPU -struct thunk -{ - DWORD index; -}; - -static inline void init_thunk( struct thunk *thunk, unsigned int index ) -{ - thunk->index = index; -} +#define THUNK_ENTRY_SIZE 0 +#define THUNK_ENTRY(num) "" #endif /* __i386__ */ -#define BLOCK_SIZE 1024 -#define MAX_BLOCKS 64 /* 64k methods should be enough for anybody */ - -static const struct thunk *method_blocks[MAX_BLOCKS]; - -static const struct thunk *allocate_block( unsigned int num ) -{ - unsigned int i; - struct thunk *prev, *block; - DWORD oldprot; - - block = VirtualAlloc( NULL, BLOCK_SIZE * sizeof(*block), - MEM_COMMIT | MEM_RESERVE, PAGE_EXECUTE_READWRITE ); - if (!block) return NULL; - - for (i = 0; i < BLOCK_SIZE; i++) init_thunk( &block[i], BLOCK_SIZE * num + i + 3 ); - VirtualProtect( block, BLOCK_SIZE * sizeof(*block), PAGE_EXECUTE_READ, &oldprot ); - prev = InterlockedCompareExchangePointer( (void **)&method_blocks[num], block, NULL ); - if (prev) /* someone beat us to it */ - { - VirtualFree( block, 0, MEM_RELEASE ); - block = prev; - } - return block; -} +extern void stubless_thunks(void); +__ASM_GLOBAL_FUNC( stubless_thunks, ALL_THUNK_ENTRIES ) +#undef THUNK_ENTRY BOOL fill_stubless_table( IUnknownVtbl *vtbl, DWORD num ) { const void **entry = (const void **)(vtbl + 1); - DWORD i, j; + DWORD i; - if (num - 3 > BLOCK_SIZE * MAX_BLOCKS) + if (num >= NB_THUNK_ENTRIES) { FIXME( "%lu methods not supported\n", num ); return FALSE; } - for (i = 0; i < (num - 3 + BLOCK_SIZE - 1) / BLOCK_SIZE; i++) - { - const struct thunk *block = method_blocks[i]; - if (!block && !(block = allocate_block( i ))) return FALSE; - for (j = 0; j < BLOCK_SIZE && j < num - 3 - i * BLOCK_SIZE; j++, entry++) - if (*entry == (LPVOID)-1) *entry = &block[j]; - } + for (i = 0; i < num - 3; i++, entry++) + if (*entry == (void *)-1) *entry = (char *)stubless_thunks + i * THUNK_ENTRY_SIZE; + return TRUE; } diff --git a/dlls/rpcrt4/cpsf.h b/dlls/rpcrt4/cpsf.h index 3cfbf77ff66..f8e75849301 100644 --- a/dlls/rpcrt4/cpsf.h +++ b/dlls/rpcrt4/cpsf.h @@ -72,4 +72,105 @@ BOOL fill_stubless_table(IUnknownVtbl *vtbl, DWORD num) DECLSPEC_HIDDEN; IUnknownVtbl *get_delegating_vtbl(DWORD num_methods) DECLSPEC_HIDDEN; void release_delegating_vtbl(IUnknownVtbl *vtbl) DECLSPEC_HIDDEN; +#define THUNK_ENTRY_FIRST_BLOCK() \ + THUNK_ENTRY(3) \ + THUNK_ENTRY(4) \ + THUNK_ENTRY(5) \ + THUNK_ENTRY(6) \ + THUNK_ENTRY(7) \ + THUNK_ENTRY(8) \ + THUNK_ENTRY(9) \ + THUNK_ENTRY(10) \ + THUNK_ENTRY(11) \ + THUNK_ENTRY(12) \ + THUNK_ENTRY(13) \ + THUNK_ENTRY(14) \ + THUNK_ENTRY(15) \ + THUNK_ENTRY(16) \ + THUNK_ENTRY(17) \ + THUNK_ENTRY(18) \ + THUNK_ENTRY(19) \ + THUNK_ENTRY(20) \ + THUNK_ENTRY(21) \ + THUNK_ENTRY(22) \ + THUNK_ENTRY(23) \ + THUNK_ENTRY(24) \ + THUNK_ENTRY(25) \ + THUNK_ENTRY(26) \ + THUNK_ENTRY(27) \ + THUNK_ENTRY(28) \ + THUNK_ENTRY(29) \ + THUNK_ENTRY(30) \ + THUNK_ENTRY(31) + +#define THUNK_ENTRY_BLOCK(block) \ + THUNK_ENTRY(32 * (block) + 0) \ + THUNK_ENTRY(32 * (block) + 1) \ + THUNK_ENTRY(32 * (block) + 2) \ + THUNK_ENTRY(32 * (block) + 3) \ + THUNK_ENTRY(32 * (block) + 4) \ + THUNK_ENTRY(32 * (block) + 5) \ + THUNK_ENTRY(32 * (block) + 6) \ + THUNK_ENTRY(32 * (block) + 7) \ + THUNK_ENTRY(32 * (block) + 8) \ + THUNK_ENTRY(32 * (block) + 9) \ + THUNK_ENTRY(32 * (block) + 10) \ + THUNK_ENTRY(32 * (block) + 11) \ + THUNK_ENTRY(32 * (block) + 12) \ + THUNK_ENTRY(32 * (block) + 13) \ + THUNK_ENTRY(32 * (block) + 14) \ + THUNK_ENTRY(32 * (block) + 15) \ + THUNK_ENTRY(32 * (block) + 16) \ + THUNK_ENTRY(32 * (block) + 17) \ + THUNK_ENTRY(32 * (block) + 18) \ + THUNK_ENTRY(32 * (block) + 19) \ + THUNK_ENTRY(32 * (block) + 20) \ + THUNK_ENTRY(32 * (block) + 21) \ + THUNK_ENTRY(32 * (block) + 22) \ + THUNK_ENTRY(32 * (block) + 23) \ + THUNK_ENTRY(32 * (block) + 24) \ + THUNK_ENTRY(32 * (block) + 25) \ + THUNK_ENTRY(32 * (block) + 26) \ + THUNK_ENTRY(32 * (block) + 27) \ + THUNK_ENTRY(32 * (block) + 28) \ + THUNK_ENTRY(32 * (block) + 29) \ + THUNK_ENTRY(32 * (block) + 30) \ + THUNK_ENTRY(32 * (block) + 31) + +#define ALL_THUNK_ENTRIES \ + THUNK_ENTRY_FIRST_BLOCK() \ + THUNK_ENTRY_BLOCK(1) \ + THUNK_ENTRY_BLOCK(2) \ + THUNK_ENTRY_BLOCK(3) \ + THUNK_ENTRY_BLOCK(4) \ + THUNK_ENTRY_BLOCK(5) \ + THUNK_ENTRY_BLOCK(6) \ + THUNK_ENTRY_BLOCK(7) \ + THUNK_ENTRY_BLOCK(8) \ + THUNK_ENTRY_BLOCK(9) \ + THUNK_ENTRY_BLOCK(10) \ + THUNK_ENTRY_BLOCK(11) \ + THUNK_ENTRY_BLOCK(12) \ + THUNK_ENTRY_BLOCK(13) \ + THUNK_ENTRY_BLOCK(14) \ + THUNK_ENTRY_BLOCK(15) \ + THUNK_ENTRY_BLOCK(16) \ + THUNK_ENTRY_BLOCK(17) \ + THUNK_ENTRY_BLOCK(18) \ + THUNK_ENTRY_BLOCK(19) \ + THUNK_ENTRY_BLOCK(20) \ + THUNK_ENTRY_BLOCK(21) \ + THUNK_ENTRY_BLOCK(22) \ + THUNK_ENTRY_BLOCK(23) \ + THUNK_ENTRY_BLOCK(24) \ + THUNK_ENTRY_BLOCK(25) \ + THUNK_ENTRY_BLOCK(26) \ + THUNK_ENTRY_BLOCK(27) \ + THUNK_ENTRY_BLOCK(28) \ + THUNK_ENTRY_BLOCK(29) \ + THUNK_ENTRY_BLOCK(30) \ + THUNK_ENTRY_BLOCK(31) + +#define NB_THUNK_ENTRIES (32 * 32) + #endif /* __WINE_CPSF_H */

1 0

Alexandre Julliard : winevdm: Don't claim that 16-bit apps are DPI aware.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: c07d50c3b94e91e518c8c11d8aa35cd54fb00f77 URL: https://gitlab.winehq.org/wine/wine/-/commit/c07d50c3b94e91e518c8c11d8aa35c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 9 13:19:12 2023 +0100 winevdm: Don't claim that 16-bit apps are DPI aware. --- programs/winevdm/winevdm.manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winevdm/winevdm.manifest b/programs/winevdm/winevdm.manifest index 98bc91bd786..b5dd0efae6d 100644 --- a/programs/winevdm/winevdm.manifest +++ b/programs/winevdm/winevdm.manifest @@ -3,7 +3,7 @@ <assemblyIdentity type="win32" name="Wine.Winevdm" version="0.0.0.0"/> <application xmlns="urn:schemas-microsoft-com:asm.v3"> <windowsSettings> - <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">false</dpiAware> </windowsSettings> </application> </assembly>

1 0

Alexandre Julliard : winealsa.drv: Allocate the MIDI device array dynamically.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: 533823ed2aaf464ee5e0fc438fe418d97ade7344 URL: https://gitlab.winehq.org/wine/wine/-/commit/533823ed2aaf464ee5e0fc438fe418… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 9 11:00:20 2023 +0100 winealsa.drv: Allocate the MIDI device array dynamically. --- dlls/winealsa.drv/alsamidi.c | 18 +++++++----------- include/mmddk.h | 8 -------- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 8b4207c50e1..fbc65bd95d1 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -80,8 +80,8 @@ static pthread_mutex_t seq_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t in_buffer_mutex = PTHREAD_MUTEX_INITIALIZER; static unsigned int num_dests, num_srcs; -static struct midi_dest dests[MAX_MIDIOUTDRV]; -static struct midi_src srcs[MAX_MIDIINDRV]; +static struct midi_dest *dests; +static struct midi_src *srcs; static snd_seq_t *midi_seq; static unsigned int seq_refs; static int port_in = -1; @@ -298,12 +298,12 @@ static void port_add(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* pinfo, u snd_seq_port_info_get_name(pinfo), type); - if (num_dests >= MAX_MIDIOUTDRV) - return; if (!type) return; + dests = realloc( dests, (num_dests + 1) * sizeof(*dests) ); dest = dests + num_dests; + memset( dest, 0, sizeof(*dest) ); dest->addr = *snd_seq_port_info_get_addr(pinfo); /* Manufac ID. We do not have access to this with soundcard.h @@ -373,12 +373,12 @@ static void port_add(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* pinfo, u snd_seq_port_info_get_name(pinfo), type); - if (num_srcs >= MAX_MIDIINDRV) - return; if (!type) return; + srcs = realloc( srcs, (num_srcs + 1) * sizeof(*srcs) ); src = srcs + num_srcs; + memset( src, 0, sizeof(*src) ); src->addr = *snd_seq_port_info_get_addr(pinfo); /* Manufac ID. We do not have access to this with soundcard.h @@ -505,11 +505,7 @@ static UINT midi_out_open(WORD dev_id, MIDIOPENDESC *midi_desc, UINT flags, stru WARN("Invalid Parameter !\n"); return MMSYSERR_INVALPARAM; } - if (dev_id >= num_dests) - { - TRACE("MAX_MIDIOUTDRV reached !\n"); - return MMSYSERR_BADDEVICEID; - } + if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID; dest = dests + dev_id; if (dest->midiDesc.hMidi != 0) { diff --git a/include/mmddk.h b/include/mmddk.h index d4217f2ebef..6854277ca37 100644 --- a/include/mmddk.h +++ b/include/mmddk.h @@ -30,14 +30,6 @@ extern "C" { #endif -#define MAX_MIDIINDRV (16) -/* For now I'm making 16 the maximum number of midi devices one can - * have. This should be more than enough for everybody. But as a purist, - * I intend to make it unbounded in the future, as soon as I figure - * a good way to do so. - */ -#define MAX_MIDIOUTDRV (16) - /* ================================== * Multimedia DDK compatible part * ================================== */

1 0

Alexandre Julliard : wineoss.drv: Allocate the MIDI device array dynamically.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: 818385e176f631ad735a238b40597a556fa5aa30 URL: https://gitlab.winehq.org/wine/wine/-/commit/818385e176f631ad735a238b40597a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 9 10:54:59 2023 +0100 wineoss.drv: Allocate the MIDI device array dynamically. --- dlls/wineoss.drv/ossmidi.c | 66 +++++++++++++--------------------------------- 1 file changed, 19 insertions(+), 47 deletions(-) diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 158132ca545..33f5a170681 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -82,8 +82,8 @@ struct midi_src static pthread_mutex_t in_buffer_mutex = PTHREAD_MUTEX_INITIALIZER; static unsigned int num_dests, num_srcs, num_synths, seq_refs; -static struct midi_dest dests[MAX_MIDIOUTDRV]; -static struct midi_src srcs[MAX_MIDIINDRV]; +static struct midi_dest *dests; +static struct midi_src *srcs; static int load_count; static unsigned int num_midi_in_started; @@ -329,14 +329,22 @@ static UINT oss_midi_init(void) seq_close(fd); return -1; } - - if (synth_devs > MAX_MIDIOUTDRV) + /* find how many MIDI devices are there in the system */ + status = ioctl(fd, SNDCTL_SEQ_NRMIDIS, &midi_devs); + if (status == -1) { - ERR("MAX_MIDIOUTDRV (%d) was enough for the number of devices (%d). " - "Some FM devices will not be available.\n", MAX_MIDIOUTDRV, synth_devs); - synth_devs = MAX_MIDIOUTDRV; + ERR("ioctl on nr midi failed.\n"); + midi_devs = 0; } + /* windows does not seem to differentiate Synth from MIDI devices */ + num_synths = synth_devs; + num_dests = synth_devs + midi_devs; + num_srcs = midi_devs; + + srcs = calloc( num_srcs, sizeof(*srcs) ); + dests = calloc( num_dests, sizeof(*dests) ); + for (i = 0, dest = dests; i < synth_devs; i++, dest++) { /* Manufac ID. We do not have access to this with soundcard.h @@ -407,30 +415,6 @@ static UINT oss_midi_init(void) (unsigned)dest->caps.dwSupport); } - /* find how many MIDI devices are there in the system */ - status = ioctl(fd, SNDCTL_SEQ_NRMIDIS, &midi_devs); - if (status == -1) - { - ERR("ioctl on nr midi failed.\n"); - midi_devs = 0; - goto wrapup; - } - - /* FIXME: the two restrictions below could be loosened in some cases */ - if (synth_devs + midi_devs > MAX_MIDIOUTDRV) - { - ERR("MAX_MIDIOUTDRV was not enough for the number of devices. " - "Some MIDI devices will not be available.\n"); - midi_devs = MAX_MIDIOUTDRV - synth_devs; - } - - if (midi_devs > MAX_MIDIINDRV) - { - ERR("MAX_MIDIINDRV (%d) was not enough for the number of devices (%d). " - "Some MIDI devices will not be available.\n", MAX_MIDIINDRV, midi_devs); - midi_devs = MAX_MIDIINDRV; - } - dest = dests + synth_devs; src = srcs; for (i = 0; i < midi_devs; i++, dest++, src++) @@ -500,12 +484,6 @@ static UINT oss_midi_init(void) i, wine_dbgstr_w(src->caps.szPname), (unsigned)src->caps.dwSupport); } -wrapup: - /* windows does not seem to differentiate Synth from MIDI devices */ - num_synths = synth_devs; - num_dests = synth_devs + midi_devs; - num_srcs = midi_devs; - /* close file and exit */ seq_close(fd); @@ -519,6 +497,8 @@ static UINT midi_exit(void) if (--load_count) return 1; + free( srcs ); + free( dests ); return 0; } @@ -661,11 +641,7 @@ static UINT midi_out_open(WORD dev_id, MIDIOPENDESC *midi_desc, UINT flags, stru WARN("Invalid Parameter !\n"); return MMSYSERR_INVALPARAM; } - if (dev_id >= num_dests) - { - TRACE("MAX_MIDIOUTDRV reached !\n"); - return MMSYSERR_BADDEVICEID; - } + if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID; dest = dests + dev_id; if (dest->midiDesc.hMidi != 0) { @@ -744,11 +720,7 @@ static UINT midi_out_close(WORD dev_id, struct notify_context *notify) TRACE("(%04X);\n", dev_id); - if (dev_id >= num_dests) - { - TRACE("MAX_MIDIOUTDRV reached !\n"); - return MMSYSERR_BADDEVICEID; - } + if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID; dest = dests + dev_id; if (dest->midiDesc.hMidi == 0)

1 0

Alex Henrie : dsound: Dynamically allocate the global device GUID arrays.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: 5a81b6ac43e1057c0c6f9953fd5cbb1bc5d0f11b URL: https://gitlab.winehq.org/wine/wine/-/commit/5a81b6ac43e1057c0c6f9953fd5cbb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Oct 19 22:39:07 2023 -0600 dsound: Dynamically allocate the global device GUID arrays. This removes the arbitrary limit on the number of renderers and capturers while satisfying applications that expect the GUIDs to remain valid after DirectSoundCaptureEnumerate returns. --- dlls/dsound/dsound_main.c | 15 +++++++++++++-- dlls/dsound/dsound_private.h | 4 ++-- include/mmsystem.h | 6 ------ 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 84a118f43aa..bb373a4304d 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -73,8 +73,11 @@ static CRITICAL_SECTION_DEBUG DSOUND_renderers_lock_debug = }; CRITICAL_SECTION DSOUND_renderers_lock = { &DSOUND_renderers_lock_debug, -1, 0, 0, 0, 0 }; -GUID DSOUND_renderer_guids[MAXWAVEDRIVERS]; -GUID DSOUND_capture_guids[MAXWAVEDRIVERS]; +/* Some applications expect the GUID pointers emitted from DirectSoundCaptureEnumerate to remain + * valid at least until the next time DirectSoundCaptureEnumerate is called, so we store them in + * these dynamically allocated arrays. */ +GUID *DSOUND_renderer_guids; +GUID *DSOUND_capture_guids; const WCHAR wine_vxd_drv[] = L"winemm.vxd"; @@ -461,11 +464,19 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, return DS_OK; } + free(guids); if(count == 0){ IMMDeviceCollection_Release(coll); release_mmdevenum(devenum, init_hr); + guids = NULL; return DS_OK; } + guids = malloc((count + 1) * sizeof(GUID)); + if(!guids){ + IMMDeviceCollection_Release(coll); + release_mmdevenum(devenum, init_hr); + return E_OUTOFMEMORY; + } TRACE("Calling back with NULL (Primary Sound Driver)\n"); keep_going = cb(NULL, L"Primary Sound Driver", L"", user); diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 46c150fc9fc..34498125317 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -255,8 +255,8 @@ HRESULT IDirectSoundCaptureImpl_Create(IUnknown *outer_unk, REFIID riid, void ** extern CRITICAL_SECTION DSOUND_renderers_lock; extern struct list DSOUND_renderers; -extern GUID DSOUND_renderer_guids[MAXWAVEDRIVERS]; -extern GUID DSOUND_capture_guids[MAXWAVEDRIVERS]; +extern GUID *DSOUND_renderer_guids; +extern GUID *DSOUND_capture_guids; extern const WCHAR wine_vxd_drv[]; diff --git a/include/mmsystem.h b/include/mmsystem.h index 691e5bce887..a80716ef949 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -60,12 +60,6 @@ typedef HWAVEOUT *LPHWAVEOUT; typedef LRESULT (CALLBACK *DRIVERPROC)(DWORD_PTR,HDRVR,UINT,LPARAM,LPARAM); -#define MAXWAVEDRIVERS 10 -#define MAXMIDIDRIVERS 10 -#define MAXAUXDRIVERS 10 -#define MAXMCIDRIVERS 32 -#define MAXMIXERDRIVERS 10 - #define MAXPNAMELEN 32 /* max product name length (including NULL) */ #define MAXERRORLENGTH 256 /* max error text length (including NULL) */ #define MAX_JOYSTICKOEMVXDNAME 260

1 0

Alex Henrie : Revert "dsound: Get rid of the global device GUID arrays.".
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: 73654470abd9dc3094e3270df592c214be4c7c15 URL: https://gitlab.winehq.org/wine/wine/-/commit/73654470abd9dc3094e3270df592c2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Oct 19 21:47:52 2023 -0600 Revert "dsound: Get rid of the global device GUID arrays.". This reverts commit e1f0318ec4fe83fdc86407303d55f4ee5ba3d2e7. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55608 --- dlls/dsound/dsound_main.c | 31 ++++++++++++++++++++----------- dlls/dsound/dsound_private.h | 6 +++++- dlls/dsound/propset.c | 12 ++++++++---- 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 810ae616308..84a118f43aa 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -73,6 +73,9 @@ static CRITICAL_SECTION_DEBUG DSOUND_renderers_lock_debug = }; CRITICAL_SECTION DSOUND_renderers_lock = { &DSOUND_renderers_lock_debug, -1, 0, 0, 0, 0 }; +GUID DSOUND_renderer_guids[MAXWAVEDRIVERS]; +GUID DSOUND_capture_guids[MAXWAVEDRIVERS]; + const WCHAR wine_vxd_drv[] = L"winemm.vxd"; /* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */ @@ -385,13 +388,13 @@ HRESULT get_mmdevice(EDataFlow flow, const GUID *tgt, IMMDevice **device) return DSERR_INVALIDPARAM; } -static BOOL send_device(IMMDevice *device, LPDSENUMCALLBACKW cb, void *user) +static BOOL send_device(IMMDevice *device, GUID *guid, + LPDSENUMCALLBACKW cb, void *user) { IPropertyStore *ps; PROPVARIANT pv; BOOL keep_going; HRESULT hr; - GUID guid; PropVariantInit(&pv); @@ -401,7 +404,7 @@ static BOOL send_device(IMMDevice *device, LPDSENUMCALLBACKW cb, void *user) return TRUE; } - hr = get_mmdevice_guid(device, ps, &guid); + hr = get_mmdevice_guid(device, ps, guid); if(FAILED(hr)){ IPropertyStore_Release(ps); return TRUE; @@ -415,10 +418,10 @@ static BOOL send_device(IMMDevice *device, LPDSENUMCALLBACKW cb, void *user) return TRUE; } - TRACE("Calling back with %s (%s)\n", wine_dbgstr_guid(&guid), + TRACE("Calling back with %s (%s)\n", wine_dbgstr_guid(guid), wine_dbgstr_w(pv.pwszVal)); - keep_going = cb(&guid, pv.pwszVal, wine_vxd_drv, user); + keep_going = cb(guid, pv.pwszVal, wine_vxd_drv, user); PropVariantClear(&pv); IPropertyStore_Release(ps); @@ -428,12 +431,13 @@ static BOOL send_device(IMMDevice *device, LPDSENUMCALLBACKW cb, void *user) /* S_FALSE means the callback returned FALSE at some point * S_OK means the callback always returned TRUE */ -HRESULT enumerate_mmdevices(EDataFlow flow, LPDSENUMCALLBACKW cb, void *user) +HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, + LPDSENUMCALLBACKW cb, void *user) { IMMDeviceEnumerator *devenum; IMMDeviceCollection *coll; IMMDevice *defdev = NULL; - UINT count, i; + UINT count, i, n; BOOL keep_going; HRESULT hr, init_hr; @@ -472,8 +476,10 @@ HRESULT enumerate_mmdevices(EDataFlow flow, LPDSENUMCALLBACKW cb, void *user) eMultimedia, &defdev); if(FAILED(hr)){ defdev = NULL; + n = 0; }else{ - keep_going = send_device(defdev, cb, user); + keep_going = send_device(defdev, &guids[0], cb, user); + n = 1; } } @@ -487,7 +493,8 @@ HRESULT enumerate_mmdevices(EDataFlow flow, LPDSENUMCALLBACKW cb, void *user) } if(device != defdev){ - keep_going = send_device(device, cb, user); + keep_going = send_device(device, &guids[n], cb, user); + ++n; } IMMDevice_Release(device); @@ -530,7 +537,8 @@ HRESULT WINAPI DirectSoundEnumerateW( setup_dsound_options(); - hr = enumerate_mmdevices(eRender, lpDSEnumCallback, lpContext); + hr = enumerate_mmdevices(eRender, DSOUND_renderer_guids, + lpDSEnumCallback, lpContext); return SUCCEEDED(hr) ? DS_OK : hr; } @@ -593,7 +601,8 @@ DirectSoundCaptureEnumerateW( setup_dsound_options(); - hr = enumerate_mmdevices(eCapture, lpDSEnumCallback, lpContext); + hr = enumerate_mmdevices(eCapture, DSOUND_capture_guids, + lpDSEnumCallback, lpContext); return SUCCEEDED(hr) ? DS_OK : hr; } diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 6c3eb672f31..46c150fc9fc 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -255,6 +255,9 @@ HRESULT IDirectSoundCaptureImpl_Create(IUnknown *outer_unk, REFIID riid, void ** extern CRITICAL_SECTION DSOUND_renderers_lock; extern struct list DSOUND_renderers; +extern GUID DSOUND_renderer_guids[MAXWAVEDRIVERS]; +extern GUID DSOUND_capture_guids[MAXWAVEDRIVERS]; + extern const WCHAR wine_vxd_drv[]; void setup_dsound_options(void); @@ -263,4 +266,5 @@ HRESULT get_mmdevice(EDataFlow flow, const GUID *tgt, IMMDevice **device); BOOL DSOUND_check_supported(IAudioClient *client, DWORD rate, DWORD depth, WORD channels); -HRESULT enumerate_mmdevices(EDataFlow flow, LPDSENUMCALLBACKW cb, void *user); +HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, + LPDSENUMCALLBACKW cb, void *user); diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 5d9ad45b01b..be284a6dda5 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -134,9 +134,11 @@ static HRESULT DSPROPERTY_WaveDeviceMappingW( search.found_guid = &ppd->DeviceId; if (ppd->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_RENDER) - hr = enumerate_mmdevices(eRender, search_callback, &search); + hr = enumerate_mmdevices(eRender, DSOUND_renderer_guids, + search_callback, &search); else if (ppd->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE) - hr = enumerate_mmdevices(eCapture, search_callback, &search); + hr = enumerate_mmdevices(eCapture, DSOUND_capture_guids, + search_callback, &search); else return DSERR_INVALIDPARAM; @@ -314,10 +316,12 @@ static HRESULT DSPROPERTY_EnumerateW( return E_PROP_ID_UNSUPPORTED; } - hr = enumerate_mmdevices(eRender, enum_callback, ppd); + hr = enumerate_mmdevices(eRender, DSOUND_renderer_guids, + enum_callback, ppd); if(hr == S_OK) - hr = enumerate_mmdevices(eCapture, enum_callback, ppd); + hr = enumerate_mmdevices(eCapture, DSOUND_capture_guids, + enum_callback, ppd); return SUCCEEDED(hr) ? DS_OK : hr; }

1 0

Paul Gofman : user32: Return empty string from LoadStringW() if resource is not found.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: 726027d60182db021edfdf83f1ec39f17486fd5d URL: https://gitlab.winehq.org/wine/wine/-/commit/726027d60182db021edfdf83f1ec39… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 8 17:32:04 2023 -0600 user32: Return empty string from LoadStringW() if resource is not found. --- dlls/user32/resource.c | 13 +++++++------ dlls/user32/tests/resource.c | 27 +++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index 3714b05ce8d..d2937988765 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -161,12 +161,13 @@ INT WINAPI DECLSPEC_HOTPATCH LoadStringW( HINSTANCE instance, UINT resource_id, if(buffer == NULL) return 0; - /* Use loword (incremented by 1) as resourceid */ - hrsrc = FindResourceW( instance, MAKEINTRESOURCEW((LOWORD(resource_id) >> 4) + 1), - (LPWSTR)RT_STRING ); - if (!hrsrc) return 0; - hmem = LoadResource( instance, hrsrc ); - if (!hmem) return 0; + if (!(hrsrc = FindResourceW( instance, MAKEINTRESOURCEW((LOWORD(resource_id) >> 4) + 1), (LPWSTR)RT_STRING )) || + !(hmem = LoadResource( instance, hrsrc ))) + { + TRACE( "Failed to load string.\n" ); + if (buflen > 0) buffer[0] = 0; + return 0; + } p = LockResource(hmem); string_num = resource_id & 0x000f; diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 2369aef2a09..da4efd2465f 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -120,6 +120,33 @@ static void test_LoadStringW(void) winetest_pop_context(); } } + + /* Test missing resource. */ + SetLastError(0xdeadbeef); + memset(returnedstringw, 0xcc, sizeof(returnedstringw)); + length1 = LoadStringW(hInst, 0xdeadbeef, returnedstringw, ARRAY_SIZE(returnedstringw)); + ok(!length1, "got %d.\n", length1); + ok(GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND || broken(GetLastError() == ERROR_MUI_FILE_NOT_FOUND) /* Win7 */, + "got %lu.\n", GetLastError()); + ok(!returnedstringw[0], "got %#x.\n", returnedstringw[0]); + ok(returnedstringw[1] == 0xcccc, "got %#x.\n", returnedstringw[1]); + + SetLastError(0xdeadbeef); + memset(returnedstringw, 0xcc, sizeof(returnedstringw)); + length1 = LoadStringW(hInst, 0xdeadbeef, returnedstringw, 0); + ok(!length1, "got %d.\n", length1); + ok(GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND || broken(GetLastError() == ERROR_MUI_FILE_NOT_LOADED) /* Win7 */, + "got %lu.\n", GetLastError()); + ok(returnedstringw[0] == 0xcccc, "got %#x.\n", returnedstringw[1]); + + SetLastError(0xdeadbeef); + memset(returnedstringw, 0xcc, sizeof(returnedstringw)); + length1 = LoadStringW(hInst, 0xdeadbeef, returnedstringw, 1); + ok(!length1, "got %d.\n", length1); + ok(GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND || broken(GetLastError() == ERROR_MUI_FILE_NOT_LOADED) /* Win7 */, + "got %lu.\n", GetLastError()); + ok(!returnedstringw[0], "got %#x.\n", returnedstringw[0]); + ok(returnedstringw[1] == 0xcccc, "got %#x.\n", returnedstringw[1]); } static void test_LoadStringA (void)

1 0

Paul Gofman : user32: Put 0 to output string even for 1 char buffer in LoadStringW().
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: ad9303d888aa0b463f07f16059ce801d8da10ea2 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad9303d888aa0b463f07f16059ce80… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 8 17:56:17 2023 -0600 user32: Put 0 to output string even for 1 char buffer in LoadStringW(). --- dlls/user32/resource.c | 13 +++---------- dlls/user32/tests/resource.c | 9 +++++++++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index d2937988765..b050e1eba8c 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -185,17 +185,10 @@ INT WINAPI DECLSPEC_HOTPATCH LoadStringW( HINSTANCE instance, UINT resource_id, } i = min(buflen - 1, *p); - if (i > 0) { - memcpy(buffer, p + 1, i * sizeof (WCHAR)); - buffer[i] = 0; - } else { - if (buflen > 1) { - buffer[0] = 0; - return 0; - } - } + memcpy(buffer, p + 1, i * sizeof(WCHAR)); + buffer[i] = 0; - TRACE("%s loaded !\n", debugstr_w(buffer)); + TRACE("returning %s\n", debugstr_w(buffer)); return i; } diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index da4efd2465f..de4bb2c8a53 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -147,6 +147,15 @@ static void test_LoadStringW(void) "got %lu.\n", GetLastError()); ok(!returnedstringw[0], "got %#x.\n", returnedstringw[0]); ok(returnedstringw[1] == 0xcccc, "got %#x.\n", returnedstringw[1]); + + /* Test short buffer */ + SetLastError(0xdeadbeef); + memset(returnedstringw, 0xcc, sizeof(returnedstringw)); + length1 = LoadStringW(hInst, 2, returnedstringw, 1); /* get resource string */ + ok(!length1, "got %d.\n", length1); + ok(GetLastError() == 0xdeadbeef, "got %lu.\n", GetLastError()); + ok(!returnedstringw[0], "got %#x.\n", returnedstringw[0]); + ok(returnedstringw[1] == 0xcccc, "got %#x.\n", returnedstringw[1]); } static void test_LoadStringA (void)

1 0

Paul Gofman : kernelbase: Put 0 to output string even for 1 char buffer in LoadStringW().
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: ed7aca011c800c60bf59bf3a1f10b06e7eedbeb6 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed7aca011c800c60bf59bf3a1f10b0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 8 17:58:41 2023 -0600 kernelbase: Put 0 to output string even for 1 char buffer in LoadStringW(). --- dlls/kernelbase/string.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index a372605bee0..f83ae35f19a 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -1253,19 +1253,8 @@ INT WINAPI DECLSPEC_HOTPATCH LoadStringW(HINSTANCE instance, UINT resource_id, L } i = min(buflen - 1, *p); - if (i > 0) - { - memcpy(buffer, p + 1, i * sizeof (WCHAR)); - buffer[i] = 0; - } - else - { - if (buflen > 1) - { - buffer[0] = 0; - return 0; - } - } + memcpy(buffer, p + 1, i * sizeof(WCHAR)); + buffer[i] = 0; TRACE("returning %s\n", debugstr_w(buffer)); return i;

1 0

Zebediah Figura : d3d9/tests: Test that GetDC() records a dirty rect.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: 8fa82bd1f89c669bc89be7d56413adde67638a82 URL: https://gitlab.winehq.org/wine/wine/-/commit/8fa82bd1f89c669bc89be7d56413ad… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 8 17:43:55 2023 -0600 d3d9/tests: Test that GetDC() records a dirty rect. --- dlls/d3d9/tests/visual.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0ac6b58cb36..51848cecbf6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19507,6 +19507,7 @@ static void add_dirty_rect_test(void) ULONG refcount; DWORD *texel; HWND window; + HDC dc; D3DLOCKED_RECT locked_rect; static const RECT part_rect = {96, 96, 160, 160}; static const RECT oob_rect[] = @@ -19748,6 +19749,21 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#lx.\n", hr); + /* GetDC() records a dirty rect. */ + fill_surface(surface_src_green, 0x00000080, D3DLOCK_NO_DIRTY_UPDATE); + hr = IDirect3DSurface9_GetDC(surface_src_green, &dc); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DSurface9_ReleaseDC(surface_src_green, dc); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)tex_src_green, + (IDirect3DBaseTexture9 *)tex_dst2); + ok(SUCCEEDED(hr), "Failed to update texture, hr %#lx.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + todo_wine ok(color_match(color, 0x00000080, 1), "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#lx.\n", hr); + fill_surface(surface_src_red, 0x00ff0000, 0); fill_surface(surface_src_green, 0x0000ff00, 0); @@ -19873,6 +19889,18 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#lx.\n", hr); + /* So does GetDC(). */ + fill_surface(surface_managed0, 0x00000080, D3DLOCK_NO_DIRTY_UPDATE); + hr = IDirect3DSurface9_GetDC(surface_managed0, &dc); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DSurface9_ReleaseDC(surface_managed0, dc); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + todo_wine ok(color_match(color, 0x00000080, 1), "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#lx.\n", hr); + /* Tests with dynamic textures */ fill_surface(surface_dynamic, 0x0000ffff, 0); hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)tex_dynamic);

1 0