August 2020 - Wine-commits - list.winehq.org

Murray Colpman : winex11.drv: Interpret mouse 6/7 as horiz scroll.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: f13f1ec6faddeb916c4065b11c7ea70e4d1b0c6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f13f1ec6faddeb916c4065b1… Author: Murray Colpman <muzer(a)tim32.org> Date: Tue May 12 00:39:02 2020 +0100 winex11.drv: Interpret mouse 6/7 as horiz scroll. X11 Mouse buttons 6 and 7 were set to translate into browser back/forward button events. However, this is based on an old convention where buttons 6 and 7 could either mean horizontal scroll or browser back/forward. Nowadays, 6 and 7 solely mean horizontal scroll, 8 and 9 being used for back/forward. In addition, the wide adoption of two-finger two-dimensional scrolling on laptop trackpads since this code was written has meant that back/forward events may be generated unintentionally, which can be very disruptive when using tools such as web browsers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49142 Signed-off-by: Murray Colpman <muzer(a)tim32.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 893080e4df5a45929320ebb88b8668eea316476c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/mouse.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 7f0edd9be6..c8a5749a2f 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -75,8 +75,8 @@ static const UINT button_down_flags[NB_BUTTONS] = MOUSEEVENTF_RIGHTDOWN, MOUSEEVENTF_WHEEL, MOUSEEVENTF_WHEEL, - MOUSEEVENTF_XDOWN, /* FIXME: horizontal wheel */ - MOUSEEVENTF_XDOWN, + MOUSEEVENTF_HWHEEL, + MOUSEEVENTF_HWHEEL, MOUSEEVENTF_XDOWN, MOUSEEVENTF_XDOWN }; @@ -88,8 +88,8 @@ static const UINT button_up_flags[NB_BUTTONS] = MOUSEEVENTF_RIGHTUP, 0, 0, - MOUSEEVENTF_XUP, - MOUSEEVENTF_XUP, + 0, + 0, MOUSEEVENTF_XUP, MOUSEEVENTF_XUP }; @@ -101,8 +101,8 @@ static const UINT button_down_data[NB_BUTTONS] = 0, WHEEL_DELTA, -WHEEL_DELTA, - XBUTTON1, - XBUTTON2, + -WHEEL_DELTA, + WHEEL_DELTA, XBUTTON1, XBUTTON2 }; @@ -114,8 +114,8 @@ static const UINT button_up_data[NB_BUTTONS] = 0, 0, 0, - XBUTTON1, - XBUTTON2, + 0, + 0, XBUTTON1, XBUTTON2 };

1 0

Jeff Smith : msvcrt: Stop forwarding iswctype functions to ntdll.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: d892c88c477133b3bdb7002486b59a8202ce4640 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d892c88c477133b3bdb70024… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Mar 10 20:59:24 2020 +0100 msvcrt: Stop forwarding iswctype functions to ntdll. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 89ca556ac54606879b788880e522f9da65196f63) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/crtdll/crtdll.spec | 6 +++--- dlls/msvcr100/msvcr100.spec | 6 +++--- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr70/msvcr70.spec | 6 +++--- dlls/msvcr71/msvcr71.spec | 6 +++--- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcr90/msvcr90.spec | 6 +++--- dlls/msvcrt/msvcrt.spec | 6 +++--- dlls/msvcrt/wcs.c | 8 ++++++++ dlls/msvcrtd/msvcrtd.spec | 6 +++--- dlls/ucrtbase/ucrtbase.spec | 6 +++--- 12 files changed, 41 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d892c88c477133b3bdb7…

1 0

Gijs Vermeulen : ucrtbase: Add more _o forwards.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: f6ae7c842f9920d9bf43728174ec0f0ca22a377a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6ae7c842f9920d9bf437281… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri May 15 17:35:26 2020 +0200 ucrtbase: Add more _o forwards. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49146 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8119865d479fe54bac27f996f153091b479735bf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 502 ++++++++++---------- dlls/ucrtbase/ucrtbase.spec | 504 ++++++++++----------- 2 files changed, 503 insertions(+), 503 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f6ae7c842f9920d9bf43…

1 0

