- Wine-Commits - list.winehq.org

Rémi Bernon : dmime/tests: Test tempo track GetParam with GUID_TempoParam.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: 92959b315b396e34f3fa807567e789df14952963 URL: https://gitlab.winehq.org/wine/wine/-/commit/92959b315b396e34f3fa807567e789… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 23 20:01:36 2023 +0200 dmime/tests: Test tempo track GetParam with GUID_TempoParam. --- dlls/dmime/tests/dmime.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 344571d2801..2f2592da6fe 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3933,6 +3933,7 @@ static void test_tempo_track_play(void) {.lTime = 4000, .dblTempo = 50}, }; IDirectMusicPerformance *performance; + MUSIC_TIME next_time; IDirectMusicSegment *segment; IDirectMusicGraph *graph; IDirectMusicTrack *track; @@ -4015,6 +4016,49 @@ static void test_tempo_track_play(void) ok(hr == S_OK, "got %#lx\n", hr); IDirectMusicTrack_Release(track); + hr = IDirectMusicSegment_GetParam(segment, &GUID_TempoParam, -1, DMUS_SEG_ALLTRACKS, 0, NULL, NULL); + ok(hr == E_POINTER, "got %#lx\n", hr); + hr = IDirectMusicSegment_GetParam(segment, &GUID_TempoParam, -1, DMUS_SEG_ALLTRACKS, 0, NULL, &param); + todo_wine ok(hr == S_OK, "got %#lx\n", hr); + + memset(&param, 0xcd, sizeof(param)); + next_time = 0xdeadbeef; + hr = IDirectMusicSegment_GetParam(segment, &GUID_TempoParam, -1, DMUS_SEG_ALLTRACKS, 0, &next_time, &param); + todo_wine ok(hr == S_OK, "got %#lx\n", hr); + todo_wine ok(next_time == 100, "got next_time %lu\n", next_time); + todo_wine ok(param.mtTime == 100, "got mtTime %ld\n", param.mtTime); + todo_wine ok(param.dblTempo == 80, "got dblTempo %f\n", param.dblTempo); + hr = IDirectMusicSegment_GetParam(segment, &GUID_TempoParam, -1, DMUS_SEG_ALLTRACKS, 100, &next_time, &param); + todo_wine ok(hr == S_OK, "got %#lx\n", hr); + todo_wine ok(next_time == 200, "got next_time %lu\n", next_time); + ok(param.mtTime == 0, "got mtTime %ld\n", param.mtTime); + todo_wine ok(param.dblTempo == 80, "got dblTempo %f\n", param.dblTempo); + hr = IDirectMusicSegment_GetParam(segment, &GUID_TempoParam, -1, DMUS_SEG_ALLTRACKS, 199, &next_time, &param); + todo_wine ok(hr == S_OK, "got %#lx\n", hr); + todo_wine ok(next_time == 101, "got next_time %lu\n", next_time); + todo_wine ok(param.mtTime == -99, "got mtTime %ld\n", param.mtTime); + todo_wine ok(param.dblTempo == 80, "got dblTempo %f\n", param.dblTempo); + hr = IDirectMusicSegment_GetParam(segment, &GUID_TempoParam, -1, DMUS_SEG_ALLTRACKS, 200, &next_time, &param); + todo_wine ok(hr == S_OK, "got %#lx\n", hr); + todo_wine ok(next_time == 100, "got next_time %lu\n", next_time); + todo_wine ok(param.mtTime == -100, "got mtTime %ld\n", param.mtTime); + todo_wine ok(param.dblTempo == 80, "got dblTempo %f\n", param.dblTempo); + hr = IDirectMusicSegment_GetParam(segment, &GUID_TempoParam, -1, DMUS_SEG_ALLTRACKS, 299, &next_time, &param); + todo_wine ok(hr == S_OK, "got %#lx\n", hr); + todo_wine ok(next_time == 1, "got next_time %lu\n", next_time); + todo_wine ok(param.mtTime == -199, "got mtTime %ld\n", param.mtTime); + todo_wine ok(param.dblTempo == 80, "got dblTempo %f\n", param.dblTempo); + hr = IDirectMusicSegment_GetParam(segment, &GUID_TempoParam, -1, DMUS_SEG_ALLTRACKS, 300, &next_time, &param); + todo_wine ok(hr == S_OK, "got %#lx\n", hr); + todo_wine ok(next_time == 3700, "got next_time %lu\n", next_time); + todo_wine ok(param.mtTime == -100, "got mtTime %ld\n", param.mtTime); + todo_wine ok(param.dblTempo == 20, "got dblTempo %f\n", param.dblTempo); + hr = IDirectMusicSegment_GetParam(segment, &GUID_TempoParam, -1, DMUS_SEG_ALLTRACKS, 5000, &next_time, &param); + todo_wine ok(hr == S_OK, "got %#lx\n", hr); + ok(next_time == 0, "got next_time %lu\n", next_time); + todo_wine ok(param.mtTime == -1000, "got mtTime %ld\n", param.mtTime); + todo_wine ok(param.dblTempo == 50, "got dblTempo %f\n", param.dblTempo); + /* now play the segment, and check produced messages */

