wine-devel March 2019

wine-devel@winehq.org

76 participants
1010 discussions

[PATCH 2/7] winex11.drv: Report primary monitor first with Xinerama.
by Zhiyi Zhang 20 Mar '19

20 Mar '19

This saves callers some trouble with identifying which monitor is primary. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/xinerama.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 739b139736..fe899e8744 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -128,6 +128,7 @@ static int query_screens(void) int i, count, event_base, error_base; XineramaScreenInfo *screens; RECT rc_work = {0, 0, 0, 0}; + MONITORINFOEXW *primary_monitor; if (!monitors) /* first time around */ load_xinerama(); @@ -156,7 +157,16 @@ static int query_screens(void) lstrcpyW( monitors[i].szDevice, default_monitor.szDevice ); } - get_primary()->dwFlags |= MONITORINFOF_PRIMARY; + primary_monitor = get_primary(); + primary_monitor->dwFlags |= MONITORINFOF_PRIMARY; + + /* Make primary monitor always the first one */ + if (primary_monitor != &monitors[0]) + { + MONITORINFOEXW tmp = monitors[0]; + monitors[0] = *primary_monitor; + *primary_monitor = tmp; + } } else count = 0; -- 2.19.2

1 0

[PATCH 1/7] winex11.drv: Support multiple display device handlers.
by Zhiyi Zhang 20 Mar '19

20 Mar '19

Display device handler will be used to initialize the registry. Different handlers can be implemented according to the interface, for example, via Xinerama or XRandR. With those registry data, EnumDisplayDevices, EnumDisplayMonitors and GetMonitorInfo can be built on top of it. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/Makefile.in | 1 + dlls/winex11.drv/display.c | 37 ++++++++++++++++++ dlls/winex11.drv/x11drv.h | 76 ++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+) create mode 100644 dlls/winex11.drv/display.c diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 747f509b44..9ca2fc6efe 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ brush.c \ clipboard.c \ desktop.c \ + display.c \ event.c \ graphics.c \ ime.c \ diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c new file mode 100644 index 0000000000..d9a755b3be --- /dev/null +++ b/dlls/winex11.drv/display.c @@ -0,0 +1,37 @@ +/* + * X11DRV display device functions + * + * Copyright 2019 Zhiyi Zhang for CodeWeavers + * + * 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 "wine/debug.h" +#include "x11drv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(x11drv); + +static struct x11drv_display_device_handler handler; + +void X11DRV_DisplayDevice_SetHandler(const struct x11drv_display_device_handler *new_handler) +{ + if (new_handler->priority > handler.priority) + { + handler = *new_handler; + TRACE("Display device functions are now handled by: %s\n", handler.name); + } +} diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a0308b0675..fc589356b8 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -665,6 +665,82 @@ struct x11drv_mode_info *X11DRV_Settings_SetHandlers(const char *name, void X11DRV_XF86VM_Init(void) DECLSPEC_HIDDEN; void X11DRV_XRandR_Init(void) DECLSPEC_HIDDEN; +/* X11 display device driver */ + +/* Represent a physical GPU in the PCI slots */ +struct x11drv_gpu +{ + /* ID to uniquely identify a GPU in handler */ + ULONG_PTR id; + /* Name */ + WCHAR name[128]; + /* PCI ID */ + UINT vendor_id; + UINT device_id; + UINT subsys_id; + UINT revision_id; +}; + +/* Represent an adapter in EnumDisplayDevices context */ +struct x11drv_adapter +{ + /* ID to uniquely identify an adapter in handler */ + ULONG_PTR id; + /* as StateFlags in DISPLAY_DEVICE struct */ + DWORD state_flags; +}; + +/* Represent a monitor in EnumDisplayDevices context */ +struct x11drv_monitor +{ + /* Name */ + WCHAR name[128]; + /* as RcMonitor in MONITORINFO struct */ + RECT rc_monitor; + /* as RcWork in MONITORINFO struct */ + RECT rc_work; + /* StateFlags in DISPLAY_DEVICE struct */ + DWORD state_flags; +}; + +/* Required functions for display device registry initialization */ +struct x11drv_display_device_handler +{ + /* A name to tell what host driver is used */ + CHAR name[MAX_PATH]; + + /* Higher priority can override handlers with lower proprity */ + INT priority; + + /* pGetGpus will be called to get a list of GPUs. First GPU has to be where the primary adapter is. + * + * Return FALSE on failure with parameters unchanged */ + BOOL (*pGetGpus)(struct x11drv_gpu **gpus, int *count); + + /* pGetAdapters will be called to get a list of adapters in EnumDisplayDevices context under a GPU. + * The first adapter has to be primary if GPU is primary. + * + * Return FALSE on failure with parameters unchanged */ + BOOL (*pGetAdapters)(ULONG_PTR gpu_id, struct x11drv_adapter **adapters, int *count); + + /* pGetMonitors will be called to get a list of monitors in EnumDisplayDevices context under an adapter. + * The first monitor has to be primary if adapter is primary. + * + * Return FALSE on failure with parameters unchanged */ + BOOL (*pGetMonitors)(ULONG_PTR adapter_id, struct x11drv_monitor **monitors, int *count); + + /* pFreeGpus will be called to free a GPU list from pGetGpus */ + void (*pFreeGpus)(struct x11drv_gpu *gpus); + + /* pFreeAdapters will be called to free an adapter list from pGetAdapters */ + void (*pFreeAdapters)(struct x11drv_adapter *adapters); + + /* pFreeMonitors will be called to free a monitor list from pGetMonitors */ + void (*pFreeMonitors)(struct x11drv_monitor *monitors); +}; + +extern void X11DRV_DisplayDevice_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; + /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) DECLSPEC_HIDDEN; -- 2.19.2

