wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Serge Gautherie : winapi: Update 'perl -w' to 'use warnings 'all''.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 866f6725056e590c55b018183471f1915bec8e2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=866f6725056e590c55b01818… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Wed Jul 22 00:10:10 2020 +0200 winapi: Update 'perl -w' to 'use warnings 'all''. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/c_function.pm | 1 + tools/winapi/c_parser.pm | 1 + tools/winapi/c_type.pm | 1 + tools/winapi/config.pm | 1 + tools/winapi/function.pm | 1 + tools/winapi/make_filter | 3 ++- tools/winapi/make_filter_options.pm | 4 +++- tools/winapi/make_parser.pm | 1 + tools/winapi/modules.pm | 1 + tools/winapi/msvcmaker | 3 ++- tools/winapi/msvcmaker_options.pm | 4 +++- tools/winapi/nativeapi.pm | 1 + tools/winapi/options.pm | 2 ++ tools/winapi/output.pm | 2 ++ tools/winapi/preprocessor.pm | 1 + tools/winapi/setup.pm | 1 + tools/winapi/tests.pm | 1 + tools/winapi/type.pm | 1 + tools/winapi/util.pm | 1 + tools/winapi/winapi.pm | 1 + tools/winapi/winapi_check | 3 ++- tools/winapi/winapi_check_options.pm | 8 ++++++-- tools/winapi/winapi_documentation.pm | 1 + tools/winapi/winapi_extract | 3 ++- tools/winapi/winapi_extract_options.pm | 4 +++- tools/winapi/winapi_function.pm | 4 +++- tools/winapi/winapi_global.pm | 1 + tools/winapi/winapi_local.pm | 1 + tools/winapi/winapi_module_user.pm | 1 + tools/winapi/winapi_parser.pm | 1 + tools/winapi/winapi_test | 3 ++- tools/winapi/winapi_test_options.pm | 4 +++- 32 files changed, 54 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=866f6725056e590c55b0…

1 0

