October 2013 - Wine-Commits

Henri Verbeet : d3d9/tests: Use explicit A calls.
by Alexandre Julliard Oct. 30, 2013

Oct. 30, 2013

Module: wine Branch: master Commit: a17abf8d7d7ef82d62a4487e2ef17179cbc09493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a17abf8d7d7ef82d62a4487e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 30 10:17:54 2013 +0100 d3d9/tests: Use explicit A calls. --- dlls/d3d9/tests/Makefile.in | 1 - dlls/d3d9/tests/d3d9ex.c | 13 +++--- dlls/d3d9/tests/device.c | 81 ++++++++++++++++++++-------------- dlls/d3d9/tests/stateblock.c | 10 ++-- dlls/d3d9/tests/vertexdeclaration.c | 10 ++-- dlls/d3d9/tests/visual.c | 10 ++-- 6 files changed, 69 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a17abf8d7d7ef82d62a44…

1 0

Henri Verbeet : d3d9/tests: Avoid windowsx.h.
by Alexandre Julliard Oct. 30, 2013

Oct. 30, 2013

Module: wine Branch: master Commit: 3528393d642b1c9fb1d589b53de3208d2d87819a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3528393d642b1c9fb1d589b53… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 30 10:17:53 2013 +0100 d3d9/tests: Avoid windowsx.h. --- dlls/d3d9/tests/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 37fb8fe..0691429 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -22,10 +22,12 @@ */ #define COBJMACROS -#include <windowsx.h> #include <d3d9.h> #include "wine/test.h" +#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) +#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) + static INT screen_width; static INT screen_height;

1 0

Alistair Leslie-Hughes : mscoree: Display the privatePath when parsing the .config file.
by Alexandre Julliard Oct. 30, 2013

Oct. 30, 2013

Module: wine Branch: master Commit: 45109f45df19c1cf7f9390056b64c147348dd93d URL: http://source.winehq.org/git/wine.git/?a=commit;h=45109f45df19c1cf7f9390056… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 28 11:24:37 2013 +1100 mscoree: Display the privatePath when parsing the .config file. --- dlls/mscoree/config.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/config.c b/dlls/mscoree/config.c index c5e3cec..5da1102 100644 --- a/dlls/mscoree/config.c +++ b/dlls/mscoree/config.c @@ -41,8 +41,11 @@ WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); enum parse_state { + STATE_ASSEMBLY_BINDING, STATE_ROOT, STATE_CONFIGURATION, + STATE_PROBING, + STATE_RUNTIME, STATE_STARTUP, STATE_UNKNOWN }; @@ -147,6 +150,23 @@ static HRESULT parse_startup(ConfigFileHandler *This, ISAXAttributes *pAttr) return hr; } +static HRESULT parse_probing(ConfigFileHandler *This, ISAXAttributes *pAttr) +{ + static const WCHAR privatePath[] = {'p','r','i','v','a','t','e','P','a','t','h',0}; + static const WCHAR empty[] = {0}; + LPCWSTR value; + int value_size; + HRESULT hr; + + hr = ISAXAttributes_getValueFromName(pAttr, empty, 0, privatePath, lstrlenW(privatePath), &value, &value_size); + if (SUCCEEDED(hr)) + FIXME("privatePath=%s not implemented\n", debugstr_wn(value, value_size)); + hr = S_OK; + + return hr; +} + + static HRESULT parse_supported_runtime(ConfigFileHandler *This, ISAXAttributes *pAttr) { static const WCHAR version[] = {'v','e','r','s','i','o','n',0}; @@ -199,8 +219,12 @@ static HRESULT WINAPI ConfigFileHandler_startElement(ISAXContentHandler *iface, { ConfigFileHandler *This = impl_from_ISAXContentHandler(iface); static const WCHAR configuration[] = {'c','o','n','f','i','g','u','r','a','t','i','o','n',0}; + static const WCHAR assemblyBinding[] = {'a','s','s','e','m','b','l','y','B','i','n','d','i','n','g',0}; + static const WCHAR probing[] = {'p','r','o','b','i','n','g',0}; + static const WCHAR runtime[] = {'r','u','n','t','i','m','e',0}; static const WCHAR startup[] = {'s','t','a','r','t','u','p',0}; static const WCHAR supportedRuntime[] = {'s','u','p','p','o','r','t','e','d','R','u','n','t','i','m','e',0}; + HRESULT hr = S_OK; TRACE("%s %s %s\n", debugstr_wn(pNamespaceUri,nNamespaceUri), @@ -231,6 +255,31 @@ static HRESULT WINAPI ConfigFileHandler_startElement(ISAXContentHandler *iface, This->states[++This->statenum] = STATE_STARTUP; break; } + else if (nLocalName == sizeof(runtime)/sizeof(WCHAR)-1 && + lstrcmpW(pLocalName, runtime) == 0) + { + This->states[++This->statenum] = STATE_RUNTIME; + break; + } + else + goto unknown; + case STATE_RUNTIME: + if (nLocalName == sizeof(assemblyBinding)/sizeof(WCHAR)-1 && + lstrcmpW(pLocalName, assemblyBinding) == 0) + { + This->states[++This->statenum] = STATE_ASSEMBLY_BINDING; + break; + } + else + goto unknown; + case STATE_ASSEMBLY_BINDING: + if (nLocalName == sizeof(probing)/sizeof(WCHAR)-1 && + lstrcmpW(pLocalName, probing) == 0) + { + hr = parse_probing(This, pAttr); + This->states[++This->statenum] = STATE_PROBING; + break; + } else goto unknown; case STATE_STARTUP:

