October 2019 - Wine-devel - list.winehq.org

[PATCH] include: Add space sim direct input defines.
by Alistair Leslie-Hughes 04 Oct '19

04 Oct '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/dinput.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/include/dinput.h b/include/dinput.h index aca7005e31..92c6255cf3 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -2217,6 +2217,38 @@ extern const DIDATAFORMAT c_dfDIJoystick2; #define DIBUTTON_FLYINGH_GLANCE_UP_LINK 0x0607c4e0 #define DIBUTTON_FLYINGH_GLANCE_DOWN_LINK 0x0607c4e8 +#define DIVIRTUAL_SPACESIM 0x07000000 +#define DIBUTTON_SPACESIM_FIRE 0x07000401 +#define DIBUTTON_SPACESIM_WEAPONS 0x07000402 +#define DIBUTTON_SPACESIM_TARGET 0x07000403 +#define DIBUTTON_SPACESIM_MENU 0x070004fd +#define DIBUTTON_SPACESIM_VIEW 0x07004404 +#define DIBUTTON_SPACESIM_DISPLAY 0x07004405 +#define DIBUTTON_SPACESIM_RAISE 0x07004406 +#define DIBUTTON_SPACESIM_LOWER 0x07004407 +#define DIBUTTON_SPACESIM_GEAR 0x07004408 +#define DIBUTTON_SPACESIM_FIRESECONDARY 0x07004409 +#define DIBUTTON_SPACESIM_PAUSE 0x070044fc +#define DIBUTTON_SPACESIM_DEVICE 0x070044fe +#define DIHATSWITCH_SPACESIM_GLANCE 0x07004601 +#define DIBUTTON_SPACESIM_LEFT_LINK 0x0700c4e4 +#define DIBUTTON_SPACESIM_RIGHT_LINK 0x0700c4ec +#define DIAXIS_SPACESIM_LATERAL 0x07008201 +#define DIAXIS_SPACESIM_MOVE 0x07010202 +#define DIBUTTON_SPACESIM_FORWARD_LINK 0x070144e0 +#define DIBUTTON_SPACESIM_BACKWARD_LINK 0x070144e8 +#define DIAXIS_SPACESIM_CLIMB 0x0701c204 +#define DIAXIS_SPACESIM_ROTATE 0x07024205 +#define DIBUTTON_SPACESIM_TURN_LEFT_LINK 0x070244e4 +#define DIBUTTON_SPACESIM_TURN_RIGHT_LINK 0x070244ec +#define DIAXIS_SPACESIM_THROTTLE 0x07038203 +#define DIBUTTON_SPACESIM_FASTER_LINK 0x0703c4e0 +#define DIBUTTON_SPACESIM_SLOWER_LINK 0x0703c4e8 +#define DIBUTTON_SPACESIM_GLANCE_UP_LINK 0x0707c4e0 +#define DIBUTTON_SPACESIM_GLANCE_LEFT_LINK 0x0707c4e4 +#define DIBUTTON_SPACESIM_GLANCE_DOWN_LINK 0x0707c4e8 +#define DIBUTTON_SPACESIM_GLANCE_RIGHT_LINK 0x0707c4ec + /***************************************************************************** * IDirectInputA interface */ -- 2.17.1

1 0

[PATCH 1/2] wininet/tests: Fix http tests to reflect current state of winehq test server.
by Owen Rudge 03 Oct '19

03 Oct '19

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- This patch updates the wininet/http tests to reflect the state of the winehq test server following recent upgrades. The tests are still broken on Windows XP, which I suspect may be due to changes to TLS version requirements on the server. These tests may well be permanently broken if so, and may need to be disabled. --- dlls/wininet/tests/http.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-)

1 0

[PATCH v4] dmime/tests: Add a notification_type test
by Alistair Leslie-Hughes 03 Oct '19