1 0

Rémi Bernon : dmime/tests: Test playing tempo track effect on performance times.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: 8f9faf8868d4a00868b73b04e844ff84cc99bc71 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f9faf8868d4a00868b73b04e844ff… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 23 19:53:37 2023 +0200 dmime/tests: Test playing tempo track effect on performance times. --- dlls/dmime/tests/dmime.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 91af7aec692..a0c298fe994 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3941,7 +3941,8 @@ static void test_tempo_track_play(void) {.lTime = 4000, .dblTempo = 50}, }; IDirectMusicPerformance *performance; - MUSIC_TIME next_time; + MUSIC_TIME music_time, next_time; + REFERENCE_TIME init_time, time; IDirectMusicSegment *segment; IDirectMusicGraph *graph; IDirectMusicTrack *track; @@ -4076,12 +4077,57 @@ static void test_tempo_track_play(void) hr = IDirectMusicPerformance_PlaySegment(performance, segment, 0x800, 0, NULL); ok(hr == S_OK, "got %#lx\n", hr); + /* the tempo track only takes effect after DMUS_PMSGT_DIRTY */ + ret = test_tool_wait_message(tool, 500, &msg); ok(!ret, "got %#lx\n", ret); ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %#lx\n", msg->dwType); hr = IDirectMusicPerformance_FreePMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); + + time = 0xdeadbeef; + hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 0, &time); + ok(hr == S_OK, "got %#lx\n", hr); + init_time = time; + + time = 0xdeadbeef; + hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 1, &time); + ok(hr == S_OK, "got %#lx\n", hr); + check_music_time(time - init_time, scale_music_time(1, 120)); + time = 0xdeadbeef; + hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 100, &time); + ok(hr == S_OK, "got %#lx\n", hr); + todo_wine check_music_time(time - init_time, scale_music_time(100, 120)); + time = 0xdeadbeef; + hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 150, &time); + ok(hr == S_OK, "got %#lx\n", hr); + todo_wine check_music_time(time - init_time, scale_music_time(100, 120) + scale_music_time(50, 80)); + time = 0xdeadbeef; + hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 200, &time); + ok(hr == S_OK, "got %#lx\n", hr); + todo_wine check_music_time(time - init_time, scale_music_time(100, 120) + scale_music_time(100, 80)); + time = 0xdeadbeef; + hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 400, &time); + ok(hr == S_OK, "got %#lx\n", hr); + todo_wine check_music_time(time - init_time, scale_music_time(100, 120) + scale_music_time(200, 80) + scale_music_time(100, 20)); + + music_time = 0xdeadbeef; + hr = IDirectMusicPerformance_ReferenceToMusicTime(performance, init_time, &music_time); + ok(hr == S_OK, "got %#lx\n", hr); + ok(music_time == 0, "got %ld\n", music_time); + music_time = 0xdeadbeef; + time = scale_music_time(100, 120) + scale_music_time(50, 80); + hr = IDirectMusicPerformance_ReferenceToMusicTime(performance, init_time + time, &music_time); + ok(hr == S_OK, "got %#lx\n", hr); + todo_wine ok(music_time == 150, "got %ld\n", music_time); + music_time = 0xdeadbeef; + time = scale_music_time(100, 120) + scale_music_time(200, 80) + scale_music_time(100, 20); + hr = IDirectMusicPerformance_ReferenceToMusicTime(performance, init_time + time, &music_time); + ok(hr == S_OK, "got %#lx\n", hr); + todo_wine ok(music_time == 400, "got %ld\n", music_time); + + ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&tempo); ok(!ret, "got %#lx\n", ret); todo_wine ok(tempo->dwType == DMUS_PMSGT_TEMPO, "got %#lx\n", tempo->dwType);

1 0

