October 2019 - Wine-commits

Alexandre Julliard : ole32/tests: Increase a timeout.
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: bb22b55e6db927deff4aecf4c65ed06801f8b073 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb22b55e6db927deff4aecf4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 30 22:33:15 2019 +0100 ole32/tests: Increase a timeout. It's too short when running under QEMU. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 6361f5f0da..69a38d48b2 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -3031,7 +3031,7 @@ static void test_CoWaitForMultipleHandles(void) /* test message pumping when CoWaitForMultipleHandles is called from non main apartment thread */ thread = CreateThread(NULL, 0, test_CoWaitForMultipleHandles_thread, handles, 0, &tid); - index = WaitForSingleObject(thread, 500); + index = WaitForSingleObject(thread, 5000); ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); CloseHandle(thread);

1 0

Alexandre Julliard : psapi/tests: Increase some timeouts.
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: 3f61f905ba3f12e83acfb8b82c1da7f8ac4d5227 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f61f905ba3f12e83acfb8b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 30 22:35:35 2019 +0100 psapi/tests: Increase some timeouts. These are too short when running under QEMU. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/tests/psapi_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index b02ceed5ec..9799d2ffae 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -125,7 +125,7 @@ static void test_EnumProcessModules(void) ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess failed: %u\n", GetLastError()); - ret = WaitForInputIdle(pi.hProcess, 1000); + ret = WaitForInputIdle(pi.hProcess, 5000); ok(!ret, "wait timed out\n"); SetLastError(0xdeadbeef); @@ -146,7 +146,7 @@ static void test_EnumProcessModules(void) ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess failed: %u\n", GetLastError()); - ret = WaitForInputIdle(pi.hProcess, 1000); + ret = WaitForInputIdle(pi.hProcess, 5000); ok(!ret, "wait timed out\n"); SetLastError(0xdeadbeef); @@ -180,7 +180,7 @@ todo_wine pWow64RevertWow64FsRedirection(cookie); ok(ret, "CreateProcess failed: %u\n", GetLastError()); - ret = WaitForInputIdle(pi.hProcess, 1000); + ret = WaitForInputIdle(pi.hProcess, 5000); ok(!ret, "wait timed out\n"); SetLastError(0xdeadbeef);

1 0

Alexandre Julliard : rpcrt4/tests: Increase some timeouts.
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: 822e2773d45544e3972c3d0e9dd60a6598d7a84f URL: https://source.winehq.org/git/wine.git/?a=commit;h=822e2773d45544e3972c3d0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 30 22:32:54 2019 +0100 rpcrt4/tests: Increase some timeouts. These are too short when running under QEMU. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/cstub.c | 2 +- dlls/rpcrt4/tests/server.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 6b99e82408..e0f519fa1d 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -1383,7 +1383,7 @@ static void test_delegated_methods(void) ready_event = CreateEventA(NULL, TRUE, FALSE, "wine_cstub_test_server_ready"); process = create_process("server"); - ok(!WaitForSingleObject(ready_event, 1000), "wait failed\n"); + ok(!WaitForSingleObject(ready_event, 5000), "wait failed\n"); hr = NdrDllGetClassObject(&CLSID_test_ps, &IID_IPSFactoryBuffer, (void **)&ps, &aProxyFileList, &CLSID_test_ps, &gPFactory); diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index e6555fa18b..a07e2f1787 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -2290,7 +2290,7 @@ static void run_server(HANDLE ready_event) ret = SetEvent(ready_event); ok(ret, "SetEvent failed: %u\n", GetLastError()); - ret = WaitForSingleObject(stop_event, 1000); + ret = WaitForSingleObject(stop_event, 5000); ok(WAIT_OBJECT_0 == ret, "WaitForSingleObject\n"); status = RpcMgmtWaitServerListen();

1 0

Piotr Caban : ntdll: Use SIZE_T to store passed buffer size in sprintf.
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: 92731ccbbe7681b10c40cd69d2cbb12c95ca211f URL: https://source.winehq.org/git/wine.git/?a=commit;h=92731ccbbe7681b10c40cd69… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 30 12:16:20 2019 +0100 ntdll: Use SIZE_T to store passed buffer size in sprintf. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/printf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c index 018f774dc0..4176f945f5 100644 --- a/dlls/ntdll/printf.c +++ b/dlls/ntdll/printf.c @@ -43,8 +43,8 @@ static const SIZE_T size_max = ~(SIZE_T)0 >> 1; typedef struct pf_output_t { - int used; - int len; + SIZE_T used; + SIZE_T len; BOOL unicode; union { LPWSTR W; @@ -68,7 +68,7 @@ typedef struct pf_flags_t */ static inline int pf_output_stringW( pf_output *out, LPCWSTR str, int len ) { - int space = out->len - out->used; + SIZE_T space = out->len - out->used; if( len < 0 ) len = strlenW( str ); @@ -122,7 +122,7 @@ static inline int pf_output_stringW( pf_output *out, LPCWSTR str, int len ) static inline int pf_output_stringA( pf_output *out, LPCSTR str, int len ) { - int space = out->len - out->used; + SIZE_T space = out->len - out->used; if( len < 0 ) len = strlen( str );

