November 2019 - wine-commits

Paul Gofman : d3dx9: Implement recording parameters to parameter block.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: 7d512a1e0ef58fad25e53af5316d445cb0cfc5e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d512a1e0ef58fad25e53af5… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Nov 20 17:50:11 2019 +0100 d3dx9: Implement recording parameters to parameter block. 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/effect.c | 241 +++++++++++++++++++++++++++++++------------ dlls/d3dx9_36/tests/effect.c | 38 +++++-- 2 files changed, 204 insertions(+), 75 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7d512a1e0ef58fad25e5…

1 0

Alistair Leslie-Hughes : dmloader: ScanDirectory doesn't specify the full path.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: 9da70c07584be4dd7bf7a38ebd5140312234cdb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9da70c07584be4dd7bf7a38e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 20 02:50:07 2019 +0000 dmloader: ScanDirectory doesn't specify the full path. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 9120abec53..0da8323e7e 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -608,7 +608,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_ScanDirectory(IDirectMusicLoader8 * do { DMUS_OBJECTDESC Desc; DM_STRUCT_INIT(&Desc); - Desc.dwValidData = DMUS_OBJ_CLASS | DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH | DMUS_OBJ_DATE; + Desc.dwValidData = DMUS_OBJ_CLASS | DMUS_OBJ_FILENAME | DMUS_OBJ_DATE; Desc.guidClass = *rguidClass; lstrcpyW (Desc.wszFileName, FileData.cFileName); FileTimeToLocalFileTime (&FileData.ftCreationTime, &Desc.ftDate);

1 0

Nikolay Sivov : wincodecs: Remove unused function.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: 544fd5b94299cb848db290ed6c1b37bf60fa4bf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=544fd5b94299cb848db290ed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 19 10:42:57 2019 +0300 wincodecs: Remove unused function. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/bitmap.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c index b517603456..3d7d775b34 100644 --- a/dlls/windowscodecs/bitmap.c +++ b/dlls/windowscodecs/bitmap.c @@ -80,11 +80,6 @@ static inline BitmapImpl *impl_from_IMILUnknown1(IMILUnknown1 *iface) return CONTAINING_RECORD(iface, BitmapImpl, IMILUnknown1_iface); } -static inline BitmapImpl *impl_from_IMILUnknown2(IMILUnknown2 *iface) -{ - return CONTAINING_RECORD(iface, BitmapImpl, IMILUnknown2_iface); -} - static inline BitmapLockImpl *impl_from_IWICBitmapLock(IWICBitmapLock *iface) { return CONTAINING_RECORD(iface, BitmapLockImpl, IWICBitmapLock_iface);

1 0

Paul Gofman : d3d9/tests: Test degenerate viewport Z ranges.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: dfb6fc64a0f8b2cf46b85b1ddac19fc63ba14deb URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfb6fc64a0f8b2cf46b85b1d… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Nov 19 11:27:10 2019 +0300 d3d9/tests: Test degenerate viewport Z ranges. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 86 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 57 insertions(+), 29 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index dfb9ea3cce..4f063d21fb 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -4931,7 +4931,8 @@ done: DestroyWindow(window); } -static void check_rect(struct surface_readback *rb, RECT r, const char *message) +#define check_rect(a, b, c) check_rect_(__LINE__, a, b, c) +static void check_rect_(unsigned int line, struct surface_readback *rb, RECT r, const char *message) { LONG x_coords[2][2] = { @@ -4965,7 +4966,7 @@ static void check_rect(struct surface_readback *rb, RECT r, const char *message) if (!all_match) break; } - ok(all_match, "%s: pixel (%d, %d) has color %08x.\n", message, x, y, color); + ok_(__FILE__, line)(all_match, "%s: pixel (%d, %d) has color %08x.\n", message, x, y, color); return; } @@ -4984,7 +4985,7 @@ static void check_rect(struct surface_readback *rb, RECT r, const char *message) if (x < 0 || x >= 640 || y < 0 || y >= 480) continue; color = get_readback_color(rb, x, y); - ok(color == expected, "%s: pixel (%d, %d) has color %08x, expected %08x.\n", + ok_(__FILE__, line)(color == expected, "%s: pixel (%d, %d) has color %08x, expected %08x.\n", message, x, y, color, expected); } } @@ -14358,28 +14359,32 @@ static void test_viewport(void) static const struct { D3DVIEWPORT9 vp; + float expected_z; RECT expected_rect; const char *message; } tests[] = { - {{ 0, 0, 640, 480}, { 0, 120, 479, 359}, "Viewport (0, 0) - (640, 480)"}, - {{ 0, 0, 320, 240}, { 0, 60, 239, 179}, "Viewport (0, 0) - (320, 240)"}, - {{ 0, 0, 1280, 960}, { 0, 240, 639, 479}, "Viewport (0, 0) - (1280, 960)"}, - {{ 0, 0, 2000, 1600}, { 0, 400, 639, 479}, "Viewport (0, 0) - (2000, 1600)"}, - {{100, 100, 640, 480}, {100, 220, 579, 459}, "Viewport (100, 100) - (640, 480)"}, - {{ 0, 0, 8192, 8192}, {-10, -10, -10, -10}, "Viewport (0, 0) - (8192, 8192)"}, + {{ 0, 0, 640, 480}, 0.001f, { 0, 120, 479, 359}, "Viewport (0, 0) - (640, 480)"}, + {{ 0, 0, 640, 480, 0.5f, 0.0f}, 0.501f, + { 0, 120, 479, 359}, "Viewport (0, 0, 0.5) - (640, 480, 0.0)"}, + {{ 0, 0, 320, 240}, 0.001f, { 0, 60, 239, 179}, "Viewport (0, 0) - (320, 240)"}, + {{ 0, 0, 1280, 960}, 0.001f, { 0, 240, 639, 479}, "Viewport (0, 0) - (1280, 960)"}, + {{ 0, 0, 2000, 1600}, 0.001f, { 0, 400, 639, 479}, "Viewport (0, 0) - (2000, 1600)"}, + {{100, 100, 640, 480}, 0.001f, {100, 220, 579, 459}, "Viewport (100, 100) - (640, 480)"}, + {{ 0, 0, 8192, 8192}, 0.001f, {-10, -10, -10, -10}, "Viewport (0, 0) - (8192, 8192)"}, /* AMD HD 2600 on XP draws nothing visible for this one. */ /* {{ 0, 0, 8192, 480}, {-10, -10, -1, -1}, "(0, 0) - (8192, 480) viewport"}, */ }; static const struct vec3 quad[] = { - {-1.5f, -0.5f, 0.1f}, - {-1.5f, 0.5f, 0.1f}, - { 0.5f, -0.5f, 0.1f}, - { 0.5f, 0.5f, 0.1f}, + {-1.5f, -0.5f, 1.0f}, + {-1.5f, 0.5f, 1.0f}, + { 0.5f, -0.5f, 1.0f}, + { 0.5f, 0.5f, 1.0f}, }; IDirect3DSurface9 *backbuffer; + const float z_eps = 0.0001; struct surface_readback rb; IDirect3DDevice9 *device; BOOL draw_succeeded; @@ -14399,13 +14404,15 @@ static void test_viewport(void) } hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); - ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); - ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, TRUE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); - ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* This crashes on Windows. */ if (0) @@ -14413,26 +14420,47 @@ static void test_viewport(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff000000, 1.0f, 0); - ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff000000, + tests[i].expected_z - z_eps, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetViewport(device, &tests[i].vp); - ok(SUCCEEDED(hr), "Failed to set the viewport, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZFUNC, D3DCMP_GREATER); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[0])); - ok(SUCCEEDED(hr) || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); - draw_succeeded = SUCCEEDED(hr); + ok(hr == D3D_OK || broken(hr == D3DERR_INVALIDCALL), "Got unexpected hr %#x.\n", hr); + draw_succeeded = hr == D3D_OK; hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - if (draw_succeeded) - { - get_rt_readback(backbuffer, &rb); - check_rect(&rb, tests[i].expected_rect, tests[i].message); - release_surface_readback(&rb); - } + if (!draw_succeeded) + continue; + + get_rt_readback(backbuffer, &rb); + check_rect(&rb, tests[i].expected_rect, tests[i].message); + release_surface_readback(&rb); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff000000, + tests[i].expected_z + z_eps, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZFUNC, D3DCMP_LESS); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[0])); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + get_rt_readback(backbuffer, &rb); + check_rect(&rb, tests[i].expected_rect, tests[i].message); + release_surface_readback(&rb); } hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);

1 0

Paul Gofman : wined3d: Handle degenerate viewport Z ranges.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: 8eab6d45020701b61cf2773305977b7b99b22e73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8eab6d45020701b61cf27733… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Nov 19 11:27:09 2019 +0300 wined3d: Handle degenerate viewport Z ranges. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48104 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 191 +++++++++++++++++++++++++++++------------ dlls/wined3d/device.c | 7 +- dlls/wined3d/state.c | 15 ++-- dlls/wined3d/wined3d_private.h | 8 ++ 4 files changed, 159 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8eab6d45020701b61cf2…

1 0

Zebediah Figura : d3d8: Track the viewport and scissor rect in the primary stateblock.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: 9d4eb5ef8c296265c3b552011e886635da52f532 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d4eb5ef8c296265c3b55201… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 18 19:08:01 2019 -0600 d3d8: Track the viewport and scissor rect in the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 17d8a726c7..e85fd72d02 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -530,6 +530,17 @@ static void *d3d8_get_object(struct d3d8_handle_table *t, DWORD handle, enum d3d return entry->object; } +static void device_reset_viewport_state(struct d3d8_device *device) +{ + struct wined3d_viewport vp; + RECT rect; + + wined3d_device_get_viewports(device->wined3d_device, NULL, &vp); + wined3d_stateblock_set_viewport(device->state, &vp); + wined3d_device_get_scissor_rects(device->wined3d_device, NULL, &rect); + wined3d_stateblock_set_scissor_rect(device->state, &rect); +} + static HRESULT WINAPI d3d8_device_QueryInterface(IDirect3DDevice8 *iface, REFIID riid, void **out) { TRACE("iface %p, riid %s, out %p.\n", @@ -928,6 +939,7 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); + device_reset_viewport_state(device); device->device_state = D3D8_DEVICE_STATE_OK; } else @@ -1473,8 +1485,13 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, if (SUCCEEDED(hr)) { rtv = render_target ? d3d8_surface_acquire_rendertarget_view(rt_impl) : NULL; - if (render_target && FAILED(hr = wined3d_device_set_rendertarget_view(device->wined3d_device, 0, rtv, TRUE))) - wined3d_device_set_depth_stencil_view(device->wined3d_device, original_dsv); + if (render_target) + { + if (SUCCEEDED(hr = wined3d_device_set_rendertarget_view(device->wined3d_device, 0, rtv, TRUE))) + device_reset_viewport_state(device); + else + wined3d_device_set_depth_stencil_view(device->wined3d_device, original_dsv); + } d3d8_surface_release_rendertarget_view(rt_impl, rtv); } @@ -3719,6 +3736,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); + device_reset_viewport_state(device); wined3d_mutex_unlock(); present_parameters_from_wined3d_swapchain_desc(parameters,

1 0

Zebediah Figura : d3d9: Track the viewport and scissor rect in the primary stateblock.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: 064d830fb7c92f89f59852651382aa3b633bffc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=064d830fb7c92f89f5985265… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 18 19:08:00 2019 -0600 d3d9: Track the viewport and scissor rect in the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5ef0c9cdf6..76fddc59f1 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -522,6 +522,17 @@ void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d } } +static void device_reset_viewport_state(struct d3d9_device *device) +{ + struct wined3d_viewport vp; + RECT rect; + + wined3d_device_get_viewports(device->wined3d_device, NULL, &vp); + wined3d_stateblock_set_viewport(device->state, &vp); + wined3d_device_get_scissor_rects(device->wined3d_device, NULL, &rect); + wined3d_stateblock_set_scissor_rect(device->state, &rect); +} + static HRESULT WINAPI d3d9_device_QueryInterface(IDirect3DDevice9Ex *iface, REFIID riid, void **out) { TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); @@ -1011,6 +1022,7 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, !!swapchain_desc.enable_auto_depth_stencil); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); + device_reset_viewport_state(device); } if (FAILED(hr = d3d9_device_get_swapchains(device))) @@ -1902,7 +1914,11 @@ static HRESULT WINAPI d3d9_device_SetRenderTarget(IDirect3DDevice9Ex *iface, DWO hr = wined3d_device_set_rendertarget_view(device->wined3d_device, idx, rtv, TRUE); d3d9_surface_release_rendertarget_view(surface_impl, rtv); if (SUCCEEDED(hr)) + { + if (!idx) + device_reset_viewport_state(device); device->render_targets[idx] = surface_impl; + } wined3d_mutex_unlock(); return hr; @@ -4636,6 +4652,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine !!swapchain_desc->enable_auto_depth_stencil); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc->enable_auto_depth_stencil); + device_reset_viewport_state(device); if (FAILED(hr = d3d9_device_get_swapchains(device))) {

1 0

Matteo Bruni : ddraw/tests: Fix a few typos.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: 39961536d41e6da051a3970d469330196c7c5c65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39961536d41e6da051a3970d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Nov 18 17:35:19 2019 +0100 ddraw/tests: Fix a few typos. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 64c03c87d0..fa65d0e722 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5083,7 +5083,7 @@ static void test_surface_attachment(void) hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) - IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface3); + IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface2); hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); hr = IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface3); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 77c8e32e6b..541362c748 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6094,7 +6094,7 @@ static void test_surface_attachment(void) hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) - IDirectDrawSurface2_DeleteAttachedSurface(surface1, 0, surface3); + IDirectDrawSurface2_DeleteAttachedSurface(surface1, 0, surface2); hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); hr = IDirectDrawSurface2_DeleteAttachedSurface(surface1, 0, surface3); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index df20ccb09d..e61d67d723 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7624,7 +7624,7 @@ static void test_surface_attachment(void) hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) - IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface3); + IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface2); hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); hr = IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface3); @@ -16622,7 +16622,7 @@ static void test_surface_format_conversion_alpha(void) {16}, {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000} }, "R5G6B5", 2, 4, 4, 0, TRUE, - /* Looks broken for sysmem texture convertions on Windows (at + /* Looks broken for sysmem texture conversions on Windows (at * least with hardware device), the result is either error from * _Blt() or a copy of the source data without any conversion. */ }, diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 7c46f33cb7..c1db7b2df6 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7496,7 +7496,7 @@ static void test_surface_attachment(void) hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) - IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface3); + IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface2); hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); hr = IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface3); @@ -16593,7 +16593,7 @@ static void test_surface_format_conversion_alpha(void) {16}, {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000} }, "R5G6B5", 2, 4, 4, 0, TRUE, - /* Looks broken for sysmem texture convertions on Windows (at + /* Looks broken for sysmem texture conversions on Windows (at * least with hardware device), the result is either error from * _Blt() or a copy of the source data without any conversion. */ },

1 0

Alexandre Julliard : kernel32: Move the locale registry setup to kernelbase.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: 35ea9cd99ac06b9b8711840c4ae704a3ec7eb91f URL: https://source.winehq.org/git/wine.git/?a=commit;h=35ea9cd99ac06b9b8711840c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 20 22:46:44 2019 +0100 kernel32: Move the locale registry setup to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel_main.c | 3 - dlls/kernel32/kernel_private.h | 1 - dlls/kernel32/locale.c | 147 ---------------------------------------- dlls/kernelbase/kernelbase.h | 2 +- dlls/kernelbase/locale.c | 149 +++++++++++++++++++++++++++++++++++------ dlls/kernelbase/main.c | 3 +- 6 files changed, 130 insertions(+), 175 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=35ea9cd99ac06b9b8711…

1 0

Alexandre Julliard : kernel32: Get the initial locales from ntdll.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: ed09f37ceffdb7bbccb594d7ff4b7011dd04e23e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed09f37ceffdb7bbccb594d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 20 20:00:29 2019 +0100 kernel32: Get the initial locales from ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 652 ++----------------------------------------------- 1 file changed, 16 insertions(+), 636 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ed09f37ceffdb7bbccb5…