Rémi Bernon : dmime/tests: Test IDirectMusicPerformance_GetSegmentState.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: 617d7fc9b81c4da3266b9c99cda4935d4e58a18b URL: https://gitlab.winehq.org/wine/wine/-/commit/617d7fc9b81c4da3266b9c99cda493… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 23 23:59:27 2023 +0200 dmime/tests: Test IDirectMusicPerformance_GetSegmentState. --- dlls/dmime/tests/dmime.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 79fbb902868..b15c3a1ac37 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -4053,6 +4053,12 @@ static void test_segment_state(void) check_track_state(track, initialized, FALSE); check_track_state(track, playing, FALSE); + hr = IDirectMusicPerformance_GetSegmentState(performance, NULL, 0); + todo_wine ok(hr == E_POINTER, "got %#lx\n", hr); + hr = IDirectMusicPerformance_GetSegmentState(performance, &tmp_state, 0); + todo_wine ok(hr == DMUS_E_NOT_FOUND, "got %#lx\n", hr); + + tmp_state = state; state = (void *)0xdeadbeef; hr = IDirectMusicPerformance_PlaySegment(performance, segment, 0, 20, &state); @@ -4062,6 +4068,22 @@ static void test_segment_state(void) ok(state != tmp_state, "got %p\n", state); IDirectMusicSegmentState_Release(tmp_state); + tmp_state = (void *)0xdeadbeef; + hr = IDirectMusicPerformance_GetSegmentState(performance, &tmp_state, 0); + ok(hr == S_OK, "got %#lx\n", hr); + todo_wine ok(state == tmp_state, "got %p\n", state); + if (tmp_state != (void *)0xdeadbeef) IDirectMusicSegmentState_Release(tmp_state); + + tmp_state = (void *)0xdeadbeef; + hr = IDirectMusicPerformance_GetSegmentState(performance, &tmp_state, 69); + ok(hr == S_OK, "got %#lx\n", hr); + todo_wine ok(state == tmp_state, "got %p\n", state); + if (tmp_state != (void *)0xdeadbeef) IDirectMusicSegmentState_Release(tmp_state); + + hr = IDirectMusicPerformance_GetSegmentState(performance, &tmp_state, 70); + todo_wine ok(hr == DMUS_E_NOT_FOUND, "got %#lx\n", hr); + + check_track_state(track, downloaded, FALSE); check_track_state(track, initialized, TRUE); @@ -4074,6 +4096,9 @@ static void test_segment_state(void) ret = test_track_wait_playing(track, 50); ok(ret == 0, "got %#lx\n", ret); + hr = IDirectMusicPerformance_GetSegmentState(performance, &tmp_state, 0); + todo_wine ok(hr == DMUS_E_NOT_FOUND, "got %#lx\n", hr); + tmp_segment = (void *)0xdeadbeef; hr = IDirectMusicSegmentState_GetSegment(state, &tmp_segment);

1 0

Alexandre Julliard : win32u: Fix handling of process default DPI awareness.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: 7710e37c479da9e78a03d14dcebaa001163e147c URL: https://gitlab.winehq.org/wine/wine/-/commit/7710e37c479da9e78a03d14dcebaa0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 9 13:15:46 2023 +0100 win32u: Fix handling of process default DPI awareness. It got broken by the conversion to NTUSER_DPI* values. --- 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 5506abac7c6..4f2a299dd16 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2134,10 +2134,10 @@ DPI_AWARENESS get_thread_dpi_awareness(void) struct ntuser_thread_info *info = NtUserGetThreadInfo(); ULONG_PTR context = info->dpi_awareness; - if (!context) context = NtUserGetProcessDpiAwarenessContext( NULL ); - switch (context) { + case 0: /* process default */ + return NtUserGetProcessDpiAwarenessContext( NULL ) & 3; case 0x10: case 0x11: case 0x12:

1 0

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

Nov. 9, 2023

Module: wine Branch: master Commit: 00fb82c315342b87be5aca97f63927acf85b4df8 URL: https://gitlab.winehq.org/wine/wine/-/commit/00fb82c315342b87be5aca97f63927… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 9 10:33:12 2023 +0100 rpcrt4: Generate vtbl delegating thunks at compile time. --- dlls/rpcrt4/cpsf.h | 5 +- dlls/rpcrt4/cstub.c | 243 +++++++++++----------------------------------- dlls/rpcrt4/ndr_typelib.c | 6 +- 3 files changed, 60 insertions(+), 194 deletions(-)

1 0

Paul Gofman : winmm: Fix pszSound allocation in PlaySound_Alloc().
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: d9636260442292990bab00aec308116f3062f3ad URL: https://gitlab.winehq.org/wine/wine/-/commit/d9636260442292990bab00aec30811… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 30 20:31:58 2023 -0600 winmm: Fix pszSound allocation in PlaySound_Alloc(). --- dlls/winmm/playsound.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 2ba2ad1e8dc..bd26bf481f3 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -231,8 +231,9 @@ static WINE_PLAYSOUND* PlaySound_Alloc(const void* pszSound, HMODULE hmod, else { UNICODE_STRING usBuffer; - RtlCreateUnicodeStringFromAsciiz(&usBuffer, pszSound); - wps->pszSound = usBuffer.Buffer; + if (!RtlCreateUnicodeStringFromAsciiz(&usBuffer, pszSound)) goto oom_error; + wps->pszSound = wcsdup(usBuffer.Buffer); + RtlFreeUnicodeString(&usBuffer); if (!wps->pszSound) goto oom_error; wps->bAlloc = TRUE; }

1 0

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