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

Huw Davies : gdi32: Try to read the dpi from the user key first.
by Alexandre Julliard 27 Apr '17

27 Apr '17

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

Huw Davies : winecfg: Try to read the dpi from the user key first.
by Alexandre Julliard 27 Apr '17

27 Apr '17

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

Huw Davies : user32/tests: Try to read the dpi from the user key first.
by Alexandre Julliard 27 Apr '17

27 Apr '17

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

Michael Stefaniuc : dmloader: Avoid a crash on a NULL string pointer.
by Alexandre Julliard 27 Apr '17

27 Apr '17

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

Michael Stefaniuc : dmloader: Cleanup IDirectMusicLoaderImpl_SetSearchDirectory().
by Alexandre Julliard 27 Apr '17

27 Apr '17

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

Michael Stefaniuc : dmloader: Return an error for an invalid directory.
by Alexandre Julliard 27 Apr '17

27 Apr '17

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

Michael Stefaniuc : dmloader/tests: Add some IDirectMusicLoader directory tests.
by Alexandre Julliard 27 Apr '17

27 Apr '17

Module: wine Branch: master Commit: ae600c0b2c5b63d0c32a19f44629c204d1a0fc51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae600c0b2c5b63d0c32a19f44… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Apr 27 19:15:30 2017 +0200 dmloader/tests: Add some IDirectMusicLoader directory tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/tests/loader.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 56f8415..6b2ee3a 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -22,6 +22,8 @@ #include "dmusici.h" #include "wine/test.h" +#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) + static unsigned char mp3file[] = "\xFF\xFB\x92\x04"; /* MP3 header */ static unsigned char rifffile[8+4+8+16+8+256] = "RIFF\x24\x01\x00\x00WAVE" /* header: 4 ("WAVE") + (8 + 16) (format segment) + (8 + 256) (data segment) = 0x124 */ "fmt \x10\x00\x00\x00\x01\x00\x20\x00\xAC\x44\x00\x00\x10\xB1\x02\x00\x04\x00\x10\x00" /* format segment: PCM, 2 chan, 44100 Hz, 16 bits */ @@ -41,6 +43,44 @@ static BOOL missing_dmloader(void) return TRUE; } +static void test_directory(void) +{ + IDirectMusicLoader8 *loader = NULL; + HRESULT hr; + WCHAR con[] = {'c', 'o', 'n'}; + WCHAR path[MAX_PATH]; + WCHAR invalid_path[] = {'/', 'i', 'n', 'v', 'a', 'l', 'i', 'd', ' ', 'p', 'a', 't', 'h', 0}; + + hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC, &IID_IDirectMusicLoader8, + (void**)&loader); + ok(hr == S_OK, "Couldn't create Loader %#x\n", hr); + + /* ScanDirectory without a previous SetSearchDirectory isn't failing */ + hr = IDirectMusicLoader_ScanDirectory(loader, &CLSID_DirectMusicContainer, con, NULL); + ok(hr == S_FALSE, "ScanDirectory for \"con\" files failed with %#x\n", hr); + + /* SetSearchDirectory with invalid path */ + hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, invalid_path, 0); + ok(hr == DMUS_E_LOADER_BADPATH, "SetSearchDirectory failed with %#x\n", hr); + + /* Two consecutive SetSearchDirectory with the same path */ + GetTempPathW(ARRAY_SIZE(path), path); + hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, path, 0); + todo_wine ok(hr == S_OK, "SetSearchDirectory failed with %#x\n", hr); + hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, path, 0); + ok(hr == S_FALSE, "Second SetSearchDirectory failed with %#x\n", hr); + hr = IDirectMusicLoader_SetSearchDirectory(loader, &CLSID_DirectSoundWave, path, 0); + ok(hr == S_OK, "SetSearchDirectory failed with %#x\n", hr); + hr = IDirectMusicLoader_SetSearchDirectory(loader, &CLSID_DirectSoundWave, path, 0); + ok(hr == S_FALSE, "Second SetSearchDirectory failed with %#x\n", hr); + + /* NULL extension is not an error */ + hr = IDirectMusicLoader_ScanDirectory(loader, &CLSID_DirectSoundWave, NULL, NULL); + ok(hr == S_FALSE, "ScanDirectory for \"wav\" files failed, received %#x\n", hr); + + IDirectMusicLoader_Release(loader); +} + static void test_release_object(void) { HRESULT hr; @@ -295,6 +335,7 @@ START_TEST(loader) CoUninitialize(); return; } + test_directory(); test_release_object(); test_simple_playing(); test_COM();