Jacek Caban : widl: Use DECLSPEC_ALIGN in MSVC compatible way.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 5d414891cdf18bc1810ad1a3e3a1b94c7ea116cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d414891cdf18bc1810ad1a3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 20 20:19:59 2020 +0200 widl: Use DECLSPEC_ALIGN in MSVC compatible way. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4fd8190ef1ba37c22904ccb499aea32cc6c0c0a3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/widl/typegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 9b8aa1a322..a1db88a7c0 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4816,7 +4816,7 @@ void write_func_param_struct( FILE *file, const type_t *iface, const type_t *fun if (align >= pointer_size) fprintf( file, "%s;\n", arg->name ); else - fprintf( file, "%s DECLSPEC_ALIGN(%u);\n", arg->name, pointer_size ); + fprintf( file, "DECLSPEC_ALIGN(%u) %s;\n", pointer_size, arg->name ); } if (add_retval && !is_void( retval->declspec.type )) {

1 0

Emilio Cobos Álvarez : widl: Use DECLSPEC_ALIGN in MSVC compatible way for return types too.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 95daac2bc175394730c97266480dd6526e570abf URL: https://source.winehq.org/git/wine.git/?a=commit;h=95daac2bc175394730c97266… Author: Emilio Cobos Álvarez <emilio(a)crisal.io> Date: Sun May 17 01:02:04 2020 +0200 widl: Use DECLSPEC_ALIGN in MSVC compatible way for return types too. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49173 Signed-off-by: Emilio Cobos Álvarez <emilio(a)crisal.io> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b1084ff910864a44d6fd0e0bda6b2b6c64987b2e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/widl/typegen.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index a1db88a7c0..04280cbb72 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4813,20 +4813,21 @@ void write_func_param_struct( FILE *file, const type_t *iface, const type_t *fun if (is_array( arg->declspec.type ) || is_ptr( arg->declspec.type )) align = pointer_size; else type_memsize_and_alignment( arg->declspec.type, &align ); - if (align >= pointer_size) - fprintf( file, "%s;\n", arg->name ); - else - fprintf( file, "DECLSPEC_ALIGN(%u) %s;\n", pointer_size, arg->name ); + if (align < pointer_size) + fprintf( file, "DECLSPEC_ALIGN(%u) ", pointer_size ); + fprintf( file, "%s;\n", arg->name ); } if (add_retval && !is_void( retval->declspec.type )) { print_file(file, 2, "%s", ""); - write_type_decl( file, &retval->declspec, retval->name ); - if (is_array( retval->declspec.type ) || is_ptr( retval->declspec.type ) || - type_memsize( retval->declspec.type ) == pointer_size) - fprintf( file, ";\n" ); - else - fprintf( file, " DECLSPEC_ALIGN(%u);\n", pointer_size ); + write_type_left( file, &retval->declspec, NAME_DEFAULT, TRUE, TRUE ); + if (needs_space_after( retval->declspec.type )) fputc( ' ', file ); + if (!is_array( retval->declspec.type ) && !is_ptr( retval->declspec.type ) && + type_memsize( retval->declspec.type ) != pointer_size) + { + fprintf( file, "DECLSPEC_ALIGN(%u) ", pointer_size ); + } + fprintf( file, "%s;\n", retval->name ); } print_file(file, 1, "} %s;\n", var_decl ); if (needs_packing) print_file( file, 0, "#include <poppack.h>\n" );

1 0

Akihiro Sagawa : ddraw: Allow to create managed textures with DDSCAPS_TEXTURE|DDSCAPS_3DDEVICE caps.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 2362c935aec407dff0c72c91caa387282b88c98b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2362c935aec407dff0c72c91… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 2 00:13:45 2020 +0900 ddraw: Allow to create managed textures with DDSCAPS_TEXTURE|DDSCAPS_3DDEVICE caps. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48844 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 62e13708d0cc01a4a9f613c077a680709bcc2e4c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/surface.c | 1 + dlls/ddraw/tests/ddraw4.c | 2 -- dlls/ddraw/tests/ddraw7.c | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index fda42f2982..e30ec6feef 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6209,6 +6209,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ if (desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) { + wined3d_desc.bind_flags &= ~WINED3D_BIND_RENDER_TARGET; wined3d_desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; /* Managed textures have the system memory flag set. */ diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 511e68475a..86b05c743d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -6212,10 +6212,8 @@ static void test_rt_caps(void) surface_desc.dwWidth = 640; surface_desc.dwHeight = 480; hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface, NULL); - todo_wine_if(i == 10 || i == 11) ok(SUCCEEDED(hr), "Test %u: Failed to create surface with caps %#x and caps2 %#x, hr %#x.\n", i, test_data[i].caps_in, test_data[i].caps2_in, hr); - if (FAILED(hr)) continue; memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 1dd6d759a4..f2dc6acd67 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -5947,10 +5947,8 @@ static void test_rt_caps(void) surface_desc.dwWidth = 640; surface_desc.dwHeight = 480; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); - todo_wine_if(i == 10 || i == 11) ok(SUCCEEDED(hr), "Test %u: Failed to create surface with caps %#x and caps2 %#x, hr %#x.\n", i, test_data[i].caps_in, test_data[i].caps2_in, hr); - if (FAILED(hr)) continue; memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc);

