March 2006 - Wine-commits - list.winehq.org

lostwages/templates/en download.template
by Jeremy Newman 07 Mar '06

07 Mar '06

ChangeSet ID: 23466 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/03/07 16:58:02 Modified files: templates/en : download.template Log message: add a direct link to the CrossOver Office trial page Patch: http://cvs.winehq.org/patch.py?id=23466 Old revision New revision Changes Path 1.75 1.76 +1 -1 lostwages/templates/en/download.template Index: lostwages/templates/en/download.template diff -u -p lostwages/templates/en/download.template:1.75 lostwages/templates/en/download.template:1.76 --- lostwages/templates/en/download.template:1.75 7 Mar 2006 22:58: 2 -0000 +++ lostwages/templates/en/download.template 7 Mar 2006 22:58: 2 -0000 @@ -161,7 +161,7 @@ for post-installation instructions.< <a href="http://www.codeweavers.com/products/">CrossOver</a> - Award winning highly customized version with installer. Easy to use GUI tools to configure to work with supported applications such as Microsoft® Office. Email support available after purchase. - Multi-user server version also available. Evaluation versions available by request. + Multi-user server version also available. <a href="http://www.codeweavers.com/products/download_trial/">Evaluation versions available</a>. By <a href="http://www.codeweavers.com/">CodeWeavers</a>. </td> </tr>

1 0

Alexandre Julliard : x11drv: Don' t send an invalid WM_NCCREATE to the desktop window.
by Alexandre Julliard 07 Mar '06

07 Mar '06

Module: wine Branch: refs/heads/master Commit: 116aaa169479a5e42aee6adcf3cf7b4d87beb18d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=116aaa169479a5e42aee6ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 7 15:11:18 2006 +0100 x11drv: Don't send an invalid WM_NCCREATE to the desktop window. --- dlls/x11drv/desktop.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/x11drv/desktop.c b/dlls/x11drv/desktop.c index ccaf9f9..9081235 100644 --- a/dlls/x11drv/desktop.c +++ b/dlls/x11drv/desktop.c @@ -80,8 +80,6 @@ static DWORD CALLBACK desktop_thread( LP XMapWindow( display, root_window ); wine_tsx11_unlock(); - SendMessageW( hwnd, WM_NCCREATE, 0, 0 /* should be CREATESTRUCT */ ); - while (GetMessageW( &msg, hwnd, 0, 0 )) DispatchMessageW( &msg ); return 0; }

1 0

Alexandre Julliard : server: Fixed length check in dump_inline_unicode_string.
by Alexandre Julliard 07 Mar '06

07 Mar '06