03 Oct '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- Reset timeout to 500. Fixed failures of testbox. It wasn't a timeout issue after all, its possible to get a DMUS_NOTIFICATION_SEGALMOSTEND message, which needs to be treated the same as DMUS_NOTIFICATION_SEGEND. dlls/dmime/tests/performance.c | 117 +++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index c2ca4cdf28..4433846f9b 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -366,6 +366,122 @@ static void test_COM(void) ok (refcount == 0, "refcount == %u, expected 0\n", refcount); } +static void test_notification_type(void) +{ + static unsigned char rifffile[8+4+8+16+8+256] = "RIFF\x24\x01\x00\x00WAVE" /* header: 4 ("WAVE") + (8 + 16) (format segment) + (8 + 256) (data segment) = 0x124 */ + "fmt \x10\x00\x00\x00\x01\x00\x20\x00\xAC\x44\x00\x00\x10\xB1\x02\x00\x04\x00\x10\x00" /* format segment: PCM, 2 chan, 44100 Hz, 16 bits */ + "data\x00\x01\x00\x00"; /* 256 byte data segment (silence) */ + + IDirectMusicPerformance8 *perf; + IDirectMusic *music = NULL; + IDirectMusicSegment8 *prime_segment8; + IDirectMusicSegment8 *segment8 = NULL; + IDirectMusicLoader8 *loader; + IDirectMusicAudioPath8 *path; + IDirectMusicSegmentState *state; + IDirectSound *dsound = NULL; + HRESULT hr; + DWORD result; + HANDLE messages; + DMUS_NOTIFICATION_PMSG *msg; + BOOL found_end = FALSE; + DMUS_OBJECTDESC desc = {0}; + + hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, + CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (void**)&perf); + ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + + hr = IDirectMusicPerformance8_InitAudio(perf, &music, &dsound, NULL, DMUS_APATH_DYNAMIC_STEREO, 64, DMUS_AUDIOF_ALL, NULL); + ok(music != NULL, "Didn't get IDirectMusic pointer\n"); + ok(dsound != NULL, "Didn't get IDirectSound pointer\n"); + + hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicLoader8, (void**)&loader); + ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + + messages = CreateEventA( NULL, FALSE, FALSE, NULL ); + + hr = IDirectMusicPerformance8_AddNotificationType(perf, &GUID_NOTIFICATION_SEGMENT); + ok(hr == S_OK, "Failed: %08x\n", hr); + + hr = IDirectMusicPerformance8_SetNotificationHandle(perf, messages, 0); + ok(hr == S_OK, "Failed: %08x\n", hr); + + hr = IDirectMusicPerformance8_GetDefaultAudioPath(perf, &path); + ok(hr == S_OK, "Failed: %08x\n", hr); + ok(path != NULL, "Didn't get IDirectMusicAudioPath pointer\n"); + + desc.dwSize = sizeof(DMUS_OBJECTDESC); + desc.dwValidData = DMUS_OBJ_CLASS | DMUS_OBJ_MEMORY; + desc.guidClass = CLSID_DirectMusicSegment; + desc.pbMemData = rifffile; + desc.llMemLength = sizeof(rifffile); + hr = IDirectMusicLoader8_GetObject(loader, &desc, &IID_IDirectMusicSegment8, (void**)&prime_segment8); + ok(hr == S_OK, "Failed: %08x\n", hr); + ok(prime_segment8 != NULL, "Didn't get IDirectMusicSegment pointer\n"); + + hr = IDirectMusicSegment8_Download(prime_segment8, (IUnknown*)path); + ok(hr == S_OK, "Download failed: %08x\n", hr); + + hr = IDirectMusicPerformance8_PlaySegmentEx(perf, (IUnknown*)prime_segment8, + NULL, NULL, DMUS_SEGF_SECONDARY, 0, &state, NULL, (IUnknown*)path); + ok(hr == S_OK, "PlaySegmentEx failed: %08x\n", hr); + ok(state != NULL, "Didn't get IDirectMusicSegmentState pointer\n"); + + while (!found_end) { + result = WaitForSingleObject(messages, 500); + todo_wine ok(result == WAIT_OBJECT_0, "Failed: %d\n", result); + if (result != WAIT_OBJECT_0) + break; + + msg = NULL; + hr = IDirectMusicPerformance8_GetNotificationPMsg(perf, &msg); + ok(hr == S_OK, "Failed: %08x\n", hr); + ok(msg != NULL, "Unexpected NULL pointer\n"); + if (FAILED(hr) || !msg) + break; + + trace("Notification: %d\n", msg->dwNotificationOption); + + if (msg->dwNotificationOption == DMUS_NOTIFICATION_SEGEND || + msg->dwNotificationOption == DMUS_NOTIFICATION_SEGALMOSTEND) { + ok(msg->punkUser != NULL, "Unexpected NULL pointer\n"); + if (msg->punkUser) { + IDirectMusicSegmentState8 *segmentstate; + IDirectMusicSegment *segment; + + hr = IUnknown_QueryInterface(msg->punkUser, &IID_IDirectMusicSegmentState8, (void**)&segmentstate); + ok(hr == S_OK, "Failed: %08x\n", hr); + + hr = IDirectMusicSegmentState8_GetSegment(segmentstate, &segment); + ok(hr == S_OK, "Failed: %08x\n", hr); + + hr = IDirectMusicSegment_QueryInterface(segment, &IID_IDirectMusicSegment8, (void**)&segment8); + ok(hr == S_OK, "Failed: %08x\n", hr); + + found_end = TRUE; + + IDirectMusicSegment_Release(segment); + IDirectMusicSegmentState8_Release(segmentstate); + } + } + + IDirectMusicPerformance8_FreePMsg(perf, (DMUS_PMSG*)msg); + } + todo_wine ok(prime_segment8 == segment8, "Wrong end segment\n"); + todo_wine ok(found_end, "Didn't recieve DMUS_NOTIFICATION_SEGEND message\n"); + + CloseHandle(messages); + + if(segment8) + IDirectMusicSegment8_Release(segment8); + IDirectSound_Release(dsound); + IDirectMusicSegmentState_Release(state); + IDirectMusicAudioPath_Release(path); + IDirectMusicLoader8_Release(loader); + IDirectMusic_Release(music); + IDirectMusicPerformance8_Release(perf); +} + START_TEST( performance ) { HRESULT hr; @@ -384,6 +500,7 @@ START_TEST( performance ) test_COM(); test_createport(); + test_notification_type(); CoUninitialize(); } -- 2.23.0