1 0

Alexandre Julliard : ntdll: Initialize the system and user locales directly in ntdll.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: f1bfd2c0b11844b9d50905d5c424c71473f281da URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1bfd2c0b11844b9d50905d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 20 09:56:25 2019 +0100 ntdll: Initialize the system and user locales directly in ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 4 -- dlls/ntdll/locale.c | 162 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 162 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index b2a5831a9e..4126589220 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3555,10 +3555,6 @@ void LOCALE_Init(void) setup_unix_locales(); if (!lcid_LC_MESSAGES) lcid_LC_MESSAGES = lcid_LC_CTYPE; - NtSetDefaultUILanguage( LANGIDFROMLCID(lcid_LC_MESSAGES) ); - NtSetDefaultLocale( TRUE, lcid_LC_MESSAGES ); - NtSetDefaultLocale( FALSE, lcid_LC_CTYPE ); - ansi_cp = get_lcid_codepage( LOCALE_USER_DEFAULT ); GetLocaleInfoW( LOCALE_USER_DEFAULT, LOCALE_IDEFAULTMACCODEPAGE | LOCALE_RETURN_NUMBER, (LPWSTR)&mac_cp, sizeof(mac_cp)/sizeof(WCHAR) ); diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 73f72b1986..27e38d6e40 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -27,6 +27,11 @@ #include <string.h> #include <stdlib.h> +#ifdef __APPLE__ +# include <CoreFoundation/CFLocale.h> +# include <CoreFoundation/CFString.h> +#endif + #include "ntstatus.h" #define WIN32_NO_STATUS #include "ntdll_misc.h" @@ -165,10 +170,167 @@ void init_unix_codepage(void) { } #endif /* __APPLE__ || __ANDROID__ */ +/* Unix format is: lang[_country][.charset][@modifier] + * Windows format is: lang[-script][-country][_modifier] */ +static LCID unix_locale_to_lcid( const char *unix_name ) +{ + static const WCHAR sepW[] = {'_','.','@',0}; + static const WCHAR posixW[] = {'P','O','S','I','X',0}; + static const WCHAR cW[] = {'C',0}; + static const WCHAR euroW[] = {'e','u','r','o',0}; + static const WCHAR latinW[] = {'l','a','t','i','n',0}; + static const WCHAR latnW[] = {'-','L','a','t','n',0}; + WCHAR buffer[LOCALE_NAME_MAX_LENGTH], win_name[LOCALE_NAME_MAX_LENGTH]; + WCHAR *p, *country = NULL, *modifier = NULL; + LCID lcid; + + if (!unix_name || !unix_name[0] || !strcmp( unix_name, "C" )) + { + unix_name = getenv( "LC_ALL" ); + if (!unix_name || !unix_name[0]) return 0; + } + + if (ntdll_umbstowcs( 0, unix_name, strlen(unix_name) + 1, buffer, ARRAY_SIZE(buffer) ) < 0) return 0; + + if (!(p = strpbrkW( buffer, sepW ))) + { + if (!strcmpW( buffer, posixW ) || !strcmpW( buffer, cW )) + return MAKELCID( MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT), SORT_DEFAULT ); + strcpyW( win_name, buffer ); + } + else + { + if (*p == '_') + { + *p++ = 0; + country = p; + p = strpbrkW( p, sepW + 1 ); + } + if (p && *p == '.') + { + *p++ = 0; + /* charset, ignore */ + p = strchrW( p, '@' ); + } + if (p) + { + *p++ = 0; + modifier = p; + } + } + + /* rebuild a Windows name */ + + strcpyW( win_name, buffer ); + if (modifier) + { + if (!strcmpW( modifier, latinW )) strcatW( win_name, latnW ); + else if (!strcmpW( modifier, euroW )) {} /* ignore */ + else return 0; + } + if (country) + { + p = win_name + strlenW(win_name); + *p++ = '-'; + strcpyW( p, country ); + } + + if (!RtlLocaleNameToLcid( win_name, &lcid, 0 )) return lcid; + + /* try neutral name */ + if (country) + { + p[-1] = 0; + if (!RtlLocaleNameToLcid( win_name, &lcid, 2 )) + { + if (SUBLANGID(lcid) == SUBLANG_NEUTRAL) + lcid = MAKELANGID( PRIMARYLANGID(lcid), SUBLANG_DEFAULT ); + return lcid; + } + } + return 0; +} + +/****************************************************************** + * init_locale + */ void init_locale( HMODULE module ) { + LCID system_lcid, user_lcid; + kernel32_handle = module; + + setlocale( LC_ALL, "" ); + + system_lcid = unix_locale_to_lcid( setlocale( LC_CTYPE, NULL )); + user_lcid = unix_locale_to_lcid( setlocale( LC_MESSAGES, NULL )); + +#ifdef __APPLE__ + if (!system_lcid) + { + char buffer[LOCALE_NAME_MAX_LENGTH]; + + CFLocaleRef locale = CFLocaleCopyCurrent(); + CFStringRef lang = CFLocaleGetValue( locale, kCFLocaleLanguageCode ); + CFStringRef country = CFLocaleGetValue( locale, kCFLocaleCountryCode ); + CFStringRef locale_string; + + if (country) + locale_string = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@_%@"), lang, country); + else + locale_string = CFStringCreateCopy(NULL, lang); + + CFStringGetCString(locale_string, buffer, sizeof(buffer), kCFStringEncodingUTF8); + system_lcid = unix_locale_to_lcid( buffer ); + CFRelease(locale); + CFRelease(locale_string); + } + if (!user_lcid) + { + /* Retrieve the preferred language as chosen in System Preferences. */ + char buffer[LOCALE_NAME_MAX_LENGTH]; + CFArrayRef preferred_langs = CFLocaleCopyPreferredLanguages(); + if (preferred_langs && CFArrayGetCount( preferred_langs )) + { + CFStringRef preferred_lang = CFArrayGetValueAtIndex( preferred_langs, 0 ); + CFDictionaryRef components = CFLocaleCreateComponentsFromLocaleIdentifier( NULL, preferred_lang ); + if (components) + { + CFStringRef lang = CFDictionaryGetValue( components, kCFLocaleLanguageCode ); + CFStringRef country = CFDictionaryGetValue( components, kCFLocaleCountryCode ); + CFLocaleRef locale = NULL; + CFStringRef locale_string; + + if (!country) + { + locale = CFLocaleCopyCurrent(); + country = CFLocaleGetValue( locale, kCFLocaleCountryCode ); + } + if (country) + locale_string = CFStringCreateWithFormat( NULL, NULL, CFSTR("%@_%@"), lang, country ); + else + locale_string = CFStringCreateCopy( NULL, lang ); + CFStringGetCString( locale_string, buffer, sizeof(buffer), kCFStringEncodingUTF8 ); + CFRelease( locale_string ); + if (locale) CFRelease( locale ); + CFRelease( components ); + user_lcid = unix_locale_to_lcid( buffer ); + } + } + if (preferred_langs) CFRelease( preferred_langs ); + } +#endif + + if (!system_lcid) system_lcid = MAKELCID( MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT), SORT_DEFAULT ); + if (!user_lcid) user_lcid = system_lcid; + + NtSetDefaultUILanguage( LANGIDFROMLCID(user_lcid) ); + NtSetDefaultLocale( TRUE, user_lcid ); + NtSetDefaultLocale( FALSE, system_lcid ); + TRACE( "system=%04x user=%04x\n", system_lcid, user_lcid ); + + setlocale( LC_NUMERIC, "C" ); /* FIXME: oleaut32 depends on this */ }

1 0

Alexandre Julliard : ntdll: Fix counting of environment strings.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: 599deed91cc6a91fa83072ac21d8516a4647e174 URL: https://source.winehq.org/git/wine.git/?a=commit;h=599deed91cc6a91fa83072ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 20 16:24:49 2019 +0100 ntdll: Fix counting of environment strings. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48141 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 6c7ca1e499..79a1805618 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -526,7 +526,7 @@ char **build_envp( const WCHAR *envW ) if (!(env = RtlAllocateHeap( GetProcessHeap(), 0, length ))) return NULL; ntdll_wcstoumbs( 0, envW, lenW, env, length, NULL, NULL ); - for (p = env; *p; p += strlen(p) + 1) + for (p = env; *p; p += strlen(p) + 1, count++) if (is_special_env_var( p )) length += 4; /* prefix it with "WINE" */ for (i = 0; i < ARRAY_SIZE( unix_vars ); i++)

1 0

Nikolay Sivov : strmbase: Remove unused function.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: 462d8ae419b7d9944ddaae1e411612e8fd961f36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=462d8ae419b7d9944ddaae1e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 19 10:35:01 2019 +0300 strmbase: Remove unused function. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/transform.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index e567804ba3..12a99eef67 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -29,11 +29,6 @@ static const WCHAR wcsOutputPinName[] = {'O','u','t',0}; static const IPinVtbl TransformFilter_InputPin_Vtbl; static const IPinVtbl TransformFilter_OutputPin_Vtbl; -static inline TransformFilter *impl_from_IBaseFilter( IBaseFilter *iface ) -{ - return CONTAINING_RECORD(iface, TransformFilter, filter.IBaseFilter_iface); -} - static inline TransformFilter *impl_from_strmbase_filter(struct strmbase_filter *iface) { return CONTAINING_RECORD(iface, TransformFilter, filter);

1 0

Zebediah Figura : qedit/samplegrabber: Reimplement the sink pin over the strmbase sink.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: 95f33d68d38d38bca3271472c3a9e3f836742a7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=95f33d68d38d38bca3271472… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 19 20:18:03 2019 -0600 qedit/samplegrabber: Reimplement the sink pin over the strmbase sink. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 535 +++++++-------------------------------- dlls/qedit/tests/samplegrabber.c | 3 +- 2 files changed, 88 insertions(+), 450 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=95f33d68d38d38bca327…

1 0

Zebediah Figura : strmbase: Get rid of the BaseInputPinFuncTable typedef.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: e438824ab33e42aeaff3f765f436d7fc8682d806 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e438824ab33e42aeaff3f765… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 19 20:18:02 2019 -0600 strmbase: Get rid of the BaseInputPinFuncTable typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 4 ++-- dlls/qcap/avimux.c | 5 ++--- dlls/qcap/smartteefilter.c | 5 ++--- dlls/strmbase/pin.c | 2 +- dlls/strmbase/renderer.c | 4 ++-- dlls/strmbase/transform.c | 4 ++-- include/wine/strmbase.h | 9 +++++---- 7 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 9b32ddb336..1cbeb70f03 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -499,7 +499,7 @@ static HRESULT WINAPI AVICompressorIn_Receive(struct strmbase_sink *base, IMedia return hres; } -static const BaseInputPinFuncTable AVICompressorBaseInputPinVtbl = +static const struct strmbase_sink_ops sink_ops = { .base.pin_query_accept = sink_query_accept, .base.pin_get_media_type = strmbase_pin_get_media_type, @@ -597,7 +597,7 @@ IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr) compressor->IPersistPropertyBag_iface.lpVtbl = &PersistPropertyBagVtbl; strmbase_sink_init(&compressor->sink, &AVICompressorInputPinVtbl, - &compressor->filter, sink_name, &AVICompressorBaseInputPinVtbl, NULL); + &compressor->filter, sink_name, &sink_ops, NULL); strmbase_source_init(&compressor->source, &AVICompressorOutputPinVtbl, &compressor->filter, source_name, &source_ops); diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 0e162dfcde..51a1a503af 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1483,7 +1483,7 @@ static HRESULT WINAPI AviMuxIn_Receive(struct strmbase_sink *base, IMediaSample return hr; } -static const BaseInputPinFuncTable AviMuxIn_BaseInputFuncTable = +static const struct strmbase_sink_ops sink_ops = { .base.pin_query_accept = sink_query_accept, .base.pin_get_media_type = strmbase_pin_get_media_type, @@ -1944,8 +1944,7 @@ static HRESULT create_input_pin(AviMux *avimux) if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - strmbase_sink_init(&object->pin, &AviMuxIn_PinVtbl, &avimux->filter, name, - &AviMuxIn_BaseInputFuncTable, NULL); + strmbase_sink_init(&object->pin, &AviMuxIn_PinVtbl, &avimux->filter, name, &sink_ops, NULL); object->pin.IMemInputPin_iface.lpVtbl = &AviMuxIn_MemInputPinVtbl; object->IAMStreamControl_iface.lpVtbl = &AviMuxIn_AMStreamControlVtbl; object->IPropertyBag_iface.lpVtbl = &AviMuxIn_PropertyBagVtbl; diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index be19fd5c09..e3740bed13 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -285,7 +285,7 @@ static HRESULT WINAPI SmartTeeFilterInput_Receive(struct strmbase_sink *base, IM return hrPreview; } -static const BaseInputPinFuncTable SmartTeeFilterInputFuncs = +static const struct strmbase_sink_ops sink_ops = { .base.pin_query_accept = sink_query_accept, .base.pin_get_media_type = sink_get_media_type, @@ -418,8 +418,7 @@ IUnknown* WINAPI QCAP_createSmartTeeFilter(IUnknown *outer, HRESULT *phr) memset(object, 0, sizeof(*object)); strmbase_filter_init(&object->filter, &SmartTeeFilterVtbl, outer, &CLSID_SmartTee, &filter_ops); - strmbase_sink_init(&object->sink, &SmartTeeFilterInputVtbl, &object->filter, - inputW, &SmartTeeFilterInputFuncs, NULL); + strmbase_sink_init(&object->sink, &SmartTeeFilterInputVtbl, &object->filter, inputW, &sink_ops, NULL); hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (void **)&object->sink.pAllocator); if (FAILED(hr)) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 39512c066b..92a2fe55b9 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -1001,7 +1001,7 @@ static const IMemInputPinVtbl MemInputPin_Vtbl = }; void strmbase_sink_init(struct strmbase_sink *pin, const IPinVtbl *vtbl, struct strmbase_filter *filter, - const WCHAR *name, const BaseInputPinFuncTable *func_table, IMemAllocator *allocator) + const WCHAR *name, const struct strmbase_sink_ops *func_table, IMemAllocator *allocator) { memset(pin, 0, sizeof(*pin)); pin->pin.IPin_iface.lpVtbl = vtbl; diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 2e8566b064..0c33b5ea84 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -302,7 +302,7 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp return BaseRendererImpl_Receive(filter, sample); } -static const BaseInputPinFuncTable input_BaseInputFuncTable = +static const struct strmbase_sink_ops sink_ops = { .base.pin_query_accept = sink_query_accept, .base.pin_query_interface = sink_query_interface, @@ -511,7 +511,7 @@ HRESULT WINAPI strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown filter->pFuncsTable = ops; strmbase_sink_init(&filter->sink, &BaseRenderer_InputPin_Vtbl, &filter->filter, - sink_name, &input_BaseInputFuncTable, NULL); + sink_name, &sink_ops, NULL); hr = CreatePosPassThru(outer ? outer : (IUnknown *)&filter->filter.IBaseFilter_iface, TRUE, &filter->sink.pin.IPin_iface, &filter->pPosition); diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 3811569da1..e567804ba3 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -210,7 +210,7 @@ static HRESULT sink_query_interface(struct strmbase_pin *iface, REFIID iid, void return S_OK; } -static const BaseInputPinFuncTable tf_input_BaseInputFuncTable = +static const struct strmbase_sink_ops sink_ops = { .base.pin_query_accept = sink_query_accept, .base.pin_get_media_type = strmbase_pin_get_media_type, @@ -353,7 +353,7 @@ static HRESULT strmbase_transform_init(IUnknown *outer, const CLSID *clsid, ZeroMemory(&filter->pmt, sizeof(filter->pmt)); strmbase_sink_init(&filter->sink, &TransformFilter_InputPin_Vtbl, &filter->filter, - wcsInputPinName, &tf_input_BaseInputFuncTable, NULL); + wcsInputPinName, &sink_ops, NULL); strmbase_source_init(&filter->source, &TransformFilter_OutputPin_Vtbl, &filter->filter, wcsOutputPinName, &source_ops); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 99c579f8df..fd79e9726d 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -84,16 +84,17 @@ struct strmbase_sink BOOL flushing, end_of_stream; IMemAllocator *preferred_allocator; - const struct BaseInputPinFuncTable *pFuncsTable; + const struct strmbase_sink_ops *pFuncsTable; }; typedef HRESULT (WINAPI *BaseInputPin_Receive)(struct strmbase_sink *This, IMediaSample *pSample); -typedef struct BaseInputPinFuncTable { +struct strmbase_sink_ops +{ BasePinFuncTable base; /* Optional */ BaseInputPin_Receive pfnReceive; -} BaseInputPinFuncTable; +}; /* Base Pin */ HRESULT strmbase_pin_get_media_type(struct strmbase_pin *pin, unsigned int index, AM_MEDIA_TYPE *mt); @@ -143,7 +144,7 @@ HRESULT WINAPI BaseInputPinImpl_EndFlush(IPin * iface); HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate); void strmbase_sink_init(struct strmbase_sink *pin, const IPinVtbl *vtbl, struct strmbase_filter *filter, - const WCHAR *name, const BaseInputPinFuncTable *func_table, IMemAllocator *allocator); + const WCHAR *name, const struct strmbase_sink_ops *ops, IMemAllocator *allocator); void strmbase_sink_cleanup(struct strmbase_sink *pin); struct strmbase_filter