Module: wine Branch: refs/heads/master Commit: 3d531f1bb5b54c46eeedc794b29b4458a281d02a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3d531f1bb5b54c46eeedc79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 7 14:59:49 2006 +0100 server: Fixed length check in dump_inline_unicode_string. --- server/trace.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/trace.c b/server/trace.c index 9b4f7bd..4b567f9 100644 --- a/server/trace.c +++ b/server/trace.c @@ -299,12 +299,12 @@ static void dump_varargs_debug_event( si /* dump a unicode string contained in a buffer; helper for dump_varargs_startup_info */ static void dump_inline_unicode_string( const UNICODE_STRING *str, const void *data, size_t size ) { - size_t length = str->Length / sizeof(WCHAR); + size_t length = str->Length; size_t offset = (size_t)str->Buffer; if (offset >= size) return; if (offset + length > size) length = size - offset; - dump_strW( (const WCHAR *)data + offset/sizeof(WCHAR), length, stderr, "\"\"" ); + dump_strW( (const WCHAR *)data + offset/sizeof(WCHAR), length/sizeof(WCHAR), stderr, "\"\"" ); } static void dump_varargs_startup_info( size_t size )

1 0

Alexandre Julliard : explorer: Merged systray support with the desktop window main loop.
by Alexandre Julliard 07 Mar '06

07 Mar '06

Module: wine Branch: refs/heads/master Commit: 576e3b706299f21897fc09c15b767fd79e701e79 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=576e3b706299f21897fc09c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 7 11:50:05 2006 +0100 explorer: Merged systray support with the desktop window main loop. Systray is now always available as part of the desktop and doesn't need to be started from shell32. --- dlls/shell32/systray.c | 53 ---------------------------------- programs/explorer/desktop.c | 3 ++ programs/explorer/explorer.c | 52 --------------------------------- programs/explorer/explorer_private.h | 1 + programs/explorer/systray.c | 27 ++--------------- programs/explorer/systray.h | 23 --------------- 6 files changed, 7 insertions(+), 152 deletions(-) delete mode 100644 programs/explorer/systray.h diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c index a1a85c8..a99912f 100644 --- a/dlls/shell32/systray.c +++ b/dlls/shell32/systray.c @@ -38,49 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(systray); const static WCHAR classname[] = /* Shell_TrayWnd */ {'S','h','e','l','l','_','T','r','a','y','W','n','d','\0'}; -/* start timeout of 1 second */ -#define SYSTRAY_START_TIMEOUT 1000 - -static BOOL start_systray_process(void) -{ - STARTUPINFOW sinfo; - PROCESS_INFORMATION pinfo; - WCHAR command_line[] = {'e','x','p','l','o','r','e','r',' ','/','s','y','s','t','r','a','y',0}; - static const WCHAR event_name[] = {'W','i','n','e','S','y','s','t','r','a','y','I','n','i','t','e','d',0}; - HANDLE systray_ready_event; - DWORD wait; - - TRACE("No tray window found, starting %s\n", debugstr_w(command_line)); - - ZeroMemory(&sinfo, sizeof(sinfo)); - sinfo.cb = sizeof(sinfo); - - if (CreateProcessW(NULL, command_line, NULL, NULL, FALSE, 0, NULL, NULL, &sinfo, &pinfo) == 0) - { - ERR("Could not start %s, error 0x%lx\n", debugstr_w(command_line), GetLastError()); - return FALSE; - } - - CloseHandle(pinfo.hThread); - CloseHandle(pinfo.hProcess); - - systray_ready_event = CreateEventW(NULL, TRUE, FALSE, event_name); - if (!systray_ready_event) return FALSE; - - /* don't guess how long to wait, just wait for process to signal to us - * that it has created the Shell_TrayWnd class before continuing */ - wait = WaitForSingleObject(systray_ready_event, SYSTRAY_START_TIMEOUT); - CloseHandle(systray_ready_event); - - if (wait == WAIT_TIMEOUT) - { - ERR("timeout waiting for %s to start\n", debugstr_w(command_line)); - return FALSE; - } - - return TRUE; -} - /************************************************************************* * Shell_NotifyIcon [SHELL32.296] * Shell_NotifyIconA [SHELL32.297] @@ -126,16 +83,6 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMe TRACE("dwMessage = %ld\n", dwMessage); tray = FindWindowExW(0, NULL, classname, NULL); - - /* this isn't how native does it - it assumes that Explorer is always - * running */ - if (!tray) - { - if (!start_systray_process()) - return FALSE; - tray = FindWindowExW(0, NULL, classname, NULL); - } - if (!tray) return FALSE; cds.dwData = dwMessage; diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 032a1c2..7c26221 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -69,6 +69,9 @@ void manage_desktop(void) SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); WINE_TRACE( "explorer starting on hwnd %p\n", hwnd ); + + initialize_systray(); while (GetMessageW( &msg, 0, 0, 0 )) DispatchMessageW( &msg ); + WINE_TRACE( "explorer exiting for hwnd %p\n", hwnd ); } diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 25287b7..32c7055 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -24,15 +24,11 @@ #include <wine/debug.h> #include "explorer_private.h" -#include <systray.h> WINE_DEFAULT_DEBUG_CHANNEL(explorer); -unsigned int shell_refs = 0; - typedef struct parametersTAG { BOOL explorer_mode; - BOOL systray_mode; BOOL desktop_mode; WCHAR root[MAX_PATH]; WCHAR selection[MAX_PATH]; @@ -139,11 +135,6 @@ static void ParseCommandLine(LPSTR comma CopyPathRoot(parameters->root, parameters->selection); } - else if (strncmp(p,"systray",7)==0) - { - parameters->systray_mode = TRUE; - p+=7; - } else if (strncmp(p,"desktop",7)==0) { parameters->desktop_mode = TRUE; @@ -159,44 +150,6 @@ static void ParseCommandLine(LPSTR comma } } -static void do_systray_loop(void) -{ - initialize_systray(); - - while (TRUE) - { - const int timeout = 5; - MSG message; - DWORD res; - - res = MsgWaitForMultipleObjectsEx(0, NULL, shell_refs ? INFINITE : timeout * 1000, - QS_ALLINPUT, MWMO_WAITALL); - if (res == WAIT_TIMEOUT) break; - - res = PeekMessage(&message, 0, 0, 0, PM_REMOVE); - if (!res) continue; - - if (message.message == WM_QUIT) - { - WINE_FIXME("Somebody sent the shell a WM_QUIT message, should we reboot?"); - - /* Sending the tray window a WM_QUIT message is actually a - * tip given by some programming websites as a way of - * forcing a reboot! let's delay implementing this hack - * until we find a program that really needs it. for now - * just bail out. - */ - - break; - } - - TranslateMessage(&message); - DispatchMessage(&message); - } - - shutdown_systray(); -} - int WINAPI WinMain(HINSTANCE hinstance, HINSTANCE previnstance, LPSTR cmdline, @@ -217,11 +170,6 @@ int WINAPI WinMain(HINSTANCE hinstance, ParseCommandLine(cmdline,&parameters); len = lstrlenW(winefile) +1; - if (parameters.systray_mode) - { - do_systray_loop(); - return 0; - } if (parameters.desktop_mode) { manage_desktop(); diff --git a/programs/explorer/explorer_private.h b/programs/explorer/explorer_private.h index e2f0010..859d1a6 100644 --- a/programs/explorer/explorer_private.h +++ b/programs/explorer/explorer_private.h @@ -22,5 +22,6 @@ #define __WINE_EXPLORER_PRIVATE_H extern void manage_desktop(void); +extern void initialize_systray(void); #endif /* __WINE_EXPLORER_PRIVATE_H */ diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 7520f8b..adf8460 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -37,7 +37,7 @@ #include <wine/debug.h> #include <wine/list.h> -#include "systray.h" +#include "explorer_private.h" WINE_DEFAULT_DEBUG_CHANNEL(systray); @@ -127,8 +127,8 @@ static LRESULT WINAPI adaptor_wndproc(HW ret = PostMessage(icon->owner, icon->callback_message, (WPARAM) icon->id, (LPARAM) msg); if (!ret && (GetLastError() == ERROR_INVALID_HANDLE)) { - WINE_ERR("application window was destroyed without removing " - "notification icon, removing automatically\n"); + WINE_WARN("application window was destroyed without removing " + "notification icon, removing automatically\n"); DestroyWindow(window); } return 0; @@ -140,9 +140,6 @@ static LRESULT WINAPI adaptor_wndproc(HW list_remove(&icon->entry); DestroyIcon(icon->image); HeapFree(GetProcessHeap(), 0, icon); - - shell_refs--; - WINE_TRACE("shell now has %d refs\n", shell_refs); break; } @@ -236,9 +233,6 @@ static void add_icon(const NOTIFYICONDAT list_add_tail(&tray.icons, &icon->entry); modify_icon(nid); - - shell_refs++; - WINE_TRACE("shell now has %d refs\n", shell_refs); } static void delete_icon(const NOTIFYICONDATAW *nid) @@ -365,11 +359,9 @@ static BOOL is_systray_hidden(void) void initialize_systray(void) { WNDCLASSEX class; - HANDLE event; static const WCHAR classname[] = /* Shell_TrayWnd */ {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; static const WCHAR winname[] = /* Wine Systray Listener */ {'W','i','n','e',' ','S','y','s','t','r','a','y',' ','L','i','s','t','e','n','e','r',0}; - static const WCHAR event_name[] = {'W','i','n','e','S','y','s','t','r','a','y','I','n','i','t','e','d',0}; WINE_TRACE("initiaizing\n"); @@ -419,17 +411,4 @@ void initialize_systray(void) WINE_ERR("Could not create tray window\n"); return; } - - /* tell shell32 that we're ready */ - event = OpenEventW(EVENT_MODIFY_STATE, FALSE, event_name); - if (event) - { - SetEvent(event); - CloseHandle(event); - } -} - -void shutdown_systray(void) -{ - DestroyWindow(tray.window); } diff --git a/programs/explorer/systray.h b/programs/explorer/systray.h deleted file mode 100644 index 38fc40b..0000000 --- a/programs/explorer/systray.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2004 Mike Hearn, for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -void initialize_systray(void); -void shutdown_systray(void); - -/* when this drops to zero, a few seconds later the shell will shut down */ -extern unsigned int shell_refs;

