January 2022 - Wine-Commits

Michael Stefaniuc : dmusic: Forward the synth port GetCaps to the synth method.
by Alexandre Julliard Jan. 26, 2022

Jan. 26, 2022

Module: wine Branch: master Commit: 57a7d8b54c76150ee2e5e365e339f117995b48d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57a7d8b54c76150ee2e5e365… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jan 25 23:11:25 2022 +0100 dmusic: Forward the synth port GetCaps to the synth method. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/port.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 490ff88059e..afdd0d7be63 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -38,7 +38,6 @@ struct synth_port { IDirectMusicSynth *synth; IDirectMusicSynthSink *synth_sink; BOOL active; - DMUS_PORTCAPS caps; DMUS_PORTPARAMS params; int nrofgroups; DMUSIC_PRIVATE_CHANNEL_GROUP group[1]; @@ -388,9 +387,7 @@ static HRESULT WINAPI synth_port_GetCaps(IDirectMusicPort *iface, DMUS_PORTCAPS TRACE("(%p/%p)->(%p)\n", iface, This, port_caps); - *port_caps = This->caps; - - return S_OK; + return IDirectMusicSynth_GetPortCaps(This->synth, port_caps); } static HRESULT WINAPI synth_port_DeviceIoControl(IDirectMusicPort *iface, DWORD io_control_code, @@ -808,7 +805,7 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param HRESULT hr = E_FAIL; int i; - TRACE("(%p, %p, %p)\n", port_params, port_caps, port); + TRACE("(%p, %p)\n", port_params, port); *port = NULL; @@ -824,7 +821,6 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param obj->parent = parent; obj->active = FALSE; obj->params = *port_params; - obj->caps = *port_caps; hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth, (void **)&obj->synth);

1 0

Michael Stefaniuc : dmsynth: Add error handling to the synth GetPortCaps method.
by Alexandre Julliard Jan. 26, 2022

Jan. 26, 2022

Module: wine Branch: master Commit: e835e143f0f2682ef05fe513a755e12df7835e6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e835e143f0f2682ef05fe513… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jan 25 23:11:24 2022 +0100 dmsynth: Add error handling to the synth GetPortCaps method. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/synth.c | 3 +++ dlls/dmsynth/tests/dmsynth.c | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 51b33e8df8d..f05f769761e 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -295,6 +295,9 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetPortCaps(IDirectMusicSynth8 *ifa TRACE("(%p)->(%p)\n", This, caps); + if (!caps || caps->dwSize < sizeof(*caps)) + return E_INVALIDARG; + *caps = This->caps; return S_OK; diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index e27d8abdb26..59ced1f0f21 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -64,6 +64,7 @@ static void test_dmsynth(void) KSPROPERTY property; ULONG value; ULONG bytes; + DMUS_PORTCAPS caps; hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth, (LPVOID*)&dmsynth); ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); @@ -146,6 +147,16 @@ static void test_dmsynth(void) ref_clock_synth = get_refcount(clock_synth); ok(ref_clock_synth > ref_clock_sink + 1, "Latency clock refcount didn't increase\n"); + /* GetPortCaps */ + hr = IDirectMusicSynth_GetPortCaps(dmsynth, NULL); + ok(hr == E_INVALIDARG, "GetPortCaps failed: %#x\n", hr); + memset(&caps, 0, sizeof(caps)); + hr = IDirectMusicSynth_GetPortCaps(dmsynth, &caps); + ok(hr == E_INVALIDARG, "GetPortCaps failed: %#x\n", hr); + caps.dwSize = sizeof(caps) + 1; + hr = IDirectMusicSynth_GetPortCaps(dmsynth, &caps); + ok(hr == S_OK, "GetPortCaps failed: %#x\n", hr); + if (control_synth) IDirectMusicSynth_Release(control_synth); if (control_sink)

1 0

Fabian Maurer : d3dcompiler/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 26, 2022