1 0

Alexandre Julliard : explorer: Allow to specify the name of the graphics driver in the /desktop option.
by Alexandre Julliard Oct. 30, 2013

Oct. 30, 2013

Module: wine Branch: master Commit: b23614253029c91cdf1e165bb90edb97ad5783be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b23614253029c91cdf1e165bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 30 09:47:08 2013 +0100 explorer: Allow to specify the name of the graphics driver in the /desktop option. --- programs/explorer/desktop.c | 32 ++++++++++++++++++++------------ 1 files changed, 20 insertions(+), 12 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 35c3168..c3abe6d 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -638,7 +638,7 @@ static BOOL get_default_desktop_size( const WCHAR *name, unsigned int *width, un return found; } -static HMODULE load_graphics_driver( const GUID *guid ) +static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) { static const WCHAR device_keyW[] = { 'S','y','s','t','e','m','\\', @@ -660,15 +660,19 @@ static HMODULE load_graphics_driver( const GUID *guid ) HKEY hkey; char error[80]; - strcpyW( buffer, default_driver ); - - /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ - if (!RegOpenKeyW( HKEY_CURRENT_USER, driversW, &hkey )) + if (!driver) { - DWORD count = sizeof(buffer); - RegQueryValueExW( hkey, graphicsW, 0, NULL, (LPBYTE)buffer, &count ); - RegCloseKey( hkey ); + strcpyW( buffer, default_driver ); + + /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ + if (!RegOpenKeyW( HKEY_CURRENT_USER, driversW, &hkey )) + { + DWORD count = sizeof(buffer); + RegQueryValueExW( hkey, graphicsW, 0, NULL, (LPBYTE)buffer, &count ); + RegCloseKey( hkey ); + } } + else lstrcpynW( buffer, driver, sizeof(buffer)/sizeof(WCHAR) ); name = buffer; while (name) @@ -773,7 +777,7 @@ void manage_desktop( WCHAR *arg ) HWND hwnd, msg_hwnd; HMODULE graphics_driver; unsigned int width, height; - WCHAR *cmdline = NULL; + WCHAR *cmdline = NULL, *driver = NULL; WCHAR *p = arg; const WCHAR *name = NULL; @@ -787,12 +791,16 @@ void manage_desktop( WCHAR *arg ) } /* parse the desktop option */ - /* the option is of the form /desktop=name[,widthxheight] */ + /* the option is of the form /desktop=name[,widthxheight[,driver]] */ if (*arg == '=' || *arg == ',') { arg++; name = arg; - if ((p = strchrW( arg, ',' ))) *p++ = 0; + if ((p = strchrW( arg, ',' ))) + { + *p++ = 0; + if ((driver = strchrW( p, ',' ))) *driver++ = 0; + } if (!p || !parse_size( p, &width, &height )) get_default_desktop_size( name, &width, &height ); } @@ -813,7 +821,7 @@ void manage_desktop( WCHAR *arg ) UuidCreate( &guid ); TRACE( "display guid %s\n", debugstr_guid(&guid) ); - graphics_driver = load_graphics_driver( &guid ); + graphics_driver = load_graphics_driver( driver, &guid ); /* create the desktop window */ hwnd = CreateWindowExW( 0, DESKTOP_CLASS_ATOM, NULL,

1 0

Frédéric Delanoy : msxml3/tests: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 30, 2013

Oct. 30, 2013

Module: wine Branch: master Commit: cbd65f1c65deb46945d4da5fc2898185533a9683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbd65f1c65deb46945d4da5fc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 29 22:23:38 2013 +0100 msxml3/tests: Use BOOL type where appropriate. --- dlls/msxml3/tests/saxreader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index d9c3c4e..f3a6bbd 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -101,7 +101,7 @@ static void free_bstrs(void) alloced_bstrs_count = 0; } -static void test_saxstr(const char *file, unsigned line, BSTR str, const char *expected, int todo, int *failcount) +static void test_saxstr(const char *file, unsigned line, BSTR str, const char *expected, BOOL todo, int *failcount) { int len, lenexp, cmp; WCHAR buf[1024]; @@ -323,7 +323,7 @@ static const char *get_event_name(CH event) } static void compare_attributes(const struct call_entry *actual, const struct call_entry *expected, const char *context, - int todo, const char *file, int line, int *failcount) + BOOL todo, const char *file, int line, int *failcount) { int i, lenexp = 0; @@ -359,7 +359,7 @@ static void compare_attributes(const struct call_entry *actual, const struct cal } static void ok_sequence_(struct call_sequence **seq, int sequence_index, - const struct call_entry *expected, const char *context, int todo, + const struct call_entry *expected, const char *context, BOOL todo, const char *file, int line) { struct call_sequence *call_seq = seq[sequence_index];

1 0

Dmitry Timoshkov : kernel32: Add special case for "." and ".." to GetShortPathName.
by Alexandre Julliard Oct. 30, 2013

Oct. 30, 2013

Module: wine Branch: master Commit: d57444a62268ff6158f9c2295093b713e6400f5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d57444a62268ff6158f9c2295… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 30 11:43:50 2013 +0900 kernel32: Add special case for "." and ".." to GetShortPathName. --- dlls/kernel32/path.c | 10 ++++++++++ dlls/kernel32/tests/path.c | 4 ---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 1728bfa..7ed1c61 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -489,6 +489,16 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl tmplen = p - (longpath + lp); lstrcpynW(tmpshortpath + sp, longpath + lp, tmplen + 1); + if (tmpshortpath[sp] == '.') + { + if (tmplen == 1 || (tmplen == 2 && tmpshortpath[sp + 1] == '.')) + { + sp += tmplen; + lp += tmplen; + continue; + } + } + /* Check if the file exists and use the existing short file name */ goit = FindFirstFileW(tmpshortpath, &wfd); if (goit == INVALID_HANDLE_VALUE) goto notfound; diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index fe699b2..62236a0 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1963,7 +1963,6 @@ todo_wine strcpy(buf, "deadbeef"); ret = GetShortPathNameA(".", buf, MAX_PATH); ok(ret, "GetShortPathName error %d\n", GetLastError()); -todo_wine ok(!strcmp(buf, "."), "expected ., got %s\n", buf); strcpy(buf, "deadbeef"); @@ -1974,7 +1973,6 @@ todo_wine strcpy(buf, "deadbeef"); ret = GetShortPathNameA("..", buf, MAX_PATH); ok(ret, "GetShortPathName error %d\n", GetLastError()); -todo_wine ok(!strcmp(buf, ".."), "expected .., got %s\n", buf); strcpy(buf, "deadbeef"); @@ -1985,9 +1983,7 @@ todo_wine ok(!strcmp(buf, "..\\foo\\file"), "expected ..\\foo\\file, got %s\n", buf); strcpy(buf, "deadbeef"); ret = GetShortPathNameA("..\\foo\\file", buf, MAX_PATH); -todo_wine ok(ret, "GetShortPathName error %d\n", GetLastError()); -todo_wine ok(!strcmp(buf, "..\\foo\\file"), "expected ..\\foo\\file, got %s\n", buf); SetCurrentDirectoryA("..");

1 0

Henri Verbeet : ddraw: Use GET_MODULE_HANDLE_EX_FLAG_PIN.
by Alexandre Julliard Oct. 30, 2013

Oct. 30, 2013

Module: wine Branch: master Commit: ff3014221eeb9acb608274f307395b7912fa90a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff3014221eeb9acb608274f30… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 30 10:17:52 2013 +0100 ddraw: Use GET_MODULE_HANDLE_EX_FLAG_PIN. --- dlls/ddraw/main.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 79033fc..e613126 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -872,10 +872,9 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) * exclusive mode, we replace the window proc of the ddraw window. If * an application would unload ddraw from the WM_DESTROY handler for * that window, it would return to unmapped memory and die. Apparently - * this is supposed to work on Windows. We should probably use - * GET_MODULE_HANDLE_EX_FLAG_PIN for this, but that's not currently - * implemented. */ - if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR *)&ddraw_self, &ddraw_self)) + * this is supposed to work on Windows. */ + if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_PIN, + (const WCHAR *)&ddraw_self, &ddraw_self)) ERR("Failed to get own module handle.\n"); instance = inst;

1 0

Vijay Kiran Kamuju : wininet: Implement setting INTERNET_PER_CONN_PROXY_BYPASS.
by Alexandre Julliard Oct. 30, 2013

Oct. 30, 2013

Module: wine Branch: master Commit: ebe121e360c4118c5263c20717a3fc25ebbcd9b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebe121e360c4118c5263c2071… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Oct 27 22:01:22 2013 +0000 wininet: Implement setting INTERNET_PER_CONN_PROXY_BYPASS. --- dlls/wininet/internet.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 954e891..73fdfe4 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2912,13 +2912,17 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, } break; + case INTERNET_PER_CONN_PROXY_BYPASS: + heap_free(pi.proxyBypass); + pi.proxyBypass = heap_strdupW(option->Value.pszValue); + break; + case INTERNET_PER_CONN_AUTOCONFIG_URL: case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS: case INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL: case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS: case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME: case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL: - case INTERNET_PER_CONN_PROXY_BYPASS: FIXME("Unhandled dwOption %d\n", option->dwOption); break;