1 0

Alexandre Julliard : user: Launch explorer to manage the desktop window.
by Alexandre Julliard 07 Mar '06

07 Mar '06

Module: wine Branch: refs/heads/master Commit: 1a4f6e579b6aab685fae2e649fd5accee7ec0b4f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1a4f6e579b6aab685fae2e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 7 11:42:35 2006 +0100 user: Launch explorer to manage the desktop window. --- dlls/user/win.c | 46 +++++++++++++++++++++++++++++++++++++--- dlls/x11drv/winpos.c | 2 -- include/wine/server_protocol.h | 3 ++- server/protocol.def | 1 + server/trace.c | 1 + server/window.c | 2 +- 6 files changed, 48 insertions(+), 7 deletions(-) diff --git a/dlls/user/win.c b/dlls/user/win.c index 1fc2d7c..44c2461 100644 --- a/dlls/user/win.c +++ b/dlls/user/win.c @@ -103,6 +103,16 @@ static WND *create_window_handle( HWND p return NULL; } + if (!parent) /* if parent is 0 we don't have a desktop window yet */ + { + struct user_thread_info *thread_info = get_user_thread_info(); + + assert( !thread_info->desktop ); + thread_info->desktop = full_parent ? full_parent : handle; + if (full_parent && !USER_Driver->pCreateDesktopWindow( thread_info->desktop )) + ERR( "failed to create desktop window\n" ); + } + USER_Lock(); index = USER_HANDLE_TO_INDEX(handle); @@ -946,7 +956,8 @@ static HWND WIN_CreateWindowEx( CREATEST WARN("No parent for child window\n" ); return 0; /* WS_CHILD needs a parent, but WS_POPUP doesn't */ } - parent = GetDesktopWindow(); + if (classAtom != LOWORD(DESKTOP_CLASS_ATOM)) /* are we creating the desktop itself? */ + parent = GetDesktopWindow(); } WIN_FixCoordinates(cs, &sw); /* fix default coordinates */ @@ -1553,16 +1564,45 @@ HWND WINAPI GetDesktopWindow(void) { struct user_thread_info *thread_info = get_user_thread_info(); + if (thread_info->desktop) return thread_info->desktop; + + SERVER_START_REQ( get_desktop_window ) + { + req->force = 0; + if (!wine_server_call( req )) thread_info->desktop = reply->handle; + } + SERVER_END_REQ; + if (!thread_info->desktop) { + STARTUPINFOW si; + PROCESS_INFORMATION pi; + WCHAR command_line[] = {'e','x','p','l','o','r','e','r','.','e','x','e',' ','/','d','e','s','k','t','o','p',0}; + + memset( &si, 0, sizeof(si) ); + si.cb = sizeof(si); + if (CreateProcessW( NULL, command_line, NULL, NULL, FALSE, DETACHED_PROCESS, + NULL, NULL, &si, &pi )) + { + TRACE( "started explorer pid %04lx tid %04lx\n", pi.dwProcessId, pi.dwThreadId ); + WaitForInputIdle( pi.hProcess, 10000 ); + CloseHandle( pi.hThread ); + CloseHandle( pi.hProcess ); + + } + else WARN( "failed to start explorer, err %ld\n", GetLastError() ); + SERVER_START_REQ( get_desktop_window ) { + req->force = 1; if (!wine_server_call( req )) thread_info->desktop = reply->handle; } SERVER_END_REQ; - if (!thread_info->desktop || !USER_Driver->pCreateDesktopWindow( thread_info->desktop )) - ERR( "failed to create desktop window\n" ); } + + if (!thread_info->desktop || !USER_Driver->pCreateDesktopWindow( thread_info->desktop )) + ERR( "failed to create desktop window\n" ); + return thread_info->desktop; } diff --git a/dlls/x11drv/winpos.c b/dlls/x11drv/winpos.c index e912531..96b1004 100644 --- a/dlls/x11drv/winpos.c +++ b/dlls/x11drv/winpos.c @@ -942,8 +942,6 @@ BOOL X11DRV_ShowWindow( HWND hwnd, INT c RECT newPos = {0, 0, 0, 0}; UINT swp = 0; - if (hwnd == GetDesktopWindow()) return FALSE; - TRACE("hwnd=%p, cmd=%d, wasVisible %d\n", hwnd, cmd, wasVisible); switch(cmd) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 0e9ae22..95587cd 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2543,6 +2543,7 @@ struct destroy_window_reply struct get_desktop_window_request { struct request_header __header; + int force; }; struct get_desktop_window_reply { @@ -4360,6 +4361,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 230 +#define SERVER_PROTOCOL_VERSION 231 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 9163a36..5db269a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1804,6 +1804,7 @@ enum message_type /* Retrieve the desktop window for the current thread */ @REQ(get_desktop_window) + int force; /* force creation if it doesn't exist */ @REPLY user_handle_t handle; /* handle to the desktop window */ @END diff --git a/server/trace.c b/server/trace.c index 0d5fac9..9b4f7bd 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2280,6 +2280,7 @@ static void dump_destroy_window_request( static void dump_get_desktop_window_request( const struct get_desktop_window_request *req ) { + fprintf( stderr, " force=%d", req->force ); } static void dump_get_desktop_window_reply( const struct get_desktop_window_reply *req ) diff --git a/server/window.c b/server/window.c index 8b7af20..6b876af 100644 --- a/server/window.c +++ b/server/window.c @@ -1459,7 +1459,7 @@ DECL_HANDLER(destroy_window) /* retrieve the desktop window for the current thread */ DECL_HANDLER(get_desktop_window) { - struct window *win = get_desktop_window( current, 1 ); + struct window *win = get_desktop_window( current, req->force ); if (win) reply->handle = win->handle; }

1 0

H. Verbeet : wined3d: Fix a few FIXME's.
by Alexandre Julliard 07 Mar '06

07 Mar '06

Module: wine Branch: refs/heads/master Commit: 78a43b3dbcb3f65677171acc03af7d2a98eeae27 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=78a43b3dbcb3f65677171ac… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Mar 6 23:29:03 2006 +0000 wined3d: Fix a few FIXME's. --- dlls/wined3d/drawprim.c | 3 ++- dlls/wined3d/pixelshader.c | 3 ++- dlls/wined3d/vertexshader.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 4a7468b..bf5bc54 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1820,7 +1820,8 @@ UINT numberOfvertices, UINT numberOfIndi /* check for any errors */ glGetIntegerv( GL_PROGRAM_ERROR_POSITION_ARB, &errPos ); if (errPos != -1) { - FIXME("HW VertexShader Error at position: %d\n%s\n", errPos, glGetString( GL_PROGRAM_ERROR_STRING_ARB) ); + FIXME("HW VertexShader Error at position %d: %s\n", + errPos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); } /* disable any attribs */ diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 81b8bd3..f534171 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -1512,7 +1512,8 @@ inline static VOID IWineD3DPixelShaderIm if (glGetError() == GL_INVALID_OPERATION) { GLint errPos; glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errPos); - FIXME("HW PixelShader Error at position: %d\n%s\n", errPos, glGetString(GL_PROGRAM_ERROR_STRING_ARB)); + FIXME("HW PixelShader Error at position %d: %s\n", + errPos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); This->prgId = -1; } } diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 32dd70f..f444ca7 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -1650,7 +1650,8 @@ inline static VOID IWineD3DVertexShaderI if (glGetError() == GL_INVALID_OPERATION) { GLint errPos; glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errPos); - FIXME("HW VertexShader Error at position: %d\n%s\n", errPos, glGetString(GL_PROGRAM_ERROR_STRING_ARB)); + FIXME("HW VertexShader Error at position %d: %s\n", + errPos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); This->prgId = -1; } }

1 0

Mike McCormack : kernel: Improve the activation context stubs.
by Alexandre Julliard 07 Mar '06

07 Mar '06

Module: wine Branch: refs/heads/master Commit: bb84eaa98fe1139c7a9b30f676eb4ef59cb6bc4b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bb84eaa98fe1139c7a9b30f… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Mar 7 18:24:24 2006 +0900 kernel: Improve the activation context stubs. --- dlls/kernel/actctx.c | 62 +++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 48 insertions(+), 14 deletions(-) diff --git a/dlls/kernel/actctx.c b/dlls/kernel/actctx.c index 62a4cca..02f2b72 100644 --- a/dlls/kernel/actctx.c +++ b/dlls/kernel/actctx.c @@ -31,6 +31,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(actctx); +#define ACTCTX_FLAGS_ALL (\ + ACTCTX_FLAG_PROCESSOR_ARCHITECTURE_VALID |\ + ACTCTX_FLAG_LANGID_VALID |\ + ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID |\ + ACTCTX_FLAG_RESOURCE_NAME_VALID |\ + ACTCTX_FLAG_SET_PROCESS_DEFAULT |\ + ACTCTX_FLAG_APPLICATION_NAME_VALID |\ + ACTCTX_FLAG_SOURCE_IS_ASSEMBLYREF |\ + ACTCTX_FLAG_HMODULE_VALID ) + +#define ACTCTX_FAKE_HANDLE ((HANDLE) 0xf00baa) +#define ACTCTX_FAKE_COOKIE ((ULONG_PTR) 0xf00bad) + /*********************************************************************** * CreateActCtxA (KERNEL32.@) * @@ -38,8 +51,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(actctx); */ HANDLE WINAPI CreateActCtxA(PCACTCTXA pActCtx) { - FIXME("stub!\n"); - return INVALID_HANDLE_VALUE; + FIXME("%p %08lx\n", pActCtx, pActCtx ? pActCtx->dwFlags : 0); + + if (!pActCtx) + return INVALID_HANDLE_VALUE; + if (pActCtx->cbSize != sizeof *pActCtx) + return INVALID_HANDLE_VALUE; + if (pActCtx->dwFlags & ~ACTCTX_FLAGS_ALL) + return INVALID_HANDLE_VALUE; + return ACTCTX_FAKE_HANDLE; } /*********************************************************************** @@ -49,8 +69,15 @@ HANDLE WINAPI CreateActCtxA(PCACTCTXA pA */ HANDLE WINAPI CreateActCtxW(PCACTCTXW pActCtx) { - FIXME("stub!\n"); - return INVALID_HANDLE_VALUE; + FIXME("%p %08lx\n", pActCtx, pActCtx ? pActCtx->dwFlags : 0); + + if (!pActCtx) + return INVALID_HANDLE_VALUE; + if (pActCtx->cbSize != sizeof *pActCtx) + return INVALID_HANDLE_VALUE; + if (pActCtx->dwFlags & ~ACTCTX_FLAGS_ALL) + return INVALID_HANDLE_VALUE; + return ACTCTX_FAKE_HANDLE; } /*********************************************************************** @@ -60,8 +87,10 @@ HANDLE WINAPI CreateActCtxW(PCACTCTXW pA */ BOOL WINAPI ActivateActCtx(HANDLE hActCtx, ULONG_PTR *ulCookie) { - FIXME("stub!\n"); - return FALSE; + FIXME("%p %p\n", hActCtx, ulCookie ); + if (ulCookie) + *ulCookie = ACTCTX_FAKE_COOKIE; + return TRUE; } /*********************************************************************** @@ -71,8 +100,10 @@ BOOL WINAPI ActivateActCtx(HANDLE hActCt */ BOOL WINAPI DeactivateActCtx(DWORD dwFlags, ULONG_PTR ulCookie) { - FIXME("stub!\n"); - return FALSE; + FIXME("%08lx %08lx\n", dwFlags, ulCookie); + if (ulCookie != ACTCTX_FAKE_COOKIE) + return FALSE; + return TRUE; } /*********************************************************************** @@ -82,8 +113,9 @@ BOOL WINAPI DeactivateActCtx(DWORD dwFla */ BOOL WINAPI GetCurrentActCtx(HANDLE* phActCtx) { - FIXME("stub!\n"); - return FALSE; + FIXME("%p\n", phActCtx); + *phActCtx = ACTCTX_FAKE_HANDLE; + return TRUE; } /*********************************************************************** @@ -93,7 +125,7 @@ BOOL WINAPI GetCurrentActCtx(HANDLE* phA */ void WINAPI AddRefActCtx(HANDLE hActCtx) { - FIXME("stub!\n"); + FIXME("%p\n", hActCtx); } /*********************************************************************** @@ -103,7 +135,7 @@ void WINAPI AddRefActCtx(HANDLE hActCtx) */ void WINAPI ReleaseActCtx(HANDLE hActCtx) { - FIXME("stub!\n"); + FIXME("%p\n", hActCtx); } /*********************************************************************** @@ -113,8 +145,10 @@ void WINAPI ReleaseActCtx(HANDLE hActCtx */ BOOL WINAPI ZombifyActCtx(HANDLE hActCtx) { - FIXME("stub!\n"); - return FALSE; + FIXME("%p\n", hActCtx); + if (hActCtx != ACTCTX_FAKE_HANDLE) + return FALSE; + return TRUE; } /***********************************************************************

1 0

Alexandre Julliard : explorer: Added desktop option.
by Alexandre Julliard 07 Mar '06

07 Mar '06

Module: wine Branch: refs/heads/master Commit: a93b6a5945b2ffd29cc950fe8e8d6cd6cdf73261 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a93b6a5945b2ffd29cc950f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 7 11:41:52 2006 +0100 explorer: Added desktop option. The /desktop option causes explorer to create and manage the desktop window. --- programs/explorer/Makefile.in | 1 programs/explorer/desktop.c | 74 ++++++++++++++++++++++++++++++++++ programs/explorer/explorer.c | 16 ++++++- programs/explorer/explorer_private.h | 26 ++++++++++++ 4 files changed, 115 insertions(+), 2 deletions(-) create mode 100644 programs/explorer/desktop.c create mode 100644 programs/explorer/explorer_private.h diff --git a/programs/explorer/Makefile.in b/programs/explorer/Makefile.in index a73d6dd..3756a94 100644 --- a/programs/explorer/Makefile.in +++ b/programs/explorer/Makefile.in @@ -7,6 +7,7 @@ APPMODE = -mwindows IMPORTS = user32 gdi32 advapi32 kernel32 C_SRCS = \ + desktop.c \ explorer.c \ systray.c diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c new file mode 100644 index 0000000..032a1c2 --- /dev/null +++ b/programs/explorer/desktop.c @@ -0,0 +1,74 @@ +/* + * Explorer desktop support + * + * Copyright 2006 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <windows.h> +#include <wine/debug.h> +#include "explorer_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(explorer); + +#define DESKTOP_CLASS_ATOM MAKEINTATOMW(32769) + +static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPARAM lp ) +{ + WINE_TRACE( "got msg %x wp %x lp %lx\n", message, wp, lp ); + + switch(message) + { + case WM_SYSCOMMAND: + if ((wp & 0xfff0) == SC_CLOSE) ExitWindows( 0, 0 ); + break; + + case WM_SETCURSOR: + return (LRESULT)SetCursor( LoadCursorA( 0, (LPSTR)IDC_ARROW ) ); + + case WM_NCHITTEST: + return HTCLIENT; + + case WM_ERASEBKGND: + PaintDesktop( (HDC)wp ); + return TRUE; + + case WM_PAINT: + { + PAINTSTRUCT ps; + BeginPaint( hwnd, &ps ); + if (ps.fErase) PaintDesktop( ps.hdc ); + EndPaint( hwnd, &ps ); + } + return 0; + } + return 0; +} + +void manage_desktop(void) +{ + MSG msg; + HWND hwnd = CreateWindowExW( 0, DESKTOP_CLASS_ATOM, NULL, + WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, + 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), + 0, 0, 0, NULL ); + if (hwnd != GetDesktopWindow()) return; /* some other process beat us to it */ + SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); + + WINE_TRACE( "explorer starting on hwnd %p\n", hwnd ); + while (GetMessageW( &msg, 0, 0, 0 )) DispatchMessageW( &msg ); + WINE_TRACE( "explorer exiting for hwnd %p\n", hwnd ); +} diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 3a51085..25287b7 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -23,7 +23,7 @@ #include <ctype.h> #include <wine/debug.h> - +#include "explorer_private.h" #include <systray.h> WINE_DEFAULT_DEBUG_CHANNEL(explorer); @@ -33,6 +33,7 @@ unsigned int shell_refs = 0; typedef struct parametersTAG { BOOL explorer_mode; BOOL systray_mode; + BOOL desktop_mode; WCHAR root[MAX_PATH]; WCHAR selection[MAX_PATH]; } parameters_struct; @@ -143,6 +144,11 @@ static void ParseCommandLine(LPSTR comma parameters->systray_mode = TRUE; p+=7; } + else if (strncmp(p,"desktop",7)==0) + { + parameters->desktop_mode = TRUE; + p+=7; + } p2 = p; p = strchr(p,'/'); } @@ -216,7 +222,13 @@ int WINAPI WinMain(HINSTANCE hinstance, do_systray_loop(); return 0; } - else if (parameters.selection[0]) + if (parameters.desktop_mode) + { + manage_desktop(); + return 0; + } + + if (parameters.selection[0]) { len += lstrlenW(parameters.selection) + 2; winefile_commandline = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); diff --git a/programs/explorer/explorer_private.h b/programs/explorer/explorer_private.h new file mode 100644 index 0000000..e2f0010 --- /dev/null +++ b/programs/explorer/explorer_private.h @@ -0,0 +1,26 @@ +/* + * Explorer private definitions + * + * Copyright 2006 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __WINE_EXPLORER_PRIVATE_H +#define __WINE_EXPLORER_PRIVATE_H + +extern void manage_desktop(void); + +#endif /* __WINE_EXPLORER_PRIVATE_H */