1 0

Alistair Leslie-Hughes : odbccp32: Handle ODBC_CONFIG_DRIVER request in SQLConfigDriver/W.
by Alexandre Julliard 27 Apr '17

27 Apr '17

Module: wine Branch: master Commit: c92189c600a899d5da6e996107154b1bc9ca67de URL: http://source.winehq.org/git/wine.git/?a=commit;h=c92189c600a899d5da6e99610… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Apr 26 10:03:44 2017 +0000 odbccp32: Handle ODBC_CONFIG_DRIVER request in SQLConfigDriver/W. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/odbccp32/tests/misc.c | 65 +++++++++++++++++++++++++++++++--- 2 files changed, 149 insertions(+), 4 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index f28d464..fce3fcd 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -65,6 +65,7 @@ static const WCHAR odbc_error_invalid_param_string[] = {'I','n','v','a','l','i', static const WCHAR odbc_error_invalid_dsn[] = {'I','n','v','a','l','i','d',' ','D','S','N',0}; static const WCHAR odbc_error_load_lib_failed[] = {'L','o','a','d',' ','L','i','b','r','a','r','y',' ','F','a','i','l','e','d',0}; static const WCHAR odbc_error_request_failed[] = {'R','e','q','u','e','s','t',' ','F','a','i','l','e','d',0}; +static const WCHAR odbc_error_invalid_keyword[] = {'I','n','v','a','l','i','d',' ','k','e','y','w','o','r','d',' ','v','a','l','u','e',0}; /* Push an error onto the error stack, taking care of ranges etc. */ static void push_error(int code, LPCWSTR msg) @@ -303,6 +304,64 @@ static HMODULE load_config_driver(const WCHAR *driver) return hmod; } +static BOOL write_config_value(const WCHAR *driver, const WCHAR *args) +{ + long ret; + HKEY hkey, hkeydriver; + WCHAR *name = NULL; + + if(!args) + return FALSE; + + if((ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, odbcini, &hkey)) == ERROR_SUCCESS) + { + if((ret = RegOpenKeyW(hkey, driver, &hkeydriver)) == ERROR_SUCCESS) + { + WCHAR *divider, *value; + + name = heap_alloc( (strlenW(args) + 1) * sizeof(WCHAR)); + if(!name) + { + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + goto fail; + } + lstrcpyW(name, args); + + divider = strchrW(name,'='); + if(!divider) + { + push_error(ODBC_ERROR_INVALID_KEYWORD_VALUE, odbc_error_invalid_keyword); + goto fail; + } + + value = divider + 1; + *divider = '\0'; + + TRACE("Write pair: %s = %s\n", debugstr_w(name), debugstr_w(value)); + if(RegSetValueExW(hkeydriver, name, 0, REG_SZ, (BYTE*)value, + (strlenW(value)+1) * sizeof(WCHAR)) != ERROR_SUCCESS) + ERR("Failed to write registry installed key\n"); + heap_free(name); + + RegCloseKey(hkeydriver); + } + + RegCloseKey(hkey); + } + + if(ret != ERROR_SUCCESS) + push_error(ODBC_ERROR_COMPONENT_NOT_FOUND, odbc_error_component_not_found); + + return ret == ERROR_SUCCESS; + +fail: + RegCloseKey(hkeydriver); + RegCloseKey(hkey); + heap_free(name); + + return FALSE; +} + BOOL WINAPI SQLConfigDriverW(HWND hwnd, WORD request, LPCWSTR driver, LPCWSTR args, LPWSTR msg, WORD msgmax, WORD *msgout) { @@ -314,6 +373,11 @@ BOOL WINAPI SQLConfigDriverW(HWND hwnd, WORD request, LPCWSTR driver, TRACE("(%p %d %s %s %p %d %p)\n", hwnd, request, debugstr_w(driver), debugstr_w(args), msg, msgmax, msgout); + if(request == ODBC_CONFIG_DRIVER) + { + return write_config_value(driver, args); + } + hmod = load_config_driver(driver); if(!hmod) return FALSE; @@ -343,6 +407,30 @@ BOOL WINAPI SQLConfigDriver(HWND hwnd, WORD request, LPCSTR driver, debugstr_a(args), msg, msgmax, msgout); driverW = heap_strdupAtoW(driver); + if(!driverW) + { + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + return FALSE; + } + if(request == ODBC_CONFIG_DRIVER) + { + BOOL ret = FALSE; + WCHAR *argsW = heap_strdupAtoW(args); + if(argsW) + { + ret = write_config_value(driverW, argsW); + HeapFree(GetProcessHeap(), 0, argsW); + } + else + { + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + } + + HeapFree(GetProcessHeap(), 0, driverW); + + return ret; + } + hmod = load_config_driver(driverW); HeapFree(GetProcessHeap(), 0, driverW); if(!hmod) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index ed8e6f1..8e119e0 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -421,31 +421,63 @@ static void test_SQLInstallDriverEx(void) DWORD cnt, error_code = 0; HKEY hkey; LONG res; + char error[1000]; GetSystemDirectoryA(syspath, MAX_PATH); - SQLInstallDriverEx("WINE ODBC Driver\0Driver=sample.dll\0Setup=sample.dll\0\0", NULL, path, MAX_PATH, &size, ODBC_INSTALL_COMPLETE, NULL); + ret = SQLConfigDriver(NULL, ODBC_CONFIG_DRIVER, "WINE ODBC Driver", "CPTimeout=59", error, sizeof(error), NULL); + ok(!ret, "SQLConfigDriver returned %d\n", ret); + sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); + ok(sql_ret && error_code == ODBC_ERROR_COMPONENT_NOT_FOUND, "SQLConfigDriver returned %d, %u\n", sql_ret, error_code); + + ret = SQLInstallDriverEx("WINE ODBC Driver\0Driver=sample.dll\0Setup=sample.dll\0\0", NULL, + path, MAX_PATH, &size, ODBC_INSTALL_COMPLETE, NULL); + ok(ret, "SQLInstallDriverEx failed\n"); sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); if (sql_ret && error_code == ODBC_ERROR_WRITING_SYSINFO_FAILED) { win_skip("not enough privileges\n"); return; } - ok(sql_ret && error_code == SQL_SUCCESS, "SQLInstallDriverEx failed %d, %u\n", sql_ret, error_code); + ok(sql_ret == SQL_NO_DATA || (sql_ret && error_code == SQL_SUCCESS), "SQLInstallDriverEx failed %d, %u\n", sql_ret, error_code); ok(!strcmp(path, syspath), "invalid path %s\n", path); +if (0) /* Crashes on XP. */ +{ + sql_ret = 0; + ret = SQLConfigDriver(NULL, ODBC_CONFIG_DRIVER, "WINE ODBC Driver", NULL, error, sizeof(error), NULL); + ok(!ret, "SQLConfigDriver failed '%s'\n",error); +} + + ret = SQLConfigDriver(NULL, ODBC_CONFIG_DRIVER, "WINE ODBC Driver", "CPTimeout=59\0NoWrite=60\0", error, sizeof(error), NULL); + ok(ret, "SQLConfigDriver failed\n"); + sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); + ok(sql_ret == SQL_NO_DATA || (sql_ret && error_code == SQL_SUCCESS), "SQLConfigDriver failed %d, %u\n", sql_ret, error_code); + ret = SQLInstallDriverEx("WINE ODBC Driver Path\0Driver=sample.dll\0Setup=sample.dll\0\0", "c:\\temp", path, MAX_PATH, &size, ODBC_INSTALL_COMPLETE, NULL); + ok(ret, "SQLInstallDriverEx failed\n"); sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); - ok(sql_ret && error_code == SQL_SUCCESS, "SQLInstallDriverEx failed %d, %u\n", sql_ret, error_code); + ok(sql_ret == SQL_NO_DATA || (sql_ret && error_code == SQL_SUCCESS), "SQLInstallDriverEx failed %d, %u\n", sql_ret, error_code); ok(!strcmp(path, "c:\\temp"), "invalid path %s\n", path); + ret = SQLConfigDriver(NULL, ODBC_CONFIG_DRIVER, "WINE ODBC Driver Path", "empty", error, sizeof(error), NULL); + ok(!ret, "SQLConfigDriver successful\n"); + sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); + ok(sql_ret && error_code == ODBC_ERROR_INVALID_KEYWORD_VALUE, "SQLConfigDriver failed %d, %u\n", sql_ret, error_code); + + ret = SQLConfigDriver(NULL, ODBC_CONFIG_DRIVER, "WINE ODBC Driver Path", "NoWrite=60;xxxx=555", error, sizeof(error), NULL); + ok(ret, "SQLConfigDriver failed\n"); + sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); + ok(sql_ret == SQL_NO_DATA || (sql_ret && error_code == SQL_SUCCESS), "SQLConfigDriver failed %d, %u\n", sql_ret, error_code); + if (ret) { + DWORD type = 0xdeadbeef, size = MAX_PATH; + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBCINST.INI\\WINE ODBC Driver", 0, KEY_READ, &hkey); ok(res == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); if (res == ERROR_SUCCESS) { - DWORD type = 0xdeadbeef, size = MAX_PATH; char driverpath[MAX_PATH]; strcpy(driverpath, syspath); @@ -458,6 +490,31 @@ static void test_SQLInstallDriverEx(void) ok(size == strlen(driverpath) + 1, "got %u\n", size); ok(!strcmp(path, driverpath), "invalid path %s\n", path); + res = RegQueryValueExA(hkey, "CPTimeout", NULL, &type, (BYTE *)&path, &size); + ok(res == ERROR_SUCCESS, "got %d\n", res); + ok(type == REG_SZ, "got %u\n", type); + ok(size == strlen("59") + 1, "got %u\n", size); + ok(!strcmp(path, "59"), "invalid value %s\n", path); + + res = RegQueryValueExA(hkey, "NoWrite", NULL, &type, (BYTE *)&path, &size); + ok(res == ERROR_FILE_NOT_FOUND, "got %d\n", res); + + RegCloseKey(hkey); + } + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBCINST.INI\\WINE ODBC Driver Path", 0, KEY_READ, &hkey); + ok(res == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); + if (res == ERROR_SUCCESS) + { + size = sizeof(path); + res = RegQueryValueExA(hkey, "NoWrite", NULL, &type, (BYTE *)&path, &size); + ok(res == ERROR_SUCCESS, "got %d\n", res); + ok(type == REG_SZ, "got %u\n", type); + ok(size == strlen("60;xxxx=555") + 1, "got %u\n", size); + ok(!strcmp(path, "60;xxxx=555"), "invalid value %s\n", path); + + res = RegQueryValueExA(hkey, "CPTimeout", NULL, &type, (BYTE *)&path, &size); + ok(res == ERROR_FILE_NOT_FOUND, "got %d\n", res); RegCloseKey(hkey); } }