Serge Gautherie : winapi_test: Fix 'MIXERLINECONTROL[AW]' typos.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: a771e58ef3839abdb041213491a7468d2238cca7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a771e58ef3839abdb0412134… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Thu Jul 23 11:43:05 2020 +0200 winapi_test: Fix 'MIXERLINECONTROL[AW]' typos. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/generated.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ tools/winapi/tests.dat | 4 ++-- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/generated.c b/dlls/winmm/tests/generated.c index 4c0fe7a530..78051c628d 100644 --- a/dlls/winmm/tests/generated.c +++ b/dlls/winmm/tests/generated.c @@ -814,6 +814,28 @@ static void test_pack_MIXERCONTROLW(void) TEST_FIELD_OFFSET(MIXERCONTROLW, cMultipleItems, 16) } +static void test_pack_MIXERLINECONTROLSA(void) +{ + /* MIXERLINECONTROLSA (pack 1) */ + TEST_FIELD_SIZE (MIXERLINECONTROLSA, cbStruct, 4) + TEST_FIELD_ALIGN (MIXERLINECONTROLSA, cbStruct, 1) + TEST_FIELD_OFFSET(MIXERLINECONTROLSA, cbStruct, 0) + TEST_FIELD_SIZE (MIXERLINECONTROLSA, dwLineID, 4) + TEST_FIELD_ALIGN (MIXERLINECONTROLSA, dwLineID, 1) + TEST_FIELD_OFFSET(MIXERLINECONTROLSA, dwLineID, 4) +} + +static void test_pack_MIXERLINECONTROLSW(void) +{ + /* MIXERLINECONTROLSW (pack 1) */ + TEST_FIELD_SIZE (MIXERLINECONTROLSW, cbStruct, 4) + TEST_FIELD_ALIGN (MIXERLINECONTROLSW, cbStruct, 1) + TEST_FIELD_OFFSET(MIXERLINECONTROLSW, cbStruct, 0) + TEST_FIELD_SIZE (MIXERLINECONTROLSW, dwLineID, 4) + TEST_FIELD_ALIGN (MIXERLINECONTROLSW, dwLineID, 1) + TEST_FIELD_OFFSET(MIXERLINECONTROLSW, dwLineID, 4) +} + static void test_pack_MIXERCONTROLDETAILS(void) { /* MIXERCONTROLDETAILS (pack 1) */ @@ -3219,6 +3241,28 @@ static void test_pack_MIXERCONTROLW(void) TEST_FIELD_OFFSET(MIXERCONTROLW, cMultipleItems, 16) } +static void test_pack_MIXERLINECONTROLSA(void) +{ + /* MIXERLINECONTROLSA (pack 1) */ + TEST_FIELD_SIZE (MIXERLINECONTROLSA, cbStruct, 4) + TEST_FIELD_ALIGN (MIXERLINECONTROLSA, cbStruct, 1) + TEST_FIELD_OFFSET(MIXERLINECONTROLSA, cbStruct, 0) + TEST_FIELD_SIZE (MIXERLINECONTROLSA, dwLineID, 4) + TEST_FIELD_ALIGN (MIXERLINECONTROLSA, dwLineID, 1) + TEST_FIELD_OFFSET(MIXERLINECONTROLSA, dwLineID, 4) +} + +static void test_pack_MIXERLINECONTROLSW(void) +{ + /* MIXERLINECONTROLSW (pack 1) */ + TEST_FIELD_SIZE (MIXERLINECONTROLSW, cbStruct, 4) + TEST_FIELD_ALIGN (MIXERLINECONTROLSW, cbStruct, 1) + TEST_FIELD_OFFSET(MIXERLINECONTROLSW, cbStruct, 0) + TEST_FIELD_SIZE (MIXERLINECONTROLSW, dwLineID, 4) + TEST_FIELD_ALIGN (MIXERLINECONTROLSW, dwLineID, 1) + TEST_FIELD_OFFSET(MIXERLINECONTROLSW, dwLineID, 4) +} + static void test_pack_MIXERCONTROLDETAILS(void) { /* MIXERCONTROLDETAILS (pack 1) */ @@ -5001,6 +5045,8 @@ static void test_pack(void) test_pack_MIXERCONTROLDETAILS_UNSIGNED(); test_pack_MIXERCONTROLW(); test_pack_MIXERLINEA(); + test_pack_MIXERLINECONTROLSA(); + test_pack_MIXERLINECONTROLSW(); test_pack_MIXERLINEW(); test_pack_MMCKINFO(); test_pack_MMIOINFO(); diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 48813393fc..0e35110f20 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -1797,8 +1797,8 @@ MIXERLINEA MIXERLINEW MIXERCONTROLA MIXERCONTROLW -MIXERLINECONTROLA -MIXERLINECONTROLW +MIXERLINECONTROLSA +MIXERLINECONTROLSW MIXERCONTROLDETAILS MIXERCONTROLDETAILS_LISTTEXTA MIXERCONTROLDETAILS_LISTTEXTW

1 0

Serge Gautherie : winapi_test: Remove MIDL_STUB_MESSAGE field exclusions.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 151af8c04249bdd90e095c456e45ef416fcbfe97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=151af8c04249bdd90e095c45… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Thu Jul 23 11:42:05 2020 +0200 winapi_test: Remove MIDL_STUB_MESSAGE field exclusions. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/generated.c | 24 ++++++++++++++++++++++++ tools/winapi/tests.dat | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/generated.c b/dlls/rpcrt4/tests/generated.c index 72672cd3a9..7dd5968318 100644 --- a/dlls/rpcrt4/tests/generated.c +++ b/dlls/rpcrt4/tests/generated.c @@ -593,6 +593,15 @@ static void test_pack_MIDL_STUB_MESSAGE(void) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, Memory, 8) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, Memory, 8) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, Memory, 48) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, IsClient, 1) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, IsClient, 1) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, IsClient, 56) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, Pad, 1) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, Pad, 1) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, Pad, 57) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, uFlags2, 2) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, uFlags2, 2) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, uFlags2, 58) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, ReuseBuffer, 4) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, ReuseBuffer, 4) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, ReuseBuffer, 60) @@ -614,6 +623,9 @@ static void test_pack_MIDL_STUB_MESSAGE(void) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, uFlags, 1) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, uFlags, 1) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, uFlags, 97) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, UniquePtrCount, 2) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, UniquePtrCount, 2) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, UniquePtrCount, 98) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, MaxCount, 8) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, MaxCount, 8) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, MaxCount, 104) @@ -1442,6 +1454,15 @@ static void test_pack_MIDL_STUB_MESSAGE(void) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, Memory, 4) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, Memory, 4) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, Memory, 28) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, IsClient, 1) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, IsClient, 1) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, IsClient, 32) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, Pad, 1) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, Pad, 1) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, Pad, 33) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, uFlags2, 2) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, uFlags2, 2) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, uFlags2, 34) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, ReuseBuffer, 4) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, ReuseBuffer, 4) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, ReuseBuffer, 36) @@ -1463,6 +1484,9 @@ static void test_pack_MIDL_STUB_MESSAGE(void) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, uFlags, 1) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, uFlags, 1) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, uFlags, 57) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, UniquePtrCount, 2) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, UniquePtrCount, 2) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, UniquePtrCount, 58) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, MaxCount, 4) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, MaxCount, 4) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, MaxCount, 60) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index e6a09923af..48813393fc 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -967,7 +967,7 @@ MALLOC_FREE_STRUCT MIDL_FORMAT_STRING MIDL_SERVER_INFO MIDL_STUB_DESC -MIDL_STUB_MESSAGE: !UniquePtrCount !IsClient !Pad !uFlags2 +MIDL_STUB_MESSAGE MIDL_STUBLESS_PROXY_INFO MIDL_SYNTAX_INFO NDR_CCONTEXT

