April 2017 - Wine-Commits - list.winehq.org

Julian Rüger : German translation for release 2.0.1
by Jeremy Newman April 28, 2017

April 28, 2017

Module: website Branch: master Commit: 0be8916586b89db6ddf3edf777fbd6e76c58cf52 URL: http://source.winehq.org/git/website.git/?a=commit;h=0be8916586b89db6ddf3ed… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Apr 28 16:05:51 2017 +0200 German translation for release 2.0.1 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017042001.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/de/2017042001.xml b/news/de/2017042001.xml new file mode 100644 index 0000000..a47df8d --- /dev/null +++ b/news/de/2017042001.xml @@ -0,0 +1,13 @@ +<news> +<date>20. April 2017</date> +<title>Wine 2.0.1 freigegeben</title> +<body> + Die Wartungsversion 2.0.1 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.0.1">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Diverse Fehlerkorrekturen.</li> + <li>tools/wineinstall gilt nun als veraltet.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.0/wine-2.0.1.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 2.5
by Jeremy Newman April 28, 2017

April 28, 2017

Module: website Branch: master Commit: 64a3c04cae8d77f0971305fd09a50146e9c4f449 URL: http://source.winehq.org/git/website.git/?a=commit;h=64a3c04cae8d77f0971305… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Apr 28 16:00:22 2017 +0200 German translation for release 2.5 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017033101.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/de/2017033101.xml b/news/de/2017033101.xml new file mode 100644 index 0000000..a1196ee --- /dev/null +++ b/news/de/2017033101.xml @@ -0,0 +1,18 @@ +<news> +<date>31. März 2017</date> +<title>Wine 2.5 freigegeben</title> +<body> + Die Entwicklungsversion 2.5 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.5">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von message-mode Named-Pipes.</li> + <li>Übersetzung der Versionsresourcen durch po-Dateien.</li> + <li>Transform-Feedback-Unterstützung in Direct3D.</li> + <li>Taskplaner-Klassen zur C++-Laufzeit hinzugefügt.</li> + <li>Besseres Scrollen in Popupmenüs.</li> + <li>Weitere Verbesserungen am XML-Reader.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.5.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Michael Stefaniuc : dmloader: Return an error for an invalid directory.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: a69dbd41be698c8e8b6c5209876940c124801761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a69dbd41be698c8e8b6c52098… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Apr 27 19:15:29 2017 +0200 dmloader: Return an error for an invalid directory. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/loader.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index b51c8ad..41418b8 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -518,8 +518,14 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetSearchDirectory(IDirectMusicLoad { IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); WCHAR current_path[MAX_PATH]; + DWORD attr; TRACE("(%p, %s, %s, %d)\n", This, debugstr_dmguid(class), debugstr_w(path), clear); + + attr = GetFileAttributesW(path); + if (attr == INVALID_FILE_ATTRIBUTES || !(attr & FILE_ATTRIBUTE_DIRECTORY)) + return DMUS_E_LOADER_BADPATH; + if (clear) FIXME("clear flag ignored\n");

1 0