1 0

H. Verbeet : wined3d: Implement GetCreationParameters ( from a patch by Al Tobey).
by Alexandre Julliard 07 Mar '06

07 Mar '06

Module: wine Branch: refs/heads/master Commit: ae21e30118eea32a72ec07eb913bb2ba05bd2cc3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ae21e30118eea32a72ec07e… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Mar 6 23:29:45 2006 +0000 wined3d: Implement GetCreationParameters (from a patch by Al Tobey). --- dlls/wined3d/device.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8f1ebe3..409d5cb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6531,13 +6531,9 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetDia HRESULT WINAPI IWineD3DDeviceImpl_GetCreationParameters(IWineD3DDevice *iface, D3DDEVICE_CREATION_PARAMETERS *pParameters) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; + TRACE("(%p) : pParameters %p\n", This, pParameters); - FIXME("(%p) : stub\n", This); - /* Setup some reasonable defaults */ - pParameters->AdapterOrdinal = 0; /* always for now */ - pParameters->DeviceType = D3DDEVTYPE_HAL; /* always for now */ - pParameters->hFocusWindow = 0; - pParameters->BehaviorFlags =0; + *pParameters = This->createParms; return D3D_OK; }

1 0

Stefan Dösinger : wined3d: Define D3D usage flags in wined3d_types.h.
by Alexandre Julliard 07 Mar '06

07 Mar '06

Module: wine Branch: refs/heads/master Commit: 270afeb5e888f5a51f9b5cc6995afb29a6476cc5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=270afeb5e888f5a51f9b5cc… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Mar 6 23:08:42 2006 +0100 wined3d: Define D3D usage flags in wined3d_types.h. --- dlls/wined3d/basetexture.c | 4 ++-- dlls/wined3d/device.c | 22 +++++++++++----------- dlls/wined3d/surface.c | 16 ++++++++-------- dlls/wined3d/utils.c | 22 +++++++++++----------- include/wine/wined3d_types.h | 12 ++++++++++++ 5 files changed, 44 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=270afeb5e888f5a51f9…

1 0