1 0

[PATCH] devenum/tests: Accept ERROR_KEY_DOES_NOT_EXIST from IPropertyBag_Read [v2]
by Detlef Riekenberg 20 Mar '19

20 Mar '19

Fixes test failures on windows 8.1 Example failures: http://test.winehq.org/data/3e61c7127ed7eb764a8b308fd8897cbc26a93a4a/win8_c… http://test.winehq.org/data/3e61c7127ed7eb764a8b308fd8897cbc26a93a4a/win8_d… v2: Add missing include Sorry for the previous broken version. -- bye bye ... ... Detlef Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> --- dlls/devenum/tests/devenum.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index e31f65c653..9fcfdcf316 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -33,6 +33,7 @@ #include "mmddk.h" #include "vfw.h" #include "dmoreg.h" +#include "setupapi.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -122,7 +123,8 @@ static void test_devenum(IBindCtx *bind_ctx) ok(hr == S_OK, "IMoniker_BindToStorage failed with error %x\n", hr); hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); - ok(hr == S_OK, "IPropertyBag_Read failed: %#x\n", hr); + ok((hr == S_OK) | (hr == ERROR_KEY_DOES_NOT_EXIST), + "IPropertyBag_Read failed: %#x\n", hr); if (winetest_debug > 1) trace(" %s %s\n", wine_dbgstr_w(displayname), wine_dbgstr_w(V_BSTR(&var))); -- 2.21.0.windows.1

1 0

[PATCH 1/7] mfplat: Add media source attribute guids.
by Nikolay Sivov 20 Mar '19