1 0

Michael Stefaniuc : winmm/tests: Skip tests for MMSYSERR_NODRIVER too.
by Alexandre Julliard Oct. 30, 2013

Oct. 30, 2013

Module: wine Branch: master Commit: ff7511cc0a5ffd410991f5563222adf45abc5663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff7511cc0a5ffd410991f5563… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 29 23:31:04 2013 +0100 winmm/tests: Skip tests for MMSYSERR_NODRIVER too. --- dlls/winmm/tests/midi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 8fb035a..6438dba 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -282,7 +282,7 @@ static void test_midiOut_device(UINT udev, HWND hwnd) rc = midiOutOpen(&hm, udev, (DWORD_PTR)hwnd, (DWORD_PTR)MYCBINST, CALLBACK_WINDOW); else rc = midiOutOpen(&hm, udev, (DWORD_PTR)callback_func, (DWORD_PTR)MYCBINST, CALLBACK_FUNCTION); - if (rc == MMSYSERR_NOTSUPPORTED) + if (rc == MMSYSERR_NOTSUPPORTED || rc == MMSYSERR_NODRIVER) { skip( "MIDI out not supported\n" ); return; @@ -481,7 +481,7 @@ static void test_midiStream(UINT udev, HWND hwnd) rc = midiStreamOpen(&hm, &udev, 1, (DWORD_PTR)hwnd, (DWORD_PTR)MYCBINST, CALLBACK_WINDOW); else rc = midiStreamOpen(&hm, &udev, 1, (DWORD_PTR)callback_func, (DWORD_PTR)MYCBINST, CALLBACK_FUNCTION); - if (rc == MMSYSERR_NOTSUPPORTED) + if (rc == MMSYSERR_NOTSUPPORTED || rc == MMSYSERR_NODRIVER) { skip( "MIDI stream not supported\n" ); return;

1 0

Alistair Leslie-Hughes : mscoree: Rename function to match its use.
by Alexandre Julliard Oct. 30, 2013

Oct. 30, 2013

Module: wine Branch: master Commit: 2d899505d7717a8e99d33ee28fcc577c8a7616de URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d899505d7717a8e99d33ee28… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 30 08:14:49 2013 +1100 mscoree: Rename function to match its use. --- dlls/mscoree/metahost.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 7e99bbe..6d87b25 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -110,7 +110,7 @@ void (CDECL *mono_trace_set_assembly)(MonoAssembly *assembly); static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path); -static MonoAssembly* mono_assembly_search_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data); +static MonoAssembly* mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data); static void mono_shutdown_callback_fn(MonoProfiler *prof); @@ -236,7 +236,7 @@ static HRESULT load_mono(CLRRuntimeInfo *This) mono_config_parse(NULL); - mono_install_assembly_preload_hook(mono_assembly_search_hook_fn, NULL); + mono_install_assembly_preload_hook(mono_assembly_preload_hook_fn, NULL); trace_size = GetEnvironmentVariableA("WINE_MONO_TRACE", trace_setting, sizeof(trace_setting)); @@ -1253,7 +1253,7 @@ HRESULT get_file_from_strongname(WCHAR* stringnameW, WCHAR* assemblies_path, int return hr; } -static MonoAssembly* mono_assembly_search_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data) +static MonoAssembly* mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data) { HRESULT hr; MonoAssembly *result=NULL;

1 0