1 0

Alexandre Julliard : preloader: Add a debug option to dump memory maps.
by Alexandre Julliard 27 Apr '17

27 Apr '17

Module: wine Branch: master Commit: 1172754fcbbcf5769edbba8a3e76a604c487af6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1172754fcbbcf5769edbba8a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 27 15:03:46 2017 +0200 preloader: Add a debug option to dump memory maps. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/preloader.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/loader/preloader.c b/loader/preloader.c index 7cf2946..91ad1da 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -127,6 +127,7 @@ static struct wine_preload_info preload_info[] = #undef DUMP_SEGMENTS #undef DUMP_AUX_INFO #undef DUMP_SYMS +#undef DUMP_MAPS /* older systems may not define these */ #ifndef PT_TLS @@ -1272,6 +1273,17 @@ void* wld_start( void **stack ) wld_printf("new stack = %p\n", *stack); wld_printf("jumping to %p\n", (void *)ld_so_map.l_entry); #endif +#ifdef DUMP_MAPS + { + char buffer[1024]; + int len, fd = wld_open( "/proc/self/maps", O_RDONLY ); + if (fd != -1) + { + while ((len = wld_read( fd, buffer, sizeof(buffer) )) > 0) wld_write( 2, buffer, len ); + wld_close( fd ); + } + } +#endif return (void *)ld_so_map.l_entry; }