1 0

Zhiyi Zhang : winex11.drv: Remove XRandR 1.2 display settings handler.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 7dd52f6d24f372f08ab71f0acbb0a2b028d390ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dd52f6d24f372f08ab71f0a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 24 17:23:32 2020 +0800 winex11.drv: Remove XRandR 1.2 display settings handler. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 18 ---- configure.ac | 4 - dlls/winex11.drv/xrandr.c | 255 ++-------------------------------------------- include/config.h.in | 3 - 4 files changed, 7 insertions(+), 273 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7dd52f6d24f372f08ab7…

1 0

Zhiyi Zhang : winex11.drv: Add XRandR 1.4 display settings handler.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 9905a5a81d6baf59e992c5b2a8ea92ee4054e5d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9905a5a81d6baf59e992c5b2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 24 17:23:21 2020 +0800 winex11.drv: Add XRandR 1.4 display settings handler. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 1 - dlls/user32/tests/sysparams.c | 23 ++- dlls/winex11.drv/xrandr.c | 376 ++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 372 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9905a5a81d6baf59e992…

1 0

Zhiyi Zhang : winex11.drv: Add set_screen_size() helper.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 45d991d54138523e5278db5618eb458100982294 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45d991d54138523e5278db56… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 24 17:23:08 2020 +0800 winex11.drv: Add set_screen_size() helper. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index cc88188943..4bbba15a25 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -466,6 +466,16 @@ static void get_screen_size( XRRScreenResources *resources, unsigned int *width, } } +static void set_screen_size( int width, int height ) +{ + int screen = default_visual.screen; + int mm_width, mm_height; + + mm_width = width * DisplayWidthMM( gdi_display, screen ) / DisplayWidth( gdi_display, screen ); + mm_height = height * DisplayHeightMM( gdi_display, screen ) / DisplayHeight( gdi_display, screen ); + pXRRSetScreenSize( gdi_display, root_window, width, height, mm_width, mm_height ); +} + static LONG xrandr12_set_current_mode( int mode ) { unsigned int screen_width, screen_height; @@ -515,12 +525,7 @@ static LONG xrandr12_set_current_mode( int mode ) get_screen_size( resources, &screen_width, &screen_height ); screen_width = max( screen_width, crtc_info->x + dd_modes[mode].width ); screen_height = max( screen_height, crtc_info->y + dd_modes[mode].height ); - - pXRRSetScreenSize( gdi_display, root_window, screen_width, screen_height, - screen_width * DisplayWidthMM( gdi_display, default_visual.screen ) - / DisplayWidth( gdi_display, default_visual.screen ), - screen_height * DisplayHeightMM( gdi_display, default_visual.screen ) - / DisplayHeight( gdi_display, default_visual.screen )); + set_screen_size( screen_width, screen_height ); status = pXRRSetCrtcConfig( gdi_display, resources, resources->crtcs[primary_crtc], CurrentTime, crtc_info->x, crtc_info->y, xrandr12_modes[mode],

1 0

Zhiyi Zhang : winex11.drv: Move broken NVIDIA driver detection into a function.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: f5e6c086f91749e9e302c1abf858807535bc9775 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5e6c086f91749e9e302c1ab… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 24 17:22:55 2020 +0800 winex11.drv: Move broken NVIDIA driver detection into a function. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 106 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 78 insertions(+), 28 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 141c2ca17f..cc88188943 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -316,6 +316,83 @@ static XRRScreenResources *xrandr_get_screen_resources(void) return resources; } +/* Some (304.64, possibly earlier) versions of the NVIDIA driver only + * report a DFP's native mode through RandR 1.2 / 1.3. Standard DMT modes + * are only listed through RandR 1.0 / 1.1. This is completely useless, + * but NVIDIA considers this a feature, so it's unlikely to change. The + * best we can do is to fall back to RandR 1.0 and encourage users to + * consider more cooperative driver vendors when we detect such a + * configuration. */ +static BOOL is_broken_driver(void) +{ + XRRScreenResources *screen_resources; + XRROutputInfo *output_info; + XRRModeInfo *first_mode; + INT major, event, error; + INT output_idx, i, j; + BOOL only_one_mode; + + screen_resources = xrandr_get_screen_resources(); + if (!screen_resources) + return TRUE; + + /* Check if any output only has one native mode */ + for (output_idx = 0; output_idx < screen_resources->noutput; ++output_idx) + { + output_info = pXRRGetOutputInfo( gdi_display, screen_resources, + screen_resources->outputs[output_idx] ); + if (!output_info) + continue; + + if (output_info->connection != RR_Connected) + { + pXRRFreeOutputInfo( output_info ); + continue; + } + + first_mode = NULL; + only_one_mode = TRUE; + for (i = 0; i < output_info->nmode; ++i) + { + for (j = 0; j < screen_resources->nmode; ++j) + { + if (output_info->modes[i] != screen_resources->modes[j].id) + continue; + + if (!first_mode) + { + first_mode = &screen_resources->modes[j]; + break; + } + + if (first_mode->width != screen_resources->modes[j].width || + first_mode->height != screen_resources->modes[j].height) + only_one_mode = FALSE; + + break; + } + + if (!only_one_mode) + break; + } + pXRRFreeOutputInfo( output_info ); + + if (!only_one_mode) + continue; + + /* Check if it is NVIDIA proprietary driver */ + if (XQueryExtension( gdi_display, "NV-CONTROL", &major, &event, &error )) + { + ERR_(winediag)("Broken NVIDIA RandR detected, falling back to RandR 1.0. " + "Please consider using the Nouveau driver instead.\n"); + pXRRFreeScreenResources( screen_resources ); + return TRUE; + } + } + pXRRFreeScreenResources( screen_resources ); + return FALSE; +} + static int xrandr12_get_current_mode(void) { XRRScreenResources *resources; @@ -504,7 +581,6 @@ static unsigned int get_frequency( const XRRModeInfo *mode ) static int xrandr12_init_modes(void) { - unsigned int only_one_resolution = 1, mode_count; XRRScreenResources *resources; XRROutputInfo *output_info; XRRCrtcInfo *crtc_info; @@ -570,32 +646,6 @@ static int xrandr12_init_modes(void) } } - mode_count = X11DRV_Settings_GetModeCount(); - for (i = 1; i < mode_count; ++i) - { - if (dd_modes[i].width != dd_modes[0].width || dd_modes[i].height != dd_modes[0].height) - { - only_one_resolution = 0; - break; - } - } - - /* Recent (304.64, possibly earlier) versions of the nvidia driver only - * report a DFP's native mode through RandR 1.2 / 1.3. Standard DMT modes - * are only listed through RandR 1.0 / 1.1. This is completely useless, - * but NVIDIA considers this a feature, so it's unlikely to change. The - * best we can do is to fall back to RandR 1.0 and encourage users to - * consider more cooperative driver vendors when we detect such a - * configuration. */ - if (only_one_resolution && XQueryExtension( gdi_display, "NV-CONTROL", &i, &j, &ret )) - { - ERR_(winediag)("Broken NVIDIA RandR detected, falling back to RandR 1.0. " - "Please consider using the Nouveau driver instead.\n"); - ret = -1; - HeapFree( GetProcessHeap(), 0, xrandr12_modes ); - goto done; - } - X11DRV_Settings_AddDepthModes(); ret = 0; @@ -1260,7 +1310,7 @@ void X11DRV_XRandR_Init(void) pXRRGetScreenResourcesCurrent = pXRRGetScreenResources; } - if (!pXRRGetScreenResourcesCurrent || xrandr12_init_modes() < 0) + if (!pXRRGetScreenResourcesCurrent || is_broken_driver() || xrandr12_init_modes() < 0) #endif xrandr10_init_modes();

