October 2012 - Wine-commits

Marcus Meissner : advapi32: Removed a double free issue on loop termination (Coverity).
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 748dd6fed378adb4ebe00ce0ca14d036d72380b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=748dd6fed378adb4ebe00ce0c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Oct 10 10:00:17 2012 +0200 advapi32: Removed a double free issue on loop termination (Coverity). --- dlls/advapi32/tests/crypt.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 7abf90b..4820d27 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -624,9 +624,6 @@ static BOOL FindProvTypesRegVals(DWORD *pdwIndex, DWORD *pdwProvType, LPSTR *psz (*pdwIndex)++; } - - if (!ret) - LocalFree(*pszTypeName); RegCloseKey(hSubKey); LocalFree(szName);

1 0

Marcus Meissner : winetest: Close filehandle on run error (Coverity).
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: a89f877fd3f65275af407a3bf7d7896afdff930c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a89f877fd3f65275af407a3bf… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Oct 10 10:12:11 2012 +0200 winetest: Close filehandle on run error (Coverity). --- programs/winetest/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 45c8602..cc73f94 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -662,6 +662,7 @@ get_subtests (const char *tempdir, struct wine_test *test, LPSTR res_name) if (status == -2) { report (R_ERROR, "Cannot run %s error %u", test->exename, err); + CloseHandle( subfile ); goto quit; }

1 0

Christian Costa : quartz: Use target rect if set otherwise default to source rect in VideoRenderer_AutoShowWindow .
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 266e79d05f054904162dea62a3a2656b8917c13e URL: http://source.winehq.org/git/wine.git/?a=commit;h=266e79d05f054904162dea62a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Oct 9 23:55:44 2012 +0200 quartz: Use target rect if set otherwise default to source rect in VideoRenderer_AutoShowWindow. --- dlls/quartz/videorenderer.c | 39 +++++++++++++++++++++++++++------------ 1 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 5e78c55..50a01fc 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -150,7 +150,8 @@ static BOOL CreateRenderingSubsystem(VideoRendererImpl* This) return TRUE; } -static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This) { +static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This) +{ if (!This->init && (!This->WindowPos.right || !This->WindowPos.top)) { DWORD style = GetWindowLongW(This->baseControlWindow.baseWindow.hWnd, GWL_STYLE); @@ -158,13 +159,29 @@ static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This) { if (!This->WindowPos.right) { - This->WindowPos.left = This->SourceRect.left; - This->WindowPos.right = This->SourceRect.right; + if (This->DestRect.right) + { + This->WindowPos.left = This->DestRect.left; + This->WindowPos.right = This->DestRect.right; + } + else + { + This->WindowPos.left = This->SourceRect.left; + This->WindowPos.right = This->SourceRect.right; + } } if (!This->WindowPos.bottom) { - This->WindowPos.top = This->SourceRect.top; - This->WindowPos.bottom = This->SourceRect.bottom; + if (This->DestRect.bottom) + { + This->WindowPos.top = This->DestRect.top; + This->WindowPos.bottom = This->DestRect.bottom; + } + else + { + This->WindowPos.top = This->SourceRect.top; + This->WindowPos.bottom = This->SourceRect.bottom; + } } AdjustWindowRectEx(&This->WindowPos, style, TRUE, style_ex); @@ -740,7 +757,7 @@ static ULONG WINAPI VideoRenderer_Release(IBaseFilter * iface) static HRESULT WINAPI VideoRenderer_Pause(IBaseFilter * iface) { VideoRendererImpl *This = impl_from_IBaseFilter(iface); - + TRACE("(%p/%p)->()\n", This, iface); EnterCriticalSection(&This->renderer.csRenderLock); @@ -781,9 +798,8 @@ static const IBaseFilterVtbl VideoRenderer_Vtbl = }; /*** IUnknown methods ***/ -static HRESULT WINAPI Basicvideo_QueryInterface(IBasicVideo *iface, - REFIID riid, - LPVOID*ppvObj) { +static HRESULT WINAPI Basicvideo_QueryInterface(IBasicVideo *iface, REFIID riid, LPVOID *ppvObj) +{ VideoRendererImpl *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid), riid, ppvObj); @@ -852,9 +868,8 @@ static const IBasicVideoVtbl IBasicVideo_VTable = /*** IUnknown methods ***/ -static HRESULT WINAPI Videowindow_QueryInterface(IVideoWindow *iface, - REFIID riid, - LPVOID*ppvObj) { +static HRESULT WINAPI Videowindow_QueryInterface(IVideoWindow *iface, REFIID riid, LPVOID *ppvObj) +{ VideoRendererImpl *This = impl_from_IVideoWindow(iface); TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid), riid, ppvObj);

