wine-commits February 2020

wine-commits@winehq.org

2 participants
874 discussions

Vijay Kiran Kamuju : ws2_32: Add stub for WSCSetApplicationCategory.
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: 0df9cce29d0d32d3f1f13c4ec4eabc81675a17ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=0df9cce29d0d32d3f1f13c4e… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Jan 31 16:01:54 2020 +0100 ws2_32: Add stub for WSCSetApplicationCategory. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48392 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 11 +++++++++++ dlls/ws2_32/ws2_32.spec | 1 + include/ws2spi.h | 1 + 3 files changed, 13 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5c3d1a0dc0..c284f595ab 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -9043,6 +9043,17 @@ INT WINAPI WSCWriteProviderOrder( LPDWORD entry, DWORD number ) return 0; } +/*********************************************************************** + * WSCSetApplicationCategory (WS2_32.@) + */ +INT WINAPI WSCSetApplicationCategory( LPCWSTR path, DWORD len, LPCWSTR extra, DWORD extralen, + DWORD lspcat, DWORD *prev_lspcat, LPINT err ) +{ + FIXME("(%s %d %s %d %d %p) Stub!\n", debugstr_w(path), len, debugstr_w(extra), + extralen, lspcat, prev_lspcat); + return 0; +} + /*********************************************************************** * WSANSPIoctl (WS2_32.91) */ diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index ae3eaf0c90..37b02e5712 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -120,6 +120,7 @@ @ stdcall WSCGetProviderPath(ptr ptr ptr ptr) @ stdcall WSCInstallNameSpace(wstr wstr long long ptr) @ stdcall WSCInstallProvider(ptr wstr ptr long ptr) +@ stdcall WSCSetApplicationCategory(wstr long wstr long long ptr ptr) @ stdcall WSCUnInstallNameSpace(ptr) @ stub WSCUpdateProvider @ stub WSCWriteNameSpaceOrder diff --git a/include/ws2spi.h b/include/ws2spi.h index 5df7d24008..3d2ca84dfa 100644 --- a/include/ws2spi.h +++ b/include/ws2spi.h @@ -41,6 +41,7 @@ INT WINAPI WSCEnableNSProvider(LPGUID,BOOL); INT WINAPI WSCEnumProtocols(LPINT,LPWSAPROTOCOL_INFOW,LPDWORD,LPINT); INT WINAPI WSCGetProviderPath(LPGUID,LPWSTR,LPINT,LPINT); INT WINAPI WSCInstallNameSpace(LPWSTR,LPWSTR,DWORD,DWORD,LPGUID); +INT WINAPI WSCSetApplicationCategory(LPCWSTR,DWORD,LPCWSTR,DWORD,DWORD,DWORD*,LPINT); INT WINAPI WSCUnInstallNameSpace(LPGUID); INT WINAPI WSCUpdateProvider(LPGUID, const WCHAR *, const LPWSAPROTOCOL_INFOW, DWORD, LPINT); INT WINAPI WSCWriteProviderOrder(LPDWORD,DWORD);

1 0