1 0

Zebediah Figura : strmbase: Get rid of the BaseInputPin typedef.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: 580ca7557dcdebf854383411cae44f3d047cc867 URL: https://source.winehq.org/git/wine.git/?a=commit;h=580ca7557dcdebf854383411… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 19 20:18:01 2019 -0600 strmbase: Get rid of the BaseInputPin typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 7 ------- dlls/qcap/avico.c | 4 ++-- dlls/qcap/avimux.c | 7 +++---- dlls/qcap/smartteefilter.c | 4 ++-- dlls/strmbase/pin.c | 40 +++++++++++++++++++--------------------- dlls/strmbase/renderer.c | 2 +- dlls/strmbase/transform.c | 2 +- include/wine/strmbase.h | 14 +++++++------- 8 files changed, 35 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=580ca7557dcdebf85438…

1 0

Zebediah Figura : qedit/samplegrabber: Reimplement the source pin over the strmbase source.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: 2c8e152ff06ae3e460276401b4b6bdaa1ffc676d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c8e152ff06ae3e460276401… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 19 20:18:00 2019 -0600 qedit/samplegrabber: Reimplement the source pin over the strmbase source. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 239 +++++++++++++++++---------------------- dlls/qedit/tests/samplegrabber.c | 1 + 2 files changed, 104 insertions(+), 136 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2c8e152ff06ae3e46027…

1 0

Jeff Smith : msvcrt: Correct behavior of strftime formats %c %x.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: 8bee5d85d805a735dd7940e6fd805ac22fd5e662 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bee5d85d805a735dd7940e6… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Nov 19 23:15:01 2019 +0100 msvcrt: Correct behavior of strftime formats %c %x. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/time.c | 48 +++++++-------- dlls/msvcrt/time.c | 150 +++++++++++++++++++++++++++++++-------------- dlls/ucrtbase/tests/misc.c | 46 +++++++------- 3 files changed, 152 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8bee5d85d805a735dd79…

1 0