1 0

Alexandre Julliard : preloader: Use the SYS_mmap2 system call instead of the old SYS_mmap one.
by Alexandre Julliard 27 Apr '17

27 Apr '17

Module: wine Branch: master Commit: 45a632ee81c9c5c58309426de5aadbd8dbbba0f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a632ee81c9c5c58309426de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 27 15:04:03 2017 +0200 preloader: Use the SYS_mmap2 system call instead of the old SYS_mmap one. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/preloader.c | 55 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 91ad1da..903061e 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -291,30 +291,37 @@ static inline int wld_mprotect( const void *addr, size_t len, int prot ) return SYSCALL_RET(ret); } -static void *wld_mmap( void *start, size_t len, int prot, int flags, int fd, off_t offset ) -{ - int ret; - - struct - { - void *addr; - unsigned int length; - unsigned int prot; - unsigned int flags; - unsigned int fd; - unsigned int offset; - } args; - - args.addr = start; - args.length = len; - args.prot = prot; - args.flags = flags; - args.fd = fd; - args.offset = offset; - __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" - : "=a" (ret) : "0" (90 /* SYS_mmap */), "q" (&args) : "memory" ); - return (void *)SYSCALL_RET(ret); -} +void *wld_mmap( void *start, size_t len, int prot, int flags, int fd, unsigned int offset ); +__ASM_GLOBAL_FUNC(wld_mmap, + "\tpushl %ebp\n" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + "\tpushl %ebx\n" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + "\tpushl %esi\n" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + "\tpushl %edi\n" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + "\tmovl $192,%eax\n" /* SYS_mmap2 */ + "\tmovl 20(%esp),%ebx\n" /* start */ + "\tmovl 24(%esp),%ecx\n" /* len */ + "\tmovl 28(%esp),%edx\n" /* prot */ + "\tmovl 32(%esp),%esi\n" /* flags */ + "\tmovl 36(%esp),%edi\n" /* fd */ + "\tmovl 40(%esp),%ebp\n" /* offset */ + "\tshrl $12,%ebp\n" + "\tint $0x80\n" + "\tcmpl $-4096,%eax\n" + "\tjbe 1f\n" + "\tmovl $-1,%eax\n" + "1:\tpopl %edi\n" + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") + "\tpopl %esi\n" + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") + "\tpopl %ebx\n" + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") + "\tpopl %ebp\n" + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") + "\tret\n" ) static inline uid_t wld_getuid(void) {

1 0