1 0

Christian Costa : quartz: Don' t say we have a menu to AdjustWindowRectEx since the created window doesn' t have one.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: c82d96fded3fabeee7a13fd60599a4a1bba49d07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c82d96fded3fabeee7a13fd60… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Oct 9 23:55:53 2012 +0200 quartz: Don't say we have a menu to AdjustWindowRectEx since the created window doesn't have one. --- dlls/quartz/videorenderer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 50a01fc..d6b87fa 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -184,7 +184,7 @@ static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This) } } - AdjustWindowRectEx(&This->WindowPos, style, TRUE, style_ex); + AdjustWindowRectEx(&This->WindowPos, style, FALSE, style_ex); TRACE("WindowPos: %d %d %d %d\n", This->WindowPos.left, This->WindowPos.top, This->WindowPos.right, This->WindowPos.bottom); SetWindowPos(This->baseControlWindow.baseWindow.hWnd, NULL,

1 0

Francois Gouget : shell32/tests: Simplify shlexec's test_directory() and add some more tests.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: eee9b8ee124dafda078dc2412658e6403c1c402e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eee9b8ee124dafda078dc2412… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 10 00:53:52 2012 +0200 shell32/tests: Simplify shlexec's test_directory() and add some more tests. --- dlls/shell32/tests/shlexec.c | 68 +++++++++++++++++++++-------------------- 1 files changed, 35 insertions(+), 33 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 69b466e..8d164a6 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -818,26 +818,6 @@ static DWORD get_long_path_name(const char* shortpath, char* longpath, DWORD lon /*** * - * PathFindFileNameA equivalent that supports WinNT - * - ***/ - -static LPSTR path_find_file_name(LPCSTR lpszPath) -{ - LPCSTR lastSlash = lpszPath; - - while (lpszPath && *lpszPath) - { - if ((*lpszPath == '\\' || *lpszPath == '/' || *lpszPath == ':') && - lpszPath[1] && lpszPath[1] != '\\' && lpszPath[1] != '/') - lastSlash = lpszPath + 1; - lpszPath = CharNext(lpszPath); - } - return (LPSTR)lastSlash; -} - -/*** - * * Tests * ***/ @@ -2592,33 +2572,55 @@ static void cleanup_test(void) static void test_directory(void) { - char path[MAX_PATH], newdir[MAX_PATH]; - char params[1024]; + char path[MAX_PATH], curdir[MAX_PATH]; + char params[1024], dirpath[1024]; INT_PTR rc; - /* copy this executable to a new folder and cd to it */ - sprintf(newdir, "%s\\newfolder", tmpdir); - rc = CreateDirectoryA( newdir, NULL ); - ok( rc, "failed to create %s err %u\n", newdir, GetLastError() ); - sprintf(path, "%s\\%s", newdir, path_find_file_name(argv0)); + sprintf(path, "%s\\test2.exe", tmpdir); CopyFileA(argv0, path, FALSE); - SetCurrentDirectory(tmpdir); sprintf(params, "shlexec \"%s\" Exec", child_file); + /* Test with the current directory */ + GetCurrentDirectoryA(sizeof(curdir), curdir); + SetCurrentDirectoryA(tmpdir); rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, - NULL, path_find_file_name(argv0), params, NULL, NULL); - todo_wine ok(rc == SE_ERR_FNF, "%s returned %lu\n", shell_call, rc); + NULL, "test2.exe", params, NULL, NULL); + ok(rc > 32, "%s returned %lu\n", shell_call, rc); + okChildInt("argcA", 4); + okChildString("argvA3", "Exec"); + todo_wine okChildPath("longPath", path); + SetCurrentDirectoryA(curdir); + + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, + NULL, "test2.exe", params, NULL, NULL); + ok(rc == SE_ERR_FNF, "%s returned %lu\n", shell_call, rc); + + /* Explicitly specify the directory to use */ + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, + NULL, "test2.exe", params, tmpdir, NULL); + ok(rc > 32, "%s returned %lu\n", shell_call, rc); + okChildInt("argcA", 4); + okChildString("argvA3", "Exec"); + todo_wine okChildPath("longPath", path); + /* Specify it through an environment variable */ rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, - NULL, path_find_file_name(argv0), params, newdir, NULL); + NULL, "test2.exe", params, "%TMPDIR%", NULL); + todo_wine ok(rc == SE_ERR_FNF, "%s returned %lu\n", shell_call, rc); + + rc=shell_execute_ex(SEE_MASK_DOENVSUBST|SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, + NULL, "test2.exe", params, "%TMPDIR%", NULL); ok(rc > 32, "%s returned %lu\n", shell_call, rc); okChildInt("argcA", 4); okChildString("argvA3", "Exec"); todo_wine okChildPath("longPath", path); - DeleteFile(path); - RemoveDirectoryA(newdir); + /* Not a colon-separated directory list */ + sprintf(dirpath, "%s:%s", curdir, tmpdir); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, + NULL, "test2.exe", params, dirpath, NULL); + ok(rc == SE_ERR_FNF, "%s returned %lu\n", shell_call, rc); } START_TEST(shlexec)