Huw Davies : user32/tests: Try to read the dpi from the user key first.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: 3845b0bb73f26146d03632702bec21ac6e808c4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3845b0bb73f26146d03632702… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 27 11:02:37 2017 +0100 user32/tests: Try to read the dpi from the user key first. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 96b1581..d879036 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -165,17 +165,34 @@ static int last_bpp; static BOOL displaychange_ok = FALSE, displaychange_test_active = FALSE; static HANDLE displaychange_sem = 0; -static int get_real_dpi(void) +static BOOL get_reg_dword(HKEY base, const char *key_name, const char *value_name, DWORD *value) { HKEY key; - DWORD value = USER_DEFAULT_SCREEN_DPI, size = sizeof(value); + DWORD type, data, size = sizeof(data); + BOOL ret = FALSE; - if (!RegOpenKeyA(HKEY_CURRENT_USER, "Control Panel\\Desktop", &key)) + if (RegOpenKeyA(base, key_name, &key) == ERROR_SUCCESS) { - RegQueryValueExA(key, "LogPixels", NULL, NULL, (BYTE *)&value, &size); + if (RegQueryValueExA(key, value_name, NULL, &type, (void *)&data, &size) == ERROR_SUCCESS && + type == REG_DWORD) + { + *value = data; + ret = TRUE; + } RegCloseKey(key); } - return value; + return ret; +} + +static DWORD get_real_dpi(void) +{ + DWORD dpi; + + if (get_reg_dword(HKEY_CURRENT_USER, "Control Panel\\Desktop", "LogPixels", &dpi)) + return dpi; + if (get_reg_dword(HKEY_CURRENT_CONFIG, "Software\\Fonts", "LogPixels", &dpi)) + return dpi; + return USER_DEFAULT_SCREEN_DPI; } static LRESULT CALLBACK SysParamsTestWndProc( HWND hWnd, UINT msg, WPARAM wParam,

1 0

Huw Davies : winecfg: Try to read the dpi from the user key first.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: 5159279f287998cff3e1598251d4a30f733b9e5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5159279f287998cff3e159825… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 27 11:02:36 2017 +0100 winecfg: Try to read the dpi from the user key first. Write changes back to the user key. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/x11drvdlg.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index 9a14fb6..2be6832 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -43,7 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(winecfg); #define IDT_DPIEDIT 0x1234 -static const WCHAR logpixels_reg[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','H','a','r','d','w','a','r','e',' ','P','r','o','f','i','l','e','s','\\','C','u','r','r','e','n','t','\\','S','o','f','t','w','a','r','e','\\','F','o','n','t','s',0}; +static const WCHAR logpixels_reg[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p','\0'}; +static const WCHAR def_logpixels_reg[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'}; static const WCHAR logpixels[] = {'L','o','g','P','i','x','e','l','s',0}; static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; @@ -236,7 +237,8 @@ static void on_fullscreen_grab_clicked(HWND dialog) static INT read_logpixels_reg(void) { DWORD dwLogPixels; - WCHAR *buf = get_reg_keyW(HKEY_LOCAL_MACHINE, logpixels_reg, logpixels, NULL); + WCHAR *buf = get_reg_keyW(HKEY_CURRENT_USER, logpixels_reg, logpixels, NULL); + if (!buf) buf = get_reg_keyW(HKEY_CURRENT_CONFIG, def_logpixels_reg, logpixels, NULL); dwLogPixels = buf ? *buf : DEFDPI; HeapFree(GetProcessHeap(), 0, buf); return dwLogPixels; @@ -296,7 +298,7 @@ static void update_dpi_trackbar_from_edit(HWND hDlg, BOOL fix) if (dpi >= MINDPI && dpi <= MAXDPI) { SendDlgItemMessageW(hDlg, IDC_RES_TRACKBAR, TBM_SETPOS, TRUE, dpi); - set_reg_key_dwordW(HKEY_LOCAL_MACHINE, logpixels_reg, logpixels, dpi); + set_reg_key_dwordW(HKEY_CURRENT_USER, logpixels_reg, logpixels, dpi); } updating_ui = FALSE; @@ -416,7 +418,7 @@ GraphDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) int i = SendMessageW(GetDlgItem(hDlg, IDC_RES_TRACKBAR), TBM_GETPOS, 0, 0); SetDlgItemInt(hDlg, IDC_RES_DPIEDIT, i, TRUE); update_font_preview(hDlg); - set_reg_key_dwordW(HKEY_LOCAL_MACHINE, logpixels_reg, logpixels, i); + set_reg_key_dwordW(HKEY_CURRENT_USER, logpixels_reg, logpixels, i); break; } }

1 0

Akihiro Sagawa : secur32: Return PRF algorithm value when using GCM.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: ffefa721ba4a0d8c35393b11238226e0d64a98ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffefa721ba4a0d8c35393b112… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 18 21:49:32 2017 +0900 secur32: Return PRF algorithm value when using GCM. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index a028176..deefa8d 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -292,7 +292,7 @@ static DWORD schannel_get_protocol(gnutls_protocol_t proto) } } -static ALG_ID schannel_get_cipher_algid(int cipher) +static ALG_ID schannel_get_cipher_algid(gnutls_cipher_algorithm_t cipher) { switch (cipher) { @@ -314,7 +314,7 @@ static ALG_ID schannel_get_cipher_algid(int cipher) } } -static ALG_ID schannel_get_mac_algid(gnutls_mac_algorithm_t mac) +static ALG_ID schannel_get_mac_algid(gnutls_mac_algorithm_t mac, gnutls_cipher_algorithm_t cipher) { switch (mac) { @@ -326,8 +326,19 @@ static ALG_ID schannel_get_mac_algid(gnutls_mac_algorithm_t mac) case GNUTLS_MAC_SHA256: return CALG_SHA_256; case GNUTLS_MAC_SHA384: return CALG_SHA_384; case GNUTLS_MAC_SHA512: return CALG_SHA_512; + case GNUTLS_MAC_AEAD: + /* When using AEAD (such as GCM), we return PRF algorithm instead + which is defined in RFC 5289. */ + switch (cipher) + { + case GNUTLS_CIPHER_AES_128_GCM: return CALG_SHA_256; + case GNUTLS_CIPHER_AES_256_GCM: return CALG_SHA_384; + default: + break; + } + /* fall through */ default: - FIXME("unknown algorithm %d\n", mac); + FIXME("unknown algorithm %d, cipher %d\n", mac, cipher); return 0; } } @@ -375,7 +386,7 @@ SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, info->dwProtocol = schannel_get_protocol(proto); info->aiCipher = schannel_get_cipher_algid(alg); info->dwCipherStrength = pgnutls_cipher_get_key_size(alg) * 8; - info->aiHash = schannel_get_mac_algid(mac); + info->aiHash = schannel_get_mac_algid(mac, alg); info->dwHashStrength = pgnutls_mac_get_key_size(mac) * 8; info->aiExch = schannel_get_kx_algid(kx); /* FIXME: info->dwExchStrength? */