1 0

Roman Pišl : user32/edit: Avoid division by zero during initialization.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: e1cac281d94b6a87d079026fd8b4f07c0f8a25b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1cac281d94b6a87d079026f… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Mon Apr 20 12:20:13 2020 +0200 user32/edit: Avoid division by zero during initialization. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=19239 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d5e591d3cb55530cab33e5f6114b1519ec286d15) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/edit.c | 4 +-- dlls/user32/tests/edit.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 557a091c0d..aba6a084a2 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -465,7 +465,7 @@ static SCRIPT_STRING_ANALYSIS EDIT_UpdateUniscribeData(EDITSTATE *es, HDC dc, IN static inline INT get_vertical_line_count(EDITSTATE *es) { - INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + INT vlc = es->line_height ? (es->format_rect.bottom - es->format_rect.top) / es->line_height : 0; return max(1,vlc); } @@ -1638,7 +1638,7 @@ static void EDIT_UpdateScrollInfo(EDITSTATE *es) si.fMask = SIF_PAGE | SIF_POS | SIF_RANGE | SIF_DISABLENOSCROLL; si.nMin = 0; si.nMax = es->line_count - 1; - si.nPage = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + si.nPage = es->line_height ? (es->format_rect.bottom - es->format_rect.top) / es->line_height : 0; si.nPos = es->y_offset; TRACE("SB_VERT, nMin=%d, nMax=%d, nPage=%d, nPos=%d\n", si.nMin, si.nMax, si.nPage, si.nPos); diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index e3ed3341d6..2289bbf03f 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1743,6 +1743,71 @@ static BOOL is_font_installed(const char*name) return ret; } +static WNDPROC orig_class_proc; + +static LRESULT CALLBACK test_class_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + RECT rect; + LRESULT result, r; + + switch (message) + { + case WM_NCCREATE: + result = CallWindowProcA(orig_class_proc, hwnd, message, wParam, lParam); + + memset(&rect, 0, sizeof(rect)); + SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rect); + ok(!rect.right && !rect.bottom, "Invalid size after NCCREATE: %d x %d\n", rect.right, rect.bottom); + + /* test that messages between WM_NCCREATE and WM_CREATE + don't crash or cause unexpected behavior */ + r = SendMessageA(hwnd, EM_SETSEL, 0, 0); + ok(r == 1, "Returned %ld, expected 1.\n", r); + r = SendMessageA(hwnd, WM_SIZE, 0, 0x00100010); + todo_wine ok(r == 1, "Returned %ld, expected 1.\n", r); + + return result; + + case WM_CREATE: + /* test that messages between WM_NCCREATE and WM_CREATE + don't crash or cause unexpected behavior */ + r = SendMessageA(hwnd, EM_SETSEL, 0, 0); + ok(r == 1, "Returned %ld, expected 1.\n", r); + r = SendMessageA(hwnd, WM_SIZE, 0, 0x00100010); + todo_wine ok(r == 1, "Returned %ld, expected 1.\n", r); + + break; + } + + return CallWindowProcA(orig_class_proc, hwnd, message, wParam, lParam); +} + +static void test_initialization(void) +{ + BOOL ret; + ATOM atom; + HWND hwEdit; + WNDCLASSA cls; + + ret = GetClassInfoA(NULL, "Edit", &cls); + ok(ret, "Failed to get class info.\n"); + + orig_class_proc = cls.lpfnWndProc; + cls.lpfnWndProc = test_class_proc; + cls.lpszClassName = "TestClassName"; + + atom = RegisterClassA(&cls); + ok(atom != 0, "Failed to register class.\n"); + + hwEdit = CreateWindowExA(0, (LPCSTR)MAKEINTATOM(atom), "Text Text", + ES_MULTILINE | WS_BORDER | ES_AUTOHSCROLL | ES_AUTOVSCROLL | WS_VSCROLL, + 10, 10, 300, 300, NULL, NULL, hinst, NULL); + ok(hwEdit != NULL, "Failed to create a window.\n"); + + DestroyWindow(hwEdit); + UnregisterClassA((LPCSTR)MAKEINTATOM(atom), hinst); +} + static void test_margins(void) { HWND hwEdit; @@ -3268,6 +3333,7 @@ START_TEST(edit) test_edit_control_6(); test_edit_control_limittext(); test_edit_control_scroll(); + test_initialization(); test_margins(); test_margins_font_change(); test_text_position();

1 0

Owen Rudge : winecfg: Add support for '/v' parameter allowing Windows version to be changed.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 4d063ffc467d5964dfd6c8e7ffe2a4db2fb1e92f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d063ffc467d5964dfd6c8e7… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Apr 16 15:06:27 2020 +0100 winecfg: Add support for '/v' parameter allowing Windows version to be changed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41559 Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 90c0123533377e9a2a7f27762ac0d514e88b5b1a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winecfg/appdefaults.c | 101 ++++++++++++++++++++++++++--------------- programs/winecfg/main.c | 35 ++++++++------ programs/winecfg/winecfg.h | 3 ++ 3 files changed, 87 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4d063ffc467d5964dfd6…

1 0

Owen Rudge : winecfg: Return 0 on success when setting Windows version.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 944588161418f7631c7068dca43f5d3b42a9d316 URL: https://source.winehq.org/git/wine.git/?a=commit;h=944588161418f7631c7068dc… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Apr 20 12:53:54 2020 +0100 winecfg: Return 0 on success when setting Windows version. The /V switch to winecfg was incorrectly passing the BOOL result through as the application exit code. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7b485dbf68e2ace921a59dcb50ef82d741fb8949) Conflicts: programs/winecfg/main.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winecfg/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index c5d4807e93..ef11774c15 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -199,7 +199,7 @@ ProcessCmdLine(LPSTR lpCmdLine) if ((lpCmdLine[1] == 'V' || lpCmdLine[1] == 'v') && (lstrlenA(lpCmdLine) > 4)) { - return set_winver_from_string(&lpCmdLine[3]); + return set_winver_from_string(&lpCmdLine[3]) ? 0 : 1; } return -1;

1 0

Michael Müller : opengl32: Treat invalid pixel types as PFD_TYPE_RGBA in wglChoosePixelFormat.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 3a939d246494905cf00b9728088e9e3a5d9d9708 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a939d246494905cf00b9728… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Apr 17 12:34:00 2020 +0300 opengl32: Treat invalid pixel types as PFD_TYPE_RGBA in wglChoosePixelFormat. Also fixes "Plebby Quest: The Crusades". Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43638 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ee12fb0e3241a1458ea81afaf8fbf822e53f0902) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/opengl32/tests/opengl.c | 59 ++++++++++++++++++++++++++++---------------- dlls/opengl32/wgl.c | 2 +- 2 files changed, 39 insertions(+), 22 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index c2fc4f4092..db5ad0ad76 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -220,7 +220,7 @@ static void test_pbuffers(HDC hdc) else skip("Pbuffer test for offscreen pixelformat skipped as no offscreen-only format with pbuffer capabilities has been found\n"); } -static int test_pfd(const PIXELFORMATDESCRIPTOR *pfd) +static int test_pfd(const PIXELFORMATDESCRIPTOR *pfd, PIXELFORMATDESCRIPTOR *fmt) { int pf; HDC hdc; @@ -233,6 +233,12 @@ static int test_pfd(const PIXELFORMATDESCRIPTOR *pfd) hdc = GetDC( hwnd ); pf = ChoosePixelFormat( hdc, pfd ); + if (pf && fmt) + { + memset(fmt, 0, sizeof(*fmt)); + ok(DescribePixelFormat( hdc, pf, sizeof(*fmt), fmt ), + "DescribePixelFormat failed with error: %u\n", GetLastError()); + } ReleaseDC( hwnd, hdc ); DestroyWindow( hwnd ); @@ -259,57 +265,68 @@ static void test_choosepixelformat(void) 0, /* reserved */ 0, 0, 0 /* layer masks */ }; + PIXELFORMATDESCRIPTOR ret_fmt; - ok( test_pfd(&pfd), "Simple pfd failed\n" ); + ok( test_pfd(&pfd, NULL), "Simple pfd failed\n" ); pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); pfd.dwFlags |= PFD_STEREO_DONTCARE; - ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_STEREO_DONTCARE; + pfd.iPixelType = 32; + ok( test_pfd(&pfd, &ret_fmt), "Invalid pixel format 32 failed\n" ); + ok( ret_fmt.iPixelType == PFD_TYPE_RGBA, "Expected pixel type PFD_TYPE_RGBA, got %d\n", ret_fmt.iPixelType ); + pfd.iPixelType = 33; + ok( test_pfd(&pfd, &ret_fmt), "Invalid pixel format 33 failed\n" ); + ok( ret_fmt.iPixelType == PFD_TYPE_RGBA, "Expected pixel type PFD_TYPE_RGBA, got %d\n", ret_fmt.iPixelType ); + pfd.iPixelType = 15; + ok( test_pfd(&pfd, &ret_fmt), "Invalid pixel format 15 failed\n" ); + ok( ret_fmt.iPixelType == PFD_TYPE_RGBA, "Expected pixel type PFD_TYPE_RGBA, got %d\n", ret_fmt.iPixelType ); + pfd.iPixelType = PFD_TYPE_RGBA; pfd.cColorBits = 32; - ok( test_pfd(&pfd), "Simple pfd failed\n" ); + ok( test_pfd(&pfd, NULL), "Simple pfd failed\n" ); pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); pfd.dwFlags |= PFD_STEREO_DONTCARE; - ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_STEREO_DONTCARE; pfd.cColorBits = 0; pfd.cAlphaBits = 8; - ok( test_pfd(&pfd), "Simple pfd failed\n" ); + ok( test_pfd(&pfd, NULL), "Simple pfd failed\n" ); pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); pfd.dwFlags |= PFD_STEREO_DONTCARE; - ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_STEREO_DONTCARE; pfd.cAlphaBits = 0; pfd.cStencilBits = 8; - ok( test_pfd(&pfd), "Simple pfd failed\n" ); + ok( test_pfd(&pfd, NULL), "Simple pfd failed\n" ); pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); pfd.dwFlags |= PFD_STEREO_DONTCARE; - ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_STEREO_DONTCARE; pfd.cStencilBits = 0; pfd.cAuxBuffers = 1; - ok( test_pfd(&pfd), "Simple pfd failed\n" ); + ok( test_pfd(&pfd, NULL), "Simple pfd failed\n" ); pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); pfd.dwFlags |= PFD_STEREO_DONTCARE; - ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_STEREO_DONTCARE; pfd.cAuxBuffers = 0; } diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index c6018b0c7b..008778c532 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -475,7 +475,7 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) { if (!wglDescribePixelFormat( hdc, i, sizeof(format), &format )) continue; - if (ppfd->iPixelType != format.iPixelType) + if ((ppfd->iPixelType == PFD_TYPE_COLORINDEX) != (format.iPixelType == PFD_TYPE_COLORINDEX)) { TRACE( "pixel type mismatch for iPixelFormat=%d\n", i ); continue;

1 0