1 0

Zhiyi Zhang : winex11.drv: Sort display modes.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: a8b4cf7f2d3d1fbd79308a106a84e753cdac69e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8b4cf7f2d3d1fbd79308a10… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 24 17:22:43 2020 +0800 winex11.drv: Sort display modes. Although tests show that their order are not always guaranteed on Windows, most of the time it is sorted. It also makes sure that when a 0Hz or 1Hz display mode is specified for ChangeDisplaySettingsExW(), the chosen display mode is the one with the highest frequency. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/settings.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 28c405ae0e..0249575617 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -20,6 +20,7 @@ */ #include "config.h" +#include <stdlib.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -333,6 +334,22 @@ BOOL get_primary_adapter(WCHAR *name) return FALSE; } +static int mode_compare(const void *p1, const void *p2) +{ + const DEVMODEW *a = p1, *b = p2; + + if (a->dmBitsPerPel != b->dmBitsPerPel) + return b->dmBitsPerPel - a->dmBitsPerPel; + + if (a->dmPelsWidth != b->dmPelsWidth) + return a->dmPelsWidth - b->dmPelsWidth; + + if (a->dmPelsHeight != b->dmPelsHeight) + return a->dmPelsHeight - b->dmPelsHeight; + + return b->dmDisplayFrequency - a->dmDisplayFrequency; +} + /*********************************************************************** * EnumDisplaySettingsEx (X11DRV.@) * @@ -379,6 +396,8 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo return FALSE; } + qsort(modes, mode_count, sizeof(*modes) + modes[0].dmDriverExtra, mode_compare); + if (cached_modes) handler.free_modes(cached_modes); lstrcpyW(cached_device_name, name); @@ -477,6 +496,7 @@ static DEVMODEW *get_full_mode(ULONG_PTR id, const DEVMODEW *dev_mode) if (!handler.get_modes(id, 0, &modes, &mode_count)) return NULL; + qsort(modes, mode_count, sizeof(*modes) + modes[0].dmDriverExtra, mode_compare); for (mode_idx = 0; mode_idx < mode_count; ++mode_idx) { found_mode = (DEVMODEW *)((BYTE *)modes + (sizeof(*modes) + modes[0].dmDriverExtra) * mode_idx);