Piotr Caban : ucrtbase: Add _Strftime tests.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: 21a2fde62197cf28601805bd9393b0212400e2ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=21a2fde62197cf28601805bd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 19 23:14:53 2019 +0100 ucrtbase: Add _Strftime tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 113 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index fa5f29372c..6c8dd88cf0 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -104,6 +104,29 @@ typedef struct MSVCRT__exception { double retval; } MSVCRT__exception; +typedef struct { + const char *short_wday[7]; + const char *wday[7]; + const char *short_mon[12]; + const char *mon[12]; + const char *am; + const char *pm; + const char *short_date; + const char *date; + const char *time; + int unk[2]; + const wchar_t *short_wdayW[7]; + const wchar_t *wdayW[7]; + const wchar_t *short_monW[12]; + const wchar_t *monW[12]; + const wchar_t *amW; + const wchar_t *pmW; + const wchar_t *short_dateW; + const wchar_t *dateW; + const wchar_t *timeW; + const wchar_t *locnameW; +} __lc_time_data; + typedef int (CDECL *MSVCRT_matherr_func)(struct MSVCRT__exception *); static HMODULE module; @@ -138,6 +161,7 @@ static void (CDECL *p___setusermatherr)(MSVCRT_matherr_func); static int* (CDECL *p_errno)(void); static char* (CDECL *p_asctime)(const struct tm *); static size_t (__cdecl *p_strftime)(char *, size_t, const char *, const struct tm *); +static size_t (__cdecl *p__Strftime)(char*, size_t, const char*, const struct tm*, void*); static struct tm* (__cdecl *p__gmtime32)(const __time32_t*); static void (CDECL *p_exit)(int); static int (CDECL *p__crt_atexit)(void (CDECL*)(void)); @@ -513,6 +537,7 @@ static BOOL init(void) p_errno = (void*)GetProcAddress(module, "_errno"); p_asctime = (void*)GetProcAddress(module, "asctime"); p_strftime = (void*)GetProcAddress(module, "strftime"); + p__Strftime = (void*)GetProcAddress(module, "_Strftime"); p__gmtime32 = (void*)GetProcAddress(module, "_gmtime32"); p__crt_atexit = (void*)GetProcAddress(module, "_crt_atexit"); p_exit = (void*)GetProcAddress(module, "exit"); @@ -949,6 +974,81 @@ static void test_strftime(void) {"%X", "23:59:60", { 60, 59, 23, 1, 0, 70, 4, 0, 0 }, TRUE}, }; + const struct { + const char *format; + const char *ret; + const wchar_t *short_date; + const wchar_t *date; + const wchar_t *time; + struct tm tm; + BOOL todo; + } tests_td[] = { + { "%c", "x z", L"x", L"y", L"z", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%#c", "y z", L"x", L"y", L"z", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "M1", 0, 0, L"MMM", { 0, 0, 1, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "1", 0, 0, L"h", { 0, 0, 1, 1, 0, 70, 0, 0, 0 }}, + { "%X", "01", 0, 0, L"hh", { 0, 0, 1, 1, 0, 70, 0, 0, 0 }}, + { "%X", "h01", 0, 0, L"hhh", { 0, 0, 1, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "hh01", 0, 0, L"hhhh", { 0, 0, 1, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "1", 0, 0, L"H", { 0, 0, 1, 1, 0, 70, 0, 0, 0 }}, + { "%X", "01", 0, 0, L"HH", { 0, 0, 1, 1, 0, 70, 0, 0, 0 }}, + { "%X", "H13", 0, 0, L"HHH", { 0, 0, 13, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "0", 0, 0, L"m", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%X", "00", 0, 0, L"mm", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%X", "m00", 0, 0, L"mmm", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "T", 0, 0, L"t", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "TAM", 0, 0, L"tt", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "TAM", 0, 0, L"ttttttttt", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "TAM", 0, 0, L"a", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "TAM", 0, 0, L"aaaaa", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "TAM", 0, 0, L"A", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "TAM", 0, 0, L"AAAAA", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%x", "1", L"d", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%x", "01", L"dd", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%x", "D1", L"ddd", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%x", "Day1", L"dddd", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%x", "dDay1", L"ddddd", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%x", "1", L"M", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%x", "01", L"MM", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%x", "M1", L"MMM", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%x", "Mon1", L"MMMM", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%x", "MMon1", L"MMMMM", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%x", "y", L"y", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%x", "70", L"yy", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%x", "y70", L"yyy", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%x", "1970", L"yyyy", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%x", "y1970", L"yyyyy", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%x", "ggggggggggg", L"ggggggggggg", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%#x", "1", 0, L"d", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%#x", "01", 0, L"dd", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%#x", "D1", 0, L"ddd", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%#x", "Day1", 0, L"dddd", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%#x", "dDay1", 0, L"ddddd", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%#x", "1", 0, L"M", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%#x", "01", 0, L"MM", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%#x", "M1", 0, L"MMM", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%#x", "Mon1", 0, L"MMMM", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%#x", "MMon1", 0, L"MMMMM", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%#x", "y", 0, L"y", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%#x", "70", 0, L"yy", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%#x", "y70", 0, L"yyy", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%#x", "1970", 0, L"yyyy", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%#x", "y1970", 0, L"yyyyy", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + }; + + __lc_time_data time_data = { + { "d1", "d2", "d3", "d4", "d5", "d6", "d7" }, + { "day1", "day2", "day3", "day4", "day5", "day6", "day7" }, + { "m1", "m2", "m3", "m4", "m5", "m6", "m7", "m8", "m9", "m10", "m11", "m12" }, + { "mon1", "mon2", "mon3", "mon4", "mon5", "mon6", "mon7", "mon8", "mon9", "mon10", "mon11", "mon12" }, + "tam", "tpm", 0, 0, 0, { 1, 0 }, + { L"D1", L"D2", L"D3", L"D4", L"D5", L"D6", L"D7" }, + { L"Day1", L"Day2", L"Day3", L"Day4", L"Day5", L"Day6", L"Day7" }, + { L"M1", L"M2", L"M3", L"M4", L"M5", L"M6", L"M7", L"M8", L"M9", L"M10", L"M11", L"M12" }, + { L"Mon1", L"Mon2", L"Mon3", L"Mon4", L"Mon5", L"Mon6", L"Mon7", L"Mon8", L"Mon9", L"Mon10", L"Mon11", L"Mon12" }, + L"TAM", L"TPM" + }; + const struct tm epoch = { 0, 0, 0, 1, 0, 70, 4, 0, 0 }; char buf[256]; int i, ret; @@ -973,6 +1073,19 @@ static void test_strftime(void) ok((buf[0] == '+' || buf[0] == '-') && isdigit(buf[1]) && isdigit(buf[2]) && isdigit(buf[3]) && isdigit(buf[4]), "got %s\n", buf); + + for (i=0; i<ARRAY_SIZE(tests_td); i++) + { + time_data.short_dateW = tests_td[i].short_date; + time_data.dateW = tests_td[i].date; + time_data.timeW = tests_td[i].time; + ret = p__Strftime(buf, sizeof(buf), tests_td[i].format, &tests_td[i].tm, &time_data); + ok(ret == strlen(buf), "%d) ret = %d\n", i, ret); + todo_wine_if(tests_td[i].todo) { + ok(!strcmp(buf, tests_td[i].ret), "%d) buf = \"%s\", expected \"%s\"\n", + i, buf, tests_td[i].ret); + } + } } static LONG* get_failures_counter(HANDLE *map)

1 0

Piotr Caban : msvcrt: Add _Strftime tests.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: fbe97003fd63c81eff396bc743ae00a20fa30711 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbe97003fd63c81eff396bc7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 19 23:14:49 2019 +0100 msvcrt: Add _Strftime tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/time.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 4a3d81d2dd..561ef853ec 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -36,6 +36,20 @@ #define MINSPERHOUR 60 #define HOURSPERDAY 24 +typedef struct { + const char *short_wday[7]; + const char *wday[7]; + const char *short_mon[12]; + const char *mon[12]; + const char *am; + const char *pm; + const char *short_date; + const char *date; + const char *time; + LCID lcid; + int unk[2]; +} __lc_time_data; + static __time32_t (__cdecl *p_mkgmtime32)(struct tm*); static struct tm* (__cdecl *p_gmtime32)(__time32_t*); static struct tm* (__cdecl *p_gmtime)(time_t*); @@ -50,6 +64,7 @@ static long* (__cdecl *p___p__dstbias)(void); static long* (__cdecl *p__dstbias)(void); static long* (__cdecl *p___p__timezone)(void); static size_t (__cdecl *p_strftime)(char *, size_t, const char *, const struct tm *); +static size_t (__cdecl *p__Strftime)(char*, size_t, const char*, const struct tm*, void*); static size_t (__cdecl *p_wcsftime)(wchar_t *, size_t, const wchar_t *, const struct tm *); static char* (__cdecl *p_asctime)(const struct tm *); @@ -71,6 +86,7 @@ static void init(void) p__dstbias = (void*)GetProcAddress(hmod, "__dstbias"); p___p__timezone = (void*)GetProcAddress(hmod, "__p__timezone"); p_strftime = (void*)GetProcAddress(hmod, "strftime"); + p__Strftime = (void*)GetProcAddress(hmod, "_Strftime"); p_wcsftime = (void*)GetProcAddress(hmod, "wcsftime"); p_asctime = (void*)GetProcAddress(hmod, "asctime"); } @@ -640,6 +656,76 @@ static void test_strftime(void) {"%W", "52", { 0, 0, 0, 1, 0, 70, 0, 365, 0 }}, }; + const struct { + const char *format; + const char *ret; + const char *short_date; + const char *date; + const char *time; + struct tm tm; + BOOL todo; + } tests_td[] = { + { "%c", "x z", "x", "y", "z", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%#c", "y z", "x", "y", "z", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "m1", 0, 0, "MMM", { 0, 0, 1, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "1", 0, 0, "h", { 0, 0, 1, 1, 0, 70, 0, 0, 0 }}, + { "%X", "01", 0, 0, "hh", { 0, 0, 1, 1, 0, 70, 0, 0, 0 }}, + { "%X", "h01", 0, 0, "hhh", { 0, 0, 1, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "hh01", 0, 0, "hhhh", { 0, 0, 1, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "1", 0, 0, "H", { 0, 0, 1, 1, 0, 70, 0, 0, 0 }}, + { "%X", "01", 0, 0, "HH", { 0, 0, 1, 1, 0, 70, 0, 0, 0 }}, + { "%X", "H13", 0, 0, "HHH", { 0, 0, 13, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "0", 0, 0, "m", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%X", "00", 0, 0, "mm", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%X", "m00", 0, 0, "mmm", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "t", 0, 0, "t", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "tam", 0, 0, "tt", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "tam", 0, 0, "ttttttttt", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "tam", 0, 0, "a", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "tam", 0, 0, "aaaaa", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "tam", 0, 0, "A", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "tam", 0, 0, "AAAAA", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%x", "1", "d", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%x", "01", "dd", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%x", "d1", "ddd", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%x", "day1", "dddd", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%x", "dday1", "ddddd", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%x", "1", "M", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%x", "01", "MM", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%x", "m1", "MMM", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%x", "mon1", "MMMM", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%x", "Mmon1", "MMMMM", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%x", "y", "y", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%x", "70", "yy", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%x", "y70", "yyy", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%x", "1970", "yyyy", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%x", "y1970", "yyyyy", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%x", "ggggggggggg", "ggggggggggg", 0, 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%#x", "1", 0, "d", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%#x", "01", 0, "dd", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%#x", "d1", 0, "ddd", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%#x", "day1", 0, "dddd", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%#x", "dday1", 0, "ddddd", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%#x", "1", 0, "M", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%#x", "01", 0, "MM", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%#x", "m1", 0, "MMM", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%#x", "mon1", 0, "MMMM", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%#x", "Mmon1", 0, "MMMMM", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%#x", "y", 0, "y", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%#x", "70", 0, "yy", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%#x", "y70", 0, "yyy", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%#x", "1970", 0, "yyyy", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%#x", "y1970", 0, "yyyyy", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + }; + + __lc_time_data time_data = { + { "d1", "d2", "d3", "d4", "d5", "d6", "d7" }, + { "day1", "day2", "day3", "day4", "day5", "day6", "day7" }, + { "m1", "m2", "m3", "m4", "m5", "m6", "m7", "m8", "m9", "m10", "m11", "m12" }, + { "mon1", "mon2", "mon3", "mon4", "mon5", "mon6", "mon7", "mon8", "mon9", "mon10", "mon11", "mon12" }, + "tam", "tpm" + }; + static const wchar_t cW[] = { '%','c',0 }; time_t gmt; struct tm* gmt_tm; @@ -729,6 +815,27 @@ static void test_strftime(void) retA = p_strftime(bufA, 256, "\x82%c", gmt_tm); ok(retA == 3, "expected 3, got %ld\n", retA); ok(!strcmp(bufA, "\x82%c"), "got %s\n", bufA); + + setlocale(LC_ALL, "C"); + if(!p__Strftime) { + win_skip("_Strftime is not available\n"); + return; + } + + /* TODO: find meaning of unk[0] */ + time_data.unk[0] = 1; + for (i=0; i<ARRAY_SIZE(tests_td); i++) + { + time_data.short_date = tests_td[i].short_date; + time_data.date = tests_td[i].date; + time_data.time = tests_td[i].time; + retA = p__Strftime(buf, sizeof(buf), tests_td[i].format, &tests_td[i].tm, &time_data); + ok(retA == strlen(buf), "%d) ret = %ld\n", i, retA); + todo_wine_if(tests_td[i].todo) { + ok(!strcmp(buf, tests_td[i].ret), "%d) buf = \"%s\", expected \"%s\"\n", + i, buf, tests_td[i].ret); + } + } } static void test_asctime(void)

1 0

Piotr Caban : msvcrt: Use correct __lc_time_data fields in strftime functions.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: c37268f0aa6da3825aa11551537b8e18aa62bdca URL: https://source.winehq.org/git/wine.git/?a=commit;h=c37268f0aa6da3825aa11551… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 19 23:14:42 2019 +0100 msvcrt: Use correct __lc_time_data fields in strftime functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 2 + dlls/msvcrt/time.c | 164 +++++++++++++++++++++++++++++++++++---------------- 2 files changed, 115 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c37268f0aa6da3825aa1…

1 0

Piotr Caban : msvcrt: Fix _mbstowcs_s_l return value on truncate.
by Alexandre Julliard 20 Nov '19

20 Nov '19

Module: wine Branch: master Commit: 47217f5979e9cee4923d55588d9e76497fb835e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47217f5979e9cee4923d5558… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 19 23:06:29 2019 +0100 msvcrt: Fix _mbstowcs_s_l return value on truncate. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 8 +++++--- dlls/msvcrt/tests/string.c | 5 +++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 770ee672af..a9dbcfff66 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2425,6 +2425,7 @@ int CDECL MSVCRT__mbstowcs_s_l(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr, MSVCRT_size_t count, MSVCRT__locale_t locale) { MSVCRT_size_t conv; + int err = 0; if(!wcstr && !size) { conv = MSVCRT__mbstowcs_l(NULL, mbstr, 0, locale); @@ -2447,9 +2448,10 @@ int CDECL MSVCRT__mbstowcs_s_l(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr, conv = MSVCRT__mbstowcs_l(wcstr, mbstr, conv, locale); if(conv<size) wcstr[conv++] = '\0'; - else if(conv==size && (count==MSVCRT__TRUNCATE || wcstr[conv-1]=='\0')) + else if(conv==size && count==MSVCRT__TRUNCATE && wcstr[conv-1]!='\0') { wcstr[conv-1] = '\0'; - else { + err = MSVCRT_STRUNCATE; + }else if(conv==size && wcstr[conv-1]!='\0') { MSVCRT_INVALID_PMT("wcstr[size] is too small", MSVCRT_ERANGE); if(size) wcstr[0] = '\0'; @@ -2458,7 +2460,7 @@ int CDECL MSVCRT__mbstowcs_s_l(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr, if(ret) *ret = conv; - return 0; + return err; } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 88922fe465..d14c7f009c 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2080,6 +2080,11 @@ static void test_mbstowcs(void) return; } + err = pmbstowcs_s(&ret, wOut, 1, mSimple, _TRUNCATE); + ok(err == STRUNCATE, "err = %d\n", err); + ok(ret == 1, "mbstowcs_s did not return 0\n"); + ok(!wOut[0], "wOut[0] = %d\n", wOut[0]); + err = pmbstowcs_s(&ret, wOut, 6, mSimple, _TRUNCATE); ok(err == 0, "err = %d\n", err); ok(ret == 5, "mbstowcs_s did not return 5\n");

1 0

Vijay Kiran Kamuju : comdlg32: Use the new colordlg.h file and update the resources.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: a9c4b309f6af82b624604bd0df898ad88d59ab5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9c4b309f6af82b624604bd0… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Nov 16 11:35:26 2019 +0100 comdlg32: Use the new colordlg.h file and update the resources. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/cdlg.h | 22 --- dlls/comdlg32/colordlg.c | 138 ++++++++-------- dlls/comdlg32/comdlg32.rc | 46 +++--- po/ar.po | 403 +++++++++++++++++++++++----------------------- po/ast.po | 401 +++++++++++++++++++++++---------------------- po/bg.po | 403 +++++++++++++++++++++++----------------------- po/ca.po | 403 +++++++++++++++++++++++----------------------- po/cs.po | 403 +++++++++++++++++++++++----------------------- po/da.po | 403 +++++++++++++++++++++++----------------------- po/de.po | 403 +++++++++++++++++++++++----------------------- po/el.po | 402 ++++++++++++++++++++++----------------------- po/en.po | 401 ++++++++++++++++++++++----------------------- po/en_US.po | 401 ++++++++++++++++++++++----------------------- po/eo.po | 403 +++++++++++++++++++++++----------------------- po/es.po | 403 +++++++++++++++++++++++----------------------- po/fa.po | 399 +++++++++++++++++++++++---------------------- po/fi.po | 403 +++++++++++++++++++++++----------------------- po/fr.po | 403 +++++++++++++++++++++++----------------------- po/he.po | 403 +++++++++++++++++++++++----------------------- po/hi.po | 399 +++++++++++++++++++++++---------------------- po/hr.po | 403 +++++++++++++++++++++++----------------------- po/hu.po | 403 +++++++++++++++++++++++----------------------- po/it.po | 403 +++++++++++++++++++++++----------------------- po/ja.po | 403 +++++++++++++++++++++++----------------------- po/ko.po | 403 +++++++++++++++++++++++----------------------- po/lt.po | 403 +++++++++++++++++++++++----------------------- po/ml.po | 399 +++++++++++++++++++++++---------------------- po/nb_NO.po | 403 +++++++++++++++++++++++----------------------- po/nl.po | 403 +++++++++++++++++++++++----------------------- po/or.po | 399 +++++++++++++++++++++++---------------------- po/pa.po | 399 +++++++++++++++++++++++---------------------- po/pl.po | 403 +++++++++++++++++++++++----------------------- po/pt_BR.po | 403 +++++++++++++++++++++++----------------------- po/pt_PT.po | 403 +++++++++++++++++++++++----------------------- po/rm.po | 399 +++++++++++++++++++++++---------------------- po/ro.po | 403 +++++++++++++++++++++++----------------------- po/ru.po | 403 +++++++++++++++++++++++----------------------- po/si.po | 403 +++++++++++++++++++++++----------------------- po/sk.po | 403 +++++++++++++++++++++++----------------------- po/sl.po | 403 +++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 403 +++++++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 401 +++++++++++++++++++++++---------------------- po/sv.po | 403 +++++++++++++++++++++++----------------------- po/ta.po | 401 +++++++++++++++++++++++---------------------- po/te.po | 399 +++++++++++++++++++++++---------------------- po/th.po | 402 ++++++++++++++++++++++----------------------- po/tr.po | 403 +++++++++++++++++++++++----------------------- po/uk.po | 403 +++++++++++++++++++++++----------------------- po/wa.po | 403 +++++++++++++++++++++++----------------------- po/wine.pot | 399 +++++++++++++++++++++++---------------------- po/zh_CN.po | 403 +++++++++++++++++++++++----------------------- po/zh_TW.po | 403 +++++++++++++++++++++++----------------------- 52 files changed, 10106 insertions(+), 9803 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a9c4b309f6af82b62460…

1 0

Vijay Kiran Kamuju : include: Add colordlg.h header file for color dialogs.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: 93effd2671f06ef8f22a1277161525649b2c5e41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93effd2671f06ef8f22a1277… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Nov 16 11:35:25 2019 +0100 include: Add colordlg.h header file for color dialogs. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/colordlg.h | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index c31fb50d74..421e3d6c59 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -60,6 +60,7 @@ SOURCES = \ cmdtxt.idl \ cmnquery.idl \ colinf.idl \ + colordlg.h \ comcat.idl \ commctrl.h \ commctrl.rh \ diff --git a/include/colordlg.h b/include/colordlg.h new file mode 100644 index 0000000000..51d2185910 --- /dev/null +++ b/include/colordlg.h @@ -0,0 +1,62 @@ +/* + * Color Dialog definitions + * + * Copyright (C) 2019 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _INC_COLORDLG +#define _INC_COLORDLG + +#define DLG_COLOR + +#define COLOR_HUESCROLL 700 +#define COLOR_SATSCROLL 701 +#define COLOR_LUMSCROLL 702 +#define COLOR_HUE 703 +#define COLOR_SAT 704 +#define COLOR_LUM 705 +#define COLOR_RED 706 +#define COLOR_GREEN 707 +#define COLOR_BLUE 708 +#define COLOR_CURRENT 709 +#define COLOR_RAINBOW 710 +#define COLOR_SAVE 711 +#define COLOR_ADD 712 +#define COLOR_SOLID 713 +#define COLOR_TUNE 714 +#define COLOR_SCHEMES 715 +#define COLOR_ELEMENT 716 +#define COLOR_SAMPLES 717 +#define COLOR_PALETTE 718 +#define COLOR_MIX 719 +#define COLOR_BOX1 720 +#define COLOR_CUSTOM1 721 + +#define COLOR_HUEACCEL 723 +#define COLOR_SATACCEL 724 +#define COLOR_LUMACCEL 725 +#define COLOR_REDACCEL 726 +#define COLOR_GREENACCEL 727 +#define COLOR_BLUEACCEL 728 + +#define COLOR_SOLID_LEFT 730 +#define COLOR_SOLID_RIGHT 731 + +#define NUM_BASIC_COLORS 48 +#define NUM_CUSTOM_COLORS 16 + +#endif /* _INC_COLORDLG */

1 0

Serge Gautherie : ole32: Improve a string format.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: cd7bf449738d5090e9a08450e772d932104f4867 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd7bf449738d5090e9a08450… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Tue Nov 19 10:26:13 2019 +0100 ole32: Improve a string format. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 5518429b31..708147e51d 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1141,7 +1141,7 @@ static void PropertyStorage_PropNameDestroy(void *k, void *d, void *extra) static int PropertyStorage_PropCompare(const void *a, const void *b, void *extra) { - TRACE("(%d, %d)\n", PtrToUlong(a), PtrToUlong(b)); + TRACE("(%u, %u)\n", PtrToUlong(a), PtrToUlong(b)); return PtrToUlong(a) - PtrToUlong(b); }

1 0

Hans Leidekker : dhcpcsvc: Implement DhcpRequestParams.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: aed088df11990ee3bbe7a7c14dded16a9a5f2c2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=aed088df11990ee3bbe7a7c1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 19 14:45:00 2019 +0100 dhcpcsvc: Implement DhcpRequestParams. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/dhcpcsvc/Makefile.in | 1 + dlls/dhcpcsvc/dhcpcsvc.c | 78 ++++++++++++++++++++-- dlls/dhcpcsvc/tests/Makefile.in | 5 ++ dlls/dhcpcsvc/tests/dhcpcsvc.c | 143 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 223 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aed088df11990ee3bbe7…

1 0

Hans Leidekker : mountmgr.sys: Add support for querying DHCP parameters on macOS.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: b7ab346cf7127755f495dd9036ebea9577cdf352 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7ab346cf7127755f495dd90… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 19 14:44:59 2019 +0100 mountmgr.sys: Add support for querying DHCP parameters on macOS. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 6 ++ configure.ac | 3 + dlls/mountmgr.sys/Makefile.in | 2 +- dlls/mountmgr.sys/diskarb.c | 167 ++++++++++++++++++++++++++++++++++++++++++ include/config.h.in | 8 ++ 5 files changed, 185 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 483efc02d3..fb29dcfae5 100755 --- a/configure +++ b/configure @@ -724,6 +724,7 @@ OPENAL_LIBS COREAUDIO_LIBS SECURITY_LIBS DISKARBITRATION_LIBS +SYSTEMCONFIGURATION_LIBS APPKIT_LIBS CORESERVICES_LIBS APPLICATIONSERVICES_LIBS @@ -7356,6 +7357,8 @@ for ac_header in \ OpenCL/opencl.h \ QuickTime/ImageCompression.h \ Security/Security.h \ + SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h \ + SystemConfiguration/SCNetworkConfiguration.h \ alias.h \ arpa/inet.h \ arpa/nameser.h \ @@ -8655,6 +8658,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu APPKIT_LIBS="-framework AppKit" + SYSTEMCONFIGURATION_LIBS="-framework SystemConfiguration" + WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,wine_info.plist" @@ -19841,6 +19846,7 @@ FORCEFEEDBACK_LIBS = $FORCEFEEDBACK_LIBS APPLICATIONSERVICES_LIBS = $APPLICATIONSERVICES_LIBS CORESERVICES_LIBS = $CORESERVICES_LIBS APPKIT_LIBS = $APPKIT_LIBS +SYSTEMCONFIGURATION_LIBS = $SYSTEMCONFIGURATION_LIBS DISKARBITRATION_LIBS = $DISKARBITRATION_LIBS SECURITY_LIBS = $SECURITY_LIBS COREAUDIO_LIBS = $COREAUDIO_LIBS diff --git a/configure.ac b/configure.ac index 64721e9644..22ce5f33a3 100644 --- a/configure.ac +++ b/configure.ac @@ -436,6 +436,8 @@ AC_CHECK_HEADERS(\ OpenCL/opencl.h \ QuickTime/ImageCompression.h \ Security/Security.h \ + SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h \ + SystemConfiguration/SCNetworkConfiguration.h \ alias.h \ arpa/inet.h \ arpa/nameser.h \ @@ -759,6 +761,7 @@ case $host_os in AC_SUBST(APPLICATIONSERVICES_LIBS,"-framework ApplicationServices") AC_SUBST(CORESERVICES_LIBS,"-framework CoreServices") AC_SUBST(APPKIT_LIBS,"-framework AppKit") + AC_SUBST(SYSTEMCONFIGURATION_LIBS,"-framework SystemConfiguration") WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,wine_info.plist" diff --git a/dlls/mountmgr.sys/Makefile.in b/dlls/mountmgr.sys/Makefile.in index 738f071390..e229164280 100644 --- a/dlls/mountmgr.sys/Makefile.in +++ b/dlls/mountmgr.sys/Makefile.in @@ -3,7 +3,7 @@ IMPORTS = uuid advapi32 ntoskrnl DELAYIMPORTS = user32 iphlpapi EXTRADLLFLAGS = -Wl,--subsystem,native EXTRAINCL = $(DBUS_CFLAGS) $(HAL_CFLAGS) -EXTRALIBS = $(DISKARBITRATION_LIBS) +EXTRALIBS = $(DISKARBITRATION_LIBS) $(SYSTEMCONFIGURATION_LIBS) $(CORESERVICES_LIBS) C_SRCS = \ dbus.c \ diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 9a7616ecc6..66c121e114 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -29,8 +29,18 @@ #ifdef HAVE_DISKARBITRATION_DISKARBITRATION_H #include <DiskArbitration/DiskArbitration.h> #endif +#if defined(HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H) && defined(HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H) +#include <SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h> +#include <SystemConfiguration/SCNetworkConfiguration.h> +#endif #include "mountmgr.h" +#define USE_WS_PREFIX +#include "winsock2.h" +#include "ws2ipdef.h" +#include "nldef.h" +#include "netioapi.h" +#include "dhcpcsdk.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); @@ -152,3 +162,160 @@ void initialize_diskarbitration(void) } #endif /* HAVE_DISKARBITRATION_DISKARBITRATION_H */ + +#if defined(HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H) && defined(HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H) + +static UInt8 map_option( ULONG option ) +{ + switch (option) + { + case OPTION_SUBNET_MASK: return 1; + case OPTION_ROUTER_ADDRESS: return 3; + case OPTION_HOST_NAME: return 12; + case OPTION_DOMAIN_NAME: return 15; + case OPTION_BROADCAST_ADDRESS: return 28; + case OPTION_MSFT_IE_PROXY: return 252; + default: + FIXME( "unhandled option %u\n", option ); + return 0; + } +} + +#define IF_NAMESIZE 16 +static BOOL map_adapter_name( const WCHAR *name, WCHAR *unix_name, DWORD len ) +{ + WCHAR buf[IF_NAMESIZE]; + UNICODE_STRING str; + GUID guid; + + RtlInitUnicodeString( &str, name ); + if (!RtlGUIDFromString( &str, &guid )) + { + NET_LUID luid; + if (ConvertInterfaceGuidToLuid( &guid, &luid ) || + ConvertInterfaceLuidToNameW( &luid, buf, ARRAY_SIZE(buf) )) return FALSE; + + name = buf; + } + if (lstrlenW( name ) >= len) return FALSE; + lstrcpyW( unix_name, name ); + return TRUE; +} + +static CFStringRef find_service_id( const WCHAR *adapter ) +{ + SCPreferencesRef prefs; + SCNetworkSetRef set = NULL; + CFArrayRef services = NULL; + CFStringRef id, ret = NULL; + WCHAR unix_name[IF_NAMESIZE]; + CFIndex i; + + if (!map_adapter_name( adapter, unix_name, ARRAY_SIZE(unix_name) )) return NULL; + if (!(prefs = SCPreferencesCreate( NULL, CFSTR("mountmgr.sys"), NULL ))) return NULL; + if (!(set = SCNetworkSetCopyCurrent( prefs ))) goto done; + if (!(services = SCNetworkSetCopyServices( set ))) goto done; + + for (i = 0; i < CFArrayGetCount( services ); i++) + { + SCNetworkServiceRef service; + UniChar buf[IF_NAMESIZE] = {0}; + CFStringRef name; + + service = CFArrayGetValueAtIndex( services, i ); + name = SCNetworkInterfaceGetBSDName( SCNetworkServiceGetInterface(service) ); + if (CFStringGetLength( name ) < ARRAY_SIZE( buf )) + { + CFStringGetCharacters( name, CFRangeMake(0, CFStringGetLength(name)), buf ); + if (!lstrcmpW( buf, unix_name ) && (id = SCNetworkServiceGetServiceID( service ))) + { + ret = CFStringCreateCopy( NULL, id ); + break; + } + } + } + +done: + if (services) CFRelease( services ); + if (set) CFRelease( set ); + CFRelease( prefs ); + return ret; +} + +ULONG get_dhcp_request_param( const WCHAR *adapter, struct mountmgr_dhcp_request_param *param, char *buf, ULONG offset, + ULONG size ) +{ + CFStringRef service_id = find_service_id( adapter ); + CFDictionaryRef dict; + CFDataRef value; + DWORD ret = 0; + CFIndex len; + + param->offset = 0; + param->size = 0; + + if (!service_id) return 0; + if (!(dict = SCDynamicStoreCopyDHCPInfo( NULL, service_id ))) + { + CFRelease( service_id ); + return 0; + } + CFRelease( service_id ); + if (!(value = DHCPInfoGetOptionData( dict, map_option(param->id) ))) + { + CFRelease( dict ); + return 0; + } + len = CFDataGetLength( value ); + + switch (param->id) + { + case OPTION_SUBNET_MASK: + case OPTION_ROUTER_ADDRESS: + case OPTION_BROADCAST_ADDRESS: + { + DWORD *ptr = (DWORD *)(buf + offset); + if (len == sizeof(*ptr) && size >= sizeof(*ptr)) + { + CFDataGetBytes( value, CFRangeMake(0, len), (UInt8 *)ptr ); + param->offset = offset; + param->size = sizeof(*ptr); + TRACE( "returning %08x\n", *ptr ); + } + ret = sizeof(*ptr); + break; + } + case OPTION_HOST_NAME: + case OPTION_DOMAIN_NAME: + case OPTION_MSFT_IE_PROXY: + { + char *ptr = buf + offset; + if (size >= len) + { + CFDataGetBytes( value, CFRangeMake(0, len), (UInt8 *)ptr ); + param->offset = offset; + param->size = len; + TRACE( "returning %s\n", debugstr_an(ptr, len) ); + } + ret = len; + break; + } + default: + FIXME( "option %u not supported\n", param->id ); + break; + } + + CFRelease( dict ); + return ret; +} + +#elif !defined(SONAME_LIBDBUS_1) + +ULONG get_dhcp_request_param( const WCHAR *adapter, struct mountmgr_dhcp_request_param *param, char *buf, ULONG offset, + ULONG size ) +{ + FIXME( "support not compiled in\n" ); + return 0; +} + +#endif diff --git a/include/config.h.in b/include/config.h.in index 858ee9bfd8..41a7cde553 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1001,6 +1001,14 @@ /* Define to 1 if you have the `sysinfo' function. */ #undef HAVE_SYSINFO +/* Define to 1 if you have the + <SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h> header file. */ +#undef HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H + +/* Define to 1 if you have the <SystemConfiguration/SCNetworkConfiguration.h> + header file. */ +#undef HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H + /* Define to 1 if you have the <sys/attr.h> header file. */ #undef HAVE_SYS_ATTR_H

1 0

Hans Leidekker : mountmgr.sys: Add support for querying DHCP parameters on Linux.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: a1c159e060a4a3f0139012a08de5fbf9f19ad38d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1c159e060a4a3f0139012a0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 19 14:44:58 2019 +0100 mountmgr.sys: Add support for querying DHCP parameters on Linux. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/Makefile.in | 2 +- dlls/mountmgr.sys/dbus.c | 274 +++++++++++++++++++++++++++++++++++++++++- dlls/mountmgr.sys/mountmgr.c | 40 ++++++ dlls/mountmgr.sys/mountmgr.h | 3 + include/ddk/mountmgr.h | 21 ++++ 5 files changed, 338 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a1c159e060a4a3f01390…

1 0

Hans Leidekker : include: Add DHCP option values.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: 5106885f427f425c86506fb4e32ac2daa0328135 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5106885f427f425c86506fb4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 19 14:44:57 2019 +0100 include: Add DHCP option values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dhcpcsdk.h | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 3 deletions(-) diff --git a/include/dhcpcsdk.h b/include/dhcpcsdk.h index 93c7af6e08..8f96a8212d 100644 --- a/include/dhcpcsdk.h +++ b/include/dhcpcsdk.h @@ -18,6 +18,75 @@ #ifndef _DHCPCSDK_ #define _DHCPCSDK_ +#define OPTION_PAD 0 +#define OPTION_SUBNET_MASK 1 +#define OPTION_TIME_OFFSET 2 +#define OPTION_ROUTER_ADDRESS 3 +#define OPTION_TIME_SERVERS 4 +#define OPTION_IEN116_NAME_SERVERS 5 +#define OPTION_DOMAIN_NAME_SERVERS 6 +#define OPTION_LOG_SERVERS 7 +#define OPTION_COOKIE_SERVERS 8 +#define OPTION_LPR_SERVERS 9 +#define OPTION_IMPRESS_SERVERS 10 +#define OPTION_RLP_SERVERS 11 +#define OPTION_HOST_NAME 12 +#define OPTION_BOOT_FILE_SIZE 13 +#define OPTION_MERIT_DUMP_FILE 14 +#define OPTION_DOMAIN_NAME 15 +#define OPTION_SWAP_SERVER 16 +#define OPTION_ROOT_DISK 17 +#define OPTION_EXTENSIONS_PATH 18 +#define OPTION_BE_A_ROUTER 19 +#define OPTION_NON_LOCAL_SOURCE_ROUTING 20 +#define OPTION_POLICY_FILTER_FOR_NLSR 21 +#define OPTION_MAX_REASSEMBLY_SIZE 22 +#define OPTION_DEFAULT_TTL 23 +#define OPTION_PMTU_AGING_TIMEOUT 24 +#define OPTION_PMTU_PLATEAU_TABLE 25 +#define OPTION_MTU 26 +#define OPTION_ALL_SUBNETS_MTU 27 +#define OPTION_BROADCAST_ADDRESS 28 +#define OPTION_PERFORM_MASK_DISCOVERY 29 +#define OPTION_BE_A_MASK_SUPPLIER 30 +#define OPTION_PERFORM_ROUTER_DISCOVERY 31 +#define OPTION_ROUTER_SOLICITATION_ADDR 32 +#define OPTION_STATIC_ROUTES 33 +#define OPTION_TRAILERS 34 +#define OPTION_ARP_CACHE_TIMEOUT 35 +#define OPTION_ETHERNET_ENCAPSULATION 36 +#define OPTION_TTL 37 +#define OPTION_KEEP_ALIVE_INTERVAL 38 +#define OPTION_KEEP_ALIVE_DATA_SIZE 39 +#define OPTION_NETWORK_INFO_SERVICE_DOM 40 +#define OPTION_NETWORK_INFO_SERVERS 41 +#define OPTION_NETWORK_TIME_SERVERS 42 +#define OPTION_VENDOR_SPEC_INFO 43 +#define OPTION_NETBIOS_NAME_SERVER 44 +#define OPTION_NETBIOS_DATAGRAM_SERVER 45 +#define OPTION_NETBIOS_NODE_TYPE 46 +#define OPTION_NETBIOS_SCOPE_OPTION 47 +#define OPTION_XWINDOW_FONT_SERVER 48 +#define OPTION_XWINDOW_DISPLAY_MANAGER 49 +#define OPTION_REQUESTED_ADDRESS 50 +#define OPTION_LEASE_TIME 51 +#define OPTION_OK_TO_OVERLAY 52 +#define OPTION_MESSAGE_TYPE 53 +#define OPTION_SERVER_IDENTIFIER 54 +#define OPTION_PARAMETER_REQUEST_LIST 55 +#define OPTION_MESSAGE 56 +#define OPTION_MESSAGE_LENGTH 57 +#define OPTION_RENEWAL_TIME 58 +#define OPTION_REBIND_TIME 59 +#define OPTION_CLIENT_CLASS_INFO 60 +#define OPTION_CLIENT_ID 61 + +#define OPTION_TFTP_SERVER_NAME 66 +#define OPTION_BOOTFILE_NAME 67 + +#define OPTION_MSFT_IE_PROXY 252 +#define OPTION_END 255 + typedef struct _DHCPAPI_PARAMS { ULONG Flags; @@ -42,9 +111,15 @@ typedef struct _DHCPCAPI_CLASSID ULONG nBytesData; } DHCPCAPI_CLASSID, *PDHCPCAPI_CLASSID, *LPDHCPCAPI_CLASSID; +#define DHCPCAPI_REQUEST_PERSISTENT 0x1 +#define DHCPCAPI_REQUEST_SYNCHRONOUS 0x2 +#define DHCPCAPI_REQUEST_ASYNCHRONOUS 0x4 +#define DHCPCAPI_REQUEST_CANCEL 0x8 +#define DHCPCAPI_REQUEST_MASK 0xf -DWORD WINAPI DhcpRequestParams( DWORD flags, void *reserved, WCHAR *adaptername, DHCPCAPI_CLASSID *classid, - DHCPCAPI_PARAMS_ARRAY sendparams, DHCPCAPI_PARAMS_ARRAY recdparams, - BYTE *buffer, DWORD *size, WCHAR *requestidstr ); +void WINAPI DhcpCApiCleanup(void); +DWORD WINAPI DhcpCApiInitialize(DWORD *); +DWORD WINAPI DhcpRequestParams(DWORD, void *, WCHAR *, DHCPCAPI_CLASSID *, DHCPCAPI_PARAMS_ARRAY, + DHCPCAPI_PARAMS_ARRAY, BYTE *, DWORD *, WCHAR *); #endif

1 0

Alexandre Julliard : dmime: Fix duplicate const.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: 51bd1da2ab3724c84b94895bc54612da454dc059 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51bd1da2ab3724c84b94895b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 19 22:37:23 2019 +0100 dmime: Fix duplicate const. --- dlls/dmime/wavetrack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index 5869c9e72d..34adca6065 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -139,7 +139,7 @@ static HRESULT WINAPI wave_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rgu static HRESULT WINAPI wave_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - static const REFGUID valid[] = { + static const GUID *valid[] = { &GUID_Disable_Auto_Download, &GUID_Download, &GUID_DownloadToAudioPath,

1 0

Michael Stefaniuc : dmstyle: Implement IsParamSupported() for the Audition track.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: 274427aa6ac8cd298532328a7b773c4fc372ddf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=274427aa6ac8cd298532328a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 19 21:02:52 2019 +0100 dmstyle: Implement IsParamSupported() for the Audition track. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/auditiontrack.c | 28 ++++++++++++++++++++-------- dlls/dmstyle/tests/dmstyle.c | 20 +++++++++----------- 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/dlls/dmstyle/auditiontrack.c b/dlls/dmstyle/auditiontrack.c index 7555da0c6c..9d45f1bcd0 100644 --- a/dlls/dmstyle/auditiontrack.c +++ b/dlls/dmstyle/auditiontrack.c @@ -137,18 +137,30 @@ static HRESULT WINAPI audition_track_SetParam(IDirectMusicTrack8 *iface, REFGUID return S_OK; } -static HRESULT WINAPI audition_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) +static HRESULT WINAPI audition_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) { - IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); + IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); + static const GUID *valid[] = { + &GUID_DisableTimeSig, + &GUID_EnableTimeSig, + &GUID_SeedVariations, + &GUID_Valid_Start_Time, + &GUID_Variations + }; + unsigned int i; + - TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); + TRACE("(%p, %s)\n", This, debugstr_dmguid(type)); + + if (!type) + return E_POINTER; - if (!rguidType) - return E_POINTER; + for (i = 0; i < ARRAY_SIZE(valid); i++) + if (IsEqualGUID(type, valid[i])) + return S_OK; - /* didn't find any params */ - TRACE("param unsupported\n"); - return DMUS_E_TYPE_UNSUPPORTED; + TRACE("param unsupported\n"); + return DMUS_E_TYPE_UNSUPPORTED; } static HRESULT WINAPI audition_track_AddNotificationType(IDirectMusicTrack8 *iface, diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 6419f6f810..a63d1dbd1c 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -286,16 +286,15 @@ static void test_track(void) const char *name; BOOL has_save; BOOL has_join; - /* bitfields with supported param types */ + /* bitfield with supported param types */ unsigned int has_params; - unsigned int todo_params; } class[] = { - { X(DirectMusicAuditionTrack), TRUE, FALSE, 0x18204200, 0x18204200 }, - { X(DirectMusicChordTrack), TRUE, TRUE, 0x100002, 0 }, - { X(DirectMusicCommandTrack), TRUE, TRUE, 0x38, 0 }, - { X(DirectMusicMotifTrack), FALSE, FALSE, 0x8204200, 0 }, - { X(DirectMusicMuteTrack), TRUE, FALSE, 0x40000, 0 }, - { X(DirectMusicStyleTrack), FALSE, TRUE, 0x1224200, 0 }, + { X(DirectMusicAuditionTrack), TRUE, FALSE, 0x18204200 }, + { X(DirectMusicChordTrack), TRUE, TRUE, 0x100002 }, + { X(DirectMusicCommandTrack), TRUE, TRUE, 0x38 }, + { X(DirectMusicMotifTrack), FALSE, FALSE, 0x8204200 }, + { X(DirectMusicMuteTrack), TRUE, FALSE, 0x40000 }, + { X(DirectMusicStyleTrack), FALSE, TRUE, 0x1224200 }, }; #undef X unsigned int i, j; @@ -329,9 +328,8 @@ static void test_track(void) for (j = 0; j < ARRAY_SIZE(param_types); j++) { hr = IDirectMusicTrack8_IsParamSupported(dmt8, param_types[j].type); if (class[i].has_params & (1 << j)) - todo_wine_if(class[i].todo_params & (1 << j)) - ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", - param_types[j].name, hr); + ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", + param_types[j].name, hr); else ok(hr == DMUS_E_TYPE_UNSUPPORTED, "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n",

1 0

Alistair Leslie-Hughes : dmstyle: Add GUID_IDirectMusicStyle support in Style Track GetParam.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: de11d172dc701740fb58fc9510eb344b23210f20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de11d172dc701740fb58fc95… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 18 03:07:53 2019 +0000 dmstyle: Add GUID_IDirectMusicStyle support in Style Track GetParam. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/styletrack.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index cc15bd81d1..06fe1c7ca8 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -132,15 +132,31 @@ static HRESULT WINAPI style_track_Play(IDirectMusicTrack8 *iface, void *pStateDa return S_OK; } -static HRESULT WINAPI style_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI style_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, MUSIC_TIME *next, void *param) { IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); + struct list *item = NULL; - if (!rguidType) + FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(type), time, next, param); + + if (!type) return E_POINTER; + if (IsEqualGUID(&GUID_IDirectMusicStyle, type)) { + LIST_FOR_EACH (item, &This->Items) { + DMUS_PRIVATE_STYLE_ITEM *style = LIST_ENTRY(item, DMUS_PRIVATE_STYLE_ITEM, entry); + if (style->pObject) { + IDirectMusicStyle8_AddRef(style->pObject); + *((IDirectMusicStyle8**)param) = style->pObject; + + return S_OK; + } + } + + return DMUS_E_NOT_FOUND; + } + return S_OK; }