20 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 11 +++++++++++ include/mfreadwrite.idl | 12 +++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index ccd0a03b0b..c459e0aae9 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -556,9 +556,11 @@ static const char *debugstr_attr(const GUID *guid) #define X(g) { &(g), #g } X(MF_READWRITE_MMCSS_CLASS), X(MF_SINK_WRITER_ENCODER_CONFIG), + X(MF_SOURCE_READER_ENABLE_TRANSCODE_ONLY_TRANSFORMS), X(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS), X(MF_MT_PIXEL_ASPECT_RATIO), X(MF_MT_AVG_BITRATE), + X(MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING), X(MF_PD_PMPHOST_CONTEXT), X(MF_PD_APP_CONTEXT), X(MF_PD_TOTAL_FILE_SIZE), @@ -570,12 +572,15 @@ static const char *debugstr_attr(const GUID *guid) X(MF_MT_ALL_SAMPLES_INDEPENDENT), X(MF_PD_PREFERRED_LANGUAGE), X(MF_PD_PLAYBACK_BOUNDARY_TIME), + X(MF_SOURCE_READER_ENABLE_VIDEO_PROCESSING), X(MF_MT_FRAME_SIZE), X(MF_SINK_WRITER_ASYNC_CALLBACK), X(MF_MT_FRAME_RATE_RANGE_MAX), X(MF_MT_USER_DATA), + X(MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN), X(MF_READWRITE_DISABLE_CONVERTERS), X(MFSampleExtension_Token), + X(MF_SOURCE_READER_D3D11_BIND_FLAGS), X(MF_PD_SAMI_STYLELIST), X(MF_SD_LANGUAGE), X(MF_SD_PROTECTED), @@ -595,14 +600,20 @@ static const char *debugstr_attr(const GUID *guid) X(MF_SD_MUTUALLY_EXCLUSIVE), X(MF_SD_STREAM_NAME), X(MF_SINK_WRITER_D3D_MANAGER), + X(MF_SOURCE_READER_D3D_MANAGER), + X(MF_SOURCE_READER_ASYNC_CALLBACK), X(MF_MT_INTERLACE_MODE), + X(MF_SOURCE_READER_MEDIASOURCE_CHARACTERISTICS), X(MF_READWRITE_MMCSS_PRIORITY), X(MFSampleExtension_DecodeTimestamp), X(MF_SINK_WRITER_DISABLE_THROTTLING), X(MF_READWRITE_D3D_OPTIONAL), X(MF_READWRITE_MMCSS_CLASS_AUDIO), + X(MF_SOURCE_READER_DISABLE_CAMERA_PLUGINS), X(MF_PD_AUDIO_ISVARIABLEBITRATE), X(MF_MT_FRAME_RATE), + X(MF_SOURCE_READER_MEDIASOURCE_CONFIG), + X(MF_SOURCE_READER_DISABLE_DXVA), #undef X }; struct guid_def *ret = NULL; diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index 9097b5a548..86e6eeaca5 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -78,7 +78,17 @@ cpp_quote("EXTERN_GUID(MF_READWRITE_MMCSS_CLASS_AUDIO, 0x430847da, 0x08 cpp_quote("EXTERN_GUID(MF_READWRITE_MMCSS_PRIORITY_AUDIO, 0x273db885, 0x2de2, 0x4db2, 0xa6, 0xa7, 0xfd, 0xb6, 0x6f, 0xb4, 0x0b, 0x61);") cpp_quote("EXTERN_GUID(MF_READWRITE_D3D_OPTIONAL, 0x216479d9, 0x3071, 0x42ca, 0xbb, 0x6c, 0x4c, 0x22, 0x10, 0x2e, 0x1d, 0x18);") -cpp_quote("EXTERN_GUID(MF_SOURCE_READER_MEDIASOURCE_CHARACTERISTICS, 0x6d23f5c8, 0xc5d7, 0x4a9b, 0x99, 0x71, 0x5d, 0x11, 0xf8, 0xbc, 0xa8, 0x80);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_ASYNC_CALLBACK, 0x1e3dbeac, 0xbb43, 0x4c35, 0xb5, 0x07, 0xcd, 0x64, 0x44, 0x64, 0xc9, 0x65);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_D3D_MANAGER, 0xec822da2, 0xe1e9, 0x4b29, 0xa0, 0xd8, 0x56, 0x3c, 0x71, 0x9f, 0x52, 0x69);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_D3D11_BIND_FLAGS, 0x33f3197b, 0xf73a, 0x4e14, 0x8d, 0x85, 0x0e, 0x4c, 0x43, 0x68, 0x78, 0x8d);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_DISABLE_CAMERA_PLUGINS, 0x9d3365dd, 0x058f, 0x4cfb, 0x9f, 0x97, 0xb3, 0x14, 0xcc, 0x99, 0xc8, 0xad);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_DISABLE_DXVA, 0xaa456cfd, 0x3943, 0x4a1e, 0xa7, 0x7d, 0x18, 0x38, 0xc0, 0xea, 0x2e, 0x35);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN, 0x56b67165, 0x219e, 0x456d, 0xa2, 0x2e, 0x2d, 0x30, 0x04, 0xc7, 0xfe, 0x56);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING, 0x0f81da2c, 0xb537, 0x4672, 0xa8, 0xb2, 0xa6, 0x81, 0xb1, 0x73, 0x07, 0xa3);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_ENABLE_TRANSCODE_ONLY_TRANSFORMS, 0xdfd4f008, 0xb5fd, 0x4e78, 0xae, 0x44, 0x62, 0xa1, 0xe6, 0x7b, 0xbe, 0x27);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_ENABLE_VIDEO_PROCESSING, 0xfb394f3d, 0xccf1, 0x42ee, 0xbb, 0xb3, 0xf9, 0xb8, 0x45, 0xd5, 0x68, 0x1d);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_MEDIASOURCE_CHARACTERISTICS, 0x6d23f5c8, 0xc5d7, 0x4a9b, 0x99, 0x71, 0x5d, 0x11, 0xf8, 0xbc, 0xa8, 0x80);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_MEDIASOURCE_CONFIG, 0x9085abeb, 0x0354, 0x48f9, 0xab, 0xb5, 0x20, 0x0d, 0xf8, 0x38, 0xc6, 0x8e);") interface IMFMediaSource; -- 2.20.1

2 7

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 19 Mar '19

19 Mar '19

1 0

[PATCH v4 1/5] Don't use ZeroBits argument of NtAllocateVirtualMemory in COMMDLG file dialogs
by Las＠protonmail.ch 19 Mar '19

19 Mar '19

I've fixed the tests and attached my real name now.

2 1

[PATCH 1/3] mshtml: Add IHTMLCSSStyleDeclaration::setProperty implementation.
by Jacek Caban 19 Mar '19

19 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 50 +++++++++++++++++++++++++++++------ dlls/mshtml/tests/elements.js | 24 +++++++++++++++++ 2 files changed, 66 insertions(+), 8 deletions(-)