2 1

[PATCH 2/2] kernel32: Add write watch test on OVERLAPPED structure.
by Piotr Caban 03 Oct '19

03 Oct '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/kernel32/tests/virtual.c | 63 ++++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-)

2 1

[PATCH 2/2 v2] kernel32/tests: Test GetUserGeoID, GetUserDefaultGeoName.
by João Diogo Ferreira 03 Oct '19

03 Oct '19

Fixes from last version: - Removed testing for SetUserGeoID and SetUserGeoName; - Inverted if blocks to avoid long nesting blocks. Good riddance to those two testing units, as they were a pain to write and still failed on older Windows versions. If someone thinks they're necessary, please contact me. Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- dlls/kernel32/tests/locale.c | 86 ++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 81e74531ea..7527c36bb9 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -108,6 +108,8 @@ static LANGID (WINAPI *pSetThreadUILanguage)(LANGID); static LANGID (WINAPI *pGetThreadUILanguage)(VOID); static INT (WINAPI *pNormalizeString)(NORM_FORM, LPCWSTR, INT, LPWSTR, INT); static INT (WINAPI *pFindStringOrdinal)(DWORD, LPCWSTR lpStringSource, INT, LPCWSTR, INT, BOOL); +static int (WINAPI *pGetUserDefaultGeoName)(LPWSTR, int); +static BOOL (WINAPI *pSetUserGeoName)(PWSTR); static void InitFunctionPointers(void) { @@ -145,6 +147,8 @@ static void InitFunctionPointers(void) X(GetThreadUILanguage); X(NormalizeString); X(FindStringOrdinal); + X(GetUserDefaultGeoName); + X(SetUserGeoName); mod = GetModuleHandleA("ntdll"); X(RtlUpcaseUnicodeChar); @@ -4745,6 +4749,86 @@ static void test_CompareStringOrdinal(void) } } +static void test_GetUserGeoID(void) +{ + GEOID id; + +todo_wine { + if (pGetUserDefaultGeoName && pSetUserGeoName) + { + ok(GEOID_NOT_AVAILABLE != GetUserGeoID(GEOCLASS_NATION), + "GEOCLASS_NATION: should never return GEOID_NOT_AVAILABLE when GeoName API is available.\n"); + ok(GEOID_NOT_AVAILABLE != GetUserGeoID(GEOCLASS_REGION), + "GEOCLASS_REGION: should never return GEOID_NOT_AVAILABLE when GeoName API is available.\n"); + } + else + win_skip("This platform allows GEOID_NOT_AVAILABLE to be returned.\n"); +} + + id = GetUserGeoID(GEOCLASS_ALL); + ok(id == GEOID_NOT_AVAILABLE, + "GEOCLASS_ALL: Expected GEOID_NOT_AVAILABLE, got %d.\n", id); + id = GetUserGeoID(12345); + ok(id == GEOID_NOT_AVAILABLE, + "Gibberish argument: Expected GEOID_NOT_AVAILABLE, got %d.\n", id); +} + +static void test_GetUserDefaultGeoName(void) +{ + WCHAR name[10] = {0}; + int result, count; + +todo_wine +{ + if (!(pGetUserDefaultGeoName && pSetUserGeoName)) + { + todo_wine win_skip("GetUserDefaultGeoName: procedure not implemented on this platform.\n"); + return; + } + SetLastError(ERROR_SUCCESS); + count = result = pGetUserDefaultGeoName(NULL, 0); + ok(result > 0, "Expected character count > 0, got %d; last error was %d.\n", result, GetLastError()); + + result = pGetUserDefaultGeoName(NULL, 10); + ok(result == 0 && (GetLastError() == ERROR_INVALID_PARAMETER), + "Expected ret=0, got %d; and expected last error = ERROR_INVALID_PARAMETER (87), got %d\n", + result, GetLastError()); + + result = pGetUserDefaultGeoName(NULL, -1); + ok(result == 0 && (GetLastError() == ERROR_INVALID_PARAMETER), + "Expected ret=0, got %d; and expected last error = ERROR_INVALID_PARAMETER (87), got %d\n", + result, GetLastError()); + + SetLastError(ERROR_SUCCESS); + result = pGetUserDefaultGeoName(name, 0); + ok(result > 0, "Expected character count > 0, got %d; last error was %d.\n", result, GetLastError()); + + result = pGetUserDefaultGeoName(name, 1); + ok(result == 0 && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "Expected ret == 0, got %d; and expected last error = ERROR_INSUFFICIENT_BUFFER (122), got %d\n", + result, GetLastError()); + + result = pGetUserDefaultGeoName(name, -1); + ok(result == 0 && (GetLastError() == ERROR_INVALID_PARAMETER), + "Expected ret=0, got %d; and expected last error = ERROR_INVALID_PARAMETER (87), got %d\n", + result, GetLastError()); + + SetLastError(ERROR_SUCCESS); + + ok(count <= 4, "Character count should never be higher than 4 (3 + null), got %d!\n", count); + if (count <= ARRAY_SIZE(name)) + { + const int result = pGetUserDefaultGeoName(name, count); + ok(result, + "Expected character count == %d, got %d; last error was %d.\n", + count, result, GetLastError()); + } + else + trace("Couldn't test successful operation since string is exceedingly large (%d > %lu).\n", + count, ARRAY_SIZE(name)); +} +} + static void test_GetGeoInfo(void) { char buffA[20]; @@ -6058,6 +6142,8 @@ START_TEST(locale) test_SetThreadUILanguage(); test_NormalizeString(); test_SpecialCasing(); + test_GetUserGeoID(); + test_GetUserDefaultGeoName(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); } -- 2.23.0