1 0

Michael Stefaniuc : dmcompos/tests: Check all IDirectMusicTrack_IsParamSupported() types.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: bcab0696e01fff9a7dd8de1627dc117d1af3c360 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcab0696e01fff9a7dd8de16… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 19 21:02:50 2019 +0100 dmcompos/tests: Check all IDirectMusicTrack_IsParamSupported() types. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmcompos/tests/dmcompos.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index d23f5d6dae..e5cb7da8ad 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -270,6 +270,42 @@ static void test_chordmaptrack(void) CLSID class; ULARGE_INTEGER size; HRESULT hr; +#define X(guid) &guid, #guid + const struct { + REFGUID type; + const char *name; + } unsupported[] = { + { X(GUID_BandParam) }, + { X(GUID_ChordParam) }, + { X(GUID_Clear_All_Bands) }, + { X(GUID_CommandParam) }, + { X(GUID_CommandParam2) }, + { X(GUID_CommandParamNext) }, + { X(GUID_ConnectToDLSCollection) }, + { X(GUID_Disable_Auto_Download) }, + { X(GUID_DisableTempo) }, + { X(GUID_DisableTimeSig) }, + { X(GUID_Download) }, + { X(GUID_DownloadToAudioPath) }, + { X(GUID_Enable_Auto_Download) }, + { X(GUID_EnableTempo) }, + { X(GUID_EnableTimeSig) }, + { X(GUID_IDirectMusicBand) }, + { X(GUID_IDirectMusicStyle) }, + { X(GUID_MuteParam) }, + { X(GUID_Play_Marker) }, + { X(GUID_RhythmParam) }, + { X(GUID_SeedVariations) }, + { X(GUID_StandardMIDIFile) }, + { X(GUID_TempoParam) }, + { X(GUID_TimeSignature) }, + { X(GUID_Unload) }, + { X(GUID_UnloadFromAudioPath) }, + { X(GUID_Valid_Start_Time) }, + { X(GUID_Variations) }, + }; +#undef X + unsigned int i; hr = CoCreateInstance(&CLSID_DirectMusicChordMapTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, (void**)&dmt8); @@ -290,8 +326,18 @@ static void test_chordmaptrack(void) hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); } + hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + hr = IDirectMusicTrack8_IsParamSupported(dmt8, &GUID_IDirectMusicChordMap); + ok(hr == S_OK, "IsParamSupported(GUID_IDirectMusicChordMap) failed: %08x, expected S_OK\n", hr); + for (i = 0; i < ARRAY_SIZE(unsupported); i++) { + hr = IDirectMusicTrack8_IsParamSupported(dmt8, unsupported[i].type); + ok(hr == DMUS_E_TYPE_UNSUPPORTED, + "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + unsupported[i].name, hr); + } + hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL);