2 1

[PATCH] devenum/tests: Accept ERROR_KEY_DOES_NOT_EXIST from IPropertyBag_Read
by Detlef Riekenberg 19 Mar '19

19 Mar '19

Fixes test failures on windows 8.1 Example failures: http://test.winehq.org/data/3e61c7127ed7eb764a8b308fd8897cbc26a93a4a/win8_c… http://test.winehq.org/data/3e61c7127ed7eb764a8b308fd8897cbc26a93a4a/win8_d… -- bye bye ... ... Detlef Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> --- dlls/devenum/tests/devenum.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index e31f65c653..22a5f75cb1 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -122,7 +122,8 @@ static void test_devenum(IBindCtx *bind_ctx) ok(hr == S_OK, "IMoniker_BindToStorage failed with error %x\n", hr); hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); - ok(hr == S_OK, "IPropertyBag_Read failed: %#x\n", hr); + ok((hr == S_OK) | (hr == ERROR_KEY_DOES_NOT_EXIST), + "IPropertyBag_Read failed: %#x\n", hr); if (winetest_debug > 1) trace(" %s %s\n", wine_dbgstr_w(displayname), wine_dbgstr_w(V_BSTR(&var))); -- 2.21.0.windows.1

1 0

[PATCH v2] po: Fix German translation
by Oliver Henning 19 Mar '19

19 Mar '19

Fixes typo and some comma mistakes. Signed-off-by: Oliver Henning <oliver.henning(a)gmail.com> --- po/de.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/po/de.po b/po/de.po index af4b1b8679..641441034e 100644 --- a/po/de.po +++ b/po/de.po @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-02-27 09:09+0530\n" -"Last-Translator: Isira Seneviratne <isirasen96(a)gmail.com>\n" +"PO-Revision-Date: 2019-03-19 15:03+0000\n" +"Last-Translator: Oliver Henning <oliver.henning(a)gmail.com>\n" "Language-Team: German\n" "Language: de\n" "MIME-Version: 1.0\n" @@ -1633,7 +1633,7 @@ msgstr "Unternehmensstamm-OID" #: crypt32.rc:122 msgid "Dummy Signer" -msgstr "Attrapenunterzeichner" +msgstr "Attrappenunterzeichner" #: crypt32.rc:123 msgid "Encrypted Private Key" @@ -2207,7 +2207,7 @@ msgstr "Zertifikatsspeicher wählen" #: cryptui.rc:276 msgid "Select the certificate store you want to use:" -msgstr "Zertifikatsspeicher wählen den Sie benutzen möchten:" +msgstr "Zertifikatsspeicher wählen, den Sie benutzen möchten:" #: cryptui.rc:279 msgid "&Show physical stores" @@ -2436,7 +2436,7 @@ msgstr "&Verstärkte Sicherheit aktivieren" #: cryptui.rc:427 msgid "Delete the private &key if the export is successful" -msgstr "Priva&ten Schlüssel löschen wenn der Export erfolgreich war" +msgstr "Priva&ten Schlüssel löschen, wenn der Export erfolgreich war" #: cryptui.rc:444 msgid "Completing the Certificate Export Wizard" @@ -2518,7 +2518,7 @@ msgstr "Dieses Zertifikat hat eine ungültige Signatur." #: cryptui.rc:43 msgid "This certificate has expired or is not yet valid." -msgstr "Dieses Zertifikat ist entweder abgelaufen, oder noch nicht gültig." +msgstr "Dieses Zertifikat ist entweder abgelaufen oder noch nicht gültig." #: cryptui.rc:44 msgid "This certificate's validity period exceeds that of its issuer." @@ -16950,7 +16950,7 @@ msgstr "Die Datei konnte nicht gespeichert werden." #: wordpad.rc:201 msgid "You do not have access to save the file." msgstr "" -"Sie haben keine ausreichende Zugriffsberechtigung um die Datei zu speichern." +"Sie haben keine ausreichende Zugriffsberechtigung, um die Datei zu speichern." #: wordpad.rc:202 msgid "Could not open the file." @@ -16959,7 +16959,7 @@ msgstr "Die Datei konnte nicht geöffnet werden." #: wordpad.rc:203 msgid "You do not have access to open the file." msgstr "" -"Sie haben keine ausreichende Zugriffsberechtigung um die Datei zu öffnen." +"Sie haben keine ausreichende Zugriffsberechtigung, um die Datei zu öffnen." #: wordpad.rc:204 msgid "Printing not implemented." -- 2.21.0.windows.1

1 0

[PATCH 3/3] mshtml: Add IHTMLAnchorElement::get_host implementation.
by Jacek Caban 19 Mar '19

19 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlanchor.c | 11 +++++++++-- dlls/mshtml/tests/elements.js | 25 +++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-)

1 0

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-devel March 2019