wine-commits April 2018

wine-commits@winehq.org

2 participants
542 discussions

Nikolay Sivov : d3d10core/tests: Add a test for setting multiple viewports.
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: wine Branch: master Commit: e8d87a538656025c604869aba0e7b28902a7ce62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8d87a538656025c604869ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 13 11:07:00 2018 +0300 d3d10core/tests: Add a test for setting multiple viewports. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 189 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 189 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index d64a892..6982a4e 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -15996,6 +15996,194 @@ done: release_test_context(&test_context); } +static void test_multiple_viewports(void) +{ + struct + { + unsigned int draw_id; + unsigned int padding[3]; + } constant; + struct d3d10core_test_context test_context; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10RenderTargetView *rtv; + ID3D10Texture2D *texture; + ID3D10GeometryShader *gs; + ID3D10PixelShader *ps; + ID3D10Device *device; + ID3D10Buffer *cb; + HRESULT hr; + + static const DWORD gs_code[] = + { +#if 0 + struct gs_in + { + float4 pos : SV_Position; + }; + + struct gs_out + { + float4 pos : SV_Position; + uint viewport : SV_ViewportArrayIndex; + }; + + [maxvertexcount(6)] + void main(triangle gs_in vin[3], inout TriangleStream<gs_out> vout) + { + gs_out o; + for (uint instance_id = 0; instance_id < 2; ++instance_id) + { + o.viewport = instance_id; + for (uint i = 0; i < 3; ++i) + { + o.pos = vin[i].pos; + vout.Append(o); + } + vout.RestartStrip(); + } + } +#endif + 0x43425844, 0xabbb660f, 0x0729bf23, 0x14a9a104, 0x1b454917, 0x00000001, 0x0000021c, 0x00000003, + 0x0000002c, 0x00000060, 0x000000c4, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000005c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000005, 0x00000001, 0x00000001, 0x00000e01, + 0x505f5653, 0x7469736f, 0x006e6f69, 0x565f5653, 0x70776569, 0x4174726f, 0x79617272, 0x65646e49, + 0xabab0078, 0x52444853, 0x00000150, 0x00020040, 0x00000054, 0x05000061, 0x002010f2, 0x00000003, + 0x00000000, 0x00000001, 0x02000068, 0x00000001, 0x0100185d, 0x0100285c, 0x04000067, 0x001020f2, + 0x00000000, 0x00000001, 0x04000067, 0x00102012, 0x00000001, 0x00000005, 0x0200005e, 0x00000006, + 0x05000036, 0x00100012, 0x00000000, 0x00004001, 0x00000000, 0x01000030, 0x07000050, 0x00100022, + 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x00000002, 0x03040003, 0x0010001a, 0x00000000, + 0x05000036, 0x00100022, 0x00000000, 0x00004001, 0x00000000, 0x01000030, 0x07000050, 0x00100042, + 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x00000003, 0x03040003, 0x0010002a, 0x00000000, + 0x07000036, 0x001020f2, 0x00000000, 0x00a01e46, 0x0010001a, 0x00000000, 0x00000000, 0x05000036, + 0x00102012, 0x00000001, 0x0010000a, 0x00000000, 0x01000013, 0x0700001e, 0x00100022, 0x00000000, + 0x0010001a, 0x00000000, 0x00004001, 0x00000001, 0x01000016, 0x01000009, 0x0700001e, 0x00100012, + 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x00000001, 0x01000016, 0x0100003e, + }; + static const DWORD ps_code[] = + { +#if 0 + uint draw_id; + + float4 main(in float4 pos : SV_Position, + in uint viewport : SV_ViewportArrayIndex) : SV_Target + { + return float4(viewport, draw_id, 0, 0); + } +#endif + 0x43425844, 0x77334c0f, 0x5df3ca7a, 0xc53c00db, 0x3e6e5750, 0x00000001, 0x00000150, 0x00000003, + 0x0000002c, 0x00000090, 0x000000c4, 0x4e475349, 0x0000005c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000005, + 0x00000001, 0x00000001, 0x00000101, 0x505f5653, 0x7469736f, 0x006e6f69, 0x565f5653, 0x70776569, + 0x4174726f, 0x79617272, 0x65646e49, 0xabab0078, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, + 0xabab0074, 0x52444853, 0x00000084, 0x00000040, 0x00000021, 0x04000059, 0x00208e46, 0x00000000, + 0x00000001, 0x04000864, 0x00101012, 0x00000001, 0x00000005, 0x03000065, 0x001020f2, 0x00000000, + 0x05000056, 0x00102012, 0x00000000, 0x0010100a, 0x00000001, 0x06000056, 0x00102022, 0x00000000, + 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x0100003e, + }; + static const struct vec4 expected_values[] = + { + {0.0f, 1.0f}, {1.0f, 1.0f}, {0.0f, 2.0f}, {0.5f, 0.5f}, {0.5f, 0.5f}, + }; + static const float clear_color[] = {0.5f, 0.5f, 0.0f, 0.0f}; + D3D10_VIEWPORT vp[2]; + RECT rect; + int width; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + memset(&constant, 0, sizeof(constant)); + cb = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(constant), &constant); + ID3D10Device_PSSetConstantBuffers(device, 0, 1, &cb); + + hr = ID3D10Device_CreateGeometryShader(device, gs_code, sizeof(gs_code), &gs); + ok(SUCCEEDED(hr), "Failed to create geometry shader, hr %#x.\n", hr); + ID3D10Device_GSSetShader(device, gs); + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + + texture_desc.Width = 32; + texture_desc.Height = 32; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); + + width = texture_desc.Width / 2; + + vp[0].TopLeftX = 0.0f; + vp[0].TopLeftY = 0.0f; + vp[0].Width = width; + vp[0].Height = texture_desc.Height; + vp[0].MinDepth = 0.0f; + vp[0].MaxDepth = 1.0f; + + vp[1] = vp[0]; + vp[1].TopLeftX = width; + vp[1].Width = width; + ID3D10Device_RSSetViewports(device, 2, vp); + + constant.draw_id = 0; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + constant.draw_id = 1; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + + SetRect(&rect, 0, 0, width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[0], 1); + SetRect(&rect, width, 0, 2 * width - 1, texture_desc.Height - 1); +todo_wine + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[1], 1); + + /* One viewport. */ + ID3D10Device_ClearRenderTargetView(device, rtv, clear_color); + ID3D10Device_RSSetViewports(device, 1, vp); + constant.draw_id = 2; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + SetRect(&rect, 0, 0, width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[2], 1); + SetRect(&rect, width, 0, 2 * width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[3], 1); + + /* Reset viewports. */ + ID3D10Device_ClearRenderTargetView(device, rtv, clear_color); + ID3D10Device_RSSetViewports(device, 0, NULL); + constant.draw_id = 3; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); +todo_wine + check_texture_sub_resource_vec4(texture, 0, NULL, &expected_values[4], 1); + + ID3D10RenderTargetView_Release(rtv); + ID3D10Texture2D_Release(texture); + + ID3D10Buffer_Release(cb); + ID3D10GeometryShader_Release(gs); + ID3D10PixelShader_Release(ps); + release_test_context(&test_context); +} + START_TEST(device) { unsigned int argc, i; @@ -16095,4 +16283,5 @@ START_TEST(device) test_combined_clip_and_cull_distances(); test_generate_mips(); test_alpha_to_coverage(); + test_multiple_viewports(); }

1 0

Anton Romanov : wmp: Add media completion notifications.
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: wine Branch: master Commit: a072899794919ffc72b5531a9ec10866e287e9ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=a072899794919ffc72b5531a… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Thu Apr 12 22:55:00 2018 -0700 wmp: Add media completion notifications. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/oleobj.c | 26 ++++++----- dlls/wmp/player.c | 92 ++++++++++++++++++++++++++++++++++++- dlls/wmp/tests/media.c | 113 +++++++++++++++++++++++++++++++++++++++++----- dlls/wmp/tests/rsrc.rc | 3 ++ dlls/wmp/tests/test1s.mp3 | Bin 0 -> 4365 bytes dlls/wmp/wmp_main.c | 1 + dlls/wmp/wmp_private.h | 7 ++- 7 files changed, 216 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a072899794919ffc72b5…

1 0

Louis Lenders : srclient: Add new stub dll.
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: wine Branch: master Commit: a56e57b3ec6c8e0cf4ba839282bc2b0fb0dee683 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a56e57b3ec6c8e0cf4ba8392… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Apr 13 09:31:55 2018 +0200 srclient: Add new stub dll. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/srclient/Makefile.in | 4 ++++ dlls/srclient/main.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/srclient/srclient.spec | 13 +++++++++++++ 5 files changed, 61 insertions(+) diff --git a/configure b/configure index 73d909f..8976ad3 100755 --- a/configure +++ b/configure @@ -1508,6 +1508,7 @@ enable_slc enable_snmpapi enable_softpub enable_spoolss +enable_srclient enable_sspicli enable_stdole2_tlb enable_stdole32_tlb @@ -19001,6 +19002,7 @@ wine_fn_config_makefile dlls/softpub enable_softpub wine_fn_config_makefile dlls/sound.drv16 enable_win16 wine_fn_config_makefile dlls/spoolss enable_spoolss wine_fn_config_makefile dlls/spoolss/tests enable_tests +wine_fn_config_makefile dlls/srclient enable_srclient wine_fn_config_makefile dlls/sspicli enable_sspicli wine_fn_config_makefile dlls/stdole2.tlb enable_stdole2_tlb wine_fn_config_makefile dlls/stdole32.tlb enable_stdole32_tlb diff --git a/configure.ac b/configure.ac index 60c410c..b9ef668 100644 --- a/configure.ac +++ b/configure.ac @@ -3624,6 +3624,7 @@ WINE_CONFIG_MAKEFILE(dlls/softpub) WINE_CONFIG_MAKEFILE(dlls/sound.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/spoolss) WINE_CONFIG_MAKEFILE(dlls/spoolss/tests) +WINE_CONFIG_MAKEFILE(dlls/srclient) WINE_CONFIG_MAKEFILE(dlls/sspicli) WINE_CONFIG_MAKEFILE(dlls/stdole2.tlb) WINE_CONFIG_MAKEFILE(dlls/stdole32.tlb) diff --git a/dlls/srclient/Makefile.in b/dlls/srclient/Makefile.in new file mode 100644 index 0000000..5c11e75 --- /dev/null +++ b/dlls/srclient/Makefile.in @@ -0,0 +1,4 @@ +MODULE = srclient.dll + +C_SRCS = \ + main.c diff --git a/dlls/srclient/main.c b/dlls/srclient/main.c new file mode 100644 index 0000000..6c2e7b4 --- /dev/null +++ b/dlls/srclient/main.c @@ -0,0 +1,41 @@ +/* + * Copyright 2018 Louis Lenders + * + * 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 + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(srclient); + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) +{ + TRACE("(%p, %d, %p)\n", hInstDLL, reason, lpv); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + } + return TRUE; +} diff --git a/dlls/srclient/srclient.spec b/dlls/srclient/srclient.spec new file mode 100644 index 0000000..0d7a812 --- /dev/null +++ b/dlls/srclient/srclient.spec @@ -0,0 +1,13 @@ +1 stub SysprepCleanup +2 stub SysprepGeneralize +@ stub DisableSR +@ stub DisableSRInternal +@ stub EnableSR +@ stub EnableSREx +@ stub EnableSRInternal +@ stub SRNewSystemId +@ stub SRRemoveRestorePoint +@ stdcall SRSetRestorePointA(ptr ptr) sfc_os.SRSetRestorePointA +@ stub SRSetRestorePointInternal +@ stdcall SRSetRestorePointW(ptr ptr) sfc_os.SRSetRestorePointW +@ stub SetSRStateAfterSetup

1 0

Dan Bassi : comctl32/treeview: Improve item text change detection.
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: wine Branch: master Commit: c5cb2f1c503106cca066985c79aed727168a2f07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5cb2f1c503106cca066985c… Author: Dan Bassi <wine.fixes(a)gmail.com> Date: Fri Apr 13 10:24:40 2018 +0300 comctl32/treeview: Improve item text change detection. Signed-off-by: Dan Bassi <wine.fixes(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 65eff8b..49eec4a 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1125,8 +1125,10 @@ TREEVIEW_DoSetItemT(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, if (tvItem->mask & TVIF_TEXT) { item->textWidth = 0; /* force width recalculation */ - if (tvItem->pszText != LPSTR_TEXTCALLBACKW && tvItem->pszText != NULL) /* covers != TEXTCALLBACKA too, and undocumented: pszText of NULL also means TEXTCALLBACK */ - { + + /* Covers != TEXTCALLBACKA too, and undocumented: pszText of NULL also means TEXTCALLBACK */ + if (tvItem->pszText != LPSTR_TEXTCALLBACKW && tvItem->pszText != NULL) + { int len; LPWSTR newText; if (isW) @@ -1134,12 +1136,14 @@ TREEVIEW_DoSetItemT(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, else len = MultiByteToWideChar(CP_ACP, 0, (LPSTR)tvItem->pszText, -1, NULL, 0); - newText = heap_realloc(item->pszText, len * sizeof(WCHAR)); + /* Allocate new block to make pointer comparison in item_changed() work. */ + newText = heap_alloc(len * sizeof(WCHAR)); if (newText == NULL) return FALSE; callbackClear |= TVIF_TEXT; + heap_free(item->pszText); item->pszText = newText; item->cchTextMax = len; if (isW) @@ -2199,7 +2203,7 @@ TREEVIEW_SetItemT(TREEVIEW_INFO *infoPtr, const TVITEMEXW *tvItem, BOOL isW) if (!TREEVIEW_ValidItem(infoPtr, item)) return FALSE; - /* store the original item values */ + /* Store the original item values. Text buffer will be freed in TREEVIEW_DoSetItemT() below. */ originalItem = *item; if (!TREEVIEW_DoSetItemT(infoPtr, item, tvItem, isW))

1 0

Zebediah Figura : ole32: Fix conditions in HGLOBAL_User*().
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: wine Branch: master Commit: 5293cb71838bba86961f62e2317f532c9812db0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5293cb71838bba86961f62e2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 12 10:20:29 2018 -0500 ole32: Fix conditions in HGLOBAL_User*(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/usrmarshal.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 63eead1..8d36e13 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -387,7 +387,7 @@ ULONG __RPC_USER HGLOBAL_UserSize(ULONG *pFlags, ULONG StartingSize, HGLOBAL *ph size += sizeof(ULONG); - if (LOWORD(*pFlags == MSHCTX_INPROC)) + if (LOWORD(*pFlags) == MSHCTX_INPROC) size += sizeof(HGLOBAL); else { @@ -429,7 +429,7 @@ unsigned char * __RPC_USER HGLOBAL_UserMarshal(ULONG *pFlags, unsigned char *pBu ALIGN_POINTER(pBuffer, 3); - if (LOWORD(*pFlags == MSHCTX_INPROC)) + if (LOWORD(*pFlags) == MSHCTX_INPROC) { if (sizeof(*phGlobal) == 8) *(ULONG *)pBuffer = WDT_INPROC64_CALL; @@ -572,7 +572,7 @@ void __RPC_USER HGLOBAL_UserFree(ULONG *pFlags, HGLOBAL *phGlobal) { TRACE("(%s, &%p\n", debugstr_user_flags(pFlags), *phGlobal); - if (LOWORD(*pFlags != MSHCTX_INPROC) && *phGlobal) + if (LOWORD(*pFlags) != MSHCTX_INPROC && *phGlobal) GlobalFree(*phGlobal); }

1 0

Alexandre Julliard : user32: Implement GetSystemMetricsForDpi().
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: wine Branch: master Commit: 3458af7db00c4ba3efd4378d7f2190df62f29b95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3458af7db00c4ba3efd4378d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 14:31:43 2018 +0200 user32: Implement GetSystemMetricsForDpi(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 112 ++++++++++++++++++++++++++++++++++++++++-- dlls/user32/tests/sysparams.c | 81 ++++++++++++++++++++++++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 4 files changed, 192 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3458af7db00c4ba3efd4…

1 0

Alexandre Julliard : user32: Implement SystemParametersInfoForDpi().
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: wine Branch: master Commit: a02ed147328e072574485bbd2bec320c630cb5c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a02ed147328e072574485bbd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 14:18:15 2018 +0200 user32: Implement SystemParametersInfoForDpi(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 162 ++++++++++++++++++++++++++++++++---------- dlls/user32/tests/sysparams.c | 99 +++++++++++++++++++++++++- dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 4 files changed, 225 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a02ed147328e07257448…

1 0

Alexandre Julliard : user32: Fix position of the small icon in the caption bar.
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: wine Branch: master Commit: 9c225fc3f962f587459774f2c400720b436ba696 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c225fc3f962f587459774f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 14:33:58 2018 +0200 user32: Fix position of the small icon in the caption bar. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/nonclient.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index fcf32f0..3f3d96a 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -703,7 +703,7 @@ BOOL NC_DrawSysButton (HWND hwnd, HDC hdc, BOOL down) NC_GetInsideRect( hwnd, COORDS_WINDOW, &rect, style, ex_style ); pt.x = rect.left + 2; - pt.y = (rect.top + GetSystemMetrics(SM_CYCAPTION) - GetSystemMetrics(SM_CYSMICON)) / 2; + pt.y = rect.top + (GetSystemMetrics(SM_CYCAPTION) - GetSystemMetrics(SM_CYSMICON)) / 2; DrawIconEx (hdc, pt.x, pt.y, hIcon, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0, 0, DI_NORMAL);

1 0

Alexandre Julliard : user32: Included padded border into the border width in NONCLIENTMETRICS.
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: wine Branch: master Commit: d4d12801bc15b1ec0bdf13d935f7040256f1c303 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4d12801bc15b1ec0bdf13d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 14:15:40 2018 +0200 user32: Included padded border into the border width in NONCLIENTMETRICS. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 14 ++++++++------ dlls/user32/tests/sysparams.c | 2 ++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 7b948eb..3ee0781 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1616,10 +1616,12 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_GETNONCLIENTMETRICS: { LPNONCLIENTMETRICSW lpnm = pvParam; + int padded_border; if (!pvParam) return FALSE; ret = get_entry( &entry_BORDER, 0, &lpnm->iBorderWidth ) && + get_entry( &entry_PADDEDBORDERWIDTH, 0, &padded_border ) && get_entry( &entry_SCROLLWIDTH, 0, &lpnm->iScrollWidth ) && get_entry( &entry_SCROLLHEIGHT, 0, &lpnm->iScrollHeight ) && get_entry( &entry_CAPTIONWIDTH, 0, &lpnm->iCaptionWidth ) && @@ -1633,19 +1635,22 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, get_entry( &entry_MENULOGFONT, 0, &lpnm->lfMenuFont ) && get_entry( &entry_STATUSLOGFONT, 0, &lpnm->lfStatusFont ) && get_entry( &entry_MESSAGELOGFONT, 0, &lpnm->lfMessageFont ); - if (ret && lpnm->cbSize == sizeof(NONCLIENTMETRICSW)) - ret = get_entry( &entry_PADDEDBORDERWIDTH, 0, &lpnm->iPaddedBorderWidth ); + lpnm->iBorderWidth += padded_border; + if (ret && lpnm->cbSize == sizeof(NONCLIENTMETRICSW)) lpnm->iPaddedBorderWidth = 0; normalize_nonclientmetrics( lpnm ); break; } case SPI_SETNONCLIENTMETRICS: { LPNONCLIENTMETRICSW lpnm = pvParam; + int padded_border; if (lpnm && (lpnm->cbSize == sizeof(NONCLIENTMETRICSW) || lpnm->cbSize == FIELD_OFFSET(NONCLIENTMETRICSW, iPaddedBorderWidth))) { - ret = set_entry( &entry_BORDER, lpnm->iBorderWidth, NULL, fWinIni ) && + get_entry( &entry_PADDEDBORDERWIDTH, 0, &padded_border ); + + ret = set_entry( &entry_BORDER, lpnm->iBorderWidth - padded_border, NULL, fWinIni ) && set_entry( &entry_SCROLLWIDTH, lpnm->iScrollWidth, NULL, fWinIni ) && set_entry( &entry_SCROLLHEIGHT, lpnm->iScrollHeight, NULL, fWinIni ) && set_entry( &entry_CAPTIONWIDTH, lpnm->iCaptionWidth, NULL, fWinIni ) && @@ -1659,9 +1664,6 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, set_entry( &entry_SMCAPTIONLOGFONT, 0, &lpnm->lfSmCaptionFont, fWinIni ) && set_entry( &entry_STATUSLOGFONT, 0, &lpnm->lfStatusFont, fWinIni ) && set_entry( &entry_MESSAGELOGFONT, 0, &lpnm->lfMessageFont, fWinIni ); - - if (ret && lpnm->cbSize == sizeof(NONCLIENTMETRICSW)) - set_entry( &entry_PADDEDBORDERWIDTH, lpnm->iPaddedBorderWidth, NULL, fWinIni ); } break; } diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 3fa6fe2..95273f2 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2710,8 +2710,10 @@ static void test_GetSystemMetrics( void) ncm.cbSize = sizeof(ncm); /* Vista added padding */ SetLastError(0xdeadbeef); + ncm.iPaddedBorderWidth = 0xcccc; rc = SystemParametersInfoA(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); ok(rc || broken(!rc) /* before Vista */, "SystemParametersInfoA failed\n"); + if (rc) ok( ncm.iPaddedBorderWidth == 0, "wrong iPaddedBorderWidth %u\n", ncm.iPaddedBorderWidth ); minim.cbSize = sizeof( minim); ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICSA, iPaddedBorderWidth);

1 0

Alexandre Julliard : user32/tests: Remove Win9x workarounds.
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: wine Branch: master Commit: 6b42665b957c8c0b1c84f675f757a6496b67cf51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b42665b957c8c0b1c84f675… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 08:44:06 2018 +0200 user32/tests: Remove Win9x workarounds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 88 +++++++++++-------------------------------- 1 file changed, 22 insertions(+), 66 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 2902913..3fa6fe2 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -53,7 +53,6 @@ static BOOL (WINAPI *pIsValidDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); static BOOL strict; static int dpi, real_dpi; -static BOOL iswin9x; #define eq(received, expected, label, type) \ ok((received) == (expected), "%s: got " type " instead of " type "\n", (label),(received),(expected)) @@ -634,30 +633,17 @@ static BOOL run_spi_setmouse_test( int curr_val[], POINT *req_change, POINT *pro BOOL rc; INT mi[3]; static int aw_turn = 0; - static BOOL w_implemented = TRUE; char buf[20]; int i; aw_turn++; rc = FALSE; - if ((aw_turn % 2!=0) && (w_implemented)) - { - /* call unicode on odd (non even) calls */ - SetLastError(0xdeadbeef); + SetLastError(0xdeadbeef); + if (aw_turn % 2) /* call unicode on odd (non even) calls */ rc=SystemParametersInfoW( SPI_SETMOUSE, 0, curr_val, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE ); - if (rc == FALSE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - w_implemented = FALSE; - trace("SystemParametersInfoW not supported on this platform\n"); - } - } - - if ((aw_turn % 2==0) || (!w_implemented)) - { - /* call ascii version on even calls or if unicode is not available */ + else rc=SystemParametersInfoA( SPI_SETMOUSE, 0, curr_val, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE ); - } if (!test_error_msg(rc,"SPI_SETMOUSE")) return FALSE; ok(rc, "SystemParametersInfo: rc=%d err=%d\n", rc, GetLastError()); @@ -676,15 +662,12 @@ static BOOL run_spi_setmouse_test( int curr_val[], POINT *req_change, POINT *pro "incorrect value for %d: %d != %d\n", i, mi[i], curr_val[i]); } - if (w_implemented) - { - rc=SystemParametersInfoW( SPI_GETMOUSE, 0, mi, 0 ); - ok(rc, "SystemParametersInfoW: rc=%d err=%d\n", rc, GetLastError()); - for (i = 0; i < 3; i++) - { - ok(mi[i] == curr_val[i], - "incorrect value for %d: %d != %d\n", i, mi[i], curr_val[i]); - } + rc=SystemParametersInfoW( SPI_GETMOUSE, 0, mi, 0 ); + ok(rc, "SystemParametersInfoW: rc=%d err=%d\n", rc, GetLastError()); + for (i = 0; i < 3; i++) + { + ok(mi[i] == curr_val[i], + "incorrect value for %d: %d != %d\n", i, mi[i], curr_val[i]); } if (0) @@ -860,15 +843,10 @@ static void test_SPI_SETBORDER( void ) /* 6 */ if ( old_border == 7 || old_border == 20 ) old_border = 1; - /* The SPI_SETBORDER seems to be buggy on Win9x/ME (looks like you need to - * do it twice to make the intended change). So skip parts of the tests on - * those platforms */ - if( !iswin9x) { - /* win2k3 fails if you set the same border twice, or if size is 0 */ - if (!test_setborder(2, 1, dpi)) return; - test_setborder(1, 1, dpi); - test_setborder(3, 1, dpi); - } + /* win2k3 fails if you set the same border twice, or if size is 0 */ + if (!test_setborder(2, 1, dpi)) return; + test_setborder(1, 1, dpi); + test_setborder(3, 1, dpi); if (!test_setborder(1, 0, dpi)) return; test_setborder(0, 0, dpi); test_setborder(3, 0, dpi); @@ -1175,8 +1153,7 @@ static void test_SPI_SETICONTITLEWRAP( void ) /* 26 */ if( regval != vals[i]) regval = metricfromreg( SPI_SETICONTITLEWRAP_REGKEY1, SPI_SETICONTITLEWRAP_VALNAME, dpi); - ok( regval == vals[i] || broken(regval == -1), /* win9x */ - "wrong value in registry %d, expected %d\n", regval, vals[i] ); + ok( regval == vals[i], "wrong value in registry %d, expected %d\n", regval, vals[i] ); rc=SystemParametersInfoA( SPI_GETICONTITLEWRAP, 0, &v, 0 ); ok(rc, "%d: rc=%d err=%d\n", i, rc, GetLastError()); @@ -1768,10 +1745,10 @@ static void test_SPI_SETICONMETRICS( void ) /* 46 */ return; /* check some registry values */ regval = metricfromreg( SPI_ICONHORIZONTALSPACING_REGKEY, SPI_ICONHORIZONTALSPACING_VALNAME, dpi); - ok( regval==im_orig.iHorzSpacing || broken(regval == -1), /* nt4 */ + ok( regval==im_orig.iHorzSpacing, "wrong value in registry %d, expected %d\n", regval, im_orig.iHorzSpacing); regval = metricfromreg( SPI_ICONVERTICALSPACING_REGKEY, SPI_ICONVERTICALSPACING_VALNAME, dpi); - ok( regval==im_orig.iVertSpacing || broken(regval == -1), /* nt4 */ + ok( regval==im_orig.iVertSpacing, "wrong value in registry %d, expected %d\n", regval, im_orig.iVertSpacing); regval = metricfromreg( SPI_SETICONTITLEWRAP_REGKEY2, SPI_SETICONTITLEWRAP_VALNAME, dpi); if( regval != im_orig.iTitleWrap) @@ -1929,7 +1906,6 @@ static void test_SPI_SETSHOWSOUNDS( void ) /* 57 */ trace("testing SPI_{GET,SET}SHOWSOUNDS\n"); SetLastError(0xdeadbeef); rc=SystemParametersInfoA( SPI_GETSHOWSOUNDS, 0, &old_b, 0 ); - /* SPI_{GET,SET}SHOWSOUNDS is completely broken on Win9x */ if (!test_error_msg(rc,"SPI_{GET,SET}SHOWSOUNDS")) return; @@ -2036,7 +2012,6 @@ static void test_SPI_SETFONTSMOOTHING( void ) /* 75 */ unsigned int i; trace("testing SPI_{GET,SET}FONTSMOOTHING\n"); - if( iswin9x) return; /* 95/98/ME don't seem to implement this fully */ SetLastError(0xdeadbeef); rc=SystemParametersInfoA( SPI_GETFONTSMOOTHING, 0, &old_b, 0 ); if (!test_error_msg(rc,"SPI_{GET,SET}FONTSMOOTHING")) @@ -2139,9 +2114,7 @@ static void test_SPI_SETLOWPOWERACTIVE( void ) /* 85 */ v = 0xdeadbeef; rc=SystemParametersInfoA( SPI_GETLOWPOWERACTIVE, 0, &v, 0 ); ok(rc, "%d: rc=%d err=%d\n", i, rc, GetLastError()); - ok(v == vals[i] || - broken(v == (0xdead0000 | vals[i])) || /* win98 only sets the low word */ - v == 0, /* win2k3 */ + ok(v == vals[i] || v == 0, /* win2k3 */ "SPI_GETLOWPOWERACTIVE: got %d instead of 0 or %d\n", v, vals[i]); } @@ -2179,9 +2152,7 @@ static void test_SPI_SETPOWEROFFACTIVE( void ) /* 86 */ v = 0xdeadbeef; rc=SystemParametersInfoA( SPI_GETPOWEROFFACTIVE, 0, &v, 0 ); ok(rc, "%d: rc=%d err=%d\n", i, rc, GetLastError()); - ok(v == vals[i] || - broken(v == (0xdead0000 | vals[i])) || /* win98 only sets the low word */ - v == 0, /* win2k3 */ + ok(v == vals[i] || v == 0, /* win2k3 */ "SPI_GETPOWEROFFACTIVE: got %d instead of 0 or %d\n", v, vals[i]); } @@ -2234,12 +2205,9 @@ static void test_SPI_SETMOUSEHOVERWIDTH( void ) /* 99 */ trace("testing SPI_{GET,SET}MOUSEHOVERWIDTH\n"); SetLastError(0xdeadbeef); rc=SystemParametersInfoA( SPI_GETMOUSEHOVERWIDTH, 0, &old_width, 0 ); - /* SPI_{GET,SET}MOUSEHOVERWIDTH does not seem to be supported on Win9x despite - * what MSDN states (Verified on Win98SE) - */ if (!test_error_msg(rc,"SPI_{GET,SET}MOUSEHOVERWIDTH")) return; - + for (i=0;i<sizeof(vals)/sizeof(*vals);i++) { UINT v; @@ -2274,12 +2242,9 @@ static void test_SPI_SETMOUSEHOVERHEIGHT( void ) /* 101 */ trace("testing SPI_{GET,SET}MOUSEHOVERHEIGHT\n"); SetLastError(0xdeadbeef); rc=SystemParametersInfoA( SPI_GETMOUSEHOVERHEIGHT, 0, &old_height, 0 ); - /* SPI_{GET,SET}MOUSEHOVERWIDTH does not seem to be supported on Win9x despite - * what MSDN states (Verified on Win98SE) - */ if (!test_error_msg(rc,"SPI_{GET,SET}MOUSEHOVERHEIGHT")) return; - + for (i=0;i<sizeof(vals)/sizeof(*vals);i++) { UINT v; @@ -2318,12 +2283,9 @@ static void test_SPI_SETMOUSEHOVERTIME( void ) /* 103 */ trace("testing SPI_{GET,SET}MOUSEHOVERTIME\n"); SetLastError(0xdeadbeef); rc=SystemParametersInfoA( SPI_GETMOUSEHOVERTIME, 0, &old_time, 0 ); - /* SPI_{GET,SET}MOUSEHOVERWIDTH does not seem to be supported on Win9x despite - * what MSDN states (Verified on Win98SE) - */ if (!test_error_msg(rc,"SPI_{GET,SET}MOUSEHOVERTIME")) return; - + for (i=0;i<sizeof(vals)/sizeof(*vals);i++) { UINT v; @@ -2473,9 +2435,6 @@ static void test_SPI_SETWALLPAPER( void ) /* 115 */ trace("testing SPI_{GET,SET}DESKWALLPAPER\n"); SetLastError(0xdeadbeef); rc=SystemParametersInfoA(SPI_GETDESKWALLPAPER, 260, oldval, 0); - /* SPI_{GET,SET}DESKWALLPAPER is completely broken on Win9x and - * unimplemented on NT4 - */ if (!test_error_msg(rc,"SPI_{GET,SET}DESKWALLPAPER")) return; @@ -2947,13 +2906,11 @@ static void test_EnumDisplaySettings(void) DWORD num; memset(&devmode, 0, sizeof(devmode)); - /* Win95 doesn't handle ENUM_CURRENT_SETTINGS correctly */ EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &devmode); hdc = GetDC(0); val = GetDeviceCaps(hdc, BITSPIXEL); - ok(devmode.dmBitsPerPel == val || - broken(devmode.dmDeviceName[0] == 0), /* Win95 */ + ok(devmode.dmBitsPerPel == val, "GetDeviceCaps(BITSPIXEL) returned %d, EnumDisplaySettings returned %d\n", val, devmode.dmBitsPerPel); @@ -3330,7 +3287,6 @@ START_TEST(sysparams) real_dpi = get_real_dpi(); trace("dpi %d real_dpi %d\n", dpi, real_dpi); ReleaseDC( 0, hdc); - iswin9x = GetVersion() & 0x80000000; /* This test requires interactivity, if we don't have it, give up */ if (!SystemParametersInfoA( SPI_SETBEEP, TRUE, 0, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE ) &&

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
55
Older →

Jump to page:

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 April 2018