1 0

Francois Gouget : shell32: Fix ShellExecute()'s handling of file URLs.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 53e4ddc399cef1f044fb25bdb19a478ced6178d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53e4ddc399cef1f044fb25bdb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 10 00:54:07 2012 +0200 shell32: Fix ShellExecute()'s handling of file URLs. --- dlls/shell32/shlexec.c | 46 +++++++++++++++++++++++++---------------- dlls/shell32/tests/shlexec.c | 46 ++++++++++++++++++++++------------------- 2 files changed, 53 insertions(+), 39 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index a714fe8..5799ab0 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1504,7 +1504,7 @@ static UINT_PTR SHELL_quote_and_execute( LPCWSTR wcmd, LPCWSTR wszParameters, LP return retval; } -static UINT_PTR SHELL_execute_url( LPCWSTR lpFile, LPCWSTR wFile, LPCWSTR wcmd, LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out, SHELL_ExecuteW32 execfunc ) +static UINT_PTR SHELL_execute_url( LPCWSTR lpFile, LPCWSTR wcmd, LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out, SHELL_ExecuteW32 execfunc ) { static const WCHAR wShell[] = {'\\','s','h','e','l','l','\\',0}; static const WCHAR wCommand[] = {'\\','c','o','m','m','a','n','d',0}; @@ -1534,13 +1534,6 @@ static UINT_PTR SHELL_execute_url( LPCWSTR lpFile, LPCWSTR wFile, LPCWSTR wcmd, strcatW(lpstrProtocol, psei->lpVerb && *psei->lpVerb ? psei->lpVerb: wszOpen); strcatW(lpstrProtocol, wCommand); - /* Remove File Protocol from lpFile */ - /* In the case file://path/file */ - if (!strncmpiW(lpFile, wFile, iSize)) - { - lpFile += iSize; - while (*lpFile == ':') lpFile++; - } retval = execute_from_key(lpstrProtocol, lpFile, NULL, psei->lpParameters, wcmd, execfunc, psei, psei_out); HeapFree(GetProcessHeap(), 0, lpstrProtocol); @@ -1567,7 +1560,6 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) { static const WCHAR wSpace[] = {' ',0}; static const WCHAR wWww[] = {'w','w','w',0}; - static const WCHAR wFile[] = {'f','i','l','e',0}; static const WCHAR wHttp[] = {'h','t','t','p',':','/','/',0}; static const DWORD unsupportedFlags = SEE_MASK_INVOKEIDLIST | SEE_MASK_ICON | SEE_MASK_HOTKEY | @@ -1724,21 +1716,39 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) dwApplicationNameLen ); } - /* expand environment strings */ - len = ExpandEnvironmentStringsW(sei_tmp.lpFile, NULL, 0); - if (len>0) + /* convert file URLs */ + if (UrlIsFileUrlW(sei_tmp.lpFile)) { LPWSTR buf; - buf = HeapAlloc(GetProcessHeap(),0,(len+1)*sizeof(WCHAR)); + DWORD size; + + size = MAX_PATH; + buf = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (FAILED(PathCreateFromUrlW(sei_tmp.lpFile, buf, &size, 0))) + return SE_ERR_OOM; - ExpandEnvironmentStringsW(sei_tmp.lpFile, buf, len+1); HeapFree(GetProcessHeap(), 0, wszApplicationName); - dwApplicationNameLen = len+1; + dwApplicationNameLen = lstrlenW(buf) + 1; wszApplicationName = buf; - /* appKnownSingular unmodified */ - sei_tmp.lpFile = wszApplicationName; } + else /* or expand environment strings (not both!) */ + { + len = ExpandEnvironmentStringsW(sei_tmp.lpFile, NULL, 0); + if (len>0) + { + LPWSTR buf; + buf = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); + + ExpandEnvironmentStringsW(sei_tmp.lpFile, buf, len + 1); + HeapFree(GetProcessHeap(), 0, wszApplicationName); + dwApplicationNameLen = len + 1; + wszApplicationName = buf; + /* appKnownSingular unmodified */ + + sei_tmp.lpFile = wszApplicationName; + } + } if (*sei_tmp.lpDirectory) { @@ -1889,7 +1899,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) } else if (PathIsURLW(lpFile)) /* File not found, check for URL */ { - retval = SHELL_execute_url( lpFile, wFile, wcmd, &sei_tmp, sei, execfunc ); + retval = SHELL_execute_url( lpFile, wcmd, &sei_tmp, sei, execfunc ); } /* Check if file specified is in the form www.??????.*** */ else if (!strncmpiW(lpFile, wWww, 3)) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 8d164a6..e3d5676 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1637,34 +1637,37 @@ typedef struct static fileurl_tests_t fileurl_tests[]= { /* How many slashes does it take... */ - {"file:", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, - {"file:/", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, - {"file://", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, - {"file:///", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, - {"File:///", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, - {"file:////", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, - {"file://///", "%s\\test file.shlexec", 0, 0x1}, + {"file:", "%s\\test file.shlexec", URL_SUCCESS, 0}, + {"file:/", "%s\\test file.shlexec", URL_SUCCESS, 0}, + {"file://", "%s\\test file.shlexec", URL_SUCCESS, 0}, + {"file:///", "%s\\test file.shlexec", URL_SUCCESS, 0}, + {"File:///", "%s\\test file.shlexec", URL_SUCCESS, 0}, + {"file:////", "%s\\test file.shlexec", URL_SUCCESS, 0}, + {"file://///", "%s\\test file.shlexec", 0, 0}, /* Test with Windows-style paths */ - {"file:///", "%s\\test file.shlexec", URL_SUCCESS | USE_COLON, 0x1}, - {"file:///", "%s\\test file.shlexec", URL_SUCCESS | USE_BSLASH, 0x1}, + {"file:///", "%s\\test file.shlexec", URL_SUCCESS | USE_COLON, 0}, + {"file:///", "%s\\test file.shlexec", URL_SUCCESS | USE_BSLASH, 0}, /* Check handling of hostnames */ - {"file://localhost/", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, - {"file://localhost:80/", "%s\\test file.shlexec", 0, 0x1}, - {"file://LocalHost/", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, - {"file://127.0.0.1/", "%s\\test file.shlexec", 0, 0x1}, - {"file://::1/", "%s\\test file.shlexec", 0, 0x1}, - {"file://notahost/", "%s\\test file.shlexec", 0, 0x1}, + {"file://localhost/", "%s\\test file.shlexec", URL_SUCCESS, 0}, + {"file://localhost:80/", "%s\\test file.shlexec", 0, 0}, + {"file://LocalHost/", "%s\\test file.shlexec", URL_SUCCESS, 0}, + {"file://127.0.0.1/", "%s\\test file.shlexec", 0, 0}, + {"file://::1/", "%s\\test file.shlexec", 0, 0}, + {"file://notahost/", "%s\\test file.shlexec", 0, 0}, /* Environment variables are not expanded in URLs */ {"%urlprefix%", "%s\\test file.shlexec", 0, 0x1}, - {"file:///", "%s\\%%urlenvvar%% file.shlexec", 0, 0x1}, + {"file:///", "%%TMPDIR%%\\test file.shlexec", 0, 0}, + + /* Test shortcuts vs. URLs */ + {"file://///", "%s\\test_shortcut_shlexec.lnk", 0, 0x1d}, {NULL, NULL, 0, 0} }; -static void test_fileurl(void) +static void test_fileurls(void) { char filename[MAX_PATH], fileurl[MAX_PATH], longtmpdir[MAX_PATH]; char command[MAX_PATH]; @@ -1681,7 +1684,6 @@ static void test_fileurl(void) get_long_path_name(tmpdir, longtmpdir, sizeof(longtmpdir)/sizeof(*longtmpdir)); SetEnvironmentVariable("urlprefix", "file:///"); - SetEnvironmentVariable("urlenvvar", "test"); test=fileurl_tests; while (test->basename) @@ -1705,7 +1707,10 @@ static void test_fileurl(void) ok(rc == SE_ERR_FNF, "FindExecutable(%s) failed: bad rc=%lu\n", fileurl, rc); /* Then ShellExecute() */ - rc = shell_execute(NULL, fileurl, NULL, NULL); + if ((test->todo & 0x10) == 0) + rc = shell_execute(NULL, fileurl, NULL, NULL); + else todo_wait + rc = shell_execute(NULL, fileurl, NULL, NULL); if (bad_shellexecute) { win_skip("shell32 is too old (likely 4.72). Skipping the file URL tests\n"); @@ -1750,7 +1755,6 @@ static void test_fileurl(void) } SetEnvironmentVariable("urlprefix", NULL); - SetEnvironmentVariable("urlenvvar", NULL); } static void test_find_executable(void) @@ -2639,7 +2643,7 @@ START_TEST(shlexec) test_argify(); test_lpFile_parsed(); test_filename(); - test_fileurl(); + test_fileurls(); test_find_executable(); test_lnks(); test_exes();

1 0

Alexandre Julliard : user32: Don' t use the window surface when the pixel format was set.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 77b9ec8cd6079bb4602f002a4a25003b551ab46b URL: http://source.winehq.org/git/wine.git/?a=commit;h=77b9ec8cd6079bb4602f002a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 10 12:46:14 2012 +0200 user32: Don't use the window surface when the pixel format was set. --- dlls/user32/painting.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 2a634fb..7d106bb 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -165,7 +165,8 @@ static void update_visible_region( struct dce *dce ) if ((win = WIN_GetPtr( top_win )) && win != WND_DESKTOP && win != WND_OTHER_PROCESS) { - surface = win->surface; + /* don't use a surface to paint the client area of OpenGL windows */ + if (!win->pixel_format || (flags & DCX_WINDOW)) surface = win->surface; if (surface) window_surface_add_ref( surface ); WIN_ReleasePtr( win ); }

1 0

Alexandre Julliard : winex11: Create a surface even for OpenGL windows, to allow painting the non-client area.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 47983d819fddb566883e8d45c631a714f7ab8922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47983d819fddb566883e8d45c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 10 12:46:37 2012 +0200 winex11: Create a surface even for OpenGL windows, to allow painting the non-client area. --- dlls/winex11.drv/opengl.c | 14 -------------- dlls/winex11.drv/window.c | 1 - dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b19f334..ac6f953 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1114,15 +1114,6 @@ static void release_gl_drawable( struct gl_drawable *gl ) if (gl) LeaveCriticalSection( &context_section ); } -BOOL has_gl_drawable( HWND hwnd ) -{ - struct gl_drawable *gl; - - gl = get_gl_drawable( hwnd, 0 ); - release_gl_drawable( gl ); - return gl != NULL; -} - static GLXContext create_glxcontext(Display *display, struct wgl_context *context, GLXContext shareList) { GLXContext ctx; @@ -3081,11 +3072,6 @@ struct opengl_funcs *get_glx_driver( UINT version ) return NULL; } -BOOL has_gl_drawable( HWND hwnd ) -{ - return FALSE; -} - void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_rect ) { } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 386db2c..b0fc9a0 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2060,7 +2060,6 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag if (data->embedded) goto done; if (data->whole_window == root_window) goto done; - if (has_gl_drawable( hwnd )) goto done; if (!client_side_graphics && !layered) goto done; surface_rect = get_surface_rect( visible_rect ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8e114a2..2f34098 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -567,7 +567,6 @@ extern void release_win_data( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern Window X11DRV_get_whole_window( HWND hwnd ) DECLSPEC_HIDDEN; extern XIC X11DRV_get_ic( HWND hwnd ) DECLSPEC_HIDDEN; -extern BOOL has_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN; extern void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_rect ) DECLSPEC_HIDDEN; extern void destroy_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN;

1 0

Francois Gouget : testbot/build: Tweak $PATH to make use of ccache if present.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: tools Branch: master Commit: cce423b4e075b12c10fc26fffe60cf9f5e28f736 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cce423b4e075b12c10fc26ff… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 10 01:13:42 2012 +0200 testbot/build: Tweak $PATH to make use of ccache if present. Remove /usr/local/mingw, it's unneeded. --- testbot/bin/BuildSingleTest.pl | 2 +- testbot/bin/Reconfig.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/BuildSingleTest.pl b/testbot/bin/BuildSingleTest.pl index 52ff8ba..a8adc4e 100755 --- a/testbot/bin/BuildSingleTest.pl +++ b/testbot/bin/BuildSingleTest.pl @@ -253,7 +253,7 @@ sub BuildTestExecutable return 1; } -$ENV{PATH} = "/usr/bin:/bin:/usr/local/mingw/bin:/usr/local/mingw64/bin"; +$ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; delete $ENV{ENV}; # Start with clean logfile diff --git a/testbot/bin/Reconfig.pl b/testbot/bin/Reconfig.pl index 2a75e6f..f2e07a3 100755 --- a/testbot/bin/Reconfig.pl +++ b/testbot/bin/Reconfig.pl @@ -103,7 +103,7 @@ sub BuildCross return 1; } -$ENV{PATH} = "/usr/bin:/bin:/usr/local/mingw/bin:/usr/local/mingw64/bin"; +$ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; delete $ENV{ENV}; # Start with clean logfile

1 0

Francois Gouget : testbot/build: Automatically use all the CPUs for builds.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: tools Branch: master Commit: 64f949e902377278c6882c2b356eb66368b87d02 URL: http://source.winehq.org/git/tools.git/?a=commit;h=64f949e902377278c6882c2b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 10 01:14:43 2012 +0200 testbot/build: Automatically use all the CPUs for builds. --- testbot/bin/BuildSingleTest.pl | 22 ++++++++++++++++++---- testbot/bin/Reconfig.pl | 26 ++++++++++++++++++++------ 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/testbot/bin/BuildSingleTest.pl b/testbot/bin/BuildSingleTest.pl index a8adc4e..af28f88 100755 --- a/testbot/bin/BuildSingleTest.pl +++ b/testbot/bin/BuildSingleTest.pl @@ -148,6 +148,18 @@ sub ApplyPatch $NeedConfigure); } +my $ncpus; +sub CountCPUs() +{ + if (open(my $fh, "<", "/proc/cpuinfo")) + { + # Linux + map { $ncpus++ if (/^processor/); } <$fh>; + close($fh); + } + $ncpus ||= 1; +} + sub BuildTestExecutable { my ($BaseName, $PatchType, $Bits, $NeedConfigure, $NeedMakefile, @@ -178,7 +190,7 @@ sub BuildTestExecutable return !1; } - system("make -C $DataDir/build-mingw${Bits}/include " . + system("make -j$ncpus -C $DataDir/build-mingw${Bits}/include " . ">> $LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { @@ -197,7 +209,7 @@ sub BuildTestExecutable } else { - system("make -C $DataDir/build-mingw${Bits}/$PatchType/$BaseName " . + system("make -j$ncpus -C $DataDir/build-mingw${Bits}/$PatchType/$BaseName " . "lib$BaseName.a >> $LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { @@ -220,7 +232,7 @@ sub BuildTestExecutable if ($NeedBuildDeps) { InfoMsg "Making build dependencies\n"; - system("cd $DataDir/build-mingw${Bits}; make __builddeps__ >> $LogDir/BuildSingleTest.log 2>&1"); + system("cd $DataDir/build-mingw${Bits}; make -j$ncpus __builddeps__ >> $LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Making build dependencies failed\n"; @@ -238,7 +250,7 @@ sub BuildTestExecutable unlink($TestExecutable); InfoMsg "Making test executable\n"; - system("make -C $TestsDir >> $LogDir/BuildSingleTest.log 2>&1"); + system("make -j$ncpus -C $TestsDir >> $LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Make failed\n"; @@ -334,6 +346,8 @@ if ($NeedMakefile < 0) exit(1); } +CountCPUs(); + if ($Run32 && ! BuildTestExecutable($BaseName, $PatchType, 32, $NeedConfigure, 0 < $NeedMakefile, $NeedMakeInclude, $NeedBuildDeps, diff --git a/testbot/bin/Reconfig.pl b/testbot/bin/Reconfig.pl index f2e07a3..fe789f0 100755 --- a/testbot/bin/Reconfig.pl +++ b/testbot/bin/Reconfig.pl @@ -63,15 +63,27 @@ sub GitPull return 1; } +my $ncpus; +sub CountCPUs() +{ + if (open(my $fh, "<", "/proc/cpuinfo")) + { + # Linux + map { $ncpus++ if (/^processor/); } <$fh>; + close($fh); + } + $ncpus ||= 1; +} + sub BuildNative { mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); system("cd $DataDir/build-native && " . "rm -rf * && " . "../wine-git/configure --enable-win64 --without-x --without-freetype " . - ">> $LogDir/Reconfig.log 2>&1 &&" . - "make depend >> $LogDir/Reconfig.log 2>&1 &&" . - "make __tooldeps__ >> $LogDir/Reconfig.log 2>&1"); + ">> $LogDir/Reconfig.log 2>&1 && " . + "make -j$ncpus depend >> $LogDir/Reconfig.log 2>&1 && " . + "make -j$ncpus __tooldeps__ >> $LogDir/Reconfig.log 2>&1"); if ($? != 0) { @@ -91,9 +103,9 @@ sub BuildCross system("cd $DataDir/build-mingw$Bits && " . "rm -rf * && " . "../wine-git/configure --host=$Host --with-wine-tools=../build-native " . - "--without-x --without-freetype >> $LogDir/Reconfig.log 2>&1 &&" . - "make depend >> $LogDir/Reconfig.log 2>&1 &&" . - "make programs/winetest >> $LogDir/Reconfig.log 2>&1"); + "--without-x --without-freetype >> $LogDir/Reconfig.log 2>&1 && " . + "make -j$ncpus depend >> $LogDir/Reconfig.log 2>&1 && " . + "make -j$ncpus programs/winetest >> $LogDir/Reconfig.log 2>&1"); if ($? != 0) { LogMsg "Build cross ($Bits bits) failed\n"; @@ -114,6 +126,8 @@ if (! GitPull()) exit(1); } +CountCPUs(); + if (! BuildNative()) { exit(1);

1 0