wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Alexandre Julliard : explorer: Specify the full application path when starting winefile.exe.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 781fcd469169a4ad48ebd06d9d32d8360acd3be4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=781fcd469169a4ad48ebd06d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 11:22:51 2009 +0100 explorer: Specify the full application path when starting winefile.exe. --- programs/explorer/explorer.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index c8c3ea0..16dcf72 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -151,6 +151,7 @@ int WINAPI wWinMain(HINSTANCE hinstance, BOOL rc; static const WCHAR winefile[] = {'\\','w','i','n','e','f','i','l','e','.','e','x','e',0}; static const WCHAR space[] = {' ',0}; + WCHAR app[MAX_PATH]; LPWSTR winefile_commandline = NULL; DWORD len = 0; @@ -164,8 +165,9 @@ int WINAPI wWinMain(HINSTANCE hinstance, else if (parameters.root[0]) len += lstrlenW(parameters.root) + 3; winefile_commandline = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); - GetSystemDirectoryW( winefile_commandline, len ); - lstrcatW(winefile_commandline,winefile); + GetSystemDirectoryW( app, MAX_PATH - sizeof(winefile)/sizeof(WCHAR) ); + strcatW( app, winefile ); + strcpyW( winefile_commandline, app ); if (parameters.selection[0]) { @@ -183,7 +185,7 @@ int WINAPI wWinMain(HINSTANCE hinstance, } } - rc = CreateProcessW(NULL, winefile_commandline, NULL, NULL, FALSE, 0, NULL, + rc = CreateProcessW(app, winefile_commandline, NULL, NULL, FALSE, 0, NULL, parameters.root[0] ? parameters.root:NULL, &si, &info); HeapFree(GetProcessHeap(),0,winefile_commandline);

1 0

Alexandre Julliard : user32: Specify the full application path when starting builtin apps.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 5950c6af807da53fa80c53cbb308901df45fbc8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5950c6af807da53fa80c53cbb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 11:22:38 2009 +0100 user32: Specify the full application path when starting builtin apps. --- dlls/user32/user_main.c | 8 +++++--- dlls/user32/win.c | 20 ++++++++++++-------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 516338c..ce55ff7 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -354,12 +354,14 @@ BOOL WINAPI ExitWindowsEx( UINT flags, DWORD reason ) static const WCHAR forceW[] = { ' ','-','-','f','o','r','c','e',0 }; static const WCHAR shutdownW[] = { ' ','-','-','s','h','u','t','d','o','w','n',0 }; + WCHAR app[MAX_PATH]; WCHAR cmdline[MAX_PATH + 64]; PROCESS_INFORMATION pi; STARTUPINFOW si; - GetSystemDirectoryW( cmdline, MAX_PATH ); - lstrcatW( cmdline, winebootW ); + GetSystemDirectoryW( app, MAX_PATH - sizeof(winebootW)/sizeof(WCHAR) ); + strcatW( app, winebootW ); + strcpyW( cmdline, app ); if (flags & EWX_FORCE) lstrcatW( cmdline, killW ); else @@ -371,7 +373,7 @@ BOOL WINAPI ExitWindowsEx( UINT flags, DWORD reason ) memset( &si, 0, sizeof si ); si.cb = sizeof si; - if (!CreateProcessW( NULL, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi )) + if (!CreateProcessW( app, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi )) { ERR( "Failed to run %s\n", debugstr_w(cmdline) ); return FALSE; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index d6746b0..9e42ff8 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1852,11 +1852,13 @@ HWND WINAPI GetDesktopWindow(void) if (!GetUserObjectInformationW( GetProcessWindowStation(), UOI_FLAGS, &flags, sizeof(flags), NULL ) || (flags.dwFlags & WSF_VISIBLE)) { - static const WCHAR command_line[] = {'\\','e','x','p','l','o','r','e','r','.','e','x','e',' ','/','d','e','s','k','t','o','p',0}; + static const WCHAR explorer[] = {'\\','e','x','p','l','o','r','e','r','.','e','x','e',0}; + static const WCHAR args[] = {' ','/','d','e','s','k','t','o','p',0}; STARTUPINFOW si; PROCESS_INFORMATION pi; - WCHAR systemdir[MAX_PATH]; - WCHAR cmdline[MAX_PATH + sizeof(command_line)/sizeof(WCHAR)]; + WCHAR windir[MAX_PATH]; + WCHAR app[MAX_PATH + sizeof(explorer)/sizeof(WCHAR)]; + WCHAR cmdline[MAX_PATH + (sizeof(explorer) + sizeof(args))/sizeof(WCHAR)]; memset( &si, 0, sizeof(si) ); si.cb = sizeof(si); @@ -1865,11 +1867,13 @@ HWND WINAPI GetDesktopWindow(void) si.hStdOutput = 0; si.hStdError = GetStdHandle( STD_ERROR_HANDLE ); - GetSystemDirectoryW( systemdir, MAX_PATH ); - lstrcpyW( cmdline, systemdir ); - lstrcatW( cmdline, command_line ); - if (CreateProcessW( NULL, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, - NULL, systemdir, &si, &pi )) + GetWindowsDirectoryW( windir, MAX_PATH ); + strcpyW( app, windir ); + strcatW( app, explorer ); + strcpyW( cmdline, app ); + strcatW( cmdline, args ); + if (CreateProcessW( app, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, + NULL, windir, &si, &pi )) { TRACE( "started explorer pid %04x tid %04x\n", pi.dwProcessId, pi.dwThreadId ); WaitForInputIdle( pi.hProcess, 10000 );

1 0

Alexandre Julliard : shdocvw: Specify the full application path when starting winemenubuilder.exe.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 0856f774704b33db2f016805803333c549e731f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0856f774704b33db2f0168058… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 11:22:32 2009 +0100 shdocvw: Specify the full application path when starting winemenubuilder.exe. --- dlls/shdocvw/intshcut.c | 37 +++++++++++++++++++++++++++++-------- 1 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/shdocvw/intshcut.c b/dlls/shdocvw/intshcut.c index 86bc543..b389ec3 100644 --- a/dlls/shdocvw/intshcut.c +++ b/dlls/shdocvw/intshcut.c @@ -65,32 +65,35 @@ static inline InternetShortcut* impl_from_IPersistFile(IPersistFile *iface) return (InternetShortcut*)((char*)iface - FIELD_OFFSET(InternetShortcut, persistFile)); } -static BOOL StartLinkProcessor(LPCOLESTR szLink) +static BOOL run_winemenubuilder( const WCHAR *args ) { - static const WCHAR szFormat[] = { - 'w','i','n','e','m','e','n','u','b','u','i','l','d','e','r','.','e','x','e', - ' ','-','w',' ','-','u',' ','"','%','s','"',0 }; + static const WCHAR menubuilder[] = {'\\','w','i','n','e','m','e','n','u','b','u','i','l','d','e','r','.','e','x','e',0}; LONG len; LPWSTR buffer; STARTUPINFOW si; PROCESS_INFORMATION pi; BOOL ret; + WCHAR app[MAX_PATH]; - len = sizeof(szFormat) + lstrlenW( szLink ) * sizeof(WCHAR); + GetSystemDirectoryW( app, MAX_PATH - sizeof(menubuilder)/sizeof(WCHAR) ); + strcatW( app, menubuilder ); + + len = (strlenW( app ) + strlenW( args ) + 1) * sizeof(WCHAR); buffer = heap_alloc( len ); if( !buffer ) return FALSE; - wsprintfW( buffer, szFormat, szLink ); + strcpyW( buffer, app ); + strcatW( buffer, args ); TRACE("starting %s\n",debugstr_w(buffer)); memset(&si, 0, sizeof(si)); si.cb = sizeof(si); - ret = CreateProcessW( NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); + ret = CreateProcessW( app, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); - HeapFree( GetProcessHeap(), 0, buffer ); + heap_free( buffer ); if (ret) { @@ -101,6 +104,24 @@ static BOOL StartLinkProcessor(LPCOLESTR szLink) return ret; } +static BOOL StartLinkProcessor( LPCOLESTR szLink ) +{ + static const WCHAR szFormat[] = { ' ','-','w',' ','-','u',' ','"','%','s','"',0 }; + LONG len; + LPWSTR buffer; + BOOL ret; + + len = sizeof(szFormat) + lstrlenW( szLink ) * sizeof(WCHAR); + buffer = heap_alloc( len ); + if( !buffer ) + return FALSE; + + wsprintfW( buffer, szFormat, szLink ); + ret = run_winemenubuilder( buffer ); + heap_free( buffer ); + return ret; +} + /* interface functions */ static HRESULT Unknown_QueryInterface(InternetShortcut *This, REFIID riid, PVOID *ppvObject)

1 0

Alexandre Julliard : shell32: Specify the full application path when starting winemenubuilder.exe.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: d72e7af9b1883c5632e794d934da3bf187217d49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d72e7af9b1883c5632e794d93… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 11:21:34 2009 +0100 shell32: Specify the full application path when starting winemenubuilder.exe. --- dlls/shell32/changenotify.c | 30 +++--------------------------- dlls/shell32/shell32_main.h | 2 ++ dlls/shell32/shelllink.c | 35 ++++++++++++++++++++++++++++------- 3 files changed, 33 insertions(+), 34 deletions(-) diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 43a5fb8..96ffd99 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -105,31 +105,6 @@ static const char * DumpEvent( LONG event ) #undef DUMPEV } -static BOOL RefreshFileTypeAssociations(void) -{ - static WCHAR szWinemenubuilder[] = { - 'w','i','n','e','m','e','n','u','b','u','i','l','d','e','r','.','e','x','e', - ' ','-','a',0 }; - STARTUPINFOW si; - PROCESS_INFORMATION pi; - BOOL ret; - - TRACE("starting %s\n",debugstr_w(szWinemenubuilder)); - - memset(&si, 0, sizeof(si)); - si.cb = sizeof(si); - - ret = CreateProcessW( NULL, szWinemenubuilder, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); - - if (ret) - { - CloseHandle( pi.hProcess ); - CloseHandle( pi.hThread ); - } - - return ret; -} - static const char * NodeName(const NOTIFICATIONLIST *item) { const char *str; @@ -425,10 +400,11 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID if (wEventId & SHCNE_ASSOCCHANGED) { + static const WCHAR args[] = {' ','-','a',0 }; TRACE("refreshing file type associations\n"); - RefreshFileTypeAssociations(); + run_winemenubuilder( args ); } - + /* if we allocated it, free it. The ANSI flag is also set in its Unicode sibling. */ if ((typeFlag & SHCNF_PATHA) || (typeFlag & SHCNF_PRINTERA)) { diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 12d50e2..16fb4a5 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -197,6 +197,8 @@ BOOL UNIXFS_is_rooted_at_desktop(void); extern const GUID CLSID_UnixFolder; extern const GUID CLSID_UnixDosFolder; +extern BOOL run_winemenubuilder( const WCHAR *args ); + /* Default shell folder value registration */ HRESULT SHELL_RegisterShellFolders(void); diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 231c72c..414cc54 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -395,30 +395,33 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFile return r; } -static BOOL StartLinkProcessor( LPCOLESTR szLink ) +BOOL run_winemenubuilder( const WCHAR *args ) { - static const WCHAR szFormat[] = { - 'w','i','n','e','m','e','n','u','b','u','i','l','d','e','r','.','e','x','e', - ' ','-','w',' ','"','%','s','"',0 }; + static const WCHAR menubuilder[] = {'\\','w','i','n','e','m','e','n','u','b','u','i','l','d','e','r','.','e','x','e',0}; LONG len; LPWSTR buffer; STARTUPINFOW si; PROCESS_INFORMATION pi; BOOL ret; + WCHAR app[MAX_PATH]; - len = sizeof(szFormat) + lstrlenW( szLink ) * sizeof(WCHAR); + GetSystemDirectoryW( app, MAX_PATH - sizeof(menubuilder)/sizeof(WCHAR) ); + strcatW( app, menubuilder ); + + len = (strlenW( app ) + strlenW( args ) + 1) * sizeof(WCHAR); buffer = HeapAlloc( GetProcessHeap(), 0, len ); if( !buffer ) return FALSE; - wsprintfW( buffer, szFormat, szLink ); + strcpyW( buffer, app ); + strcatW( buffer, args ); TRACE("starting %s\n",debugstr_w(buffer)); memset(&si, 0, sizeof(si)); si.cb = sizeof(si); - ret = CreateProcessW( NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); + ret = CreateProcessW( app, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); HeapFree( GetProcessHeap(), 0, buffer ); @@ -431,6 +434,24 @@ static BOOL StartLinkProcessor( LPCOLESTR szLink ) return ret; } +static BOOL StartLinkProcessor( LPCOLESTR szLink ) +{ + static const WCHAR szFormat[] = {' ','-','w',' ','"','%','s','"',0 }; + LONG len; + LPWSTR buffer; + BOOL ret; + + len = sizeof(szFormat) + lstrlenW( szLink ) * sizeof(WCHAR); + buffer = HeapAlloc( GetProcessHeap(), 0, len ); + if( !buffer ) + return FALSE; + + wsprintfW( buffer, szFormat, szLink ); + ret = run_winemenubuilder( buffer ); + HeapFree( GetProcessHeap(), 0, buffer ); + return ret; +} + static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFileName, BOOL fRemember) { IShellLinkImpl *This = impl_from_IPersistFile(iface);

1 0

Alexandre Julliard : rpcrt4: Specify the full application path when starting rpcss.exe.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: c4ebf3687b6964a95f0b2d474f47c928bb2abcbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4ebf3687b6964a95f0b2d474… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 11:20:42 2009 +0100 rpcrt4: Specify the full application path when starting rpcss.exe. --- dlls/rpcrt4/rpc_epmap.c | 22 +++++----------------- 1 files changed, 5 insertions(+), 17 deletions(-) diff --git a/dlls/rpcrt4/rpc_epmap.c b/dlls/rpcrt4/rpc_epmap.c index 60c4255..c1b8d1d 100644 --- a/dlls/rpcrt4/rpc_epmap.c +++ b/dlls/rpcrt4/rpc_epmap.c @@ -79,30 +79,18 @@ static BOOL start_rpcss(void) { PROCESS_INFORMATION pi; STARTUPINFOW si; - static WCHAR cmd[6]; - static const WCHAR rpcss[] = {'r','p','c','s','s',0}; + WCHAR cmd[MAX_PATH]; + static const WCHAR rpcss[] = {'\\','r','p','c','s','s','.','e','x','e',0}; BOOL rslt; TRACE("\n"); - ZeroMemory(&pi, sizeof(PROCESS_INFORMATION)); ZeroMemory(&si, sizeof(STARTUPINFOA)); si.cb = sizeof(STARTUPINFOA); + GetSystemDirectoryW( cmd, MAX_PATH - sizeof(rpcss)/sizeof(WCHAR) ); + lstrcatW( cmd, rpcss ); - memcpy(cmd, rpcss, sizeof(rpcss)); - - rslt = CreateProcessW( - NULL, /* executable */ - cmd, /* command line */ - NULL, /* process security attributes */ - NULL, /* primary thread security attributes */ - FALSE, /* inherit handles */ - 0, /* creation flags */ - NULL, /* use parent's environment */ - NULL, /* use parent's current directory */ - &si, /* STARTUPINFO pointer */ - &pi /* PROCESS_INFORMATION */ - ); + rslt = CreateProcessW( cmd, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); if (rslt) {

1 0

Alexandre Julliard : ole32: Specify the full application path when starting rpcss.exe.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 0beaa44d7d0de6f15306257b40bed5bae4b6b60f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0beaa44d7d0de6f15306257b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 11:20:34 2009 +0100 ole32: Specify the full application path when starting rpcss.exe. --- dlls/ole32/moniker.c | 22 +++++----------------- 1 files changed, 5 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index f65fe8f..a7c5a11 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -124,30 +124,18 @@ static BOOL start_rpcss(void) { PROCESS_INFORMATION pi; STARTUPINFOW si; - static WCHAR cmd[6]; - static const WCHAR rpcss[] = {'r','p','c','s','s',0}; + WCHAR cmd[MAX_PATH]; + static const WCHAR rpcss[] = {'\\','r','p','c','s','s','.','e','x','e',0}; BOOL rslt; TRACE("\n"); - ZeroMemory(&pi, sizeof(PROCESS_INFORMATION)); ZeroMemory(&si, sizeof(STARTUPINFOA)); si.cb = sizeof(STARTUPINFOA); + GetSystemDirectoryW( cmd, MAX_PATH - sizeof(rpcss)/sizeof(WCHAR) ); + strcatW( cmd, rpcss ); - memcpy(cmd, rpcss, sizeof(rpcss)); - - rslt = CreateProcessW( - NULL, /* executable */ - cmd, /* command line */ - NULL, /* process security attributes */ - NULL, /* primary thread security attributes */ - FALSE, /* inherit handles */ - 0, /* creation flags */ - NULL, /* use parent's environment */ - NULL, /* use parent's current directory */ - &si, /* STARTUPINFO pointer */ - &pi /* PROCESS_INFORMATION */ - ); + rslt = CreateProcessW( cmd, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); if (rslt) {

1 0

Henri Verbeet : wined3d: Restore the thread' s previous GL context in WineD3D_ReleaseFakeGLContext().
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 30d2660d99d7a4c38088a439c3ba2ebc258f09d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30d2660d99d7a4c38088a439c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 27 10:10:43 2009 +0100 wined3d: Restore the thread's previous GL context in WineD3D_ReleaseFakeGLContext(). --- dlls/wined3d/directx.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ffd3301..2640aa6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -217,6 +217,8 @@ struct wined3d_fake_gl_ctx HDC dc; HWND wnd; HGLRC gl_ctx; + HDC restore_dc; + HGLRC restore_gl_ctx; }; static void WineD3D_ReleaseFakeGLContext(struct wined3d_fake_gl_ctx *ctx) @@ -236,6 +238,11 @@ static void WineD3D_ReleaseFakeGLContext(struct wined3d_fake_gl_ctx *ctx) ReleaseDC(ctx->wnd, ctx->dc); DestroyWindow(ctx->wnd); + + if (ctx->restore_gl_ctx && !pwglMakeCurrent(ctx->restore_dc, ctx->restore_gl_ctx)) + { + ERR_(d3d_caps)("Failed to restore previous GL context.\n"); + } } static BOOL WineD3D_CreateFakeGLContext(struct wined3d_fake_gl_ctx *ctx) @@ -245,6 +252,9 @@ static BOOL WineD3D_CreateFakeGLContext(struct wined3d_fake_gl_ctx *ctx) TRACE("getting context...\n"); + ctx->restore_dc = pwglGetCurrentDC(); + ctx->restore_gl_ctx = pwglGetCurrentContext(); + /* We need a fake window as a hdc retrieved using GetDC(0) can't be used for much GL purposes. */ ctx->wnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", WS_OVERLAPPEDWINDOW, 10, 10, 10, 10, NULL, NULL, NULL, NULL); @@ -309,6 +319,10 @@ fail: ctx->dc = NULL; if (ctx->wnd) DestroyWindow(ctx->wnd); ctx->wnd = NULL; + if (ctx->restore_gl_ctx && !pwglMakeCurrent(ctx->restore_dc, ctx->restore_gl_ctx)) + { + ERR_(d3d_caps)("Failed to restore previous GL context.\n"); + } return FALSE; }

1 0

Henri Verbeet : wined3d: Restore the wglMakeCurrent() call in context_destroy_gl_resources().
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 94509f85b563e20ba9be791522f58b1a22a160cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=94509f85b563e20ba9be79152… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 27 10:10:42 2009 +0100 wined3d: Restore the wglMakeCurrent() call in context_destroy_gl_resources(). e3ca576576c46131330353f45990f55045cf7541 removed this call because we don't need it to tell if the context is valid, but we still need it to actually make the context current. --- dlls/wined3d/context.c | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d4fb7fd..2cbac67 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -641,6 +641,18 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource } } +static void context_validate(struct wined3d_context *context) +{ + HWND wnd = WindowFromDC(context->hdc); + + if (wnd != context->win_handle) + { + WARN("DC %p belongs to window %p instead of %p.\n", + context->hdc, wnd, context->win_handle); + context->valid = 0; + } +} + static void context_destroy_gl_resources(struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -648,6 +660,9 @@ static void context_destroy_gl_resources(struct wined3d_context *context) struct wined3d_event_query *event_query; struct fbo_entry *entry, *entry2; + context_validate(context); + if (context->valid) pwglMakeCurrent(context->hdc, context->glCtx); + ENTER_GL(); LIST_FOR_EACH_ENTRY(occlusion_query, &context->occlusion_queries, struct wined3d_occlusion_query, entry) @@ -712,7 +727,7 @@ static void context_destroy_gl_resources(struct wined3d_context *context) HeapFree(GetProcessHeap(), 0, context->free_occlusion_queries); HeapFree(GetProcessHeap(), 0, context->free_event_queries); - if (!pwglMakeCurrent(NULL, NULL)) + if (pwglGetCurrentContext() && !pwglMakeCurrent(NULL, NULL)) { ERR("Failed to disable GL context.\n"); } @@ -801,18 +816,6 @@ BOOL context_set_current(struct wined3d_context *ctx) return TlsSetValue(wined3d_context_tls_idx, ctx); } -static void context_validate(struct wined3d_context *context) -{ - HWND wnd = WindowFromDC(context->hdc); - - if (wnd != context->win_handle) - { - WARN("DC %p belongs to window %p instead of %p.\n", - context->hdc, wnd, context->win_handle); - context->valid = 0; - } -} - /***************************************************************************** * Context_MarkStateDirty *

1 0

Henri Verbeet : wined3d: Set a driver name appropriate for the vendor in init_driver_info().
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 13c4fe72ad1e26eb492b10d87ac80f0363fffc2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=13c4fe72ad1e26eb492b10d87… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 27 10:10:41 2009 +0100 wined3d: Set a driver name appropriate for the vendor in init_driver_info(). --- dlls/wined3d/directx.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9c4fbea..ffd3301 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -993,7 +993,22 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, } driver_info->device = device; - driver_info->name = "Display"; + switch (vendor) + { + case VENDOR_ATI: + driver_info->name = "ati2dvag.dll"; + break; + + case VENDOR_NVIDIA: + driver_info->name = "nv4_disp.dll"; + break; + + default: + FIXME_(d3d_caps)("Unhandled vendor %04x.\n", vendor); + driver_info->name = "Display"; + break; + } + driver_info->description = "Direct3D HAL"; driver_info->version_high = MAKEDWORD_VERSION(7, 1); driver_info->version_low = MAKEDWORD_VERSION(8, 6); /* Nvidia RIVA TNT, arbitrary */

1 0

Henri Verbeet : wined3d: Apply PCI ID overrides in init_driver_info() instead of IWineD3DImpl_GetAdapterIdentifier().
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 26ba2124079aa5f990d5839704d089329f422936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26ba2124079aa5f990d583970… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 27 10:10:40 2009 +0100 wined3d: Apply PCI ID overrides in init_driver_info() instead of IWineD3DImpl_GetAdapterIdentifier(). --- dlls/wined3d/directx.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2367187..9c4fbea 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -979,8 +979,20 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, { unsigned int i; + if (wined3d_settings.pci_vendor_id != PCI_VENDOR_NONE) + { + TRACE_(d3d_caps)("Overriding PCI vendor ID with: %04x\n", wined3d_settings.pci_vendor_id); + vendor = wined3d_settings.pci_vendor_id; + } driver_info->vendor = vendor; + + if (wined3d_settings.pci_device_id != PCI_DEVICE_NONE) + { + TRACE_(d3d_caps)("Overriding PCI device ID with: %04x\n", wined3d_settings.pci_device_id); + device = wined3d_settings.pci_device_id; + } driver_info->device = device; + driver_info->name = "Display"; driver_info->description = "Direct3D HAL"; driver_info->version_high = MAKEDWORD_VERSION(7, 1); @@ -2352,19 +2364,6 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterIdentifier(IWineD3D *iface, UINT Ad pIdentifier->subsystem_id = 0; pIdentifier->revision = 0; memcpy(&pIdentifier->device_identifier, &IID_D3DDEVICE_D3DUID, sizeof(pIdentifier->device_identifier)); - - if(wined3d_settings.pci_device_id != PCI_DEVICE_NONE) - { - TRACE_(d3d_caps)("Overriding pci device id with: %x\n", wined3d_settings.pci_device_id); - pIdentifier->device_id = wined3d_settings.pci_device_id; - } - - if(wined3d_settings.pci_vendor_id != PCI_VENDOR_NONE) - { - TRACE_(d3d_caps)("Overriding pci vendor id with: %x\n", wined3d_settings.pci_vendor_id); - pIdentifier->vendor_id = wined3d_settings.pci_vendor_id; - } - pIdentifier->whql_level = (Flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; return WINED3D_OK;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2009