July 2020 - Wine-devel - list.winehq.org

[PATCH 08/10] xactengine3_7: Implement IXACT3Wave interface.
by Vijay Kiran Kamuju 24 Jul '20

24 Jul '20

Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 07/10] xactengine3_7: Implement IXACT3Engine::CreateStreamingWaveBank.
by Vijay Kiran Kamuju 24 Jul '20

24 Jul '20

Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 06/10] xactengine3_7: Implement IXACT3WaveBank Interface.
by Vijay Kiran Kamuju 24 Jul '20

24 Jul '20

Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 05/10] xactengine3_7: Implement IXACT3SoundBank::Play function.
by Vijay Kiran Kamuju 24 Jul '20

24 Jul '20

Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 04/10] xactengine3_7: Implement IXACT3Cue Interface.
by Vijay Kiran Kamuju 24 Jul '20

24 Jul '20

Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 02/10] xactengine3_7: Implement IXACT3Engine interface.
by Vijay Kiran Kamuju 24 Jul '20

24 Jul '20

Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 01/10] xactengine3_7: Add new dll.
by Vijay Kiran Kamuju 24 Jul '20

24 Jul '20

Based on original patch from Ethan Lee Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 4/6] winex11.drv: Add set_screen_size() helper.
by Zhiyi Zhang 24 Jul '20

24 Jul '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- 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 cc881889430..4bbba15a259 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], -- 2.25.1

2 1

[PATCH 3/6] winex11.drv: Move broken NVIDIA driver detection into a function.
by Zhiyi Zhang 24 Jul '20

24 Jul '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- 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 141c2ca17f6..cc881889430 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(); -- 2.25.1

2 1

[PATCH 3/3] winapi_test: Fix 'MIXERLINECONTROL[AW]' typos.
by Serge Gautherie 24 Jul '20

24 Jul '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Addendum to e9e6845d66645daff6ffcfe599e03849e6ba9d32. --- 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 4c0fe7a..78051c6 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 4881339..0e35110 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 -- 2.10.0.windows.1

2 1