1 0

Nikolay Sivov : po: Fix Russian strings for page setup dialog.
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: 931408698859360e56cd85d532b142e789a6c274 URL: https://source.winehq.org/git/wine.git/?a=commit;h=931408698859360e56cd85d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 30 21:10:12 2019 +0300 po: Fix Russian strings for page setup dialog. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ru.po b/po/ru.po index 9dabdc22c5..cd03d2d5e7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -803,15 +803,15 @@ msgstr "&Слева:" #: comdlg32.rc:447 notepad.rc:112 msgid "&Right:" -msgstr "&Правое:" +msgstr "Сп&рава:" #: comdlg32.rc:449 msgid "T&op:" -msgstr "Спр&ава:" +msgstr "Св&ерху:" #: comdlg32.rc:451 notepad.rc:114 msgid "&Bottom:" -msgstr "&Нижнее:" +msgstr "С&низу:" #: comdlg32.rc:455 msgid "P&rinter..."

1 0

Michael Stefaniuc : mfreadwrite: Use wchar string literals instead of temp variables.
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: 7bc4e49f119ea67829d0efc469d125e9f1d4154e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bc4e49f119ea67829d0efc4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 30 00:41:34 2019 +0100 mfreadwrite: Use wchar string literals instead of temp variables. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 6859af8d53..3467746bb8 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -1123,8 +1123,6 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) static const UINT8 asfmagic[] = {0x30,0x26,0xb2,0x75,0x8e,0x66,0xcf,0x11,0xa6,0xd9,0x00,0xaa,0x00,0x62,0xce,0x6c}; static const UINT8 wavmagic[] = { 'R', 'I', 'F', 'F',0x00,0x00,0x00,0x00, 'W', 'A', 'V', 'E', 'f', 'm', 't', ' '}; static const UINT8 wavmask[] = {0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; - static const WCHAR asfW[] = {'.','a','s','f',0}; - static const WCHAR wavW[] = {'.','w','a','v',0}; static const struct stream_content_url_hint { const UINT8 *magic; @@ -1134,8 +1132,8 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) } url_hints[] = { - { asfmagic, sizeof(asfmagic), asfW }, - { wavmagic, sizeof(wavmagic), wavW, wavmask }, + { asfmagic, sizeof(asfmagic), L".asf" }, + { wavmagic, sizeof(wavmagic), L".wav", wavmask }, }; UINT8 buffer[4 * sizeof(unsigned int)]; IMFAttributes *attributes;

1 0

Michael Stefaniuc : dmsynth: Use a wchar string literal instead of a temp variable.
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: c547d8c9a4b73529607d20b81f36cb0762ea99b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c547d8c9a4b73529607d20b8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 29 22:58:11 2019 +0100 dmsynth: Use a wchar string literal instead of a temp variable. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/synth.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index ebc92afdf0..6d2c778a74 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -574,8 +574,6 @@ static const IKsControlVtbl DMSynthImpl_IKsControl_Vtbl = { /* for ClassFactory */ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj) { - static const WCHAR descrW[] = {'M','i','c','r','o','s','o','f','t',' ', - 'S','y','n','t','h','e','s','i','z','e','r',0}; IDirectMusicSynth8Impl *obj; HRESULT hr; @@ -600,7 +598,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj) obj->pCaps.dwMaxVoices = 1000; obj->pCaps.dwMaxAudioChannels = 2; obj->pCaps.dwEffectFlags = DMUS_EFFECT_REVERB; - lstrcpyW(obj->pCaps.wszDescription, descrW); + lstrcpyW(obj->pCaps.wszDescription, L"Microsoft Synthesizer"); DMSYNTH_LockModule(); hr = IDirectMusicSynth8_QueryInterface(&obj->IDirectMusicSynth8_iface, riid, ppobj);

1 0