Zhiyi Zhang : winex11.drv: Calculate mask in X11DRV_resize_desktop().
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: 2538b0100fbbe1223e7c18a52bade5cfe5f8d3e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2538b0100fbbe1223e7c18a5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Feb 4 16:52:04 2020 +0800 winex11.drv: Calculate mask in X11DRV_resize_desktop(). Calculate XReconfigureWMWindow() mask in X11DRV_resize_desktop() instead of doing it in EnumWindows() callback update_windows_on_desktop_resize() because the result is the same anyway. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index d70b38b2b3..bde4841ed4 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -321,26 +321,16 @@ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) return TRUE; } - -struct desktop_resize_data -{ - RECT old_virtual_rect; - RECT new_virtual_rect; -}; - static BOOL CALLBACK update_windows_on_desktop_resize( HWND hwnd, LPARAM lparam ) { struct x11drv_win_data *data; - struct desktop_resize_data *resize_data = (struct desktop_resize_data *)lparam; - int mask = 0; + UINT mask = (UINT)lparam; if (!(data = get_win_data( hwnd ))) return TRUE; /* update the full screen state */ update_net_wm_states( data ); - if (resize_data->old_virtual_rect.left != resize_data->new_virtual_rect.left) mask |= CWX; - if (resize_data->old_virtual_rect.top != resize_data->new_virtual_rect.top) mask |= CWY; if (mask && data->whole_window) { POINT pos = virtual_screen_to_root( data->whole_rect.left, data->whole_rect.top ); @@ -399,14 +389,18 @@ static void update_desktop_fullscreen( unsigned int width, unsigned int height) */ void X11DRV_resize_desktop( unsigned int width, unsigned int height ) { + RECT old_virtual_rect, new_virtual_rect; HWND hwnd = GetDesktopWindow(); - struct desktop_resize_data resize_data; + UINT mask = 0; - resize_data.old_virtual_rect = get_virtual_screen_rect(); + old_virtual_rect = get_virtual_screen_rect(); desktop_width = width; desktop_height = height; X11DRV_DisplayDevices_Init( TRUE ); - resize_data.new_virtual_rect = get_virtual_screen_rect(); + new_virtual_rect = get_virtual_screen_rect(); + + if (old_virtual_rect.left != new_virtual_rect.left) mask |= CWX; + if (old_virtual_rect.top != new_virtual_rect.top) mask |= CWY; if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) { @@ -416,14 +410,13 @@ void X11DRV_resize_desktop( unsigned int width, unsigned int height ) { TRACE( "desktop %p change to (%dx%d)\n", hwnd, width, height ); update_desktop_fullscreen( width, height ); - SetWindowPos( hwnd, 0, resize_data.new_virtual_rect.left, resize_data.new_virtual_rect.top, - resize_data.new_virtual_rect.right - resize_data.new_virtual_rect.left, - resize_data.new_virtual_rect.bottom - resize_data.new_virtual_rect.top, + SetWindowPos( hwnd, 0, new_virtual_rect.left, new_virtual_rect.top, + new_virtual_rect.right - new_virtual_rect.left, new_virtual_rect.bottom - new_virtual_rect.top, SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE ); ungrab_clipping_window(); SendMessageTimeoutW( HWND_BROADCAST, WM_DISPLAYCHANGE, screen_bpp, MAKELPARAM( width, height ), SMTO_ABORTIFHUNG, 2000, NULL ); } - EnumWindows( update_windows_on_desktop_resize, (LPARAM)&resize_data ); + EnumWindows( update_windows_on_desktop_resize, (LPARAM)mask ); }

1 0

Alistair Leslie-Hughes : oledb32: Add Advanced page to datalink dialog.
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: a45d3639afe3f0b51084e4f59276d1f0cb11482c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a45d3639afe3f0b51084e4f5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 6 03:34:59 2020 +0000 oledb32: Add Advanced page to datalink dialog. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/dslocator.c | 63 +++++++++++++++++++++++++- dlls/oledb32/resource.h | 16 +++++++ dlls/oledb32/version.rc | 26 +++++++++++ po/ar.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/ast.po | 110 +++++++++++++++++++++++++++++++++++---------- po/bg.po | 106 +++++++++++++++++++++++++++++++++---------- po/ca.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/cs.po | 112 ++++++++++++++++++++++++++++++++++++---------- po/da.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/de.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/el.po | 104 ++++++++++++++++++++++++++++++++---------- po/en.po | 98 ++++++++++++++++++++++++++++++---------- po/en_US.po | 98 ++++++++++++++++++++++++++++++---------- po/eo.po | 110 +++++++++++++++++++++++++++++++++++---------- po/es.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/fa.po | 99 ++++++++++++++++++++++++++++++---------- po/fi.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/fr.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/he.po | 111 +++++++++++++++++++++++++++++++++++---------- po/hi.po | 101 +++++++++++++++++++++++++++++++---------- po/hr.po | 112 ++++++++++++++++++++++++++++++++++++---------- po/hu.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/it.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/ja.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/ko.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/lt.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/ml.po | 105 +++++++++++++++++++++++++++++++++---------- po/nb_NO.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/nl.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/or.po | 101 +++++++++++++++++++++++++++++++---------- po/pa.po | 101 +++++++++++++++++++++++++++++++---------- po/pl.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/pt_BR.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/pt_PT.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/rm.po | 99 ++++++++++++++++++++++++++++++---------- po/ro.po | 112 ++++++++++++++++++++++++++++++++++++---------- po/ru.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/si.po | 112 ++++++++++++++++++++++++++++++++++++---------- po/sk.po | 108 ++++++++++++++++++++++++++++++++++---------- po/sl.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/sr_RS(a)cyrillic.po | 108 ++++++++++++++++++++++++++++++++++---------- po/sr_RS(a)latin.po | 111 +++++++++++++++++++++++++++++++++++---------- po/sv.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/ta.po | 104 ++++++++++++++++++++++++++++++++---------- po/te.po | 101 +++++++++++++++++++++++++++++++---------- po/th.po | 105 +++++++++++++++++++++++++++++++++---------- po/tr.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/uk.po | 112 ++++++++++++++++++++++++++++++++++++---------- po/wa.po | 103 ++++++++++++++++++++++++++++++++---------- po/wine.pot | 98 ++++++++++++++++++++++++++++++---------- po/zh_CN.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/zh_TW.po | 114 +++++++++++++++++++++++++++++++++++++---------- 52 files changed, 4338 insertions(+), 1130 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a45d3639afe3f0b51084…

1 0

Gerald Pfeifer : wldap32: Define a debug channel only when we are using it.
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: c6e45649fe4c9285b6b55646c5385de9f711e55d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6e45649fe4c9285b6b55646… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Feb 5 21:44:14 2020 +0100 wldap32: Define a debug channel only when we are using it. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/add.c | 2 +- dlls/wldap32/ber.c | 2 ++ dlls/wldap32/bind.c | 2 ++ dlls/wldap32/compare.c | 2 ++ dlls/wldap32/control.c | 2 ++ dlls/wldap32/delete.c | 2 ++ dlls/wldap32/dn.c | 2 ++ dlls/wldap32/modify.c | 2 +- dlls/wldap32/modrdn.c | 2 ++ dlls/wldap32/option.c | 2 ++ dlls/wldap32/parse.c | 2 ++ dlls/wldap32/rename.c | 2 ++ dlls/wldap32/search.c | 2 ++ 13 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/add.c b/dlls/wldap32/add.c index 0a24d95f32..270311e561 100644 --- a/dlls/wldap32/add.c +++ b/dlls/wldap32/add.c @@ -34,9 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); -#ifdef HAVE_LDAP static LDAPMod *nullattrs[] = { NULL }; #endif diff --git a/dlls/wldap32/ber.c b/dlls/wldap32/ber.c index c2c6f26949..c4c77d68da 100644 --- a/dlls/wldap32/ber.c +++ b/dlls/wldap32/ber.c @@ -26,7 +26,9 @@ #include "winldap.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif #ifndef LBER_ERROR # define LBER_ERROR (~0U) diff --git a/dlls/wldap32/bind.c b/dlls/wldap32/bind.c index 0e9404ec50..27fb286f50 100644 --- a/dlls/wldap32/bind.c +++ b/dlls/wldap32/bind.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_bindA (WLDAP32.@) diff --git a/dlls/wldap32/compare.c b/dlls/wldap32/compare.c index 7cadc2a970..a7eab26d96 100644 --- a/dlls/wldap32/compare.c +++ b/dlls/wldap32/compare.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_compareA (WLDAP32.@) diff --git a/dlls/wldap32/control.c b/dlls/wldap32/control.c index 1ec8641847..ffbf41ef68 100644 --- a/dlls/wldap32/control.c +++ b/dlls/wldap32/control.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_control_freeA (WLDAP32.@) diff --git a/dlls/wldap32/delete.c b/dlls/wldap32/delete.c index 47e1cb4f2c..7d62edc8ac 100644 --- a/dlls/wldap32/delete.c +++ b/dlls/wldap32/delete.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_deleteA (WLDAP32.@) diff --git a/dlls/wldap32/dn.c b/dlls/wldap32/dn.c index fbe1a0c091..1303eb5057 100644 --- a/dlls/wldap32/dn.c +++ b/dlls/wldap32/dn.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_dn2ufnA (WLDAP32.@) diff --git a/dlls/wldap32/modify.c b/dlls/wldap32/modify.c index 292fa831a8..defc32af9c 100644 --- a/dlls/wldap32/modify.c +++ b/dlls/wldap32/modify.c @@ -34,9 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); -#ifdef HAVE_LDAP static LDAPMod *nullmods[] = { NULL }; #endif diff --git a/dlls/wldap32/modrdn.c b/dlls/wldap32/modrdn.c index 3e2c867956..97ab0a9258 100644 --- a/dlls/wldap32/modrdn.c +++ b/dlls/wldap32/modrdn.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_modrdnA (WLDAP32.@) diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index ddc5ca4933..4b7ec36c38 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_get_optionA (WLDAP32.@) diff --git a/dlls/wldap32/parse.c b/dlls/wldap32/parse.c index e83e6d2351..88464a3b13 100644 --- a/dlls/wldap32/parse.c +++ b/dlls/wldap32/parse.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_parse_extended_resultA (WLDAP32.@) diff --git a/dlls/wldap32/rename.c b/dlls/wldap32/rename.c index 2de50818b7..f8cac439a9 100644 --- a/dlls/wldap32/rename.c +++ b/dlls/wldap32/rename.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_rename_extA (WLDAP32.@) diff --git a/dlls/wldap32/search.c b/dlls/wldap32/search.c index 7e774f6894..f3d3eb48d4 100644 --- a/dlls/wldap32/search.c +++ b/dlls/wldap32/search.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_searchA (WLDAP32.@)

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: ce0f263a02f7df663fd505b6af932f6dcbe4b0ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce0f263a02f7df663fd505b6… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Feb 10 17:40:09 2020 +0100 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 78 +++++++++++++++++++++------------------------------------------- 1 file changed, 25 insertions(+), 53 deletions(-) diff --git a/po/de.po b/po/de.po index 59e4854ff9..bdddd56375 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ 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-12-06 16:25+0100\n" +"PO-Revision-Date: 2020-02-10 17:39+0100\n" "Last-Translator: Julian Rüger <jr98(a)gmx.net>\n" "Language-Team: German\n" "Language: de\n" @@ -3717,17 +3717,15 @@ msgstr "'@' erwartet" #: jscript.rc:75 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Microsoft JScript Übersetzungsfehler" #: jscript.rc:76 msgid "Microsoft JScript runtime error" -msgstr "" +msgstr "Microsoft JScript Laufzeitfehler" #: jscript.rc:77 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown runtime error" -msgstr "Unbekannter Fehler" +msgstr "Unbekannter Laufzeitfehler" #: jscript.rc:54 msgid "Number expected" @@ -3775,7 +3773,7 @@ msgstr "Syntaxfehler in regulärem Ausdruck" #: jscript.rc:63 msgid "Exception thrown and not caught" -msgstr "" +msgstr "Exception ausgelöst und nicht abgefangen" #: jscript.rc:65 msgid "URI to be encoded contains invalid characters" @@ -8324,98 +8322,72 @@ msgid "Off" msgstr "Aus" #: version.rc:42 -#, fuzzy -#| msgid "video" msgid "Provider" -msgstr "Video" +msgstr "Anbieter" #: version.rc:45 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Select the data you want to connect to:" -msgstr "Wählen Sie das gewünschte Format:" +msgstr "Wählen Sie die zu verbindenden Daten aus:" #: version.rc:52 -#, fuzzy -#| msgid "Connections" msgid "Connection" -msgstr "Verbindungen" +msgstr "Verbindung" #: version.rc:55 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Specify the following to connect to ODBC data:" -msgstr "Wählen Sie das gewünschte Format:" +msgstr "Geben Sie folgendes an, um sich mit ODBC-Daten zu verbinden:" #: version.rc:56 msgid "1. Specify the source of data:" -msgstr "" +msgstr "1. Geben Sie die Datenquelle an:" #: version.rc:57 -#, fuzzy -#| msgid "Please enter your name" msgid "Use &data source name" -msgstr "Bitte geben Sie Ihren Namen ein" +msgstr "&Datenquellennamen verwenden" #: version.rc:60 -#, fuzzy -#| msgid "Reset Connections" msgid "Use c&onnection string" -msgstr "Zurückgesetzte Verbindungen" +msgstr "Verbindungs-Zeichenkette &verwenden" #: version.rc:61 -#, fuzzy -#| msgid "Connections" msgid "&Connection string:" -msgstr "Verbindungen" +msgstr "Verbindungs-&Zeichenkette:" #: version.rc:63 -#, fuzzy -#| msgid "A&dd..." msgid "B&uild..." -msgstr "&Hinzufügen..." +msgstr "B&uild..." #: version.rc:64 msgid "2. Enter information to log on to the server" -msgstr "" +msgstr "2. Zugangsdaten zum Login auf Server" #: version.rc:65 -#, fuzzy -#| msgid "&User name:" msgid "User &name:" msgstr "&Benutzername:" #: version.rc:69 -#, fuzzy -#| msgid "&Blank page" msgid "&Blank password" -msgstr "&Leere Seite" +msgstr "&Leeres Kennwort" #: version.rc:70 -#, fuzzy -#| msgid "Wrong password.\n" msgid "Allow &saving password" -msgstr "Falsches Passwort.\n" +msgstr "Kennwort &speichern" #: version.rc:71 msgid "3. Enter the &initial catalog to use:" -msgstr "" +msgstr "3. Folgenden Initialkatalog verwenden:" #: version.rc:73 -#, fuzzy -#| msgid "Reset Connections" msgid "&Test Connection" -msgstr "Zurückgesetzte Verbindungen" +msgstr "Verbindung &testen" #: version.rc:36 -#, fuzzy -#| msgid "Properties" msgid "Data Link Properties" -msgstr "&Eigenschaften" +msgstr "Eigenschaften der Datenverbindung" #: version.rc:37 msgid "OLE DB Provider(s)" -msgstr "" +msgstr "OLE DB-Anbieter" #: oledlg.rc:55 msgid "Insert Object" @@ -8431,15 +8403,15 @@ msgstr "Ergebnis" #: oledlg.rc:65 msgid "Create New" -msgstr "&Neu erstellen" +msgstr "Neu erstellen" #: oledlg.rc:67 msgid "Create Control" -msgstr "S&teuerelement erstellen" +msgstr "Steuerelement erstellen" #: oledlg.rc:69 msgid "Create From File" -msgstr "A&us Datei erstellen" +msgstr "Aus Datei erstellen" #: oledlg.rc:72 msgid "&Add Control..." @@ -8447,7 +8419,7 @@ msgstr "Steuerelement hin&zufügen..." #: oledlg.rc:73 msgid "Display As Icon" -msgstr "Als &Symbol anzeigen" +msgstr "Als Symbol anzeigen" #: oledlg.rc:75 setupapi.rc:61 msgid "Browse..."

1 0

Dmitry Timoshkov : gdiplus: Make GdipGetNearestColor print FIXME only if indexed bitmap is associated with the graphics object.
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: 5ca9da2c0197ac1260975c1b7b643dbd11185715 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ca9da2c0197ac1260975c1b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 7 18:31:38 2020 +0800 gdiplus: Make GdipGetNearestColor print FIXME only if indexed bitmap is associated with the graphics object. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c52fa65445..8f3272b281 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4775,7 +4775,7 @@ GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics *graphics, /* FIXME: Need to handle color depths less than 24bpp */ GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics *graphics, ARGB* argb) { - FIXME("(%p, %p): Passing color unmodified\n", graphics, argb); + TRACE("(%p, %p)\n", graphics, argb); if(!graphics || !argb) return InvalidParameter; @@ -4783,6 +4783,13 @@ GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics *graphics, ARGB* argb) if(graphics->busy) return ObjectBusy; + if (graphics->image->type == ImageTypeBitmap) + { + GpBitmap *bitmap = (GpBitmap *)graphics->image; + if (IsIndexedPixelFormat(bitmap->format)) + FIXME("(%p, %p): Passing color unmodified\n", graphics, argb); + } + return Ok; }