1 0

Michael Stefaniuc : dmstyle: The Chord track doesn't support the BandParam type.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: f5ad835ec3bcfbce2039a994577f2dd27fc48957 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5ad835ec3bcfbce2039a994… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 19 21:02:51 2019 +0100 dmstyle: The Chord track doesn't support the BandParam type. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/chordtrack.c | 25 +++++++++++-------------- dlls/dmstyle/tests/dmstyle.c | 9 ++++----- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c index cb690b04dc..09d0bf3c9f 100644 --- a/dlls/dmstyle/chordtrack.c +++ b/dlls/dmstyle/chordtrack.c @@ -140,23 +140,20 @@ static HRESULT WINAPI chord_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rg return S_OK; } -static HRESULT WINAPI chord_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) +static HRESULT WINAPI chord_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) { - IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); - - TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); + IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); - if (!rguidType) - return E_POINTER; + TRACE("(%p, %s)\n", This, debugstr_dmguid(type)); - if (IsEqualGUID (rguidType, &GUID_BandParam) - || IsEqualGUID (rguidType, &GUID_ChordParam) - || IsEqualGUID (rguidType, &GUID_RhythmParam)) { - TRACE("param supported\n"); - return S_OK; - } - TRACE("param unsupported\n"); - return DMUS_E_TYPE_UNSUPPORTED; + if (!type) + return E_POINTER; + + if (IsEqualGUID(type, &GUID_ChordParam) || IsEqualGUID(type, &GUID_RhythmParam)) + return S_OK; + + TRACE("param unsupported\n"); + return DMUS_E_TYPE_UNSUPPORTED; } static HRESULT WINAPI chord_track_AddNotificationType(IDirectMusicTrack8 *iface, diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 0c17ef3b41..6419f6f810 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -291,7 +291,7 @@ static void test_track(void) unsigned int todo_params; } class[] = { { X(DirectMusicAuditionTrack), TRUE, FALSE, 0x18204200, 0x18204200 }, - { X(DirectMusicChordTrack), TRUE, TRUE, 0x100002, 1 }, + { X(DirectMusicChordTrack), TRUE, TRUE, 0x100002, 0 }, { X(DirectMusicCommandTrack), TRUE, TRUE, 0x38, 0 }, { X(DirectMusicMotifTrack), FALSE, FALSE, 0x8204200, 0 }, { X(DirectMusicMuteTrack), TRUE, FALSE, 0x40000, 0 }, @@ -333,10 +333,9 @@ static void test_track(void) ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", param_types[j].name, hr); else - todo_wine_if(class[i].todo_params & (1 << j)) - ok(hr == DMUS_E_TYPE_UNSUPPORTED, - "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", - param_types[j].name, hr); + ok(hr == DMUS_E_TYPE_UNSUPPORTED, + "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + param_types[j].name, hr); } if (class[i].clsid == &CLSID_DirectMusicMuteTrack) {

1 0

Alistair Leslie-Hughes : dmime: Rewrite IDirectMusicSegment8 GetParam.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: cec8d5c968ed6c5708f7d94192bf93f631e13781 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cec8d5c968ed6c5708f7d941… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 19 21:02:49 2019 +0100 dmime: Rewrite IDirectMusicSegment8 GetParam. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/segment.c | 78 +++++++++++++++++++++++----------------------------- 1 file changed, 35 insertions(+), 43 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index d47c2f2c23..3c0d4ac567 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -366,58 +366,50 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_RemoveNotificationType(IDirectMus } static HRESULT WINAPI IDirectMusicSegment8Impl_GetParam(IDirectMusicSegment8 *iface, - REFGUID rguidType, DWORD dwGroupBits, DWORD dwIndex, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, - void *pParam) + REFGUID type, DWORD group, DWORD index, MUSIC_TIME time, MUSIC_TIME *next, + void *param) { - IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - CLSID pIt_clsid; - struct list* pEntry = NULL; - IDirectMusicTrack* pTrack = NULL; - IPersistStream* pCLSIDStream = NULL; - LPDMUS_PRIVATE_SEGMENT_TRACK pIt = NULL; - HRESULT hr = S_OK; + IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); + struct list *item; + IDirectMusicTrack *track; + DMUS_PRIVATE_SEGMENT_TRACK *segment; + HRESULT hr; - FIXME("(%p, %s, 0x%x, %d, %d, %p, %p)\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pmtNext, pParam); - - if (DMUS_SEG_ANYTRACK == dwIndex) { - - LIST_FOR_EACH (pEntry, &This->Tracks) { - pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); + FIXME("(%p, %s, 0x%x, %d, %d, %p, %p) Semi-stub\n", This, debugstr_dmguid(type), group, + index, time, next, param); - hr = IDirectMusicTrack_QueryInterface(pIt->pTrack, &IID_IPersistStream, (void**) &pCLSIDStream); - if (FAILED(hr)) { - ERR("(%p): object %p don't implement IPersistStream Interface. Expect a crash (critical problem)\n", This, pIt->pTrack); - continue ; - } + if (index == DMUS_SEG_ANYTRACK || group == 0xffffffff) { + if (group == 0xffffffff && index != DMUS_SEG_ANYTRACK) + WARN("Any group doesnt have DMUS_SEG_ANYTRACK index.\n"); - TRACE(" - %p -> 0x%x,%p\n", pIt, pIt->dwGroupBits, pIt->pTrack); + LIST_FOR_EACH (item, &This->Tracks) { + segment = LIST_ENTRY(item, DMUS_PRIVATE_SEGMENT_TRACK, entry); - if (0xFFFFFFFF != dwGroupBits && 0 == (pIt->dwGroupBits & dwGroupBits)) continue ; - hr = IPersistStream_GetClassID(pCLSIDStream, &pIt_clsid); - IPersistStream_Release(pCLSIDStream); pCLSIDStream = NULL; - if (FAILED(hr)) { - ERR("(%p): non-implemented GetClassID for object %p\n", This, pIt->pTrack); - continue ; - } - if (FALSE == IsEqualGUID(&pIt_clsid, rguidType)) continue ; - if (FAILED(IDirectMusicTrack_IsParamSupported(pIt->pTrack, rguidType))) continue ; - hr = IDirectMusicTrack_GetParam(pIt->pTrack, rguidType, mtTime, pmtNext, pParam); - if (SUCCEEDED(hr)) return hr; + TRACE(" - %p -> 0x%x,%p\n", segment, segment->dwGroupBits, segment->pTrack); + + if (group != 0xffffffff && !(segment->dwGroupBits & group)) + continue; + if (FAILED(IDirectMusicTrack_IsParamSupported(segment->pTrack, type))) + continue; + hr = IDirectMusicTrack_GetParam(segment->pTrack, type, time, next, param); + if (SUCCEEDED(hr)) + return hr; + } + + WARN("(%p): not found\n", This); + return DMUS_E_TRACK_NOT_FOUND; } - ERR("(%p): not found\n", This); - return DMUS_E_TRACK_NOT_FOUND; - } - hr = IDirectMusicSegment8Impl_GetTrack(iface, &GUID_NULL, dwGroupBits, dwIndex, &pTrack); - if (FAILED(hr)) { - ERR("(%p): not found\n", This); - return DMUS_E_TRACK_NOT_FOUND; - } + hr = IDirectMusicSegment8Impl_GetTrack(iface, &GUID_NULL, group, index, &track); + if (FAILED(hr)) { + ERR("(%p): not found\n", This); + return DMUS_E_TRACK_NOT_FOUND; + } - hr = IDirectMusicTrack_GetParam(pTrack, rguidType, mtTime, pmtNext, pParam); - IDirectMusicTrack_Release(pTrack); pTrack = NULL; + hr = IDirectMusicTrack_GetParam(track, type, time, next, param); + IDirectMusicTrack_Release(track); - return hr; + return hr; } static HRESULT WINAPI IDirectMusicSegment8Impl_SetParam(IDirectMusicSegment8 *iface,

1 0

João Diogo Ferreira : kernel32: Handle GEOCLASS_ALL in EnumSystemGeoID().
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: 2a03c0958b1d15e7684b9437e67bf327098bcfde URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a03c0958b1d15e7684b9437… Author: João Diogo Ferreira <devilj(a)outlook.pt> Date: Mon Nov 18 02:27:24 2019 +0000 kernel32: Handle GEOCLASS_ALL in EnumSystemGeoID(). Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 25 +++++++++++++++++++------ dlls/kernel32/tests/locale.c | 13 +++++++++++++ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index e5e32d3cb5..b2a5831a9e 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4247,16 +4247,28 @@ INT WINAPI GetGeoInfoA(GEOID geoid, GEOTYPE geotype, LPSTR data, int data_len, L /****************************************************************************** * EnumSystemGeoID (KERNEL32.@) * - * Call a users function for every location available on the system. + * Calls a user's function for every location available on the system. * * PARAMS - * geoclass [I] Type of information desired (SYSGEOTYPE enum from "winnls.h") - * parent [I] GEOID for the parent - * enumproc [I] Callback function to call for each location + * geoclass [I] Type of location desired (SYSGEOTYPE enum from "winnls.h") + * parent [I] GeoID for the parent + * enumproc [I] Callback function to call for each location (prototype in "winnls.h") * * RETURNS * Success: TRUE. * Failure: FALSE. Use GetLastError() to determine the cause. + * + * NOTES + * The enumproc function returns TRUE to continue enumerating + * or FALSE to interrupt the enumeration. + * + * On failure, GetLastError() returns one of the following values: + * - ERROR_INVALID_PARAMETER: no callback function was provided. + * - ERROR_INVALID_FLAGS: the location type was invalid. + * + * TODO + * On Windows 10, this function filters out those locations which + * simultaneously lack ISO and UN codes (e.g. Johnson Atoll). */ BOOL WINAPI EnumSystemGeoID(GEOCLASS geoclass, GEOID parent, GEO_ENUMPROC enumproc) { @@ -4269,7 +4281,7 @@ BOOL WINAPI EnumSystemGeoID(GEOCLASS geoclass, GEOID parent, GEO_ENUMPROC enumpr return FALSE; } - if (geoclass != GEOCLASS_NATION && geoclass != GEOCLASS_REGION) { + if (geoclass != GEOCLASS_NATION && geoclass != GEOCLASS_REGION && geoclass != GEOCLASS_ALL) { SetLastError(ERROR_INVALID_FLAGS); return FALSE; } @@ -4277,9 +4289,10 @@ BOOL WINAPI EnumSystemGeoID(GEOCLASS geoclass, GEOID parent, GEO_ENUMPROC enumpr for (i = 0; i < ARRAY_SIZE(geoinfodata); i++) { const struct geoinfo_t *ptr = &geoinfodata[i]; - if (geoclass == GEOCLASS_NATION && (ptr->kind == LOCATION_REGION)) + if (geoclass == GEOCLASS_NATION && (ptr->kind != LOCATION_NATION)) continue; + /* LOCATION_BOTH counts as region. */ if (geoclass == GEOCLASS_REGION && (ptr->kind == LOCATION_NATION)) continue; diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index aaaf09cf5c..45cb11d254 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4981,6 +4981,19 @@ static void test_EnumSystemGeoID(void) ret = pEnumSystemGeoID(GEOCLASS_REGION, 0, test_geoid_enumproc2); ok(ret && geoidenum_count > 0, "got %d, count %d\n", ret, geoidenum_count); } + + geoidenum_count = 0; + ret = pEnumSystemGeoID(GEOCLASS_ALL, 39070, test_geoid_enumproc2); + if (ret == 0) + win_skip("GEOCLASS_ALL is not supported in EnumSystemGeoID.\n"); + else + { + ok(ret && geoidenum_count > 0, "got %d, count %d\n", ret, geoidenum_count); + + geoidenum_count = 0; + ret = pEnumSystemGeoID(GEOCLASS_ALL, 0, test_geoid_enumproc2); + ok(ret && geoidenum_count > 0, "got %d, count %d\n", ret, geoidenum_count); + } } struct invariant_entry {

1 0

Derek Lesho : setupapi: Add SetupGetInfDriverStoreLocationW stub.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: f1b94dc16c35a5c477b6df8aa94c6d3537642c77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1b94dc16c35a5c477b6df8a… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Nov 18 16:20:12 2019 -0600 setupapi: Add SetupGetInfDriverStoreLocationW stub. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/query.c | 14 ++++++++++++++ dlls/setupapi/setupapi.spec | 1 + 2 files changed, 15 insertions(+) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index ea1b969618..828d8a1145 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -717,3 +717,17 @@ BOOL WINAPI SetupQueryInfOriginalFileInformationW( return TRUE; } + +/*********************************************************************** + * SetupGetInfDriverStoreLocationW (SETUPAPI.@) + */ +BOOL WINAPI SetupGetInfDriverStoreLocationW( + PCWSTR FileName, PSP_ALTPLATFORM_INFO AlternativePlatformInfo, + PCWSTR LocaleName, PWSTR ReturnBuffer, DWORD ReturnBufferSize, + PDWORD RequiredSize) +{ + FIXME("stub: %s %p %s %p %u %p\n", debugstr_w(FileName), AlternativePlatformInfo, debugstr_w(LocaleName), ReturnBuffer, ReturnBufferSize, RequiredSize); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 81256a3417..8c4ebcc101 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -421,6 +421,7 @@ @ stdcall SetupGetFileCompressionInfoW(wstr ptr ptr ptr ptr) @ stdcall SetupGetFileQueueCount(long long ptr) @ stdcall SetupGetFileQueueFlags(long ptr) +@ stdcall SetupGetInfDriverStoreLocationW(wstr ptr wstr ptr long ptr) @ stdcall SetupGetInfFileListA(str long ptr long ptr) @ stdcall SetupGetInfFileListW(wstr long ptr long ptr) @ stdcall SetupGetInfInformationA(ptr long ptr long ptr)

1 0

Alexandre Julliard : kernel32/tests: Get rid of Unicode helper functions.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: e8ef4c0f53720243f8bccfdfec7f87cf75e0ed7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8ef4c0f53720243f8bccfdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 19 15:36:22 2019 +0100 kernel32/tests: Get rid of Unicode helper functions. --- dlls/kernel32/tests/locale.c | 57 +++++++++++++------------------------------- 1 file changed, 16 insertions(+), 41 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 9a13693443..aaaf09cf5c 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -48,33 +48,6 @@ static const WCHAR fooW[] = {'f','o','o',0}; static const WCHAR emptyW[] = {0}; static const WCHAR invalidW[] = {'i','n','v','a','l','i','d',0}; -static inline unsigned int strlenW( const WCHAR *str ) -{ - const WCHAR *s = str; - while (*s) s++; - return s - str; -} - -static inline int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ) -{ - if (n <= 0) return 0; - while ((--n > 0) && *str1 && (*str1 == *str2)) { str1++; str2++; } - return *str1 - *str2; -} - -static inline WCHAR *strchrW( const WCHAR *str, WCHAR ch ) -{ - do { if (*str == ch) return (WCHAR *)str; } while (*str++); - return NULL; -} - -static inline BOOL isdigitW( WCHAR wc ) -{ - WORD type; - GetStringTypeW( CT_CTYPE1, &wc, 1, &type ); - return type & C1_DIGIT; -} - /* Some functions are only in later versions of kernel32.dll */ static WORD enumCount; @@ -171,7 +144,7 @@ static void InitFunctionPointers(void) MultiByteToWideChar(CP_ACP,0,y,-1,Expected,ARRAY_SIZE(Expected)); \ SetLastError(0xdeadbeef); buffer[0] = '\0' #define EXPECT_LENW ok(ret == lstrlenW(Expected)+1, "Expected Len %d, got %d\n", lstrlenW(Expected)+1, ret) -#define EXPECT_EQW ok(strncmpW(buffer, Expected, strlenW(Expected)) == 0, "Bad conversion\n") +#define EXPECT_EQW ok(wcsncmp(buffer, Expected, lstrlenW(Expected)) == 0, "Bad conversion\n") #define NUO LOCALE_NOUSEROVERRIDE @@ -681,7 +654,7 @@ static void test_GetTimeFormatEx(void) STRINGSW("m1s2m3s4", ""); /* TIME_NOMINUTESORSECONDS/complex format */ ret = pGetTimeFormatEx(localeW, TIME_NOMINUTESORSECONDS, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret == strlenW(buffer)+1, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + ok(ret == lstrlenW(buffer)+1, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); EXPECT_LENW; EXPECT_EQW; STRINGSW("", "8:56 AM"); /* TIME_NOSECONDS/Default format */ @@ -701,7 +674,7 @@ static void test_GetTimeFormatEx(void) STRINGSW("s1s2s3", ""); /* Duplicate tokens */ ret = pGetTimeFormatEx(localeW, TIME_NOSECONDS, &curtime, input, buffer, ARRAY_SIZE(buffer)); - ok(ret == strlenW(buffer)+1, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); + ok(ret == lstrlenW(buffer)+1, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); EXPECT_LENW; EXPECT_EQW; STRINGSW("t/tt", "A/AM"); /* AM time marker */ @@ -3346,6 +3319,7 @@ static void test_FoldStringA(void) static void test_FoldStringW(void) { int ret; + WORD type; unsigned int i, j; WCHAR src[256], dst[256], ch, prev_ch = 1; static const DWORD badFlags[] = @@ -3564,10 +3538,11 @@ static void test_FoldStringW(void) ret = pFoldStringW(MAP_FOLDDIGITS, src, -1, dst, 256); ok(ret == 2, "Expected ret == 2, got %d, error %d\n", ret, GetLastError()); - ok(dst[0] == ch || strchrW(outOfSequenceDigits, ch) || + ok(dst[0] == ch || wcschr(outOfSequenceDigits, ch) || (ch >= 0xa8e0 && ch <= 0xa8e9), /* combining Devanagari on Win8 */ "MAP_FOLDDIGITS: ch 0x%04x Expected unchanged got %04x\n", ch, dst[0]); - ok(!isdigitW(ch) || strchrW(outOfSequenceDigits, ch) || + GetStringTypeW( CT_CTYPE1, &ch, 1, &type ); + ok(!(type & C1_DIGIT) || wcschr(outOfSequenceDigits, ch) || broken( ch >= 0xbf0 && ch <= 0xbf2 ), /* win2k */ "char %04x should not be a digit\n", ch ); } @@ -3595,7 +3570,7 @@ static void test_FoldStringW(void) broken( dst[0] == ch ) || /* old Windows versions don't have all mappings */ (digitRanges[j] == 0x3020 && dst[0] == ch) || /* Hangzhou not present in all Windows versions */ (digitRanges[j] == 0x0F29 && dst[0] == ch) || /* Tibetan not present in all Windows versions */ - strchrW(noDigitAvailable, c), + wcschr(noDigitAvailable, c), "MAP_FOLDDIGITS: ch %04x Expected %04x got %04x\n", ch, '0' + digitRanges[j] - ch, dst[0]); } @@ -5908,22 +5883,22 @@ static void test_NormalizeString(void) if (dstlen) { dstlen = pNormalizeString( norm_forms[i], ptest->str, -1, dst, dstlen ); - ok(dstlen == strlenW( dst )+1, "%s:%d: Copied length differed: was %d, should be %d\n", - wine_dbgstr_w(ptest->str), i, dstlen, strlenW( dst )+1); - str_cmp = strncmpW( ptest->expected[i], dst, dstlen+1 ); + ok(dstlen == lstrlenW( dst )+1, "%s:%d: Copied length differed: was %d, should be %d\n", + wine_dbgstr_w(ptest->str), i, dstlen, lstrlenW( dst )+1); + str_cmp = wcsncmp( ptest->expected[i], dst, dstlen+1 ); todo_wine_if(ptest->todo[i]) ok( str_cmp == 0, "%s:%d: string incorrect got %s expect %s\n", wine_dbgstr_w(ptest->str), i, wine_dbgstr_w(dst), wine_dbgstr_w(ptest->expected[i]) ); } - dstlen = pNormalizeString( norm_forms[i], ptest->str, strlenW(ptest->str), NULL, 0 ); + dstlen = pNormalizeString( norm_forms[i], ptest->str, lstrlenW(ptest->str), NULL, 0 ); if (dstlen) { memset(dst, 0, sizeof(dst)); - dstlen = pNormalizeString( norm_forms[i], ptest->str, strlenW(ptest->str), dst, dstlen ); - ok(dstlen == strlenW( dst ), "%s:%d: Copied length differed: was %d, should be %d\n", - wine_dbgstr_w(ptest->str), i, dstlen, strlenW( dst )); - str_cmp = strncmpW( ptest->expected[i], dst, dstlen ); + dstlen = pNormalizeString( norm_forms[i], ptest->str, lstrlenW(ptest->str), dst, dstlen ); + ok(dstlen == lstrlenW( dst ), "%s:%d: Copied length differed: was %d, should be %d\n", + wine_dbgstr_w(ptest->str), i, dstlen, lstrlenW( dst )); + str_cmp = wcsncmp( ptest->expected[i], dst, dstlen ); todo_wine_if(ptest->todo[i]) ok( str_cmp == 0, "%s:%d: string incorrect got %s expect %s\n", wine_dbgstr_w(ptest->str), i, wine_dbgstr_w(dst), wine_dbgstr_w(ptest->expected[i]) );

1 0

Alexandre Julliard : kernel32: Use RtlLocaleNameToLcid().
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: 9f0983ddfc570f20e211ddc257f2c39068266273 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f0983ddfc570f20e211ddc2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 19 10:10:18 2019 +0100 kernel32: Use RtlLocaleNameToLcid(). --- dlls/kernel32/locale.c | 43 +++++++------------------------------------ dlls/kernel32/tests/locale.c | 7 +++++++ 2 files changed, 14 insertions(+), 36 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index a465ba6e29..e5e32d3cb5 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1182,32 +1182,12 @@ BOOL WINAPI GetUserPreferredUILanguages( DWORD flags, ULONG *count, WCHAR *buffe */ LCID WINAPI LocaleNameToLCID( LPCWSTR name, DWORD flags ) { - struct locale_name locale_name; - static int once; - - if (flags && !once++) - FIXME( "unsupported flags %x\n", flags ); - - if (name == LOCALE_NAME_USER_DEFAULT) - return GetUserDefaultLCID(); + LCID lcid; - /* string parsing */ - parse_locale_name( name, &locale_name ); - - TRACE( "found lcid %x for %s, matches %d\n", - locale_name.lcid, debugstr_w(name), locale_name.matches ); - - if (!locale_name.matches) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - if (locale_name.matches == 1) - WARN( "locale %s not recognized, defaulting to %s\n", - debugstr_w(name), debugstr_w(locale_name.lang) ); - - return locale_name.lcid; + if (!name) return GetUserDefaultLCID(); + if (!set_ntstatus( RtlLocaleNameToLcid( name, &lcid, 2 ))) return 0; + if (!(flags & LOCALE_ALLOW_NEUTRAL_NAMES)) lcid = ConvertDefaultLocale( lcid ); + return lcid; } @@ -2570,18 +2550,9 @@ BOOL WINAPI IsValidLocale( LCID lcid, DWORD flags ) */ BOOL WINAPI IsValidLocaleName( LPCWSTR locale ) { - struct locale_name locale_name; - - if (!locale) - return FALSE; - - /* string parsing */ - parse_locale_name( locale, &locale_name ); - - TRACE( "found lcid %x for %s, matches %d\n", - locale_name.lcid, debugstr_w(locale), locale_name.matches ); + LCID lcid; - return locale_name.matches > 0; + return !RtlLocaleNameToLcid( locale, &lcid, 2 ); } /****************************************************************************** diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index b87f99c1c2..9a13693443 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2856,6 +2856,9 @@ static void test_LocaleNameToLCID(void) ok(lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), SORT_DEFAULT), "Got wrong lcid for es-es: 0x%x\n", lcid); /* english neutral name */ + lcid = pLocaleNameToLCID(enW, LOCALE_ALLOW_NEUTRAL_NAMES); + ok(lcid == MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_NEUTRAL), SORT_DEFAULT) || + broken(lcid == 0) /* Vista */, "got 0x%04x\n", lcid); lcid = pLocaleNameToLCID(enW, 0); ok(lcid == MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT) || broken(lcid == 0) /* Vista */, "got 0x%04x\n", lcid); @@ -2871,6 +2874,7 @@ static void test_LocaleNameToLCID(void) *buffer = 0; ret = pLCIDToLocaleName(lcid, buffer, ARRAY_SIZE(buffer), 0); ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(ptr->name), ret); + todo_wine_if (ptr->todo) ok(!lstrcmpW(ptr->sname, buffer), "%s: got wrong locale name %s\n", wine_dbgstr_w(ptr->name), wine_dbgstr_w(buffer)); @@ -4740,6 +4744,7 @@ static void test_GetLocaleInfoEx(void) static void test_IsValidLocaleName(void) { static const WCHAR enusW[] = {'e','n','-','U','S',0}; + static const WCHAR enW[] = {'e','n',0}; static const WCHAR zzW[] = {'z','z',0}; static const WCHAR zz_zzW[] = {'z','z','-','Z','Z',0}; static const WCHAR zzzzW[] = {'z','z','z','z',0}; @@ -4753,6 +4758,8 @@ static void test_IsValidLocaleName(void) ret = pIsValidLocaleName(enusW); ok(ret, "IsValidLocaleName failed\n"); + ret = pIsValidLocaleName(enW); + ok(ret || broken(!ret), "IsValidLocaleName failed\n"); ret = pIsValidLocaleName(zzW); ok(!ret || broken(ret), "IsValidLocaleName should have failed\n"); ret = pIsValidLocaleName(zz_zzW);

1 0

Alexandre Julliard : ntdll: Implement RtlLocaleNameToLcid().
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: 7ac7a902c87d7d82e6b2431b8a44260eb5149ce5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ac7a902c87d7d82e6b2431b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 19 10:08:27 2019 +0100 ntdll: Implement RtlLocaleNameToLcid(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 79 ++++++++++++++++++++++-- dlls/ntdll/loader.c | 2 + dlls/ntdll/locale.c | 142 +++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/ntdll_misc.h | 1 + include/winternl.h | 1 + 6 files changed, 221 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7ac7a902c87d7d82e6b2…

1 0

Alexandre Julliard : ntdll: Move locale functions to a new locale.c file.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: 4538a137e089240f1981f0d6f82fb8d63a65f4f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4538a137e089240f1981f0d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 13 20:55:03 2019 +0100 ntdll: Move locale functions to a new locale.c file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 + dlls/ntdll/directory.c | 134 --------------------------- dlls/ntdll/loader.c | 1 + dlls/ntdll/locale.c | 236 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll_misc.h | 4 +- dlls/ntdll/resource.c | 59 +----------- 6 files changed, 242 insertions(+), 193 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4538a137e089240f1981…

1 0

Alexandre Julliard : kernel32: Add more special cases in ConvertDefaultLocale().
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: 4b1a8d63615d0e553fd4021a7b135192467220cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b1a8d63615d0e553fd4021a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 19 09:58:20 2019 +0100 kernel32: Add more special cases in ConvertDefaultLocale(). --- dlls/kernel32/locale.c | 41 ++++++++++++++++--------- dlls/kernel32/tests/locale.c | 73 ++++++++++++++++++++++++++++++++------------ 2 files changed, 81 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4b1a8d63615d0e553fd4…

1 0

Alexandre Julliard : kernel32: Move system information functions to kernelbase.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: 71aba33fc68e97d1b49a9207c8fc2ef733b604a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71aba33fc68e97d1b49a9207… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 18 18:57:26 2019 +0100 kernel32: Move system information functions to kernelbase. --- dlls/kernel32/cpu.c | 151 ---------------------------------------- dlls/kernel32/kernel32.spec | 10 +-- dlls/kernelbase/kernelbase.spec | 10 +-- dlls/kernelbase/memory.c | 147 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 157 insertions(+), 161 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=71aba33fc68e97d1b49a…

1 0

Alexandre Julliard : kernel32: Move physical memory status functions to kernelbase.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: b73cfa72edaed76744cfa9a19670bff3684c66ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=b73cfa72edaed76744cfa9a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 18 15:05:04 2019 +0100 kernel32: Move physical memory status functions to kernelbase. --- dlls/kernel32/heap.c | 274 +--------------------------------------- dlls/kernel32/kernel32.spec | 4 +- dlls/kernelbase/kernelbase.spec | 4 +- dlls/kernelbase/memory.c | 77 +++++++++++ 4 files changed, 83 insertions(+), 276 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b73cfa72edaed76744cf…

1 0

Alexandre Julliard : ntdll: Support SystemPerformanceInformation on non-Linux platforms.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: dad14ab8331922171393d6ef75861303c8bc8d50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dad14ab8331922171393d6ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 18 14:55:00 2019 +0100 ntdll: Support SystemPerformanceInformation on non-Linux platforms. Based on the GlobalMemoryStatusEx implementation. --- dlls/ntdll/nt.c | 197 ++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 147 insertions(+), 50 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index b6daa226b3..c9b278d3fc 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -50,6 +50,19 @@ #endif #include <time.h> +#ifdef sun +/* FIXME: Unfortunately swapctl can't be used with largefile.... */ +# undef _FILE_OFFSET_BITS +# define _FILE_OFFSET_BITS 32 +# ifdef HAVE_SYS_RESOURCE_H +# include <sys/resource.h> +# endif +# ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +# endif +# include <sys/swap.h> +#endif + #define NONAMELESSUNION #include "ntstatus.h" #define WIN32_NO_STATUS @@ -2347,6 +2360,139 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG #endif +static void get_performance_info( SYSTEM_PERFORMANCE_INFORMATION *info ) +{ + unsigned long long totalram = 0, freeram = 0, totalswap = 0, freeswap = 0; + FILE *fp; + + memset( info, 0, sizeof(*info) ); + + if ((fp = fopen("/proc/uptime", "r"))) + { + double uptime, idle_time; + + fscanf(fp, "%lf %lf", &uptime, &idle_time); + fclose(fp); + info->IdleTime.QuadPart = 10000000 * idle_time; + } + else + { + static ULONGLONG idle; + /* many programs expect IdleTime to change so fake change */ + info->IdleTime.QuadPart = ++idle; + } + +#ifdef linux + if ((fp = fopen("/proc/meminfo", "r"))) + { + unsigned long long value; + char line[64]; + + while (fgets(line, sizeof(line), fp)) + { + if(sscanf(line, "MemTotal: %llu kB", &value) == 1) + totalram += value * 1024; + else if(sscanf(line, "MemFree: %llu kB", &value) == 1) + freeram += value * 1024; + else if(sscanf(line, "SwapTotal: %llu kB", &value) == 1) + totalswap += value * 1024; + else if(sscanf(line, "SwapFree: %llu kB", &value) == 1) + freeswap += value * 1024; + else if (sscanf(line, "Buffers: %llu", &value)) + freeram += value * 1024; + else if (sscanf(line, "Cached: %llu", &value)) + freeram += value * 1024; + } + fclose(fp); + } +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || \ + defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) + { +#ifdef __APPLE__ + unsigned int val; +#else + unsigned long val; +#endif + int mib[2]; + size_t size_sys; + + mib[0] = CTL_HW; +#ifdef HW_MEMSIZE + { + uint64_t val64; + mib[1] = HW_MEMSIZE; + size_sys = sizeof(val64); + if (!sysctl(mib, 2, &val64, &size_sys, NULL, 0) && size_sys == sizeof(val64)) totalram = val64; + } +#endif + +#ifdef HAVE_MACH_MACH_H + { + host_name_port_t host = mach_host_self(); + mach_msg_type_number_t count; +#ifdef HOST_VM_INFO64_COUNT + vm_statistics64_data_t vm_stat; + + count = HOST_VM_INFO64_COUNT; + if (host_statistics64(host, HOST_VM_INFO64, (host_info64_t)&vm_stat, &count) == KERN_SUCCESS) + freeram = (vm_stat.free_count + vm_stat.inactive_count) * (ULONGLONG)page_size; +#endif + if (!totalram) + { + host_basic_info_data_t info; + count = HOST_BASIC_INFO_COUNT; + if (host_info(host, HOST_BASIC_INFO, (host_info_t)&info, &count) == KERN_SUCCESS) + totalram = info.max_mem; + } + mach_port_deallocate(mach_task_self(), host); + } +#endif + + if (!totalram) + { + mib[1] = HW_PHYSMEM; + size_sys = sizeof(val); + if (!sysctl(mib, 2, &val, &size_sys, NULL, 0) && size_sys == sizeof(val)) totalram = val; + } + if (!freeram) + { + mib[1] = HW_USERMEM; + size_sys = sizeof(val); + if (!sysctl(mib, 2, &val, &size_sys, NULL, 0) && size_sys == sizeof(val)) freeram = val; + } +#ifdef VM_SWAPUSAGE + { + struct xsw_usage swap; + mib[0] = CTL_VM; + mib[1] = VM_SWAPUSAGE; + size_sys = sizeof(swap); + if (!sysctl(mib, 2, &swap, &size_sys, NULL, 0) && size_sys == sizeof(swap)) + { + totalswap = swap.xsu_total; + freeswap = swap.xsu_avail; + } + } +#endif + } +#elif defined( sun ) + { + struct anoninfo swapinf; + int rval; + totalram = sysconf(_SC_PHYS_PAGES) * (ULONGLONG)page_size; + freeram = sysconf(_SC_AVPHYS_PAGES) * (ULONGLONG)page_size; + rval = swapctl(SC_AINFO, &swapinf); + if (rval > -1) + { + totalswap = swapinf.ani_max * (ULONGLONG)page_size; + freeswap = swapinf.ani_free * (ULONGLONG)page_size; + } + } +#endif + info->AvailablePages = freeram / page_size; + info->TotalCommittedPages = (totalram + totalswap - freeram - freeswap) / page_size; + info->TotalCommitLimit = (totalram + totalswap) / page_size; +} + /*********************************************************************** * RtlIsProcessorFeaturePresent [NTDLL.@] */ @@ -2415,59 +2561,10 @@ NTSTATUS WINAPI NtQuerySystemInformation( { SYSTEM_PERFORMANCE_INFORMATION spi; static BOOL fixme_written = FALSE; - FILE *fp; - memset(&spi, 0 , sizeof(spi)); + get_performance_info( &spi ); len = sizeof(spi); - spi.Reserved3 = 0x7fffffff; /* Available paged pool memory? */ - - if ((fp = fopen("/proc/uptime", "r"))) - { - double uptime, idle_time; - - fscanf(fp, "%lf %lf", &uptime, &idle_time); - fclose(fp); - spi.IdleTime.QuadPart = 10000000 * idle_time; - } - else - { - static ULONGLONG idle; - /* many programs expect IdleTime to change so fake change */ - spi.IdleTime.QuadPart = ++idle; - } - - if ((fp = fopen("/proc/meminfo", "r"))) - { - unsigned long long totalram = 0, freeram = 0, totalswap = 0, freeswap = 0; - char line[64]; - while (fgets(line, sizeof(line), fp)) - { - if(sscanf(line, "MemTotal: %llu kB", &totalram) == 1) - { - totalram *= 1024; - } - else if(sscanf(line, "MemFree: %llu kB", &freeram) == 1) - { - freeram *= 1024; - } - else if(sscanf(line, "SwapTotal: %llu kB", &totalswap) == 1) - { - totalswap *= 1024; - } - else if(sscanf(line, "SwapFree: %llu kB", &freeswap) == 1) - { - freeswap *= 1024; - break; - } - } - fclose(fp); - - spi.AvailablePages = freeram / page_size; - spi.TotalCommittedPages = (totalram + totalswap - freeram - freeswap) / page_size; - spi.TotalCommitLimit = (totalram + totalswap) / page_size; - } - if (Length >= len) { if (!SystemInformation) ret = STATUS_ACCESS_VIOLATION;

1 0

Zebediah Figura : strmbase: Avoid unnecessary use of IPin::ConnectedTo().
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: cc78d104054378570b0d4a244efb5a3e95b92cb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc78d104054378570b0d4a24… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 18 18:51:24 2019 -0600 strmbase: Avoid unnecessary use of IPin::ConnectedTo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/outputqueue.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/strmbase/outputqueue.c b/dlls/strmbase/outputqueue.c index ee05653d7a..dbcc4b6d0d 100644 --- a/dlls/strmbase/outputqueue.c +++ b/dlls/strmbase/outputqueue.c @@ -177,6 +177,8 @@ VOID WINAPI OutputQueue_SendAnyway(OutputQueue *pOutputQueue) VOID WINAPI OutputQueue_EOS(OutputQueue *pOutputQueue) { + IPin *peer; + EnterCriticalSection(&pOutputQueue->csQueue); if (pOutputQueue->hThread) { @@ -191,16 +193,8 @@ VOID WINAPI OutputQueue_EOS(OutputQueue *pOutputQueue) qev->pSample = NULL; list_add_tail(&pOutputQueue->SampleList, &qev->entry); } - else - { - IPin* ppin = NULL; - IPin_ConnectedTo(&pOutputQueue->pInputPin->pin.IPin_iface, &ppin); - if (ppin) - { - IPin_EndOfStream(ppin); - IPin_Release(ppin); - } - } + else if ((peer = pOutputQueue->pInputPin->pin.peer)) + IPin_EndOfStream(peer); LeaveCriticalSection(&pOutputQueue->csQueue); /* Covers sending the Event to the worker Thread */ OutputQueue_SendAnyway(pOutputQueue); @@ -259,13 +253,9 @@ DWORD WINAPI OutputQueueImpl_ThreadProc(OutputQueue *pOutputQueue) QueuedEvent *qev = LIST_ENTRY(cursor, QueuedEvent, entry); if (qev->type == EOS_PACKET) { - IPin* ppin = NULL; - IPin_ConnectedTo(&pOutputQueue->pInputPin->pin.IPin_iface, &ppin); - if (ppin) - { - IPin_EndOfStream(ppin); - IPin_Release(ppin); - } + IPin *peer; + if ((peer = pOutputQueue->pInputPin->pin.peer)) + IPin_EndOfStream(peer); } else if (qev->type == SAMPLE_PACKET) break;

1 0

Zebediah Figura : quartz/videorenderer: Avoid calling IPin::ConnectionMediaType() on our own pin.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: bcb05ad29b7cf1bcda29f5b019cf2636b3491f4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcb05ad29b7cf1bcda29f5b0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 18 18:51:23 2019 -0600 quartz/videorenderer: Avoid calling IPin::ConnectionMediaType() on our own pin. Avoids leaking the format block. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 18e5f618b0..b71d15a5d2 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -136,30 +136,23 @@ static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This) static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, DWORD size) { - AM_MEDIA_TYPE amt; - HRESULT hr = S_OK; + const AM_MEDIA_TYPE *amt = &This->renderer.sink.pin.mt; BITMAPINFOHEADER *bmiHeader; HDC dc; TRACE("(%p)->(%p, %d)\n", This, data, size); - hr = IPin_ConnectionMediaType(&This->renderer.sink.pin.IPin_iface, &amt); - if (FAILED(hr)) { - ERR("Unable to retrieve media type\n"); - return hr; - } - - if (IsEqualIID(&amt.formattype, &FORMAT_VideoInfo)) + if (IsEqualGUID(&amt->formattype, &FORMAT_VideoInfo)) { - bmiHeader = &((VIDEOINFOHEADER *)amt.pbFormat)->bmiHeader; + bmiHeader = &((VIDEOINFOHEADER *)amt->pbFormat)->bmiHeader; } - else if (IsEqualIID(&amt.formattype, &FORMAT_VideoInfo2)) + else if (IsEqualGUID(&amt->formattype, &FORMAT_VideoInfo2)) { - bmiHeader = &((VIDEOINFOHEADER2 *)amt.pbFormat)->bmiHeader; + bmiHeader = &((VIDEOINFOHEADER2 *)amt->pbFormat)->bmiHeader; } else { - FIXME("Unknown type %s\n", debugstr_guid(&amt.subtype)); + FIXME("Unknown subtype %s.\n", debugstr_guid(&amt->subtype)); return VFW_E_RUNTIME_ERROR; }

1 0

Zebediah Figura : wineqtdecoder: Simplify disconnecting the sink's peer in qt_splitter_destroy().
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: 31bd0a6abbf2816c428c4044227d190b6ccda8d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31bd0a6abbf2816c428c4044… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 18 18:51:22 2019 -0600 wineqtdecoder: Simplify disconnecting the sink's peer in qt_splitter_destroy(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index a7da3b37d6..2da0f691dc 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -234,12 +234,9 @@ static void qt_splitter_destroy(struct strmbase_filter *iface) EnterCriticalSection(&filter->csReceive); /* Don't need to clean up output pins, disconnecting input pin will do that */ - IPin_ConnectedTo(&filter->pInputPin.pin.IPin_iface, &peer); - if (peer) - { - IPin_Disconnect(peer); - IPin_Release(peer); - } + + if (filter->pInputPin.pin.peer) + IPin_Disconnect(filter->pInputPin.pin.peer); FreeMediaType(&filter->pInputPin.pin.mt); if (filter->pInputPin.pAlloc)

1 0

Zebediah Figura : strmbase: Forbid (dis)connecting pins if the filter is not stopped.
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: 2a6037e263ff3fae8ca82d90b0b141bea1cd473d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a6037e263ff3fae8ca82d90… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 18 18:51:21 2019 -0600 strmbase: Forbid (dis)connecting pins if the filter is not stopped. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index c7f1ed2af4..8c337ca471 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -366,6 +366,13 @@ HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const EnterCriticalSection(&This->pin.filter->csFilter); { + if (This->pin.filter->state != State_Stopped) + { + LeaveCriticalSection(&This->pin.filter->csFilter); + WARN("Filter is not stopped; returning VFW_E_NOT_STOPPED.\n"); + return VFW_E_NOT_STOPPED; + } + /* if we have been a specific type to connect with, then we can either connect * with that or fail. We cannot choose different AM_MEDIA_TYPE */ if (pmt && !IsEqualGUID(&pmt->majortype, &GUID_NULL) && !IsEqualGUID(&pmt->subtype, &GUID_NULL)) @@ -447,6 +454,13 @@ HRESULT WINAPI BaseOutputPinImpl_Disconnect(IPin * iface) EnterCriticalSection(&This->pin.filter->csFilter); { + if (This->pin.filter->state != State_Stopped) + { + LeaveCriticalSection(&This->pin.filter->csFilter); + WARN("Filter is not stopped; returning VFW_E_NOT_STOPPED.\n"); + return VFW_E_NOT_STOPPED; + } + if (This->pMemInputPin) { IMemInputPin_Release(This->pMemInputPin); @@ -730,6 +744,13 @@ HRESULT WINAPI BaseInputPinImpl_ReceiveConnection(IPin * iface, IPin * pReceiveP EnterCriticalSection(&This->pin.filter->csFilter); { + if (This->pin.filter->state != State_Stopped) + { + LeaveCriticalSection(&This->pin.filter->csFilter); + WARN("Filter is not stopped; returning VFW_E_NOT_STOPPED.\n"); + return VFW_E_NOT_STOPPED; + } + if (This->pin.peer) hr = VFW_E_ALREADY_CONNECTED;

1 0

Zebediah Figura : strmbase: Rename the "mtCurrent" field of struct strmbase_pin to "mt".
by Alexandre Julliard 19 Nov '19

19 Nov '19

Module: wine Branch: master Commit: 03f0479c34ec1d9cf732728f740113fedd48a10c URL: https://source.winehq.org/git/wine.git/?a=commit;h=03f0479c34ec1d9cf732728f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 18 18:51:20 2019 -0600 strmbase: Rename the "mtCurrent" field of struct strmbase_pin to "mt". Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 4 ++-- dlls/qcap/avimux.c | 2 +- dlls/qcap/smartteefilter.c | 4 ++-- dlls/quartz/dsoundrender.c | 14 +++++++------- dlls/quartz/filesource.c | 4 ++-- dlls/quartz/tests/videorenderer.c | 4 ++-- dlls/quartz/tests/vmr7.c | 4 ++-- dlls/quartz/tests/vmr9.c | 4 ++-- dlls/quartz/videorenderer.c | 4 ++-- dlls/quartz/vmr9.c | 6 +++--- dlls/strmbase/pin.c | 20 ++++++++++---------- dlls/winegstreamer/gstdemux.c | 4 ++-- dlls/wineqtdecoder/qtsplitter.c | 4 ++-- include/wine/strmbase.h | 2 +- 14 files changed, 40 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=03f0479c34ec1d9cf732…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2019