1 0

Zhiyi Zhang : user32: Check invalid device names in EnumDisplaySettingsExW().
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 46182aa559144e141a62a86be89779b14c87d906 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46182aa559144e141a62a86b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 24 17:22:28 2020 +0800 user32: Check invalid device names in EnumDisplaySettingsExW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 33 +++++++++++++++++++++++---------- dlls/user32/tests/sysparams.c | 8 ++++---- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index d4462e589e..79f938a3c2 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -590,6 +590,21 @@ static BOOL get_primary_adapter(WCHAR *name) return FALSE; } +static BOOL is_valid_adapter_name(const WCHAR *name) +{ + long int adapter_idx; + WCHAR *end; + + if (strncmpiW(name, ADAPTER_PREFIX, ARRAY_SIZE(ADAPTER_PREFIX))) + return FALSE; + + adapter_idx = strtolW(name + ARRAY_SIZE(ADAPTER_PREFIX), &end, 10); + if (*end || adapter_idx < 1) + return FALSE; + + return TRUE; +} + /* get text metrics and/or "average" char width of the specified logfont * for the specified dc */ static void get_text_metr_size( HDC hdc, LOGFONTW *plf, TEXTMETRICW * ptm, UINT *psz) @@ -3307,8 +3322,7 @@ static BOOL is_detached_mode(const DEVMODEW *mode) LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lparam ) { - WCHAR primary_adapter[CCHDEVICENAME], *end; - long int display_idx; + WCHAR primary_adapter[CCHDEVICENAME]; BOOL def_mode = TRUE; DEVMODEW dm; LONG ret; @@ -3332,14 +3346,7 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND devname = primary_adapter; } - if (strncmpiW(devname, ADAPTER_PREFIX, ARRAY_SIZE(ADAPTER_PREFIX))) - { - ERR("Invalid device name %s.\n", wine_dbgstr_w(devname)); - return DISP_CHANGE_BADPARAM; - } - - display_idx = strtolW(devname + ARRAY_SIZE(ADAPTER_PREFIX), &end, 10); - if (*end || display_idx < 1) + if (!is_valid_adapter_name(devname)) { ERR("Invalid device name %s.\n", wine_dbgstr_w(devname)); return DISP_CHANGE_BADPARAM; @@ -3466,6 +3473,12 @@ BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR lpszDeviceName, DWORD iModeNum, lpszDeviceName = primary_adapter; } + if (!is_valid_adapter_name(lpszDeviceName)) + { + ERR("Invalid device name %s.\n", wine_dbgstr_w(lpszDeviceName)); + return FALSE; + } + ret = USER_Driver->pEnumDisplaySettingsEx(lpszDeviceName, iModeNum, lpDevMode, dwFlags); if (ret) TRACE("device:%s mode index:%#x position:(%d,%d) resolution:%ux%u frequency:%uHz " diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 6750325a29..f71b73930f 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3154,18 +3154,18 @@ static void test_EnumDisplaySettings(void) dm.dmSize = sizeof(dm); SetLastError(0xdeadbeef); ret = EnumDisplaySettingsA("invalid", ENUM_CURRENT_SETTINGS, &dm); - todo_wine ok(!ret, "EnumDisplaySettingsA succeeded\n"); + ok(!ret, "EnumDisplaySettingsA succeeded\n"); ok(GetLastError() == 0xdeadbeef, "Expect error 0xdeadbeef, got %#x\n", GetLastError()); - todo_wine ok(dm.dmFields == 0, "Expect dmFields unchanged, got %#x\n", dm.dmFields); + ok(dm.dmFields == 0, "Expect dmFields unchanged, got %#x\n", dm.dmFields); /* Monitor device names are invalid */ memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); SetLastError(0xdeadbeef); ret = EnumDisplaySettingsA("\\\\.\\DISPLAY1\\Monitor0", ENUM_CURRENT_SETTINGS, &dm); - todo_wine ok(!ret, "EnumDisplaySettingsA succeeded\n"); + ok(!ret, "EnumDisplaySettingsA succeeded\n"); ok(GetLastError() == 0xdeadbeef, "Expect error 0xdeadbeef, got %#x\n", GetLastError()); - todo_wine ok(dm.dmFields == 0, "Expect dmFields unchanged, got %#x\n", dm.dmFields); + ok(dm.dmFields == 0, "Expect dmFields unchanged, got %#x\n", dm.dmFields); /* Test that passing NULL to device name parameter means to use the primary adapter */ memset(&dm, 0, sizeof(dm));

1 0

Matteo Bruni : d3dcompiler: Don't link to dxguid or uuid.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 8928a417507b084a056360d644b5d06607a645cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=8928a417507b084a056360d6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 24 11:14:09 2020 +0200 d3dcompiler: Don't link to dxguid or uuid. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/Makefile.in | 1 - dlls/d3dcompiler_43/reflection.c | 1 - 2 files changed, 2 deletions(-) diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in index d273e278c3..8464113cd1 100644 --- a/dlls/d3dcompiler_43/Makefile.in +++ b/dlls/d3dcompiler_43/Makefile.in @@ -1,5 +1,4 @@ MODULE = d3dcompiler_43.dll -IMPORTS = dxguid uuid EXTRADEFS = -DD3D_COMPILER_VERSION=43 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index b29db47c71..7a8af39b07 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -20,7 +20,6 @@ #include "initguid.h" #include "d3dcompiler_private.h" -#include "winternl.h" #include "d3d10.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler);

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
83
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 July 2020