1 0

Michael Stefaniuc : dmloader: Avoid a crash on a NULL string pointer.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: ed6ee0f815518a7bbb3942dbc49f157a57970db1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed6ee0f815518a7bbb3942dbc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Apr 27 19:15:27 2017 +0200 dmloader: Avoid a crash on a NULL string pointer. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/loader.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 0822891..d644abb 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -536,12 +536,16 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_ScanDirectory(IDirectMusicLoader8 * WCHAR wszSearchString[MAX_PATH]; WCHAR *p; HRESULT result; - TRACE("(%p, %s, %p, %p)\n", This, debugstr_dmguid(rguidClass), pwzFileExtension, pwzScanFileName); + TRACE("(%p, %s, %s, %s)\n", This, debugstr_dmguid(rguidClass), debugstr_w(pwzFileExtension), + debugstr_w(pwzScanFileName)); if (IsEqualGUID (rguidClass, &GUID_DirectMusicAllTypes) || !DMUSIC_IsValidLoadableClass(rguidClass)) { ERR(": rguidClass invalid CLSID\n"); return REGDB_E_CLASSNOTREG; } - + + if (!pwzFileExtension) + return S_FALSE; + /* get search path for given class */ DMUSIC_GetLoaderSettings (iface, rguidClass, wszSearchString, NULL);

1 0

Huw Davies : gdi32: Try to read the dpi from the user key first.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: 2dfb09893c64261a5859dfaed60873e572144f1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dfb09893c64261a5859dfaed… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 27 11:02:35 2017 +0100 gdi32: Try to read the dpi from the user key first. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 11 +++------ dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdiobj.c | 61 +++++++++++++++++++++++++++++++----------------- 3 files changed, 44 insertions(+), 29 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 8956720..13edef6 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3993,16 +3993,11 @@ static void update_font_info(void) DWORD len, type; HKEY hkey = 0; UINT i, ansi_cp = 0, oem_cp = 0; - DWORD screen_dpi = 96, font_dpi = 0; + DWORD screen_dpi, font_dpi = 0; BOOL done = FALSE; - if (RegOpenKeyA(HKEY_LOCAL_MACHINE, - "System\\CurrentControlSet\\Hardware Profiles\\Current\\Software\\Fonts", - &hkey) == ERROR_SUCCESS) - { - reg_load_dword(hkey, logpixels, &screen_dpi); - RegCloseKey(hkey); - } + screen_dpi = get_dpi(); + if (!screen_dpi) screen_dpi = 96; if (RegCreateKeyExA(HKEY_CURRENT_USER, "Software\\Wine\\Fonts", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL) != ERROR_SUCCESS) return; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 1eba290..4236aa3 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -303,6 +303,7 @@ extern HGDIOBJ GDI_inc_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern BOOL GDI_dec_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern void GDI_hdc_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; extern void GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; +extern DWORD get_dpi(void) DECLSPEC_HIDDEN; /* mapping.c */ extern BOOL dp_to_lp( DC *dc, POINT *points, INT count ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 46b2241..16b82a3 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -597,45 +597,64 @@ BOOL GDI_dec_ref_count( HGDIOBJ handle ) return entry != NULL; } +static const WCHAR dpi_key_name[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p','\0'}; +static const WCHAR def_dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'}; +static const WCHAR dpi_value_name[] = {'L','o','g','P','i','x','e','l','s','\0'}; + /****************************************************************************** - * get_dpi (internal) + * get_reg_dword * - * get the dpi from the registry + * Read a DWORD value from the registry */ -static int get_dpi( void ) +static BOOL get_reg_dword(HKEY base, const WCHAR *key_name, const WCHAR *value_name, DWORD *value) { - static const WCHAR dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'}; - static const WCHAR dpi_value_name[] = {'L','o','g','P','i','x','e','l','s','\0'}; - static int dpi = -1; - HKEY hkey; - - if (dpi != -1) return dpi; + HKEY key; + DWORD type, data, size = sizeof(data); + BOOL ret = FALSE; - if (RegOpenKeyW(HKEY_CURRENT_CONFIG, dpi_key_name, &hkey) == ERROR_SUCCESS) + if (RegOpenKeyW(base, key_name, &key) == ERROR_SUCCESS) { - DWORD type, size; - int new_dpi; - - size = sizeof(new_dpi); - if (RegQueryValueExW(hkey, dpi_value_name, NULL, &type, (void *)&new_dpi, &size) == ERROR_SUCCESS) + if (RegQueryValueExW(key, value_name, NULL, &type, (void *)&data, &size) == ERROR_SUCCESS && + type == REG_DWORD) { - if (type == REG_DWORD && new_dpi != 0) - dpi = new_dpi; + *value = data; + ret = TRUE; } - RegCloseKey(hkey); + RegCloseKey(key); } - if (dpi <= 0) dpi = 96; - return dpi; + return ret; } +/****************************************************************************** + * get_dpi + * + * get the dpi from the registry + */ +DWORD get_dpi(void) +{ + DWORD dpi; + + if (get_reg_dword(HKEY_CURRENT_USER, dpi_key_name, dpi_value_name, &dpi)) + return dpi; + if (get_reg_dword(HKEY_CURRENT_CONFIG, def_dpi_key_name, dpi_value_name, &dpi)) + return dpi; + return 0; +} static HFONT create_scaled_font( const LOGFONTW *deffont ) { LOGFONTW lf; LONG height; + static DWORD dpi; + + if (!dpi) + { + dpi = get_dpi(); + if (!dpi) dpi = 96; + } lf = *deffont; - height = abs(lf.lfHeight) * get_dpi() / 96; + height = abs(lf.lfHeight) * dpi / 96; lf.lfHeight = deffont->lfHeight < 0 ? -height : height; return CreateFontIndirectW( &lf );

1 0

Michael Stefaniuc : dmloader: Cleanup IDirectMusicLoaderImpl_SetSearchDirectory().
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: 879c428200bdc0ca16a751dea8fc833032fa7de6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=879c428200bdc0ca16a751dea… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Apr 27 19:15:28 2017 +0200 dmloader: Cleanup IDirectMusicLoaderImpl_SetSearchDirectory(). and emit a FIXME only if the clear flag is set. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/loader.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index d644abb..b51c8ad 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -513,18 +513,21 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac return S_OK; } -static HRESULT WINAPI IDirectMusicLoaderImpl_SetSearchDirectory(IDirectMusicLoader8 *iface, REFGUID rguidClass, WCHAR *pwzPath, BOOL fClear) +static HRESULT WINAPI IDirectMusicLoaderImpl_SetSearchDirectory(IDirectMusicLoader8 *iface, + REFGUID class, WCHAR *path, BOOL clear) { - IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); - WCHAR wszCurrentPath[MAX_PATH]; - TRACE("(%p, %s, %s, %d)\n", This, debugstr_dmguid(rguidClass), debugstr_w(pwzPath), fClear); - FIXME(": fClear ignored\n"); - DMUSIC_GetLoaderSettings (iface, rguidClass, wszCurrentPath, NULL); - if (!strncmpW(wszCurrentPath, pwzPath, MAX_PATH)) { - return S_FALSE; - } - /* FIXME: check if path is valid; else return DMUS_E_LOADER_BADPATH */ - return DMUSIC_SetLoaderSettings (iface, rguidClass, pwzPath, NULL); + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); + WCHAR current_path[MAX_PATH]; + + TRACE("(%p, %s, %s, %d)\n", This, debugstr_dmguid(class), debugstr_w(path), clear); + if (clear) + FIXME("clear flag ignored\n"); + + DMUSIC_GetLoaderSettings(iface, class, current_path, NULL); + if (!strncmpW(current_path, path, MAX_PATH)) + return S_FALSE; + + return DMUSIC_SetLoaderSettings(iface, class, path, NULL); } static HRESULT WINAPI IDirectMusicLoaderImpl_ScanDirectory(IDirectMusicLoader8 *iface, REFGUID rguidClass, WCHAR *pwzFileExtension, WCHAR *pwzScanFileName)