1 0

Zebediah Figura : d3d9: Return a stub interface from Direct3DShaderValidatorCreate9().
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: 2a4a8a5cf34e9697a976a8272a1c93e5660cbea6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a4a8a5cf34e9697a976a827… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 10 18:44:31 2020 +0330 d3d9: Return a stub interface from Direct3DShaderValidatorCreate9(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46735 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/d3d9_main.c | 124 +++++++++++++++++++++++++++++++++++++++++++---- dlls/d3d9/tests/device.c | 66 +++++++++++++++++++++++++ 2 files changed, 181 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index 21df2a34cd..75e627dd76 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -75,18 +75,124 @@ HRESULT WINAPI DECLSPEC_HOTPATCH Direct3DCreate9Ex(UINT sdk_version, IDirect3D9E return D3D_OK; } -/******************************************************************* - * Direct3DShaderValidatorCreate9 (D3D9.@) +/* The callback is called on any error encountered during validation, including + * improper IDirect3DShaderValidator9 method calls. + * - "file" and "line" are passed through directly from Instruction(). "line" + * is provably 32-bit, as 64-bit values passed to Instruction() will be + * truncated. + * - "arg3" has been observed to be at least 0, 2, and 6. The integer size is + * not known. + * - "message_id" is a numeric error code. fxc.exe adds 5000 before printing + * it. The integer size is not known. + * - "context" is passed through directly from Begin(). * - * No documentation available for this function. - * SDK only says it is internal and shouldn't be used. - */ -void* WINAPI Direct3DShaderValidatorCreate9(void) + * Improper calls to IDirect3DShaderValidator9 methods, or other errors not + * generated by specific Instruction() calls, yield NULL as the file, and + * either 0 or -1 as the line. + * + * The callback return type is not known, but programs (fxc.exe, The Sims 2) + * seem to consistently return 0. + * + * The interface and method names below are derived from the messages that + * native d3d9 prints on said improper method calls. + * + * Calls to Begin(), Instruction(), End() have been observed to return S_OK and + * E_FAIL. E_FAIL is not always returned if an error message is handed to the + * callback. */ + +typedef HRESULT (WINAPI *shader_validator_cb)(const char *file, int line, + DWORD_PTR arg3, DWORD_PTR message_id, const char *message, void *context); + +typedef struct IDirect3DShaderValidator9 IDirect3DShaderValidator9; + +struct IDirect3DShaderValidator9Vtbl +{ + HRESULT (WINAPI *QueryInterface)(IDirect3DShaderValidator9 *iface, REFIID iid, void **out); + ULONG (WINAPI *AddRef)(IDirect3DShaderValidator9 *iface); + ULONG (WINAPI *Release)(IDirect3DShaderValidator9 *iface); + HRESULT (WINAPI *Begin)(IDirect3DShaderValidator9 *iface, + shader_validator_cb callback, void *context, DWORD_PTR arg3); + HRESULT (WINAPI *Instruction)(IDirect3DShaderValidator9 *iface, + const char *file, int line, const DWORD *tokens, DWORD token_count); + HRESULT (WINAPI *End)(IDirect3DShaderValidator9 *iface); +}; + +struct IDirect3DShaderValidator9 +{ + const struct IDirect3DShaderValidator9Vtbl *vtbl; +}; + +static HRESULT WINAPI shader_validator_QueryInterface(IDirect3DShaderValidator9 *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + + return E_NOINTERFACE; +} + +static ULONG WINAPI shader_validator_AddRef(IDirect3DShaderValidator9 *iface) +{ + TRACE("iface %p.\n", iface); + + return 2; +} + +static ULONG WINAPI shader_validator_Release(IDirect3DShaderValidator9 *iface) +{ + TRACE("iface %p.\n", iface); + + return 1; +} + +/* The size and type of the third argument is not known. The Sims 2 passes 0; + * fxc.exe passes 1. */ +static HRESULT WINAPI shader_validator_Begin(IDirect3DShaderValidator9 *iface, + shader_validator_cb callback, void *context, DWORD_PTR arg3) +{ + FIXME("iface %p, callback %p, context %p, arg3 %#Ix, stub!\n", iface, callback, context, arg3); + + return S_OK; +} + +/* - "file" and "line" are passed directly through to the callback. + * - "tokens" comprises a single instruction; the caller must determine its + * length. + * - "token_count" is in DWORDs. */ +static HRESULT WINAPI shader_validator_Instruction(IDirect3DShaderValidator9 *iface, + const char *file, int line, const DWORD *tokens, DWORD token_count) +{ + FIXME("iface %p, file %s, line %u, tokens %p, token_count %u, stub!\n", + iface, debugstr_a(file), line, tokens, token_count); + + return S_OK; +} + +static HRESULT WINAPI shader_validator_End(IDirect3DShaderValidator9 *iface) +{ + FIXME("iface %p, stub!\n", iface); + + return S_OK; +} + +static const struct IDirect3DShaderValidator9Vtbl shader_validator_vtbl = +{ + shader_validator_QueryInterface, + shader_validator_AddRef, + shader_validator_Release, + shader_validator_Begin, + shader_validator_Instruction, + shader_validator_End, +}; + +static IDirect3DShaderValidator9 shader_validator = {&shader_validator_vtbl}; + +IDirect3DShaderValidator9 * WINAPI Direct3DShaderValidatorCreate9(void) { - static int once; + TRACE("Returning validator %p.\n", &shader_validator); - if (!once++) FIXME("stub\n"); - return NULL; + return &shader_validator; } /*********************************************************************** diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 156cb188f0..8c1ebc1719 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -53,6 +53,8 @@ struct device_desc static DEVMODEW registry_mode; +static void *(WINAPI *Direct3DShaderValidatorCreate9)(void); + static const DWORD simple_vs[] = { 0xfffe0101, /* vs_1_1 */ @@ -13447,8 +13449,69 @@ static void test_multi_adapter(void) IDirect3D9_Release(d3d); } +typedef HRESULT (WINAPI *shader_validator_cb)(const char *file, int line, + DWORD_PTR arg3, DWORD_PTR message_id, const char *message, void *context); + +typedef struct IDirect3DShaderValidator9 IDirect3DShaderValidator9; + +struct IDirect3DShaderValidator9Vtbl +{ + HRESULT (WINAPI *QueryInterface)(IDirect3DShaderValidator9 *iface, REFIID iid, void **out); + ULONG (WINAPI *AddRef)(IDirect3DShaderValidator9 *iface); + ULONG (WINAPI *Release)(IDirect3DShaderValidator9 *iface); + HRESULT (WINAPI *Begin)(IDirect3DShaderValidator9 *iface, + shader_validator_cb callback, void *context, DWORD_PTR arg3); + HRESULT (WINAPI *Instruction)(IDirect3DShaderValidator9 *iface, + const char *file, int line, const DWORD *tokens, DWORD token_count); + HRESULT (WINAPI *End)(IDirect3DShaderValidator9 *iface); +}; + +struct IDirect3DShaderValidator9 +{ + const struct IDirect3DShaderValidator9Vtbl *vtbl; +}; + +HRESULT WINAPI test_shader_validator_cb(const char *file, int line, DWORD_PTR arg3, + DWORD_PTR message_id, const char *message, void *context) +{ + ok(0, "Unexpected call.\n"); + return S_OK; +} + +static void test_shader_validator(void) +{ + IDirect3DShaderValidator9 *validator; + ULONG refcount; + HRESULT hr; + + validator = Direct3DShaderValidatorCreate9(); + + hr = validator->vtbl->Begin(validator, test_shader_validator_cb, NULL, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[0], 1); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[1], 3); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[4], 4); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[8], 4); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[12], 4); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[16], 4); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[20], 1); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->End(validator); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + refcount = validator->vtbl->Release(validator); + todo_wine ok(!refcount, "Validator has %u references left.\n", refcount); +} + START_TEST(device) { + HMODULE d3d9_handle = GetModuleHandleA("d3d9.dll"); WNDCLASSA wc = {0}; IDirect3D9 *d3d9; DEVMODEW current_mode; @@ -13476,6 +13539,8 @@ START_TEST(device) wc.lpszClassName = "d3d9_test_wc"; RegisterClassA(&wc); + Direct3DShaderValidatorCreate9 = (void *)GetProcAddress(d3d9_handle, "Direct3DShaderValidatorCreate9"); + test_get_set_vertex_declaration(); test_get_declaration(); test_fvf_decl_conversion(); @@ -13575,6 +13640,7 @@ START_TEST(device) test_vertex_buffer_read_write(); test_get_display_mode(); test_multi_adapter(); + test_shader_validator(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Zebediah Figura : d3d9: Retrieve the pixel shader from the primary stateblock.
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: 7027e7779de34fa3c82b1c1b8dcfa9cf5e4001c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7027e7779de34fa3c82b1c1b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 7 22:07:12 2020 -0600 d3d9: Retrieve the pixel shader from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 6f35b3caab..fe23625a05 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3872,7 +3872,7 @@ static HRESULT WINAPI d3d9_device_GetPixelShader(IDirect3DDevice9Ex *iface, IDir if (!shader) return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - if ((wined3d_shader = wined3d_device_get_pixel_shader(device->wined3d_device))) + if ((wined3d_shader = wined3d_stateblock_get_state(device->state)->ps)) { shader_impl = wined3d_shader_get_parent(wined3d_shader); *shader = &shader_impl->IDirect3DPixelShader9_iface;

1 0

Zebediah Figura : d3d9: Stop setting the device state in d3d9_device_SetVertexShader().
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: 6acd71d17b2b73a8928dab33f86af31151924995 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6acd71d17b2b73a8928dab33… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 7 22:07:09 2020 -0600 d3d9: Stop setting the device state in d3d9_device_SetVertexShader(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index c95e1a003e..6f35b3caab 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3507,9 +3507,6 @@ static HRESULT WINAPI d3d9_device_SetVertexShader(IDirect3DDevice9Ex *iface, IDi wined3d_mutex_lock(); wined3d_stateblock_set_vertex_shader(device->update_state, shader_obj ? shader_obj->wined3d_shader : NULL); - if (!device->recording) - wined3d_device_set_vertex_shader(device->wined3d_device, - shader_obj ? shader_obj->wined3d_shader : NULL); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d9: Retrieve the vertex shader from the primary stateblock.
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: 706e174817d3ae31c91a525c3179b3a457888087 URL: https://source.winehq.org/git/wine.git/?a=commit;h=706e174817d3ae31c91a525c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 7 22:07:08 2020 -0600 d3d9: Retrieve the vertex shader from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2d5bc77ed7..c95e1a003e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3524,7 +3524,7 @@ static HRESULT WINAPI d3d9_device_GetVertexShader(IDirect3DDevice9Ex *iface, IDi TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); - if ((wined3d_shader = wined3d_device_get_vertex_shader(device->wined3d_device))) + if ((wined3d_shader = wined3d_stateblock_get_state(device->state)->vs)) { shader_impl = wined3d_shader_get_parent(wined3d_shader); *shader = &shader_impl->IDirect3DVertexShader9_iface;

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
88
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 February 2020