1 0

[PATCH 1/2] ntdll: Try to handle write-watches while we're on the signal stack (x86_64).
by Piotr Caban 03 Oct '19

03 Oct '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 9 +++++++++ 1 file changed, 9 insertions(+)

1 0

[PATCH] dsound/tests: Allow more time for an event to be signalled.
by Alistair Leslie-Hughes 03 Oct '19

03 Oct '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47868 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dsound/tests/dsound.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index d242bf6b24..7fdac9144e 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1089,7 +1089,7 @@ static HRESULT test_notify(LPDIRECTSOUNDBUFFER dsb, ok(rc == DS_OK,"Failed %08x\n",rc); ok(status == 0 /* Stopped */,"got %08x\n", status); - ret=WaitForMultipleObjects(count,event,FALSE,0); + ret = WaitForMultipleObjects(count, event, FALSE, 3000); ok(ret==expected,"expected %d. got %d\n",expected,ret); return rc; -- 2.17.1

2 1

[PATCH 1/4] wined3d: Introduce wined3d_stateblock_set_ps_consts_i().
by Zebediah Figura 03 Oct '19

03 Oct '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/stateblock.c | 20 ++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 23 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 64a900fbde4..0ff3199525f 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1366,6 +1366,26 @@ HRESULT CDECL wined3d_stateblock_set_ps_consts_f(struct wined3d_stateblock *stat return WINED3D_OK; } +HRESULT CDECL wined3d_stateblock_set_ps_consts_i(struct wined3d_stateblock *stateblock, + unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants) +{ + unsigned int i; + + TRACE("stateblock %p, start_idx %u, count %u, constants %p.\n", + stateblock, start_idx, count, constants); + + if (!constants || start_idx >= WINED3D_MAX_CONSTS_I) + return WINED3DERR_INVALIDCALL; + + if (count > WINED3D_MAX_CONSTS_I - start_idx) + count = WINED3D_MAX_CONSTS_I - start_idx; + + memcpy(&stateblock->stateblock_state.ps_consts_i[start_idx], constants, count * sizeof(*constants)); + for (i = start_idx; i < count + start_idx; ++i) + stateblock->changed.pixelShaderConstantsI |= (1u << i); + return WINED3D_OK; +} + void CDECL wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, struct wined3d_vertex_declaration *declaration) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 016cf55c032..9772874c8be 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -260,6 +260,7 @@ @ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_stateblock_set_pixel_shader(ptr ptr) @ cdecl wined3d_stateblock_set_ps_consts_f(ptr long long ptr) +@ cdecl wined3d_stateblock_set_ps_consts_i(ptr long long ptr) @ cdecl wined3d_stateblock_set_vertex_declaration(ptr ptr) @ cdecl wined3d_stateblock_set_vertex_shader(ptr ptr) @ cdecl wined3d_stateblock_set_vs_consts_b(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c4c469d4fe4..215e50116cd 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2663,6 +2663,8 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); HRESULT __cdecl wined3d_stateblock_set_ps_consts_f(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); +HRESULT __cdecl wined3d_stateblock_set_ps_consts_i(struct wined3d_stateblock *stateblock, + unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants); void __cdecl wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, struct wined3d_vertex_declaration *declaration); void __cdecl wined3d_stateblock_set_vertex_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); -- 2.23.0

3 11

[PATCH] msvcp: Use fput[w]c in basic_filebuf_char_overflow.
by Jacek Caban 03 Oct '19

03 Oct '19

From: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcp90/ios.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 1

[PATCH 6/6] vbscript/tests: Add err.raise tests.
by Jacek Caban 03 Oct '19

03 Oct '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/tests/api.vbs | 88 +++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+)

1 0