Jan. 26, 2022

Module: wine Branch: master Commit: cd7b14f1aeef115403f7a441f84a6204c9f9c827 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd7b14f1aeef115403f7a441… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jan 25 22:06:30 2022 +0100 d3dcompiler/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/asm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index e467cec9623..27f2c5b063d 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -1725,7 +1725,7 @@ static void test_disassemble_shader(void) HRESULT hr; hr = D3DDisassemble(vs_2_0, 0, 0, NULL, &blob); -todo_wine + todo_wine #if D3D_COMPILER_VERSION >= 46 ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); #else @@ -1733,7 +1733,7 @@ todo_wine #endif hr = D3DDisassemble(vs_2_0, sizeof(vs_2_0), 0, NULL, &blob); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ID3D10Blob_Release(blob);

1 0

Fabian Maurer : d2d1/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 26, 2022

Jan. 26, 2022

Module: wine Branch: master Commit: d2f7621f349a4f06731242afaa710299f65baacf URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2f7621f349a4f06731242af… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Jan 26 15:43:44 2022 +0100 d2d1/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 0228ae8d52b..b0aa02ad2a9 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4766,7 +4766,7 @@ static void test_shared_bitmap(BOOL d3d11) bitmap_desc.pixelFormat = bitmap_format_tests[i].original; hr = ID2D1RenderTarget_CreateSharedBitmap(rt2, &IID_IDXGISurface, surface2, &bitmap_desc, &bitmap2); - todo_wine_if(i == 2 || i == 3 || i == 5 || i == 6) + todo_wine_if(i == 2 || i == 3 || i == 5 || i == 6) ok(hr == bitmap_format_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); if (SUCCEEDED(bitmap_format_tests[i].hr)) @@ -5233,8 +5233,7 @@ static void test_draw_text_layout(BOOL d3d11) ID2D1RenderTarget_DrawTextLayout(rt, origin, text_layout, (ID2D1Brush*)brush, D2D1_DRAW_TEXT_OPTIONS_NONE); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); -todo_wine - ok(hr == D2DERR_WRONG_FACTORY, "Unexpected hr %#x.\n", hr); + todo_wine ok(hr == D2DERR_WRONG_FACTORY, "Got unexpected hr %#x.\n", hr); /* Effect is d2d resource, but not a brush. */ set_rect(&rect, 0.0f, 0.0f, 10.0f, 10.0f); @@ -5500,8 +5499,7 @@ static void test_dc_target(BOOL d3d11) /* Invalid DC. */ hr = ID2D1DCRenderTarget_BindDC(rt, (HDC)0xdeadbeef, &rect); -todo_wine - ok(hr == E_INVALIDARG, "BindDC() returned %#x.\n", hr); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); ID2D1DCRenderTarget_BeginDraw(rt); @@ -5512,8 +5510,7 @@ todo_wine ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); clr = GetPixel(hdc2, 0, 0); -todo_wine - ok(clr == RGB(255, 0, 0), "Unexpected color 0x%08x.\n", clr); + todo_wine ok(clr == RGB(255, 0, 0), "Got unexpected colour 0x%08x.\n", clr); hr = ID2D1DCRenderTarget_BindDC(rt, NULL, &rect); ok(hr == E_INVALIDARG, "BindDC() returned %#x.\n", hr); @@ -5527,8 +5524,7 @@ todo_wine ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); clr = GetPixel(hdc2, 0, 0); -todo_wine - ok(clr == RGB(0, 0, 255), "Unexpected color 0x%08x.\n", clr); + todo_wine ok(clr == RGB(0, 0, 255), "Got unexpected colour 0x%08x.\n", clr); DeleteDC(hdc); DeleteDC(hdc2); @@ -7884,8 +7880,7 @@ static void test_gdi_interop(BOOL d3d11) dc = (void *)0xdeadbeef; hr = ID2D1GdiInteropRenderTarget_GetDC(interop, D2D1_DC_INITIALIZE_MODE_COPY, &dc); ok(FAILED(hr), "GetDC() was expected to fail, hr %#x.\n", hr); -todo_wine - ok(dc == NULL, "Expected NULL dc, got %p.\n", dc); + todo_wine ok(!dc, "Got unexpected DC %p.\n", dc); ID2D1GdiInteropRenderTarget_Release(interop); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); @@ -7942,8 +7937,7 @@ todo_wine ID2D1RenderTarget_BeginDraw(rt); hr = IWICBitmap_Lock(wic_bitmap, NULL, WICBitmapLockRead, &wic_lock); -todo_wine - ok(hr == WINCODEC_ERR_ALREADYLOCKED, "Expected bitmap to be locked, hr %#x.\n", hr); + todo_wine ok(hr == WINCODEC_ERR_ALREADYLOCKED, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) IWICBitmapLock_Release(wic_lock); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); @@ -7954,8 +7948,7 @@ todo_wine ok(SUCCEEDED(hr), "Expected bitmap to be unlocked, hr %#x.\n", hr); ID2D1RenderTarget_BeginDraw(rt); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); -todo_wine - ok(hr == WINCODEC_ERR_ALREADYLOCKED, "Unexpected hr %#x.\n", hr); + todo_wine ok(hr == WINCODEC_ERR_ALREADYLOCKED, "Got unexpected hr %#x.\n", hr); IWICBitmapLock_Release(wic_lock); ID2D1GdiInteropRenderTarget_Release(interop); @@ -8460,7 +8453,7 @@ static void test_bitmap_surface(BOOL d3d11) bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(device_context, ctx.surface, &bitmap_desc, &bitmap); - todo_wine_if(bitmap_format_tests[i].hr == WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT) + todo_wine_if(bitmap_format_tests[i].hr == WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT) ok(hr == bitmap_format_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); if (SUCCEEDED(bitmap_format_tests[i].hr)) @@ -8716,8 +8709,7 @@ static void test_device_context(BOOL d3d11) ok(options == (D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW), "Unexpected bitmap options %#x.\n", options); hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); -todo_wine - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); ID2D1Bitmap1_Release(bitmap); ID2D1DeviceContext_SetTarget(device_context, NULL); @@ -8982,8 +8974,7 @@ static void test_command_list(BOOL d3d11) ok(device_context != NULL, "Failed to create device context.\n"); hr = ID2D1DeviceContext_CreateCommandList(device_context, &command_list); -todo_wine - ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); if (FAILED(hr)) {

1 0

Eric Pouech : find: Use correct integral type.
by Alexandre Julliard Jan. 26, 2022

Jan. 26, 2022

Module: wine Branch: master Commit: 5a714bd99e57eec23d18848fdc216b526a1eb40a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a714bd99e57eec23d18848f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Jan 26 08:43:52 2022 +0100 find: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/find/find.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/find/find.c b/programs/find/find.c index 7d178874b4d..5b86325d1c2 100644 --- a/programs/find/find.c +++ b/programs/find/find.c @@ -29,8 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(find); static BOOL read_char_from_handle(HANDLE handle, char *char_out) { static char buffer[4096]; - static UINT buffer_max = 0; - static UINT buffer_pos = 0; + static DWORD buffer_max = 0; + static DWORD buffer_pos = 0; /* Read next content into buffer */ if (buffer_pos >= buffer_max)

1 0

Fabian Maurer : d3dx9_36/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 26, 2022

Jan. 26, 2022

Module: wine Branch: master Commit: fc503ab07d65112a21126d01b378b7e05249a3b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc503ab07d65112a21126d01… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jan 25 22:06:32 2022 +0100 d3dx9_36/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/texture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 9e2c999c5f2..e8a57fc609e 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -2469,7 +2469,7 @@ float4 main(float3 pos : POSITION, float3 size : PSIZE) : COLOR /* Constant buffer */ hr = tx->lpVtbl->GetConstantBuffer(tx, &buffer); -todo_wine + todo_wine ok(SUCCEEDED(hr), "Failed to get texture shader constant buffer.\n"); if (FAILED(hr)) { @@ -2650,7 +2650,7 @@ todo_wine ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); hr = tx->lpVtbl->GetConstantBuffer(tx, &buffer); -todo_wine + todo_wine ok(SUCCEEDED(hr), "Failed to get texture shader constant buffer.\n"); if (FAILED(hr)) {

1 0

Eric Pouech : progman: Use correct integral type.
by Alexandre Julliard Jan. 26, 2022

Jan. 26, 2022

Module: wine Branch: master Commit: 268ede1e62b18cf2a4896c66ad60a7d7df97c420 URL: https://source.winehq.org/git/wine.git/?a=commit;h=268ede1e62b18cf2a4896c66… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Jan 26 08:44:44 2022 +0100 progman: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/progman/grpfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/progman/grpfile.c b/programs/progman/grpfile.c index f3a084d290a..62cc1172fad 100644 --- a/programs/progman/grpfile.c +++ b/programs/progman/grpfile.c @@ -511,7 +511,7 @@ static BOOL GRPFILE_DoWriteGroupFile(HFILE file, PROGGROUP *group) HLOCAL hProgram; INT NumProg, Title, Progs, Icons, Extension; INT CurrProg, CurrIcon, nCmdShow, ptr, seqnum; - DWORD sizeAnd, sizeXor; + UINT sizeAnd, sizeXor; BOOL need_extension; LPCSTR lpszTitle = LocalLock(group->hName);

1 0

Eric Pouech : rpcss: Use correct integral type.
by Alexandre Julliard Jan. 26, 2022

Jan. 26, 2022

Module: wine Branch: master Commit: b5a3848ee752d02c2534d6639526995ed07dd4d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5a3848ee752d02c2534d663… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Jan 26 08:46:29 2022 +0100 rpcss: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/rpcss/rpcss_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/rpcss/rpcss_main.c b/programs/rpcss/rpcss_main.c index af055e6000a..99b4020882b 100644 --- a/programs/rpcss/rpcss_main.c +++ b/programs/rpcss/rpcss_main.c @@ -56,7 +56,7 @@ HRESULT __cdecl irpcss_server_register(handle_t h, const GUID *clsid, unsigned i PMInterfacePointer object, unsigned int *cookie) { struct registered_class *entry; - static int next_cookie; + static LONG next_cookie; if (!(entry = heap_alloc_zero(sizeof(*entry)))) return E_OUTOFMEMORY;

1 0

Fabian Maurer : dwrite/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 26, 2022

Jan. 26, 2022

Module: wine Branch: master Commit: ddb315bfd274ac806ba395fa14a1c0981fb83bf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddb315bfd274ac806ba395fa… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jan 25 22:06:34 2022 +0100 dwrite/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 50 +++++++++++++++++++++++----------------------- dlls/dwrite/tests/layout.c | 26 ++++++++++++------------ 2 files changed, 38 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ddb315bfd274ac806ba3…

1 0

Fabian Maurer : comdlg32/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 26, 2022

Jan. 26, 2022

Module: wine Branch: master Commit: c5c5da6249780b6c18a1ad850078d59b6ca72e8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5c5da6249780b6c18a1ad85… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Jan 25 22:06:25 2022 +0100 comdlg32/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/tests/filedlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 165b5cd8bdc..142eb371a46 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -467,7 +467,7 @@ static UINT_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L break; /* todo_wine: non moving non sizing controls */ case lst1: -todo_wine + todo_wine ok( TESTRECTS( rc, ctrlrcs[i], 0, 0, 0, 0), "control id %03x was moved/resized, before %s after %s\n", ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ),

1 0