Michael Stefaniuc : t2embed: Use a wchar string literal instead of a temp variable.
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: 85925f69071efa02cf5fe4ecba32959369c72adf URL: https://source.winehq.org/git/wine.git/?a=commit;h=85925f69071efa02cf5fe4ec… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 30 00:41:35 2019 +0100 t2embed: Use a wchar string literal instead of a temp variable. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/t2embed/main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index e47884611c..1200564028 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -107,8 +107,6 @@ LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) LONG WINAPI TTIsEmbeddingEnabledForFacename(LPCSTR facename, BOOL *enabled) { - static const WCHAR exclusionlistW[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'S','h','a','r','e','d',' ','T','o','o','l','s','\\','t','2','e','m','b','e','d',0}; DWORD index; HKEY hkey; LONG ret; @@ -122,7 +120,7 @@ LONG WINAPI TTIsEmbeddingEnabledForFacename(LPCSTR facename, BOOL *enabled) return E_PBENABLEDINVALID; *enabled = TRUE; - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, exclusionlistW, 0, GENERIC_READ, &hkey)) + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Shared Tools\\t2embed", 0, GENERIC_READ, &hkey)) goto out; *enabled = TRUE;

1 0

Paul Gofman : d3dx9: Don't pass usage flags for staging texture in D3DXCreateCubeTextureFromFileInMemoryEx().
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: a0840773f7ee00dc9373b4db825fec68d08ee53b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0840773f7ee00dc9373b4db… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Oct 25 20:30:54 2019 +0300 d3dx9: Don't pass usage flags for staging texture in D3DXCreateCubeTextureFromFileInMemoryEx(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47974 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/texture.c | 17 ++++++++++++----- dlls/d3dx9_36/texture.c | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 3416a3318b..3e4d5e5df9 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -2061,8 +2061,14 @@ static void test_D3DXCreateCubeTextureFromFileInMemory(IDirect3DDevice9 *device) static void test_D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *device) { - HRESULT hr; IDirect3DCubeTexture9 *cube_texture; + HRESULT hr; + + hr = D3DXCreateCubeTextureFromFileInMemoryEx(device, dds_cube_map, sizeof(dds_cube_map), D3DX_DEFAULT, + D3DX_DEFAULT, D3DUSAGE_RENDERTARGET, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, D3DX_DEFAULT, + D3DX_DEFAULT, 0, NULL, NULL, &cube_texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + IDirect3DCubeTexture9_Release(cube_texture); if (!is_autogenmipmap_supported(device, D3DRTYPE_CUBETEXTURE)) { @@ -2070,10 +2076,11 @@ static void test_D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic return; } - hr = D3DXCreateCubeTextureFromFileInMemoryEx(device, dds_cube_map, sizeof(dds_cube_map), D3DX_DEFAULT, D3DX_DEFAULT, - D3DUSAGE_DYNAMIC | D3DUSAGE_AUTOGENMIPMAP, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &cube_texture); - ok(hr == D3D_OK, "D3DXCreateCubeTextureFromFileInMemoryEx returned %#x, expected %#x.\n", hr, D3D_OK); - if (SUCCEEDED(hr)) IDirect3DCubeTexture9_Release(cube_texture); + hr = D3DXCreateCubeTextureFromFileInMemoryEx(device, dds_cube_map, sizeof(dds_cube_map), D3DX_DEFAULT, + D3DX_DEFAULT, D3DUSAGE_DYNAMIC | D3DUSAGE_AUTOGENMIPMAP, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, + D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &cube_texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + IDirect3DCubeTexture9_Release(cube_texture); } static void test_D3DXCreateVolumeTextureFromFileInMemory(IDirect3DDevice9 *device) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 6ee7d72e38..12cb2f3983 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1481,7 +1481,7 @@ HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *device, dynamic_texture = (caps.Caps2 & D3DCAPS2_DYNAMICTEXTURES) && (usage & D3DUSAGE_DYNAMIC); if (pool == D3DPOOL_DEFAULT && !dynamic_texture) { - hr = D3DXCreateCubeTexture(device, size, mip_levels, usage, format, D3DPOOL_SYSTEMMEM, &buftex); + hr = D3DXCreateCubeTexture(device, size, mip_levels, 0, format, D3DPOOL_SYSTEMMEM, &buftex); tex = buftex; } else

1 0

Matteo Bruni : d3dx9: Return an error if no fallback format is found.
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: fcdcd5d3cbb58a40894f661fd8a9285b81a55789 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcdcd5d3cbb58a40894f661f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 30 10:24:39 2019 +0100 d3dx9: Return an error if no fallback format is found. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/texture.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 12cb2f3983..736d11dfad 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -323,6 +323,11 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN bestfmt = curfmt; } } + if (!bestfmt) + { + hr = D3DERR_NOTAVAILABLE; + goto cleanup; + } fmt = bestfmt; hr = D3D_OK; }

1 0