1 0

Ken Thomases : secur32: Implement schan_imp_get_key_signature_algorithm() for macOS.
by Alexandre Julliard April 27, 2017

April 27, 2017

Module: wine Branch: master Commit: 39b467da61eb95c6c50a70b14471c6c450f0e7a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39b467da61eb95c6c50a70b14… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Apr 27 14:43:35 2017 -0500 secur32: Implement schan_imp_get_key_signature_algorithm() for macOS. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_macosx.c | 60 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index f397291..7f38133 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -916,8 +916,64 @@ unsigned int schan_imp_get_max_message_size(schan_imp_session session) ALG_ID schan_imp_get_key_signature_algorithm(schan_imp_session session) { - FIXME("(%p)\n", session); - return 0; + struct mac_session* s = (struct mac_session*)session; + SSLCipherSuite cipherSuite; + const struct cipher_suite* c; + int status; + + TRACE("(%p/%p)\n", s, s->context); + + status = SSLGetNegotiatedCipher(s->context, &cipherSuite); + if (status != noErr) + { + ERR("Failed to get session cipher suite: %d\n", status); + return 0; + } + + c = get_cipher_suite(cipherSuite); + if (!c) + { + ERR("Unknown session cipher suite: %#x\n", (unsigned int)cipherSuite); + return 0; + } + + switch (c->kx_alg) + { + case schan_kx_DH_DSS_EXPORT: + case schan_kx_DH_DSS: + case schan_kx_DHE_DSS_EXPORT: + case schan_kx_DHE_DSS: + return CALG_DSS_SIGN; + + case schan_kx_DH_RSA_EXPORT: + case schan_kx_DH_RSA: + case schan_kx_DHE_RSA_EXPORT: + case schan_kx_DHE_RSA: + case schan_kx_ECDH_RSA: + case schan_kx_ECDHE_RSA: + case schan_kx_RSA_EXPORT: + case schan_kx_RSA: + return CALG_RSA_SIGN; + + case schan_kx_ECDH_ECDSA: + case schan_kx_ECDHE_ECDSA: + return CALG_ECDSA; + + case schan_kx_DH_anon_EXPORT: + case schan_kx_DH_anon: + case schan_kx_DHE_PSK: + case schan_kx_ECDH_anon: + case schan_kx_FORTEZZA_DMS: + case schan_kx_NULL: + case schan_kx_PSK: + case schan_kx_RSA_PSK: + FIXME("Don't know key signature algorithm for key exchange algorithm %d, returning 0\n", c->kx_alg); + return 0; + + default: + FIXME("Unknown key exchange algorithm %d for cipher suite %#x, returning 0\n", c->kx_alg, (unsigned int)c->suite); + return 0; + } } SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session,

1 0