March 2006 - wine-commits

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

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

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

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

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

Stefan Dösinger : wined3d: Add device caps to wined3d_types.h.
by Alexandre Julliard 07 Mar '06

07 Mar '06

Module: wine Branch: refs/heads/master Commit: 2f0c7819885aaae1810a3202ac6c98f240c6d492 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2f0c7819885aaae1810a320… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Mar 6 23:05:02 2006 +0100 wined3d: Add device caps to wined3d_types.h. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 14 +++++++------- dlls/wined3d/surface.c | 2 +- include/wine/wined3d_types.h | 25 +++++++++++++++++++++++++ 4 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6b8a17f..7134891 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4661,7 +4661,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetTex if(pTexture != NULL) { /* SetTexture isn't allowed on textures in D3DPOOL_SCRATCH; The same is - * the case for D3DPOOL_SYSTEMMEM textures unless D3DDEVCAPS_TEXTURESYSTEMMORY is set. + * the case for D3DPOOL_SYSTEMMEM textures unless WINED3DDEVCAPS_TEXTURESYSTEMMORY is set. * We don't check the caps as GetDeviceCaps is inefficient and we don't set the cap anyway. */ if(((IWineD3DTextureImpl*)pTexture)->resource.pool == D3DPOOL_SCRATCH || ((IWineD3DTextureImpl*)pTexture)->resource.pool == D3DPOOL_SYSTEMMEM) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1749635..5a3739d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1462,18 +1462,18 @@ HRESULT WINAPI IWineD3DImpl_GetDeviceCap *pCaps->Caps = 0; *pCaps->Caps2 = D3DCAPS2_CANRENDERWINDOWED; - *pCaps->Caps3 = D3DDEVCAPS_HWTRANSFORMANDLIGHT; + *pCaps->Caps3 = WINED3DDEVCAPS_HWTRANSFORMANDLIGHT; *pCaps->PresentationIntervals = D3DPRESENT_INTERVAL_IMMEDIATE; *pCaps->CursorCaps = 0; - *pCaps->DevCaps = D3DDEVCAPS_DRAWPRIMTLVERTEX | - D3DDEVCAPS_HWTRANSFORMANDLIGHT | - D3DDEVCAPS_EXECUTEVIDEOMEMORY | - D3DDEVCAPS_PUREDEVICE | - D3DDEVCAPS_HWRASTERIZATION | - D3DDEVCAPS_TEXTUREVIDEOMEMORY; + *pCaps->DevCaps = WINED3DDEVCAPS_DRAWPRIMTLVERTEX | + WINED3DDEVCAPS_HWTRANSFORMANDLIGHT | + WINED3DDEVCAPS_EXECUTEVIDEOMEMORY | + WINED3DDEVCAPS_PUREDEVICE | + WINED3DDEVCAPS_HWRASTERIZATION | + WINED3DDEVCAPS_TEXTUREVIDEOMEMORY; *pCaps->PrimitiveMiscCaps = D3DPMISCCAPS_CULLCCW | diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c03587e..362f5b9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -949,7 +949,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LoadT * these resources cannot be accessed by the Direct3D device nor set as textures or render targets. * However, these resources can always be created, locked, and copied. * In general never store scratch or system mem textures in the video ram. However it is allowed - * for system memory textures when D3DDEVCAPS_TEXTURESYSTEMMEMORY is set but it isn't right now. + * for system memory textures when WINED3DDEVCAPS_TEXTURESYSTEMMEMORY is set but it isn't right now. */ if (This->resource.pool == D3DPOOL_SCRATCH || This->resource.pool == D3DPOOL_SYSTEMMEM) { diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 418a52e..ffc00f9 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -869,4 +869,29 @@ typedef enum _WINED3DDECLUSAGE { #define WINED3DVTXPCAPS_TEXGEN_SPHEREMAP 0x00000100L #define WINED3DVTXPCAPS_NO_TEXGEN_NONLOCALVIEWER 0x00000200L +#define WINED3DDEVCAPS_FLOATTLVERTEX 0x000000001 +#define WINED3DDEVCAPS_SORTINCREASINGZ 0x000000002 +#define WINED3DDEVCAPS_SORTDECREASINGZ 0X000000004 +#define WINED3DDEVCAPS_SORTEXACT 0x000000008 +#define WINED3DDEVCAPS_EXECUTESYSTEMMEMORY 0x000000010 +#define WINED3DDEVCAPS_EXECUTEVIDEOMEMORY 0x000000020 +#define WINED3DDEVCAPS_TLVERTEXSYSTEMMEMORY 0x000000040 +#define WINED3DDEVCAPS_TLVERTEXVIDEOMEMORY 0x000000080 +#define WINED3DDEVCAPS_TEXTURESYSTEMMEMORY 0x000000100 +#define WINED3DDEVCAPS_TEXTUREVIDEOMEMORY 0x000000200 +#define WINED3DDEVCAPS_DRAWPRIMTLVERTEX 0x000000400 +#define WINED3DDEVCAPS_CANRENDERAFTERFLIP 0x000000800 +#define WINED3DDEVCAPS_TEXTURENONLOCALVIDMEM 0x000001000 +#define WINED3DDEVCAPS_DRAWPRIMITIVES2 0x000002000 +#define WINED3DDEVCAPS_SEPARATETEXTUREMEMORIES 0x000004000 +#define WINED3DDEVCAPS_DRAWPRIMITIVES2EX 0x000008000 +#define WINED3DDEVCAPS_HWTRANSFORMANDLIGHT 0x000010000 +#define WINED3DDEVCAPS_CANBLTSYSTONONLOCAL 0x000020000 +#define WINED3DDEVCAPS_HWRASTERIZATION 0x000080000 +#define WINED3DDEVCAPS_PUREDEVICE 0x000100000 +#define WINED3DDEVCAPS_QUINTICRTPATCHES 0x000200000 +#define WINED3DDEVCAPS_RTPATCHES 0x000400000 +#define WINED3DDEVCAPS_RTPATCHHANDLEZERO 0x000800000 +#define WINED3DDEVCAPS_NPATCHES 0x001000000 + #endif

1 0

Jacek Caban : mshtml: Added IHTMLTextAreaElement implementation.
by Alexandre Julliard 07 Mar '06

07 Mar '06

Module: wine Branch: refs/heads/master Commit: 8f897239c46dabeeeb06827f53463e651ee70648 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8f897239c46dabeeeb06827… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 6 22:38:02 2006 +0100 mshtml: Added IHTMLTextAreaElement implementation. --- dlls/mshtml/Makefile.in | 1 dlls/mshtml/htmlelem.c | 3 dlls/mshtml/htmltextarea.c | 379 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 dlls/mshtml/nsiface.idl | 31 +++ 5 files changed, 415 insertions(+), 0 deletions(-) create mode 100644 dlls/mshtml/htmltextarea.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=8f897239c46dabeeeb0…

1 0

Jacek Caban : mshtml: Added IHTMLSelectElement implementation.
by Alexandre Julliard 07 Mar '06

07 Mar '06

Module: wine Branch: refs/heads/master Commit: 54cce2e7ceccbea268718ea51aea98bac7997627 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=54cce2e7ceccbea268718ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 6 22:37:10 2006 +0100 mshtml: Added IHTMLSelectElement implementation. --- dlls/mshtml/Makefile.in | 1 dlls/mshtml/htmlelem.c | 3 dlls/mshtml/htmlselect.c | 363 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 dlls/mshtml/nsiface.idl | 32 ++++ 5 files changed, 400 insertions(+), 0 deletions(-) create mode 100644 dlls/mshtml/htmlselect.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=54cce2e7ceccbea2687…

1 0

Jacek Caban : mshtml: Added IHTMLInputElement implementation.
by Alexandre Julliard 07 Mar '06

07 Mar '06

Module: wine Branch: refs/heads/master Commit: 8b3eab6e35cf038330880426d0dd2e324db6721f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8b3eab6e35cf03833088042… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 6 22:35:56 2006 +0100 mshtml: Added IHTMLInputElement implementation. --- dlls/mshtml/Makefile.in | 1 dlls/mshtml/htmlelem.c | 19 + dlls/mshtml/htmlinput.c | 690 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 dlls/mshtml/nsiface.idl | 48 +++ 5 files changed, 758 insertions(+), 1 deletions(-) create mode 100644 dlls/mshtml/htmlinput.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=8b3eab6e35cf0383308…

1 0

Jacek Caban : mshtml: Added IHTMLElementCollection::tags implementation.
by Alexandre Julliard 07 Mar '06

07 Mar '06

Module: wine Branch: refs/heads/master Commit: 3d6859935599321270d6c18a12e3767044963e54 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3d6859935599321270d6c18… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 6 22:34:49 2006 +0100 mshtml: Added IHTMLElementCollection::tags implementation. --- dlls/mshtml/htmlelem.c | 48 ++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/mshtml_private.h | 4 ++++ dlls/mshtml/nsembed.c | 26 +++++++++++++++++------ dlls/mshtml/nsiface.idl | 8 ++++++- 4 files changed, 76 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 818a3a3..12765af 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1096,8 +1096,52 @@ static HRESULT WINAPI HTMLElementCollect VARIANT tagName, IDispatch **pdisp) { HTMLElementCollection *This = ELEMCOL_THIS(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(V_BSTR(&tagName)), pdisp); - return E_NOTIMPL; + DWORD size = 8, len = 0, i; + HTMLElement **elem_list; + nsAString tag_str; + const PRUnichar *tag; + + if(V_VT(&tagName) != VT_BSTR) { + WARN("Invalid arg\n"); + return E_INVALIDARG; + } + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(V_BSTR(&tagName)), pdisp); + + elem_list = HeapAlloc(GetProcessHeap(), 0, size*sizeof(HTMLElement*)); + + nsAString_Init(&tag_str, NULL); + + for(i=0; i<This->len; i++) { + if(!This->elems[i]->nselem) + continue; + + nsIDOMElement_GetTagName(This->elems[i]->nselem, &tag_str); + nsAString_GetData(&tag_str, &tag, NULL); + + if(CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, tag, -1, + V_BSTR(&tagName), -1) == CSTR_EQUAL) { + if(len == size) { + size <<= 2; + elem_list = HeapReAlloc(GetProcessHeap(), 0, elem_list, size); + } + + elem_list[len++] = This->elems[i]; + } + } + + nsAString_Finish(&tag_str); + + TRACE("fount %ld tags\n", len); + + if(!len) { + HeapFree(GetProcessHeap(), 0, elem_list); + elem_list = NULL; + }else if(size > len) { + HeapReAlloc(GetProcessHeap(), 0, elem_list, len); + } + + return HTMLElementCollection_Create(This->ref_unk, elem_list, len, pdisp); } #undef ELEMCOL_THIS diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 246205d..57aece0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -203,6 +203,10 @@ PRUint32 nsACString_GetData(const nsACSt void nsACString_SetData(nsACString*,const char*); void nsACString_Destroy(nsACString*); +void nsAString_Init(nsAString*,const PRUnichar*); +PRUint32 nsAString_GetData(const nsAString*,const PRUnichar**,PRBool*); +void nsAString_Finish(nsAString*); + nsIInputStream *create_nsstream(const char*,PRInt32); IHlink *Hlink_Create(void); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 029fa1c..03c1fed 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -44,13 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define PR_UINT32_MAX 0xffffffff -struct nsStringContainer { - void *v; - void *d1; - PRUint32 d2; - void *d3; -}; - struct nsCStringContainer { void *v; void *d1; @@ -68,6 +61,7 @@ static nsresult (*NS_CStringContainerFin static nsresult (*NS_StringSetData)(nsAString*,const PRUnichar*,PRUint32); static nsresult (*NS_CStringSetData)(nsACString*,const char*,PRUint32); static nsresult (*NS_NewLocalFile)(const nsAString*,PRBool,nsIFile**); +static PRUint32 (*NS_StringGetData)(const nsAString*,const PRUnichar **,PRBool*); static PRUint32 (*NS_CStringGetData)(const nsACString*,const char**,PRBool*); static HINSTANCE hXPCOM = NULL; @@ -304,6 +298,7 @@ static BOOL load_gecko(void) NS_DLSYM(NS_StringSetData); NS_DLSYM(NS_CStringSetData); NS_DLSYM(NS_NewLocalFile); + NS_DLSYM(NS_StringGetData); NS_DLSYM(NS_CStringGetData); #undef NS_DLSYM @@ -390,6 +385,23 @@ void nsACString_Destroy(nsACString *str) HeapFree(GetProcessHeap(), 0, str); } +void nsAString_Init(nsAString *str, const PRUnichar *data) +{ + NS_StringContainerInit(str); + if(data) + NS_StringSetData(str, data, PR_UINT32_MAX); +} + +PRUint32 nsAString_GetData(const nsAString *str, const PRUnichar **data, PRBool *termited) +{ + return NS_StringGetData(str, data, termited); +} + +void nsAString_Finish(nsAString *str) +{ + NS_StringContainerFinish(str); +} + nsIInputStream *create_nsstream(const char *data, PRInt32 data_len) { nsIStringInputStream *ret; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 7aa4acd..bc7cca0 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -47,8 +47,14 @@ typedef ULARGE_INTEGER PRUint64; typedef PRUint64 DOMTimeStamp; typedef PRUint32 nsLoadFlags; +typedef struct { + void *v; + void *d1; + PRUint32 d2; + void *d3; +} nsStringContainer; + typedef struct nsCStringContainer nsCStringContainer; -typedef struct nsStringContainer nsStringContainer; typedef nsCStringContainer nsACString; typedef nsStringContainer nsAString;

1 0

Juan Lang : crypt32: Simplify stores.
by Alexandre Julliard 07 Mar '06

07 Mar '06

Module: wine Branch: refs/heads/master Commit: 78872852fd988fc56474dc95870160905895fc85 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=78872852fd988fc56474dc9… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Mar 6 12:46:38 2006 -0800 crypt32: Simplify stores. Ref count cert context references, and eliminate the DupCert function from stores. --- dlls/crypt32/store.c | 115 ++++++++++---------------------------------------- 1 files changed, 22 insertions(+), 93 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 2ac2e10..fe37a56 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -144,8 +144,6 @@ typedef BOOL (*AddCertFunc)(struct WINE_ */ typedef void (*FreeCertFunc)(struct _WINE_CERT_CONTEXT_REF *ref); -typedef PCCERT_CONTEXT (*DupCertFunc)(PCCERT_CONTEXT context); - typedef enum _CertStoreType { StoreTypeMem, StoreTypeCollection, @@ -170,7 +168,6 @@ typedef struct WINE_CRYPTCERTSTORE AddCertFunc addCert; EnumCertFunc enumCert; PFN_CERT_STORE_PROV_DELETE_CERT deleteCert; - DupCertFunc dupCert; FreeCertFunc freeCert; /* optional */ PFN_CERT_STORE_PROV_CONTROL control; /* optional */ } WINECRYPT_CERTSTORE, *PWINECRYPT_CERTSTORE; @@ -193,7 +190,8 @@ typedef struct _WINE_CERT_CONTEXT typedef struct _WINE_CERT_CONTEXT_REF { - CERT_CONTEXT cert; + CERT_CONTEXT cert; + LONG ref; WINE_CERT_CONTEXT *context; } WINE_CERT_CONTEXT_REF, *PWINE_CERT_CONTEXT_REF; @@ -326,6 +324,7 @@ static void CRYPT_InitCertRef(PWINE_CERT { TRACE("(%p, %p)\n", ref, context); memcpy(&ref->cert, context, sizeof(ref->cert)); + ref->ref = 1; ref->context = context; InterlockedIncrement(&context->ref); TRACE("%p's ref count is %ld\n", context, context->ref); @@ -532,21 +531,6 @@ static void WINAPI CRYPT_MemCloseStore(H CryptMemFree(store); } -static PCCERT_CONTEXT CRYPT_MemDupCert(PCCERT_CONTEXT pCertContext) -{ - const WINE_CERT_LIST_ENTRY *context = - (const WINE_CERT_LIST_ENTRY *)pCertContext; - PWINE_CERT_LIST_ENTRY ret; - - ret = CryptMemAlloc(sizeof(WINE_CERT_LIST_ENTRY)); - if (ret) - { - memcpy(ret, context, sizeof(WINE_CERT_LIST_ENTRY)); - InterlockedIncrement(&ret->cert.context->ref); - } - return (PCCERT_CONTEXT)ret; -} - static WINECRYPT_CERTSTORE *CRYPT_MemOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags, const void *pvPara) { @@ -571,7 +555,6 @@ static WINECRYPT_CERTSTORE *CRYPT_MemOpe store->hdr.enumCert = CRYPT_MemEnumCert; store->hdr.deleteCert = CRYPT_MemDeleteCert; store->hdr.freeCert = NULL; - store->hdr.dupCert = CRYPT_MemDupCert; store->hdr.control = NULL; InitializeCriticalSection(&store->cs); list_init(&store->certs); @@ -749,21 +732,6 @@ static BOOL WINAPI CRYPT_CollectionDelet return ret; } -static PCCERT_CONTEXT CRYPT_CollectionDupCert(PCCERT_CONTEXT pCertContext) -{ - const WINE_COLLECTION_CERT_CONTEXT *context = - (const WINE_COLLECTION_CERT_CONTEXT *)pCertContext; - PWINE_COLLECTION_CERT_CONTEXT ret; - - ret = CryptMemAlloc(sizeof(WINE_COLLECTION_CERT_CONTEXT)); - if (ret) - { - memcpy(ret, context, sizeof(WINE_COLLECTION_CERT_CONTEXT)); - InterlockedIncrement(&ret->cert.context->ref); - } - return (PCCERT_CONTEXT)ret; -} - static void CRYPT_CollectionFreeCert(PWINE_CERT_CONTEXT_REF ref) { PWINE_COLLECTION_CERT_CONTEXT context = (PWINE_COLLECTION_CERT_CONTEXT)ref; @@ -796,7 +764,6 @@ static WINECRYPT_CERTSTORE *CRYPT_Collec store->hdr.addCert = CRYPT_CollectionAddCert; store->hdr.enumCert = CRYPT_CollectionEnumCert; store->hdr.deleteCert = CRYPT_CollectionDeleteCert; - store->hdr.dupCert = CRYPT_CollectionDupCert; store->hdr.freeCert = CRYPT_CollectionFreeCert; InitializeCriticalSection(&store->cs); list_init(&store->stores); @@ -887,21 +854,6 @@ static PWINE_CERT_CONTEXT_REF CRYPT_Prov return (PWINE_CERT_CONTEXT_REF)ret; } -static PCCERT_CONTEXT CRYPT_ProvDupCert(PCCERT_CONTEXT pCertContext) -{ - const WINE_PROV_CERT_CONTEXT *context = - (const WINE_PROV_CERT_CONTEXT *)pCertContext; - PWINE_PROV_CERT_CONTEXT ret; - - ret = CryptMemAlloc(sizeof(WINE_PROV_CERT_CONTEXT)); - if (ret) - { - memcpy(ret, context, sizeof(WINE_PROV_CERT_CONTEXT)); - InterlockedIncrement(&ret->cert.context->ref); - } - return (PCCERT_CONTEXT)ret; -} - static BOOL WINAPI CRYPT_ProvDeleteCert(HCERTSTORE hCertStore, PCCERT_CONTEXT cert, DWORD dwFlags) { @@ -965,7 +917,6 @@ static PWINECRYPT_CERTSTORE CRYPT_ProvCr ret->hdr.addCert = CRYPT_ProvAddCert; ret->hdr.enumCert = CRYPT_ProvEnumCert; ret->hdr.deleteCert = CRYPT_ProvDeleteCert; - ret->hdr.dupCert = CRYPT_ProvDupCert; ret->hdr.freeCert = CRYPT_ProvFreeCert; ret->hdr.control = CRYPT_ProvControl; if (pProvInfo->cStoreProvFunc > CERT_STORE_PROV_CLOSE_FUNC) @@ -2337,33 +2288,11 @@ BOOL WINAPI CertSetCertificateContextPro PCCERT_CONTEXT WINAPI CertDuplicateCertificateContext( PCCERT_CONTEXT pCertContext) { - PCCERT_CONTEXT ret; + PWINE_CERT_CONTEXT_REF context = (PWINE_CERT_CONTEXT_REF)pCertContext; TRACE("(%p)\n", pCertContext); - if (pCertContext->hCertStore) - { - PWINECRYPT_CERTSTORE store = - (PWINECRYPT_CERTSTORE)pCertContext->hCertStore; - - ret = store->dupCert(pCertContext); - } - else - { - PWINE_CERT_CONTEXT_REF context = (PWINE_CERT_CONTEXT_REF)pCertContext, - ref; - - ref = CryptMemAlloc(sizeof(WINE_CERT_CONTEXT_REF)); - if (ref) - { - memcpy(ref, context, sizeof(*ret)); - ref->cert.hCertStore = 0; - InterlockedIncrement(&ref->context->ref); - ret = (PCCERT_CONTEXT)ref; - } - else - ret = NULL; - } - return (PCCERT_CONTEXT)ret; + InterlockedIncrement(&context->ref); + return pCertContext; } BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore, @@ -2694,31 +2623,31 @@ BOOL WINAPI CertSetCTLContextProperty(PC static void CRYPT_UnrefCertificateContext(PWINE_CERT_CONTEXT_REF ref) { - if (InterlockedDecrement(&ref->context->ref) == 0) - { - TRACE("%p's ref count is 0, freeing\n", ref->context); - CRYPT_FreeCert(ref->context); - } - else - TRACE("%p's ref count is %ld\n", ref->context, ref->context->ref); -} - -BOOL WINAPI CertFreeCertificateContext(PCCERT_CONTEXT pCertContext) -{ - TRACE("(%p)\n", pCertContext); - - if (pCertContext) + if (InterlockedDecrement(&ref->ref) == 0) { - PWINE_CERT_CONTEXT_REF ref = (PWINE_CERT_CONTEXT_REF)pCertContext; PWINECRYPT_CERTSTORE store = (PWINECRYPT_CERTSTORE)ref->cert.hCertStore; - CRYPT_UnrefCertificateContext(ref); + if (InterlockedDecrement(&ref->context->ref) == 0) + { + TRACE("%p's ref count is 0, freeing\n", ref->context); + CRYPT_FreeCert(ref->context); + } + else + TRACE("%p's ref count is %ld\n", ref->context, ref->context->ref); if (store && store->dwMagic == WINE_CRYPTCERTSTORE_MAGIC && store->freeCert) store->freeCert(ref); TRACE("freeing %p\n", ref); CryptMemFree(ref); } +} + +BOOL WINAPI CertFreeCertificateContext(PCCERT_CONTEXT pCertContext) +{ + TRACE("(%p)\n", pCertContext); + + if (pCertContext) + CRYPT_UnrefCertificateContext((PWINE_CERT_CONTEXT_REF)pCertContext); return TRUE; }

1 0

Alexandre Julliard : kernel: Better support for detached processes.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: a401f3c4bb5819e6fcfefa9587eca60796531c4a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a401f3c4bb5819e6fcfefa9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 6 22:22:30 2006 +0100 kernel: Better support for detached processes. Call setsid() in the new process to create a new Unix process group when CREATE_NEW_PROCESS_GROUP, CREATE_NEW_CONSOLE, or DETACHED_PROCESS are specified. --- dlls/kernel/process.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index 62b6669..d1ff341 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -1116,7 +1116,7 @@ static char **build_envp( const WCHAR *e * Fork and exec a new Unix binary, checking for errors. */ static int fork_and_exec( const char *filename, const WCHAR *cmdline, - const WCHAR *env, const char *newdir ) + const WCHAR *env, const char *newdir, DWORD flags ) { int fd[2]; int pid, err; @@ -1135,6 +1135,8 @@ static int fork_and_exec( const char *fi char **envp = build_envp( env ); close( fd[0] ); + if (flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS)) setsid(); + /* Reset signals that we previously set to SIG_IGN */ signal( SIGPIPE, SIG_DFL ); signal( SIGCHLD, SIG_DFL ); @@ -1302,6 +1304,8 @@ static BOOL create_process( HANDLE hFile if (read( startfd[0], &dummy, 1 ) != 1) _exit(1); close( startfd[0] ); + if (flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS)) setsid(); + /* Reset signals that we previously set to SIG_IGN */ signal( SIGPIPE, SIG_DFL ); signal( SIGCHLD, SIG_DFL ); @@ -1743,7 +1747,7 @@ BOOL WINAPI CreateProcessW( LPCWSTR app_ if ((unix_name = wine_get_unix_file_name( name ))) { - retv = (fork_and_exec( unix_name, tidy_cmdline, envW, unixdir ) != -1); + retv = (fork_and_exec( unix_name, tidy_cmdline, envW, unixdir, flags ) != -1); HeapFree( GetProcessHeap(), 0, unix_name ); } }

1 0

Alexandre Julliard : x11drv: Make sure to never manipulate the root window, even if we own
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 6d5f5447eaae4837d8da9210d21fd3265a0073d7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6d5f5447eaae4837d8da921… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 6 21:02:59 2006 +0100 x11drv: Make sure to never manipulate the root window, even if we own the desktop window. --- dlls/x11drv/window.c | 6 ++++-- dlls/x11drv/winpos.c | 9 ++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/x11drv/window.c b/dlls/x11drv/window.c index 8eca46e..5cac2ed 100644 --- a/dlls/x11drv/window.c +++ b/dlls/x11drv/window.c @@ -145,7 +145,8 @@ void X11DRV_sync_window_style( Display * int mask = get_window_attributes( data, &attr ); wine_tsx11_lock(); - XChangeWindowAttributes( display, data->whole_window, mask, &attr ); + if (data->whole_window != DefaultRootWindow(display)) + XChangeWindowAttributes( display, data->whole_window, mask, &attr ); wine_tsx11_unlock(); } @@ -715,7 +716,8 @@ static void destroy_whole_window( Displa wine_tsx11_lock(); XSync( gdi_display, False ); /* flush any reference to this drawable in GDI queue */ XDeleteContext( display, data->whole_window, winContext ); - XDestroyWindow( display, data->whole_window ); /* this destroys client too */ + if (data->whole_window != DefaultRootWindow(display)) + XDestroyWindow( display, data->whole_window ); data->whole_window = 0; if (data->xic) { diff --git a/dlls/x11drv/winpos.c b/dlls/x11drv/winpos.c index c49b8c9..e912531 100644 --- a/dlls/x11drv/winpos.c +++ b/dlls/x11drv/winpos.c @@ -586,9 +586,16 @@ BOOL X11DRV_set_window_pos( HWND hwnd, H } SERVER_END_REQ; - if (win == WND_DESKTOP) + if (win == WND_DESKTOP || data->whole_window == DefaultRootWindow(gdi_display)) { data->whole_rect = data->client_rect = data->window_rect = *rectWindow; + if (win != WND_DESKTOP) + { + win->rectWindow = *rectWindow; + win->rectClient = *rectClient; + win->dwStyle = new_style; + WIN_ReleasePtr( win ); + } return ret; }

1 0

Alexandre Julliard : server: Support for closing the desktop window.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: f978f615d8d89f5e3dc7056cfff7b34e1f174295 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f978f615d8d89f5e3dc7056… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 6 21:02:24 2006 +0100 server: Support for closing the desktop window. If a thread is owning the desktop window, when all other users of the desktop have exited, signal the owner to close the desktop (with a 1 second delay). --- server/process.c | 1 + server/user.h | 17 +++++++++++------ server/window.c | 15 +++++++++++++++ server/winstation.c | 41 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+), 6 deletions(-) diff --git a/server/process.c b/server/process.c index cc88c5f..824f9b3 100644 --- a/server/process.c +++ b/server/process.c @@ -570,6 +570,7 @@ static void process_killed( struct proce assert( list_empty( &process->thread_list )); gettimeofday( &process->end_time, NULL ); + close_process_desktop( process ); handles = process->handles; process->handles = NULL; if (handles) release_object( handles ); diff --git a/server/user.h b/server/user.h index 7a64a4d..a70c6fc 100644 --- a/server/user.h +++ b/server/user.h @@ -52,12 +52,14 @@ struct winstation struct desktop { - struct object obj; /* object header */ - unsigned int flags; /* desktop flags */ - struct winstation *winstation; /* winstation this desktop belongs to */ - struct list entry; /* entry in winstation list of desktops */ - struct window *top_window; /* desktop window for this desktop */ - struct hook_table *global_hooks; /* table of global hooks on this desktop */ + struct object obj; /* object header */ + unsigned int flags; /* desktop flags */ + struct winstation *winstation; /* winstation this desktop belongs to */ + struct list entry; /* entry in winstation list of desktops */ + struct window *top_window; /* desktop window for this desktop */ + struct hook_table *global_hooks; /* table of global hooks on this desktop */ + struct timeout_user *close_timeout; /* timeout before closing the desktop */ + unsigned int users; /* processes and threads using this desktop */ }; /* user handles functions */ @@ -123,6 +125,8 @@ extern int rect_in_region( struct region /* window functions */ +extern struct process *get_top_window_owner( struct desktop *desktop ); +extern void close_desktop_window( struct desktop *desktop ); extern void destroy_window( struct window *win ); extern void destroy_thread_windows( struct thread *thread ); extern int is_child_window( user_handle_t parent, user_handle_t child ); @@ -150,6 +154,7 @@ extern struct winstation *get_process_wi extern struct desktop *get_thread_desktop( struct thread *thread, unsigned int access ); extern void connect_process_winstation( struct process *process, const struct unicode_str *name ); extern void connect_process_desktop( struct process *process, const struct unicode_str *name ); +extern void close_process_desktop( struct process *process ); extern void close_thread_desktop( struct thread *thread ); #endif /* __WINE_SERVER_USER_H */ diff --git a/server/window.c b/server/window.c index 812ecee..8b7af20 100644 --- a/server/window.c +++ b/server/window.c @@ -351,6 +351,21 @@ void destroy_window( struct window *win free( win ); } +/* get the process owning the top window of a given desktop */ +struct process *get_top_window_owner( struct desktop *desktop ) +{ + struct window *win = desktop->top_window; + if (!win || !win->thread) return NULL; + return win->thread->process; +} + +/* attempt to close the desktop window when the last process using it is gone */ +void close_desktop_window( struct desktop *desktop ) +{ + struct window *win = desktop->top_window; + if (win && win->thread) post_message( win->handle, WM_SYSCOMMAND, SC_CLOSE, 0 ); +} + /* create a new window structure (note: the window is not linked in the window tree) */ static struct window *create_window( struct window *parent, struct window *owner, atom_t atom, void *instance ) diff --git a/server/winstation.c b/server/winstation.c index da24be4..1239298 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -36,6 +36,7 @@ #include "request.h" #include "process.h" #include "user.h" +#include "file.h" #include "wine/unicode.h" @@ -199,6 +200,8 @@ static struct desktop *create_desktop( c desktop->winstation = (struct winstation *)grab_object( winstation ); desktop->top_window = NULL; desktop->global_hooks = NULL; + desktop->close_timeout = NULL; + desktop->users = 0; list_add_tail( &winstation->desktops, &desktop->entry ); } } @@ -233,6 +236,7 @@ static void desktop_destroy( struct obje if (desktop->top_window) destroy_window( desktop->top_window ); if (desktop->global_hooks) release_object( desktop->global_hooks ); + if (desktop->close_timeout) remove_timeout_user( desktop->close_timeout ); list_remove( &desktop->entry ); release_object( desktop->winstation ); } @@ -293,6 +297,12 @@ void connect_process_desktop( struct pro if ((desktop = create_desktop( name, OBJ_CASE_INSENSITIVE | OBJ_OPENIF, 0, winstation ))) { process->desktop = alloc_handle( process, desktop, DESKTOP_ALL_ACCESS, 0 ); + desktop->users++; + if (desktop->close_timeout) + { + remove_timeout_user( desktop->close_timeout ); + desktop->close_timeout = NULL; + } release_object( desktop ); } release_object( winstation ); @@ -300,6 +310,37 @@ void connect_process_desktop( struct pro clear_error(); /* ignore errors */ } +static void close_desktop_timeout( void *private ) +{ + struct desktop *desktop = private; + + desktop->close_timeout = NULL; + unlink_named_object( &desktop->obj ); /* make sure no other process can open it */ + close_desktop_window( desktop ); /* and signal the owner to quit */ +} + +/* close the desktop of a given process */ +void close_process_desktop( struct process *process ) +{ + struct desktop *desktop; + + if (process->desktop && (desktop = get_desktop_obj( process, process->desktop, 0 ))) + { + assert( desktop->users > 0 ); + desktop->users--; + /* if we have one remaining user, it has to be the manager of the desktop window */ + if (desktop->users == 1 && get_top_window_owner( desktop )) + { + struct timeval when; + gettimeofday( &when, NULL ); + add_timeout( &when, 1000 ); + desktop->close_timeout = add_timeout_user( &when, close_desktop_timeout, desktop ); + } + release_object( desktop ); + } + clear_error(); /* ignore errors */ +} + /* close the desktop of a given thread */ void close_thread_desktop( struct thread *thread ) {

1 0

Alexandre Julliard : server: Added unlink_named_object function.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 8cea993033944e927e6bcbceda647322d00916e5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8cea993033944e927e6bcbc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 6 21:00:09 2006 +0100 server: Added unlink_named_object function. Allows to remove the name of an object while keeping around the object itself. --- server/object.c | 7 +++++++ server/object.h | 1 + 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/server/object.c b/server/object.c index e881a69..fbef1a1 100644 --- a/server/object.c +++ b/server/object.c @@ -217,6 +217,13 @@ void dump_object_name( struct object *ob } } +/* unlink a named object from its namespace, without freeing the object itself */ +void unlink_named_object( struct object *obj ) +{ + if (obj->name) free_name( obj ); + obj->name = NULL; +} + /* grab an object (i.e. increment its refcount) and return the object */ struct object *grab_object( void *ptr ) { diff --git a/server/object.h b/server/object.h index 4a137fd..319bbba 100644 --- a/server/object.h +++ b/server/object.h @@ -109,6 +109,7 @@ extern void *create_object( struct names const struct unicode_str *name, struct object *parent ); extern void *create_named_object( struct namespace *namespace, const struct object_ops *ops, const struct unicode_str *name, unsigned int attributes ); +extern void unlink_named_object( struct object *obj ); extern struct namespace *create_namespace( unsigned int hash_size ); /* grab/release_object can take any pointer, but you better make sure */ /* that the thing pointed to starts with a struct object... */

1 0

Alexandre Julliard : server: Infrastructure for having a thread own the desktop window.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 251be542aca1dbf418e5c15e4adb0c5a2d7d3fc0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=251be542aca1dbf418e5c15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 6 20:37:52 2006 +0100 server: Infrastructure for having a thread own the desktop window. --- server/class.c | 31 +++-------------- server/user.h | 1 + server/window.c | 99 ++++++++++++++++++++++++++++++++++--------------------- 3 files changed, 69 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=251be542aca1dbf418e…

1 0

Alexandre Julliard : mlang: Decrement the module refcount when an object is destroyed.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 19a3adb9580ccf32c66c0ff4864a68d31044684f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=19a3adb9580ccf32c66c0ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 6 20:10:36 2006 +0100 mlang: Decrement the module refcount when an object is destroyed. --- dlls/mlang/mlang.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index e339b02..21076f4 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -836,6 +836,7 @@ static ULONG WINAPI MLang_Release( MLang { TRACE("Destroying %p\n", This); HeapFree(GetProcessHeap(), 0, This); + UnlockModule(); } return ref;

1 0

H. Verbeet : wined3d: Fix the relation between volumes and their container.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 07004966a8585f55074d5fff903c51bf2a033070 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=07004966a8585f55074d5ff… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Mar 6 18:28:20 2006 +0000 wined3d: Fix the relation between volumes and their container. --- dlls/d3d8/volume.c | 41 ++++++++++++++++++++++++++++++-------- dlls/d3d9/volume.c | 40 +++++++++++++++++++++++++++++-------- dlls/wined3d/volume.c | 24 ++++++++++++++++++++++ dlls/wined3d/volumetexture.c | 13 +++++++++++- include/wine/wined3d_interface.h | 2 ++ 5 files changed, 101 insertions(+), 19 deletions(-) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index cffc50b..20421a8 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -40,24 +40,47 @@ HRESULT WINAPI IDirect3DVolume8Impl_Quer ULONG WINAPI IDirect3DVolume8Impl_AddRef(LPDIRECT3DVOLUME8 iface) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; - ULONG ref = InterlockedIncrement(&This->ref); + IUnknown *containerParent = NULL; - TRACE("(%p) : AddRef from %ld\n", This, ref - 1); + TRACE("(%p)\n", This); - return ref; + IWineD3DVolume_GetContainerParent(This->wineD3DVolume, &containerParent); + if (containerParent) { + /* Forward to the containerParent */ + TRACE("(%p) : Forwarding to %p\n", This, containerParent); + return IUnknown_AddRef(containerParent); + } else { + /* No container, handle our own refcounting */ + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) : AddRef from %ld\n", This, ref - 1); + return ref; + } } ULONG WINAPI IDirect3DVolume8Impl_Release(LPDIRECT3DVOLUME8 iface) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; - ULONG ref = InterlockedDecrement(&This->ref); + IUnknown *containerParent = NULL; - TRACE("(%p) : ReleaseRef to %ld\n", This, ref); + TRACE("(%p)\n", This); + + IWineD3DVolume_GetContainerParent(This->wineD3DVolume, &containerParent); + if (containerParent) { + /* Forward to the containerParent */ + TRACE("(%p) : Forwarding to %p\n", This, containerParent); + return IUnknown_Release(containerParent); + } + else { + /* No container, handle our own refcounting */ + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p) : ReleaseRef to %ld\n", This, ref); + + if (ref == 0) { + IWineD3DVolume_Release(This->wineD3DVolume); + HeapFree(GetProcessHeap(), 0, This); + } - if (ref == 0) { - IWineD3DVolume_Release(This->wineD3DVolume); - HeapFree(GetProcessHeap(), 0, This); + return ref; } - return ref; } /* IDirect3DVolume8 Interface follow: */ diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 4e53b2a..1223932 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -41,24 +41,46 @@ HRESULT WINAPI IDirect3DVolume9Impl_Quer ULONG WINAPI IDirect3DVolume9Impl_AddRef(LPDIRECT3DVOLUME9 iface) { IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; - ULONG ref = InterlockedIncrement(&This->ref); + IUnknown *containerParent = NULL; - TRACE("(%p) : AddRef from %ld\n", This, ref - 1); + TRACE("(%p)\n", This); - return ref; + IWineD3DVolume_GetContainerParent(This->wineD3DVolume, &containerParent); + if (containerParent) { + /* Forward to the containerParent */ + TRACE("(%p) : Forwarding to %p\n", This, containerParent); + return IUnknown_AddRef(containerParent); + } else { + /* No container, handle our own refcounting */ + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) : AddRef from %ld\n", This, ref - 1); + return ref; + } } ULONG WINAPI IDirect3DVolume9Impl_Release(LPDIRECT3DVOLUME9 iface) { IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; - ULONG ref = InterlockedDecrement(&This->ref); + IUnknown *containerParent = NULL; - TRACE("(%p) : ReleaseRef to %ld\n", This, ref); + TRACE("(%p)\n", This); + + IWineD3DVolume_GetContainerParent(This->wineD3DVolume, &containerParent); + if (containerParent) { + /* Forward to the containerParent */ + TRACE("(%p) : Forwarding to %p\n", This, containerParent); + return IUnknown_Release(containerParent); + } else { + /* No container, handle our own refcounting */ + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p) : ReleaseRef to %ld\n", This, ref); + + if (ref == 0) { + IWineD3DVolume_Release(This->wineD3DVolume); + HeapFree(GetProcessHeap(), 0, This); + } - if (ref == 0) { - IWineD3DVolume_Release(This->wineD3DVolume); - HeapFree(GetProcessHeap(), 0, This); + return ref; } - return ref; } /* IDirect3DVolume9 Interface follow: */ diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 3fa1717..151ade3 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -103,6 +103,29 @@ D3DRESOURCETYPE WINAPI IWineD3DVolumeImp /* ******************************************* IWineD3DVolume parts follow ******************************************* */ +HRESULT WINAPI IWineD3DVolumeImpl_GetContainerParent(IWineD3DVolume *iface, IUnknown **ppContainerParent) { + IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; + + TRACE("(%p) : ppContainerParent %p\n", This, ppContainerParent); + + if (!ppContainerParent) { + ERR("(%p) : Called without a valid ppContainerParent\n", This); + } + + if (This->container) { + IWineD3DBase_GetParent(This->container, ppContainerParent); + if (!ppContainerParent) { + /* WineD3D objects should always have a parent */ + ERR("(%p) : GetParent returned NULL\n", This); + } + IUnknown_Release(*ppContainerParent); /* GetParent adds a reference; we want just the pointer */ + } else { + *ppContainerParent = NULL; + } + + return D3D_OK; +} + HRESULT WINAPI IWineD3DVolumeImpl_GetContainer(IWineD3DVolume *iface, REFIID riid, void** ppContainer) { IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; @@ -304,6 +327,7 @@ const IWineD3DVolumeVtbl IWineD3DVolume_ IWineD3DVolumeImpl_PreLoad, IWineD3DVolumeImpl_GetType, /* IWineD3DVolume */ + IWineD3DVolumeImpl_GetContainerParent, IWineD3DVolumeImpl_GetContainer, IWineD3DVolumeImpl_GetDesc, IWineD3DVolumeImpl_LockBox, diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 14e1154..9464357 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -60,8 +60,19 @@ ULONG WINAPI IWineD3DVolumeTextureImpl_R if (ref == 0) { for (i = 0; i < This->baseTexture.levels; i++) { if (This->volumes[i] != NULL) { + /* Since the volumes were created by callback, the texture is + * keeping the reference to the parent, so the texture should + * release it. */ + IUnknown *volumeParent = NULL; + TRACE("(%p) : Releasing volume %p\n", This, This->volumes[i]); - IWineD3DVolume_Release(This->volumes[i]); + + /* Cleanup the container */ + IWineD3DVolume_SetContainer(This->volumes[i], 0); + /* Now, release the parent, which will take care of cleaning up the volume for us */ + IWineD3DVolume_GetParent(This->volumes[i], &volumeParent); + IUnknown_Release(volumeParent); /* Once for the reference GetParent added */ + IUnknown_Release(volumeParent); /* Once for the reference we're keeping */ } } IWineD3DBaseTextureImpl_CleanUp((IWineD3DBaseTexture *) iface); diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 4184fee..c37ac00 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -1125,6 +1125,7 @@ DECLARE_INTERFACE_(IWineD3DVolume,IWineD STDMETHOD_(void,PreLoad)(THIS) PURE; STDMETHOD_(D3DRESOURCETYPE, GetType)(THIS) PURE; /*** IWineD3DVolume methods ***/ + STDMETHOD(GetContainerParent)(THIS_ IUnknown **ppContainerParent) PURE; STDMETHOD(GetContainer)(THIS_ REFIID riid, void ** ppContainer) PURE; STDMETHOD(GetDesc)(THIS_ WINED3DVOLUME_DESC * pDesc) PURE; STDMETHOD(LockBox)(THIS_ D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) PURE; @@ -1153,6 +1154,7 @@ DECLARE_INTERFACE_(IWineD3DVolume,IWineD #define IWineD3DVolume_PreLoad(p) (p)->lpVtbl->PreLoad(p) #define IWineD3DVolume_GetType(p) (p)->lpVtbl->GetType(p) /*** IWineD3DVolume methods ***/ +#define IWineD3DVolume_GetContainerParent(p,a) (p)->lpVtbl->GetContainerParent(p,a) #define IWineD3DVolume_GetContainer(p,a,b) (p)->lpVtbl->GetContainer(p,a,b) #define IWineD3DVolume_GetDesc(p,a) (p)->lpVtbl->GetDesc(p,a) #define IWineD3DVolume_LockBox(p,a,b,c) (p)->lpVtbl->LockBox(p,a,b,c)

1 0

H. Verbeet : wined3d: Fix the relation between surfaces and their container .
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: f7356a34c37f96a6f56120d875f77cfccd79c947 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f7356a34c37f96a6f56120d… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Mar 6 18:28:03 2006 +0000 wined3d: Fix the relation between surfaces and their container. --- dlls/d3d8/surface.c | 40 ++++++++++++++++++++++++++++-------- dlls/d3d9/surface.c | 42 ++++++++++++++++++++++++++++++-------- dlls/wined3d/cubetexture.c | 3 +++ dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 24 ++++++++++++++++++++++ dlls/wined3d/swapchain.c | 2 ++ dlls/wined3d/texture.c | 3 +++ include/wine/wined3d_interface.h | 2 ++ 8 files changed, 99 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=f7356a34c37f96a6f56…

1 0

H. Verbeet : wined3d: Don' t call glCompressedTexImage2DARB without allocatedMemory.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: fd2739b0239f3e4186664868b300a133cdc073b2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fd2739b0239f3e418666486… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Mar 6 18:27:53 2006 +0000 wined3d: Don't call glCompressedTexImage2DARB without allocatedMemory. Don't call glCompressedTexImage2DARB if we haven't got allocatedMemory (yet). Fix a small typo. --- dlls/wined3d/surface.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a4d9770..f8e6abf 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1029,7 +1029,9 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LoadT This->resource.format == WINED3DFMT_DXT3 || This->resource.format == WINED3DFMT_DXT4 || This->resource.format == WINED3DFMT_DXT5) { - if (GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) { + if (!GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) { + FIXME("Using DXT1/3/5 without advertized support\n"); + } else if (This->resource.allocatedMemory) { TRACE("Calling glCompressedTexImage2D %x i=%d, intfmt=%x, w=%d, h=%d,0=%d, sz=%d, Mem=%p\n", This->glDescription.target, This->glDescription.level, @@ -1050,7 +1052,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LoadT 0, This->resource.size, This->resource.allocatedMemory); - checkGLcall("glCommpressedTexTexImage2D"); + checkGLcall("glCommpressedTexImage2D"); LEAVE_GL(); @@ -1058,9 +1060,6 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LoadT HeapFree(GetProcessHeap(), 0, This->resource.allocatedMemory); This->resource.allocatedMemory = NULL; } - - } else { - FIXME("Using DXT1/3/5 without advertized support\n"); } } else {

1 0

Robert Shearman : wininet: Rewrite InternetCreateUrlW.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 414d1ddeb92f5fc9b0afb6c28347c7db8e9a6fd5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=414d1ddeb92f5fc9b0afb6c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Mar 6 17:31:56 2006 +0000 wininet: Rewrite InternetCreateUrlW. - Rewrite InternetCreateUrlW to respect the lengths passed in via the URL_COMPONENTS structure and fall back to a strlenW call when a length is zero. - Expand the number of protocols supported when determining whether the port number should be added. - Fix a test by passing in the correct length of scheme. --- dlls/wininet/internet.c | 139 ++++++++++++++++++++++++++------------------- dlls/wininet/tests/http.c | 12 ++-- 2 files changed, 86 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=414d1ddeb92f5fc9b0a…

1 0

Robert Shearman : wininet: Don' t continue to connect to a secure server without SSL support since it won' t work.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 9981f337e3aa38cc1b1cbf89f646030397540cd8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9981f337e3aa38cc1b1cbf8… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Mar 6 17:31:09 2006 +0000 wininet: Don't continue to connect to a secure server without SSL support since it won't work. Don't continue to connect to a secure server without SSL support since it won't work. Return an error back to the application instead. --- dlls/wininet/http.c | 11 +++++++++-- dlls/wininet/internet.h | 2 +- dlls/wininet/netconnection.c | 31 ++++++++++++++++++------------- 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9e74001..495b0b5 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1016,7 +1016,12 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(L goto lend; } - NETCON_init(&lpwhr->netConnection, dwFlags & INTERNET_FLAG_SECURE); + if (!NETCON_init(&lpwhr->netConnection, dwFlags & INTERNET_FLAG_SECURE)) + { + InternetCloseHandle( handle ); + handle = NULL; + goto lend; + } if (NULL != lpszObjectName && strlenW(lpszObjectName)) { HRESULT rc; @@ -2077,7 +2082,9 @@ static BOOL HTTP_HandleRedirect(LPWININE szaddr, strlen(szaddr)+1); NETCON_close(&lpwhr->netConnection); - NETCON_init(&lpwhr->netConnection,lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE); + + if (!NETCON_init(&lpwhr->netConnection,lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE)) + return FALSE; } HeapFree(GetProcessHeap(), 0, lpwhr->lpszPath); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 6df7e31..6399de9 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -468,7 +468,7 @@ VOID INTERNET_SendCallback(LPWININETHAND LPHTTPHEADERW HTTP_GetHeader(LPWININETHTTPREQW lpwhr, LPCWSTR header); BOOL NETCON_connected(WININET_NETCONNECTION *connection); -void NETCON_init(WININET_NETCONNECTION *connnection, BOOL useSSL); +BOOL NETCON_init(WININET_NETCONNECTION *connnection, BOOL useSSL); BOOL NETCON_create(WININET_NETCONNECTION *connection, int domain, int type, int protocol); BOOL NETCON_close(WININET_NETCONNECTION *connection); diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 97608b6..e046e04 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -111,7 +111,7 @@ MAKE_FUNCPTR(ERR_error_string); #endif -void NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) +BOOL NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) { connection->useSSL = FALSE; connection->socketFD = -1; @@ -119,23 +119,23 @@ void NETCON_init(WININET_NETCONNECTION * { #if defined HAVE_OPENSSL_SSL_H && defined HAVE_OPENSSL_ERR_H TRACE("using SSL connection\n"); - if (OpenSSL_ssl_handle) /* already initilzed everything */ - return; + if (OpenSSL_ssl_handle) /* already initialized everything */ + return TRUE; OpenSSL_ssl_handle = wine_dlopen(SONAME_LIBSSL, RTLD_NOW, NULL, 0); if (!OpenSSL_ssl_handle) { ERR("trying to use a SSL connection, but couldn't load %s. Expect trouble.\n", SONAME_LIBSSL); - connection->useSSL = FALSE; - return; + INTERNET_SetLastError(ERROR_INTERNET_SECURITY_CHANNEL_ERROR); + return FALSE; } OpenSSL_crypto_handle = wine_dlopen(SONAME_LIBCRYPTO, RTLD_NOW, NULL, 0); if (!OpenSSL_crypto_handle) { ERR("trying to use a SSL connection, but couldn't load %s. Expect trouble.\n", SONAME_LIBCRYPTO); - connection->useSSL = FALSE; - return; + INTERNET_SetLastError(ERROR_INTERNET_SECURITY_CHANNEL_ERROR); + return FALSE; } /* mmm nice ugly macroness */ @@ -144,8 +144,8 @@ void NETCON_init(WININET_NETCONNECTION * if (!p##x) \ { \ ERR("failed to load symbol %s\n", #x); \ - connection->useSSL = FALSE; \ - return; \ + INTERNET_SetLastError(ERROR_INTERNET_SECURITY_CHANNEL_ERROR); \ + return FALSE; \ } DYNSSL(SSL_library_init); @@ -172,8 +172,8 @@ void NETCON_init(WININET_NETCONNECTION * if (!p##x) \ { \ ERR("failed to load symbol %s\n", #x); \ - connection->useSSL = FALSE; \ - return; \ + INTERNET_SetLastError(ERROR_INTERNET_SECURITY_CHANNEL_ERROR); \ + return FALSE; \ } DYNCRYPTO(BIO_new_fp); DYNCRYPTO(ERR_get_error); @@ -189,9 +189,11 @@ void NETCON_init(WININET_NETCONNECTION * connection->peek_msg_mem = NULL; #else FIXME("can't use SSL, not compiled in.\n"); - connection->useSSL = FALSE; + INTERNET_SetLastError(ERROR_INTERNET_SECURITY_CHANNEL_ERROR); + return FALSE; #endif } + return TRUE; } BOOL NETCON_connected(WININET_NETCONNECTION *connection) @@ -353,6 +355,7 @@ BOOL NETCON_secure_connect(WININET_NETCO { ERR("SSL_CTX_set_default_verify_paths failed: %s\n", pERR_error_string(pERR_get_error(), 0)); + INTERNET_SetLastError(ERROR_OUTOFMEMORY); return FALSE; } connection->ssl_s = pSSL_new(ctx); @@ -360,6 +363,7 @@ BOOL NETCON_secure_connect(WININET_NETCO { ERR("SSL_new failed: %s\n", pERR_error_string(pERR_get_error(), 0)); + INTERNET_SetLastError(ERROR_OUTOFMEMORY); goto fail; } @@ -367,6 +371,7 @@ BOOL NETCON_secure_connect(WININET_NETCO { ERR("SSL_set_fd failed: %s\n", pERR_error_string(pERR_get_error(), 0)); + INTERNET_SetLastError(ERROR_INTERNET_SECURITY_CHANNEL_ERROR); goto fail; } @@ -397,7 +402,7 @@ BOOL NETCON_secure_connect(WININET_NETCO hostname_unix = HeapAlloc(GetProcessHeap(), 0, len); if (!hostname_unix) { - INTERNET_SetLastError(ERROR_NOT_ENOUGH_MEMORY); + INTERNET_SetLastError(ERROR_OUTOFMEMORY); goto fail; } WideCharToMultiByte(CP_UNIXCP, 0, hostname, -1, hostname_unix, len, NULL, NULL);

1 0

Robert Shearman : wininet: More tests for InternetCreateUrl.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 8bfc85957ac58de832793690ebe2b50de3bf4a0c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8bfc85957ac58de83279369… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Mar 6 17:31:32 2006 +0000 wininet: More tests for InternetCreateUrl. Fix an InternetCreateUrl test so that it correctly sets the scheme length and add tests which show the behaviour when the lengths are set to zero and when the https scheme is used. --- dlls/wininet/tests/http.c | 87 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 69 insertions(+), 18 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 1abecec..f7b6851 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -44,8 +44,9 @@ #define CREATE_URL3 "http://username:" #define CREATE_URL4 "http://www.winehq.org/site/about" #define CREATE_URL5 "http://" -#define CREATE_URL6 "nhtt://username:password@www.winehq.org:80/site/about" +#define CREATE_URL6 "nhttp://username:password@www.winehq.org:80/site/about" #define CREATE_URL7 "http://username:password@www.winehq.org:42/site/about" +#define CREATE_URL8 "https://username:password@www.winehq.org/site/about" static HANDLE hCompleteEvent; @@ -967,7 +968,7 @@ static void InternetCreateUrlA_test(void ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); ok(len == 50, "Expected len 50, got %ld\n", len); - ok(!strcmp(szUrl, CREATE_URL3), "Expected %s, got %s\n", CREATE_URL2, szUrl); + ok(!strcmp(szUrl, CREATE_URL3), "Expected %s, got %s\n", CREATE_URL3, szUrl); /* valid password, NULL username * if password is provided, username has to exist @@ -981,7 +982,7 @@ static void InternetCreateUrlA_test(void ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); ok(len == 42, "Expected len 42, got %ld\n", len); - ok(!strcmp(szUrl, CREATE_URL3), "Expected %s, got %s\n", CREATE_URL2, szUrl); + ok(!strcmp(szUrl, CREATE_URL3), "Expected %s, got %s\n", CREATE_URL3, szUrl); /* valid password, empty username * if password is provided, username has to exist @@ -995,7 +996,7 @@ static void InternetCreateUrlA_test(void ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); ok(len == 50, "Expected len 50, got %ld\n", len); - ok(!strcmp(szUrl, CREATE_URL5), "Expected %s, got %s\n", CREATE_URL4, szUrl); + ok(!strcmp(szUrl, CREATE_URL5), "Expected %s, got %s\n", CREATE_URL5, szUrl); /* NULL username, NULL password */ fill_url_components(&urlComp); @@ -1008,7 +1009,7 @@ static void InternetCreateUrlA_test(void ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); ok(len == 32, "Expected len 32, got %ld\n", len); - ok(!strcmp(szUrl, CREATE_URL4), "Expected %s, got %s\n", CREATE_URL3, szUrl); + ok(!strcmp(szUrl, CREATE_URL4), "Expected %s, got %s\n", CREATE_URL4, szUrl); /* empty username, empty password */ fill_url_components(&urlComp); @@ -1021,25 +1022,23 @@ static void InternetCreateUrlA_test(void ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); ok(len == 50, "Expected len 50, got %ld\n", len); - ok(!strcmp(szUrl, CREATE_URL5), "Expected %s, got %s\n", CREATE_URL4, szUrl); + ok(!strcmp(szUrl, CREATE_URL5), "Expected %s, got %s\n", CREATE_URL5, szUrl); - /* if lpszScheme != "http" or nPort != 80, display nPort. - * depending on nScheme, displays only first x characters - * of lpszScheme: - * HTTP: x=4 - * FTP: x=3 etc + /* shows that nScheme is ignored, as the appearance of the port number + * depends on lpszScheme and the string copied depends on lpszScheme. */ fill_url_components(&urlComp); HeapFree(GetProcessHeap(), 0, szUrl); urlComp.lpszScheme = "nhttp"; - len = 54; - szUrl = HeapAlloc(GetProcessHeap(), 0, len); + urlComp.dwSchemeLength = strlen(urlComp.lpszScheme); + len = strlen(CREATE_URL6) + 1; + szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); - ok(len == 53, "Expected len 51, got %ld\n", len); - ok(strstr(szUrl, "80") != NULL, "Expected to find 80 in szUrl\n"); - ok(!strncmp(szUrl, "nhtt://", 7), "Expected 'nhtt://'\n"); - ok(!strcmp(szUrl, CREATE_URL6), "Expected %s, got %s\n", CREATE_URL5, szUrl); + todo_wine { + ok(len == strlen(CREATE_URL6), "Expected len %d, got %ld\n", strlen(CREATE_URL6) + 1, len); + ok(!strcmp(szUrl, CREATE_URL6), "Expected %s, got %s\n", CREATE_URL6, szUrl); + } /* if lpszScheme != "http" or nPort != 80, display nPort */ HeapFree(GetProcessHeap(), 0, szUrl); @@ -1050,7 +1049,59 @@ static void InternetCreateUrlA_test(void ok(ret, "Expected success\n"); ok(len == 53, "Expected len 53, got %ld\n", len); ok(strstr(szUrl, "42") != NULL, "Expected to find 42 in szUrl\n"); - ok(!strcmp(szUrl, CREATE_URL7), "Expected %s, got %s\n", CREATE_URL6, szUrl); + ok(!strcmp(szUrl, CREATE_URL7), "Expected %s, got %s\n", CREATE_URL7, szUrl); + + HeapFree(GetProcessHeap(), 0, szUrl); + + memset(&urlComp, 0, sizeof(urlComp)); + urlComp.dwStructSize = sizeof(URL_COMPONENTS); + urlComp.lpszScheme = "http"; + urlComp.dwSchemeLength = 0; + urlComp.nScheme = INTERNET_SCHEME_HTTP; + urlComp.lpszHostName = "www.winehq.org"; + urlComp.dwHostNameLength = 0; + urlComp.nPort = 80; + urlComp.lpszUserName = "username"; + urlComp.dwUserNameLength = 0; + urlComp.lpszPassword = "password"; + urlComp.dwPasswordLength = 0; + urlComp.lpszUrlPath = "/site/about"; + urlComp.dwUrlPathLength = 0; + urlComp.lpszExtraInfo = ""; + urlComp.dwExtraInfoLength = 0; + len = strlen(CREATE_URL1); + szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); + ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); + ok(ret, "Expected success\n"); + todo_wine { + ok(len == strlen(CREATE_URL1), "Expected len %d, got %ld\n", strlen(CREATE_URL1), len); + ok(!strcmp(szUrl, CREATE_URL1), "Expected %s, got %s\n", CREATE_URL1, szUrl); + } + + memset(&urlComp, 0, sizeof(urlComp)); + urlComp.dwStructSize = sizeof(URL_COMPONENTS); + urlComp.lpszScheme = "https"; + urlComp.dwSchemeLength = 0; + urlComp.nScheme = INTERNET_SCHEME_HTTP; + urlComp.lpszHostName = "www.winehq.org"; + urlComp.dwHostNameLength = 0; + urlComp.nPort = 443; + urlComp.lpszUserName = "username"; + urlComp.dwUserNameLength = 0; + urlComp.lpszPassword = "password"; + urlComp.dwPasswordLength = 0; + urlComp.lpszUrlPath = "/site/about"; + urlComp.dwUrlPathLength = 0; + urlComp.lpszExtraInfo = ""; + urlComp.dwExtraInfoLength = 0; + len = strlen(CREATE_URL8); + szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); + ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); + ok(ret, "Expected success\n"); + todo_wine { + ok(len == strlen(CREATE_URL8), "Expected len %d, got %ld\n", strlen(CREATE_URL8), len); + ok(!strcmp(szUrl, CREATE_URL8), "Expected %s, got %s\n", CREATE_URL8, szUrl); + } HeapFree(GetProcessHeap(), 0, szUrl); }

1 0

Victor Pelt : wininet: Add stub for missing InternetSetOption.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 472ad3a450f044aa6c99086b36d0666e28dd9c59 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=472ad3a450f044aa6c99086… Author: Victor Pelt <victor.pelt(a)gmail.com> Date: Mon Mar 6 14:04:47 2006 +0100 wininet: Add stub for missing InternetSetOption. --- dlls/wininet/internet.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index f52103d..ff189a0 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2455,6 +2455,9 @@ BOOL WINAPI InternetSetOptionW(HINTERNET case INTERNET_OPTION_CONNECT_RETRIES: FIXME("Option INTERNET_OPTION_CONNECT_RETRIES: STUB\n"); break; + case INTERNET_OPTION_CONTEXT_VALUE: + FIXME("Option INTERNET_OPTION_CONTEXT_VALUE; STUB\n"); + break; default: FIXME("Option %ld STUB\n",dwOption); INTERNET_SetLastError(ERROR_INVALID_PARAMETER);

1 0

Alexandre Julliard : libwine: Export a function to retrieve the data directory (based on a
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 2f026d1694d6e34b6e2d9d4d61ef5632e6f3251d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2f026d1694d6e34b6e2d9d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 6 18:50:15 2006 +0100 libwine: Export a function to retrieve the data directory (based on a patch by Dmitry Timoshkov). --- include/wine/library.h | 1 + libs/wine/Makefile.in | 4 +++- libs/wine/config.c | 9 +++++++++ libs/wine/wine.def | 1 + libs/wine/wine.map | 1 + 5 files changed, 15 insertions(+), 1 deletions(-) diff --git a/include/wine/library.h b/include/wine/library.h index e92262c..385256d 100644 --- a/include/wine/library.h +++ b/include/wine/library.h @@ -30,6 +30,7 @@ /* configuration */ extern const char *wine_get_config_dir(void); +extern const char *wine_get_data_dir(void); extern const char *wine_get_server_dir(void); extern const char *wine_get_user_name(void); extern void wine_init_argv0_path( const char *argv0 ); diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 9304175..9d5d6ee 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -23,7 +23,9 @@ CONFIGDIRS = \ -DDLLDIR='"$(dlldir)"' \ -DLIB_TO_BINDIR=\"`$(RELPATH) $(libdir) $(bindir)`\" \ -DLIB_TO_DLLDIR=\"`$(RELPATH) $(libdir) $(dlldir)`\" \ - -DBIN_TO_DLLDIR=\"`$(RELPATH) $(bindir) $(dlldir)`\" + -DBIN_TO_DLLDIR=\"`$(RELPATH) $(bindir) $(dlldir)`\" \ + -DLIB_TO_DATADIR=\"`$(RELPATH) $(libdir) $(datadir)/wine`\" \ + -DBIN_TO_DATADIR=\"`$(RELPATH) $(bindir) $(datadir)/wine`\" config.o: config.c $(RELPATH) $(CC) -c $(ALLCFLAGS) -o $@ $(SRCDIR)/config.c $(CONFIGDIRS) diff --git a/libs/wine/config.c b/libs/wine/config.c index ca1080a..9bafe0f 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -41,6 +41,7 @@ static const char server_dir_prefix[] = static char *bindir; static char *dlldir; +static char *datadir; static char *config_dir; static char *server_dir; static char *user_name; @@ -248,6 +249,7 @@ void wine_init_argv0_path( const char *a { bindir = build_path( libdir, LIB_TO_BINDIR ); dlldir = build_path( libdir, LIB_TO_DLLDIR ); + datadir = build_path( libdir, LIB_TO_DATADIR ); return; } @@ -283,6 +285,7 @@ void wine_init_argv0_path( const char *a } dlldir = build_path( bindir, BIN_TO_DLLDIR ); + datadir = build_path( bindir, BIN_TO_DATADIR ); } /* return the configuration directory ($WINEPREFIX or $HOME/.wine) */ @@ -292,6 +295,12 @@ const char *wine_get_config_dir(void) return config_dir; } +/* retrieve the wine data dir */ +const char *wine_get_data_dir(void) +{ + return datadir; +} + /* return the full name of the server directory (the one containing the socket) */ const char *wine_get_server_dir(void) { diff --git a/libs/wine/wine.def b/libs/wine/wine.def index ffd8667..0388374 100644 --- a/libs/wine/wine.def +++ b/libs/wine/wine.def @@ -27,6 +27,7 @@ EXPORTS wine_exec_wine_binary wine_get_config_dir wine_get_cs + wine_get_data_dir wine_get_ds wine_get_es wine_get_fs diff --git a/libs/wine/wine.map b/libs/wine/wine.map index b230047..3a9c72a 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -27,6 +27,7 @@ WINE_1.0 wine_exec_wine_binary; wine_get_config_dir; wine_get_cs; + wine_get_data_dir; wine_get_ds; wine_get_es; wine_get_fs;

1 0

Francois Gouget : Fix compatibility with native advpack dlls.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 9a722d0afd7672ea631b91b81fc7cb9569e15a2d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9a722d0afd7672ea631b91b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 6 11:11:09 2006 +0100 Fix compatibility with native advpack dlls. Most native advpack dlls in circulation don't have RegInstallA. So mshtml and urlmon should do a GetProcAddress() on 'RegInstall' instead. --- dlls/mshtml/main.c | 2 +- dlls/urlmon/regsvr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index e921e45..5aa506e 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -316,7 +316,7 @@ static HRESULT register_server(BOOL do_r strtable.pse = pse; hAdvpack = LoadLibraryW(wszAdvpack); - pRegInstall = (typeof(RegInstallA)*)GetProcAddress(hAdvpack, "RegInstallA"); + pRegInstall = (typeof(RegInstallA)*)GetProcAddress(hAdvpack, "RegInstall"); hres = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", &strtable); diff --git a/dlls/urlmon/regsvr.c b/dlls/urlmon/regsvr.c index 302584d..c04803b 100644 --- a/dlls/urlmon/regsvr.c +++ b/dlls/urlmon/regsvr.c @@ -608,7 +608,7 @@ static HRESULT register_inf(BOOL doregis strtable.pse = pse; hAdvpack = LoadLibraryW(wszAdvpack); - pRegInstall = (typeof(RegInstallA)*)GetProcAddress(hAdvpack, "RegInstallA"); + pRegInstall = (typeof(RegInstallA)*)GetProcAddress(hAdvpack, "RegInstall"); hres = pRegInstall(URLMON_hInstance, doregister ? "RegisterDll" : "UnregisterDll", &strtable);

1 0

Mike McCormack : wrc: Don't use identifiers starting yy*, they' re reserved for flex.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 69dcbaaf93a65820a28fe2485b6d15a90f423899 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=69dcbaaf93a65820a28fe24… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Mar 6 21:41:00 2006 +0900 wrc: Don't use identifiers starting yy*, they're reserved for flex. --- tools/wrc/parser.l | 106 ++++++++++++++++++++++++++-------------------------- 1 files changed, 53 insertions(+), 53 deletions(-) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index aea3fb8..9ad1751 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -68,11 +68,11 @@ */ /* Exclusive string handling */ -%x yystr +%x tkstr /* Exclusive unicode string handling */ -%x yylstr +%x tklstr /* Exclusive rcdata single quoted data handling */ -%x yyrcd +%x tkrcd /* Exclusive comment eating... */ %x comment /* Set when stripping c-junk */ @@ -428,102 +428,102 @@ static struct keyword *iskeyword(char *k * Wide string scanning */ L\" { - yy_push_state(yylstr); + yy_push_state(tklstr); wbufidx = 0; if(!win32) yywarning("16bit resource contains unicode strings\n"); } -<yylstr>\"{ws}+ | -<yylstr>\" { +<tklstr>\"{ws}+ | +<tklstr>\" { yy_pop_state(); yylval.str = get_buffered_wstring(); return tSTRING; } -<yylstr>\\[0-7]{1,6} { /* octal escape sequence */ +<tklstr>\\[0-7]{1,6} { /* octal escape sequence */ unsigned int result; result = strtoul(yytext+1, 0, 8); if ( result > 0xffff ) yyerror("Character constant out of range"); addwchar((WCHAR)result); } -<yylstr>\\x[0-9a-fA-F]{4} { /* hex escape sequence */ +<tklstr>\\x[0-9a-fA-F]{4} { /* hex escape sequence */ unsigned int result; result = strtoul(yytext+2, 0, 16); addwchar((WCHAR)result); } -<yylstr>\\x[0-9a-fA-F]{1,3} { yyerror("Invalid hex escape sequence '%s'", yytext); } +<tklstr>\\x[0-9a-fA-F]{1,3} { yyerror("Invalid hex escape sequence '%s'", yytext); } -<yylstr>\\[0-9]+ yyerror("Bad escape sequence"); -<yylstr>\\\n{ws}* line_number++; char_number = 1; /* backslash at EOL continues string after leading whitespace on next line */ -<yylstr>\\a addwchar('\a'); -<yylstr>\\b addwchar('\b'); -<yylstr>\\f addwchar('\f'); -<yylstr>\\n addwchar('\n'); -<yylstr>\\r addwchar('\r'); -<yylstr>\\t addwchar('\t'); -<yylstr>\\v addwchar('\v'); -<yylstr>\\. addwchar(yytext[1]); -<yylstr>\\\r\n addwchar(yytext[2]); line_number++; char_number = 1; -<yylstr>\"\" addwchar('\"'); /* "bla""bla" -> "bla\"bla" */ -<yylstr>\\\"\" addwchar('\"'); /* "bla\""bla" -> "bla\"bla" */ -<yylstr>\"{ws}+\" ; /* "bla" "bla" -> "blabla" */ -<yylstr>[^\\\n\"]+ { +<tklstr>\\[0-9]+ yyerror("Bad escape sequence"); +<tklstr>\\\n{ws}* line_number++; char_number = 1; /* backslash at EOL continues string after leading whitespace on next line */ +<tklstr>\\a addwchar('\a'); +<tklstr>\\b addwchar('\b'); +<tklstr>\\f addwchar('\f'); +<tklstr>\\n addwchar('\n'); +<tklstr>\\r addwchar('\r'); +<tklstr>\\t addwchar('\t'); +<tklstr>\\v addwchar('\v'); +<tklstr>\\. addwchar(yytext[1]); +<tklstr>\\\r\n addwchar(yytext[2]); line_number++; char_number = 1; +<tklstr>\"\" addwchar('\"'); /* "bla""bla" -> "bla\"bla" */ +<tklstr>\\\"\" addwchar('\"'); /* "bla\""bla" -> "bla\"bla" */ +<tklstr>\"{ws}+\" ; /* "bla" "bla" -> "blabla" */ +<tklstr>[^\\\n\"]+ { char *yptr = yytext; while(*yptr) /* FIXME: codepage translation */ addwchar(*yptr++ & 0xff); } -<yylstr>\n yyerror("Unterminated string"); +<tklstr>\n yyerror("Unterminated string"); /* * Normal string scanning */ -\" yy_push_state(yystr); cbufidx = 0; -<yystr>\"{ws}+ | -<yystr>\" { +\" yy_push_state(tkstr); cbufidx = 0; +<tkstr>\"{ws}+ | +<tkstr>\" { yy_pop_state(); yylval.str = get_buffered_cstring(); return tSTRING; } -<yystr>\\[0-7]{1,3} { /* octal escape sequence */ +<tkstr>\\[0-7]{1,3} { /* octal escape sequence */ int result; result = strtol(yytext+1, 0, 8); if ( result > 0xff ) yyerror("Character constant out of range"); addcchar((char)result); } -<yystr>\\x[0-9a-fA-F]{2} { /* hex escape sequence */ +<tkstr>\\x[0-9a-fA-F]{2} { /* hex escape sequence */ int result; result = strtol(yytext+2, 0, 16); addcchar((char)result); } -<yystr>\\x[0-9a-fA-F] { yyerror("Invalid hex escape sequence '%s'", yytext); } +<tkstr>\\x[0-9a-fA-F] { yyerror("Invalid hex escape sequence '%s'", yytext); } -<yystr>\\[0-9]+ yyerror("Bad escape sequence"); -<yystr>\\\n{ws}* line_number++; char_number = 1; /* backslash at EOL continues string after leading whitespace on next line */ -<yystr>\\a addcchar('\a'); -<yystr>\\b addcchar('\b'); -<yystr>\\f addcchar('\f'); -<yystr>\\n addcchar('\n'); -<yystr>\\r addcchar('\r'); -<yystr>\\t addcchar('\t'); -<yystr>\\v addcchar('\v'); -<yystr>\\. addcchar(yytext[1]); -<yystr>\\\r\n addcchar(yytext[2]); line_number++; char_number = 1; -<yystr>[^\\\n\"]+ { +<tkstr>\\[0-9]+ yyerror("Bad escape sequence"); +<tkstr>\\\n{ws}* line_number++; char_number = 1; /* backslash at EOL continues string after leading whitespace on next line */ +<tkstr>\\a addcchar('\a'); +<tkstr>\\b addcchar('\b'); +<tkstr>\\f addcchar('\f'); +<tkstr>\\n addcchar('\n'); +<tkstr>\\r addcchar('\r'); +<tkstr>\\t addcchar('\t'); +<tkstr>\\v addcchar('\v'); +<tkstr>\\. addcchar(yytext[1]); +<tkstr>\\\r\n addcchar(yytext[2]); line_number++; char_number = 1; +<tkstr>[^\\\n\"]+ { char *yptr = yytext; while(*yptr) addcchar(*yptr++); } -<yystr>\"\" addcchar('\"'); /* "bla""bla" -> "bla\"bla" */ -<yystr>\\\"\" addcchar('\"'); /* "bla\""bla" -> "bla\"bla" */ -<yystr>\"{ws}+\" ; /* "bla" "bla" -> "blabla" */ -<yystr>\n yyerror("Unterminated string"); +<tkstr>\"\" addcchar('\"'); /* "bla""bla" -> "bla\"bla" */ +<tkstr>\\\"\" addcchar('\"'); /* "bla\""bla" -> "bla\"bla" */ +<tkstr>\"{ws}+\" ; /* "bla" "bla" -> "blabla" */ +<tkstr>\n yyerror("Unterminated string"); /* * Raw data scanning */ -\' yy_push_state(yyrcd); cbufidx = 0; -<yyrcd>\' { +\' yy_push_state(tkrcd); cbufidx = 0; +<tkrcd>\' { yy_pop_state(); yylval.raw = new_raw_data(); yylval.raw->size = cbufidx; @@ -531,14 +531,14 @@ L\" { memcpy(yylval.raw->data, cbuffer, yylval.raw->size); return tRAWDATA; } -<yyrcd>[0-9a-fA-F]{2} { +<tkrcd>[0-9a-fA-F]{2} { int result; result = strtol(yytext, 0, 16); addcchar((char)result); } -<yyrcd>{ws}+ ; /* Ignore space */ -<yyrcd>\n line_number++; char_number = 1; -<yyrcd>. yyerror("Malformed data-line"); +<tkrcd>{ws}+ ; /* Ignore space */ +<tkrcd>\n line_number++; char_number = 1; +<tkrcd>. yyerror("Malformed data-line"); /* * Comment stripping

1 0

Mike McCormack : avifil32: Fix some more gcc 4. 1 warnings caused by windowsx.h macros.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 8723936de63387a9871367848ebbb6487d7a4bf3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8723936de63387a98713678… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Mar 6 20:33:13 2006 +0900 avifil32: Fix some more gcc 4.1 warnings caused by windowsx.h macros. --- dlls/avifil32/editstream.c | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index eba563a..29f6a4d 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -26,7 +26,6 @@ #include "wingdi.h" #include "winnls.h" #include "winerror.h" -#include "windowsx.h" #include "mmsystem.h" #include "vfw.h" @@ -330,11 +329,11 @@ static BOOL AVIFILE_FormatsEqual(PAVISTR return FALSE; /* sizes match, now get formats and compare them */ - fmt1 = GlobalAllocPtr(GHND, size1); + fmt1 = GlobalLock(GlobalAlloc(GHND, size1)); if (fmt1 == NULL) return FALSE; if (SUCCEEDED(AVIStreamReadFormat(avi1, start1, fmt1, &size1))) { - fmt2 = GlobalAllocPtr(GHND, size1); + fmt2 = GlobalLock(GlobalAlloc(GHND, size1)); if (fmt2 != NULL) { if (SUCCEEDED(AVIStreamReadFormat(avi2, start2, fmt2, &size1))) status = (memcmp(fmt1, fmt2, size1) == 0); @@ -342,8 +341,12 @@ static BOOL AVIFILE_FormatsEqual(PAVISTR } if (fmt2 != NULL) - GlobalFreePtr(fmt2); - GlobalFreePtr(fmt1); + { + GlobalUnlock(GlobalHandle(fmt2)); + GlobalFree(GlobalHandle(fmt2)); + } + GlobalUnlock(GlobalHandle(fmt1)); + GlobalFree(GlobalHandle(fmt1)); return status; } @@ -404,7 +407,8 @@ static ULONG WINAPI IAVIEditStream_fnR if (This->pStreams[i].pStream != NULL) IAVIStream_Release(This->pStreams[i].pStream); } - GlobalFreePtr(This->pStreams); + GlobalUnlock(GlobalHandle(This->pStreams)); + GlobalFree(GlobalHandle(This->pStreams)); } LocalFree((HLOCAL)This); @@ -470,8 +474,8 @@ static HRESULT WINAPI IAVIEditStream_fnC } else { /* splitting */ if (This->nStreams + 1 >= This->nTableSize) { - This->pStreams = - GlobalReAllocPtr(This->pStreams, (This->nTableSize + 32) * sizeof(EditStreamTable), GMEM_SHARE|GHND); + GlobalUnlock(GlobalHandle(This->pStreams)); + This->pStreams = GlobalLock(GlobalReAlloc(GlobalHandle(This->pStreams), (This->nTableSize + 32) * sizeof(EditStreamTable), GMEM_SHARE|GHND)); if (This->pStreams == NULL) return AVIERR_MEMORY; This->nTableSize += 32; @@ -662,8 +666,8 @@ static HRESULT WINAPI IAVIEditStream_fnP if (This->nStreams + nStreams + 1 > This->nTableSize) { n = This->nStreams + nStreams + 33; - This->pStreams = - GlobalReAllocPtr(This->pStreams, n * sizeof(EditStreamTable), GMEM_SHARE|GHND); + GlobalUnlock(GlobalHandle(This->pStreams)); + This->pStreams = GlobalLock(GlobalReAlloc(GlobalHandle(This->pStreams), n * sizeof(EditStreamTable), GMEM_SHARE|GHND)); if (This->pStreams == NULL) return AVIERR_MEMORY; This->nTableSize = n; @@ -752,7 +756,8 @@ static HRESULT WINAPI IAVIEditStream_fnC if (pEdit == NULL) return AVIERR_MEMORY; if (This->nStreams > pEdit->nTableSize) { - pEdit->pStreams = GlobalReAllocPtr(pEdit->pStreams, This->nStreams * sizeof(EditStreamTable),GMEM_SHARE|GHND); + GlobalUnlock(GlobalHandle(pEdit->pStreams)); + pEdit->pStreams = GlobalLock(GlobalReAlloc(GlobalHandle(pEdit->pStreams), This->nStreams * sizeof(EditStreamTable), GMEM_SHARE|GHND)); if (pEdit->pStreams == NULL) return AVIERR_MEMORY; pEdit->nTableSize = This->nStreams; @@ -841,7 +846,7 @@ static HRESULT WINAPI IEditAVIStream_fnC if (This->pStreams == NULL) { This->pStreams = - GlobalAllocPtr(GMEM_SHARE|GHND, 256 * sizeof(EditStreamTable)); + GlobalLock(GlobalAlloc(GMEM_SHARE|GHND, 256 * sizeof(EditStreamTable))); if (This->pStreams == NULL) return AVIERR_MEMORY; This->nTableSize = 256;

1 0

Jacek Caban : shdocvw: Added get_LocationURL implementation.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 87e04f2f4a020a4209f051c2ee39f4c0a463d985 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=87e04f2f4a020a4209f051c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 6 15:53:31 2006 +0100 shdocvw: Added get_LocationURL implementation. --- dlls/shdocvw/navigate.c | 15 ++++++++++----- dlls/shdocvw/webbrowser.c | 13 +++++++++++-- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 5a6b45a..d1030d2 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -315,7 +315,7 @@ static IBindStatusCallback *create_callb return BINDSC(ret); } -static void on_before_navigate2(WebBrowser *This, PBYTE post_data, ULONG post_data_len, +static void on_before_navigate2(WebBrowser *This, LPWSTR url, PBYTE post_data, ULONG post_data_len, LPWSTR headers, VARIANT_BOOL *cancel) { VARIANT var_url, var_flags, var_frame_name, var_post_data, var_post_data2, var_headers; @@ -366,13 +366,14 @@ static void on_before_navigate2(WebBrows V_VT(params+5) = (VT_BYREF|VT_VARIANT); V_VARIANTREF(params+5) = &var_url; V_VT(&var_url) = VT_BSTR; - V_BSTR(&var_url) = SysAllocString(This->url); + V_BSTR(&var_url) = SysAllocString(url); V_VT(params+6) = (VT_DISPATCH); V_DISPATCH(params+6) = (IDispatch*)WEBBROWSER2(This); call_sink(This->cp_wbe2, DISPID_BEFORENAVIGATE2, &dispparams); + SysFreeString(V_BSTR(&var_url)); if(post_data_len) SafeArrayDestroy(V_ARRAY(&var_post_data)); } @@ -472,6 +473,7 @@ HRESULT navigate_hlink(WebBrowser *This, IBindStatusCallback *callback) { IHttpNegotiate *http_negotiate; + LPWSTR url = NULL; PBYTE post_data = NULL; ULONG post_data_len = 0; LPWSTR headers = NULL; @@ -480,8 +482,8 @@ HRESULT navigate_hlink(WebBrowser *This, DWORD bindf = 0; HRESULT hres; - IMoniker_GetDisplayName(mon, NULL, NULL, &This->url); - TRACE("navigating to %s\n", debugstr_w(This->url)); + IMoniker_GetDisplayName(mon, NULL, NULL, &url); + TRACE("navigating to %s\n", debugstr_w(url)); hres = IBindStatusCallback_QueryInterface(callback, &IID_IHttpNegotiate, (void**)&http_negotiate); @@ -504,16 +506,19 @@ HRESULT navigate_hlink(WebBrowser *This, post_data = bindinfo.stgmedData.u.hGlobal; } - on_before_navigate2(This, post_data, post_data_len, headers, &cancel); + on_before_navigate2(This, url, post_data, post_data_len, headers, &cancel); CoTaskMemFree(headers); ReleaseBindInfo(&bindinfo); if(cancel) { FIXME("navigation canceled\n"); + CoTaskMemFree(url); return S_OK; } + This->url = url; + return navigate(This, mon, bindctx, callback); } diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 493a124..a2021e1 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -351,8 +351,17 @@ static HRESULT WINAPI WebBrowser_get_Loc static HRESULT WINAPI WebBrowser_get_LocationURL(IWebBrowser2 *iface, BSTR *LocationURL) { WebBrowser *This = WEBBROWSER_THIS(iface); + FIXME("(%p)->(%p)\n", This, LocationURL); - return E_NOTIMPL; + + if(!This->url) { + static const WCHAR null_char = 0; + *LocationURL = SysAllocString(&null_char); + return S_FALSE; + } + + *LocationURL = SysAllocString(This->url); + return S_OK; } static HRESULT WINAPI WebBrowser_get_Busy(IWebBrowser2 *iface, VARIANT_BOOL *pBool) @@ -543,7 +552,7 @@ static HRESULT WINAPI WebBrowser_Navigat return E_INVALIDARG; headers = V_BSTR(Headers); - FIXME("Headers: %s\n", debugstr_w(headers)); + TRACE("Headers: %s\n", debugstr_w(headers)); } if(!This->doc_view_hwnd)

1 0

Jacek Caban : mshtml: Added IHTMLElementCollection implementation.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: d6d76870cb1ccb83f6feb8736dfca6d9dc1d984d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d6d76870cb1ccb83f6feb87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 5 21:56:04 2006 +0100 mshtml: Added IHTMLElementCollection implementation. - Added IHTMLElementCollection implementation. - Added get_all implementation. --- dlls/mshtml/htmlelem.c | 267 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlnode.c | 1 2 files changed, 266 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 9502b7a..818a3a3 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -36,6 +36,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +static HRESULT HTMLElementCollection_Create(IUnknown*,HTMLElement**,DWORD,IDispatch**); + #define HTMLELEM_THIS(iface) DEFINE_THIS(HTMLElement, HTMLElement, iface) static HRESULT WINAPI HTMLElement_QueryInterface(IHTMLElement *iface, @@ -738,11 +740,67 @@ static HRESULT WINAPI HTMLElement_get_ch return E_NOTIMPL; } +static void create_all_list(HTMLDocument *doc, HTMLElement *elem, HTMLElement ***list, DWORD *size, + DWORD *len) +{ + nsIDOMNodeList *nsnode_list; + nsIDOMNode *iter; + PRUint32 list_len = 0, i; + HTMLDOMNode *node; + nsresult nsres; + + nsres = nsIDOMNode_GetChildNodes(elem->node->nsnode, &nsnode_list); + if(NS_FAILED(nsres)) { + ERR("GetChildNodes failed: %08lx\n", nsres); + return; + } + + nsIDOMNodeList_GetLength(nsnode_list, &list_len); + if(!list_len) + return; + + for(i=0; i<list_len; i++) { + nsres = nsIDOMNodeList_Item(nsnode_list, i, &iter); + if(NS_FAILED(nsres)) { + ERR("Item failed: %08lx\n", nsres); + continue; + } + + node = get_node(doc, iter); + if(node->node_type != NT_HTMLELEM) + continue; + + if(*len == *size) { + *size <<= 1; + *list = HeapReAlloc(GetProcessHeap(), 0, *list, *size * sizeof(HTMLElement**)); + } + + (*list)[(*len)++] = (HTMLElement*)node->impl.elem; + + create_all_list(doc, (HTMLElement*)node->impl.elem, list, size, len); + } +} + static HRESULT WINAPI HTMLElement_get_all(IHTMLElement *iface, IDispatch **p) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + HTMLElement **elem_list; + DWORD list_size = 8, len = 0; + + TRACE("(%p)->(%p)\n", This, p); + + elem_list = HeapAlloc(GetProcessHeap(), 0, list_size*sizeof(HTMLElement**)); + + create_all_list(This->node->doc, This, &elem_list, &list_size, &len); + + if(!len) { + HeapFree(GetProcessHeap(), 0, elem_list); + elem_list = NULL; + }else if(list_size > len) { + elem_list = HeapReAlloc(GetProcessHeap(), 0, elem_list, len*sizeof(HTMLElement**)); + } + + return HTMLElementCollection_Create((IUnknown*)HTMLELEM(This), elem_list, len, p); } static void HTMLElement_destructor(IUnknown *iface) @@ -873,3 +931,208 @@ void HTMLElement_Create(HTMLDOMNode *nod nsIDOMNode_QueryInterface(node->nsnode, &IID_nsIDOMHTMLElement, (void**)&ret->nselem); } + +typedef struct { + const IHTMLElementCollectionVtbl *lpHTMLElementCollectionVtbl; + + IUnknown *ref_unk; + HTMLElement **elems; + DWORD len; + + LONG ref; +} HTMLElementCollection; + +#define HTMLELEMCOL(x) ((IHTMLElementCollection*) &(x)->lpHTMLElementCollectionVtbl) + +#define ELEMCOL_THIS(iface) DEFINE_THIS(HTMLElementCollection, HTMLElementCollection, iface) + +static HRESULT WINAPI HTMLElementCollection_QueryInterface(IHTMLElementCollection *iface, + REFIID riid, void **ppv) +{ + HTMLElementCollection *This = ELEMCOL_THIS(iface); + + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = HTMLELEMCOL(This); + }else if(IsEqualGUID(&IID_IDispatch, riid)) { + TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); + *ppv = HTMLELEMCOL(This); + }else if(IsEqualGUID(&IID_IHTMLElementCollection, riid)) { + TRACE("(%p)->(IID_IHTMLElementCollection %p)\n", This, ppv); + *ppv = HTMLELEMCOL(This); + } + + if(*ppv) { + IHTMLElementCollection_AddRef(HTMLELEMCOL(This)); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI HTMLElementCollection_AddRef(IHTMLElementCollection *iface) +{ + HTMLElementCollection *This = ELEMCOL_THIS(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%ld\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLElementCollection_Release(IHTMLElementCollection *iface) +{ + HTMLElementCollection *This = ELEMCOL_THIS(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%ld\n", This, ref); + + if(!ref) { + IUnknown_Release(This->ref_unk); + HeapFree(GetProcessHeap(), 0, This->elems); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI HTMLElementCollection_GetTypeInfoCount(IHTMLElementCollection *iface, + UINT *pctinfo) +{ + HTMLElementCollection *This = ELEMCOL_THIS(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLElementCollection_GetTypeInfo(IHTMLElementCollection *iface, + UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLElementCollection *This = ELEMCOL_THIS(iface); + FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLElementCollection_GetIDsOfNames(IHTMLElementCollection *iface, + REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLElementCollection *This = ELEMCOL_THIS(iface); + FIXME("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLElementCollection_Invoke(IHTMLElementCollection *iface, + DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLElementCollection *This = ELEMCOL_THIS(iface); + FIXME("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLElementCollection_toString(IHTMLElementCollection *iface, + BSTR *String) +{ + HTMLElementCollection *This = ELEMCOL_THIS(iface); + FIXME("(%p)->(%p)\n", This, String); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLElementCollection_put_length(IHTMLElementCollection *iface, + long v) +{ + HTMLElementCollection *This = ELEMCOL_THIS(iface); + FIXME("(%p)->(%ld)\n", This, v); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLElementCollection_get_length(IHTMLElementCollection *iface, + long *p) +{ + HTMLElementCollection *This = ELEMCOL_THIS(iface); + + TRACE("(%p)->(%p)\n", This, p); + + *p = This->len; + return S_OK; +} + +static HRESULT WINAPI HTMLElementCollection_get__newEnum(IHTMLElementCollection *iface, + IUnknown **p) +{ + HTMLElementCollection *This = ELEMCOL_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface, + VARIANT name, VARIANT index, IDispatch **pdisp) +{ + HTMLElementCollection *This = ELEMCOL_THIS(iface); + + if(V_VT(&index) != VT_I4) { + WARN("Invalid index vt=%d\n", V_VT(&index)); + return E_INVALIDARG; + } + + if(V_VT(&name) != VT_I4 || V_I4(&name) != V_I4(&index)) + FIXME("Unsupproted name vt=%d\n", V_VT(&name)); + + TRACE("(%p)->(%ld %ld %p)\n", This, V_I4(&name), V_I4(&index), pdisp); + + if(V_I4(&index) < 0 || V_I4(&index) >= This->len) + return E_INVALIDARG; + + *pdisp = (IDispatch*)This->elems[V_I4(&index)]; + IDispatch_AddRef(*pdisp); + return S_OK; +} + +static HRESULT WINAPI HTMLElementCollection_tags(IHTMLElementCollection *iface, + VARIANT tagName, IDispatch **pdisp) +{ + HTMLElementCollection *This = ELEMCOL_THIS(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(V_BSTR(&tagName)), pdisp); + return E_NOTIMPL; +} + +#undef ELEMCOL_THIS + +static const IHTMLElementCollectionVtbl HTMLElementCollectionVtbl = { + HTMLElementCollection_QueryInterface, + HTMLElementCollection_AddRef, + HTMLElementCollection_Release, + HTMLElementCollection_GetTypeInfoCount, + HTMLElementCollection_GetTypeInfo, + HTMLElementCollection_GetIDsOfNames, + HTMLElementCollection_Invoke, + HTMLElementCollection_toString, + HTMLElementCollection_put_length, + HTMLElementCollection_get_length, + HTMLElementCollection_get__newEnum, + HTMLElementCollection_item, + HTMLElementCollection_tags +}; + +static HRESULT HTMLElementCollection_Create(IUnknown *ref_unk, HTMLElement **elems, DWORD len, + IDispatch **p) +{ + HTMLElementCollection *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(HTMLElementCollection)); + + ret->lpHTMLElementCollectionVtbl = &HTMLElementCollectionVtbl; + ret->ref = 1; + ret->elems = elems; + ret->len = len; + + IUnknown_AddRef(ref_unk); + ret->ref_unk = ref_unk; + + TRACE("ret=%p len=%ld\n", ret, len); + + *p = (IDispatch*)ret; + return S_OK; +} diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index cb4e8e6..ef8f5fa 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -328,6 +328,7 @@ HTMLDOMNode *get_node(HTMLDocument *This ret->lpHTMLDOMNodeVtbl = &HTMLDOMNodeVtbl; ret->node_type = NT_UNKNOWN; ret->impl.unk = NULL; + ret->destructor = NULL; ret->doc = This; nsIDOMNode_AddRef(nsnode);

1 0

Alexandre Julliard : shell32: Grow the file list dynamically in SHFileOperation.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 1110d62752947c82723d1eb252be8e49cac3dfb0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1110d62752947c82723d1eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 6 17:47:57 2006 +0100 shell32: Grow the file list dynamically in SHFileOperation. This avoids searching the same directories twice, once to count the files and then once for real. --- dlls/shell32/shlfileop.c | 73 +++++++++++----------------------------------- 1 files changed, 18 insertions(+), 55 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 19cf225..4f2a799 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -760,53 +760,20 @@ typedef struct typedef struct { FILE_ENTRY *feFiles; + DWORD num_alloc; DWORD dwNumFiles; BOOL bAnyFromWildcard; BOOL bAnyDirectories; BOOL bAnyDontExist; } FILE_LIST; -/* count the number of expanded files from a given wildcard */ -static DWORD count_wildcard_files(LPCWSTR szWildFile) -{ - WIN32_FIND_DATAW wfd; - HANDLE hFile = FindFirstFileW(szWildFile, &wfd); - BOOL res = TRUE; - DWORD dwCount = 0; - - if (hFile == INVALID_HANDLE_VALUE) - return 0; - - while (res) - { - if (!IsDotDir(wfd.cFileName)) dwCount++; - res = FindNextFileW(hFile, &wfd); - } - FindClose(hFile); - return dwCount; -} - -/* counts the number of files in a file list including expanded wildcard files */ -static DWORD count_files(LPCWSTR szFileList) +static inline void grow_list(FILE_LIST *list) { - DWORD dwCount = 0; - LPCWSTR str = szFileList; - - /* test empty list */ - if (!szFileList[0]) return -1; - - while (*str) - { - if (StrPBrkW(str, wWildcardChars)) - dwCount += count_wildcard_files(str); - else - dwCount++; - - str += lstrlenW(str) + 1; - } - - return dwCount; + FILE_ENTRY *new = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, list->feFiles, + list->num_alloc * 2 * sizeof(*new) ); + list->feFiles = new; + list->num_alloc *= 2; } /* adds a file to the FILE_ENTRY struct @@ -861,6 +828,7 @@ static void parse_wildcard_files(FILE_LI for (res = TRUE; res; res = FindNextFileW(hFile, &wfd)) { if (IsDotDir(wfd.cFileName)) continue; + if (*pdwListIndex >= flList->num_alloc) grow_list( flList ); szFullPath = wildcard_to_file(szFile, wfd.cFileName); file = &flList->feFiles[(*pdwListIndex)++]; add_file_to_entry(file, szFullPath); @@ -878,7 +846,7 @@ static HRESULT parse_file_list(FILE_LIST { LPCWSTR ptr = szFiles; WCHAR szCurFile[MAX_PATH]; - DWORD i, dwDirLen; + DWORD i = 0, dwDirLen; if (!szFiles) return ERROR_INVALID_PARAMETER; @@ -886,19 +854,19 @@ static HRESULT parse_file_list(FILE_LIST flList->bAnyFromWildcard = FALSE; flList->bAnyDirectories = FALSE; flList->bAnyDontExist = FALSE; - flList->dwNumFiles = count_files(szFiles); + flList->num_alloc = 32; + flList->dwNumFiles = 0; /* empty list */ - if (flList->dwNumFiles == -1) + if (!szFiles[0]) return ERROR_ACCESS_DENIED; flList->feFiles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - flList->dwNumFiles * sizeof(FILE_ENTRY)); + flList->num_alloc * sizeof(FILE_ENTRY)); - for (i = 0; i < flList->dwNumFiles; i++) + while (*ptr) { - if (!*ptr) - return ERROR_ACCESS_DENIED; + if (i >= flList->num_alloc) grow_list( flList ); /* change relative to absolute path */ if (PathIsRelativeW(ptr)) @@ -925,21 +893,16 @@ static HRESULT parse_file_list(FILE_LIST FILE_ENTRY *file = &flList->feFiles[i]; add_file_to_entry(file, szCurFile); file->attributes = GetFileAttributesW( file->szFullPath ); + file->bExists = (file->attributes != INVALID_FILE_ATTRIBUTES); + if (!file->bExists) flList->bAnyDontExist = TRUE; if (IsAttribDir(file->attributes)) flList->bAnyDirectories = TRUE; } - /* record whether the file exists */ - if (!PathFileExistsW(flList->feFiles[i].szFullPath)) - { - flList->feFiles[i].bExists = FALSE; - flList->bAnyDontExist = TRUE; - } - else - flList->feFiles[i].bExists = TRUE; - /* advance to the next string */ ptr += strlenW(ptr) + 1; + i++; } + flList->dwNumFiles = i; return S_OK; }

1 0

Alexandre Julliard : shell32: Store only the file attributes in the file list for SHFileOperation.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 23cb632be2265cf9f927cae54237c78dea161358 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=23cb632be2265cf9f927cae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 6 16:44:31 2006 +0100 shell32: Store only the file attributes in the file list for SHFileOperation. We don't need the rest of the WIN32_FIND_DATA structure. --- dlls/shell32/shlfileop.c | 60 +++++++++++++++++++++------------------------- 1 files changed, 27 insertions(+), 33 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index d6c9159..19cf225 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -748,7 +748,7 @@ int WINAPI SHFileOperationA(LPSHFILEOPST typedef struct { - WIN32_FIND_DATAW wfd; + DWORD attributes; LPWSTR szDirectory; LPWSTR szFilename; LPWSTR szFullPath; @@ -810,13 +810,11 @@ static DWORD count_files(LPCWSTR szFileL } /* adds a file to the FILE_ENTRY struct - * returns TRUE if szFile is a directory, FALSE otherwise */ -static BOOL add_file_to_entry(FILE_ENTRY *feFile, LPWSTR szFile, BOOL bFromWildcard) +static void add_file_to_entry(FILE_ENTRY *feFile, LPWSTR szFile) { DWORD dwLen = strlenW(szFile) + 1; LPWSTR ptr; - HANDLE h; feFile->szFullPath = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); strcpyW(feFile->szFullPath, szFile); @@ -832,19 +830,7 @@ static BOOL add_file_to_entry(FILE_ENTRY feFile->szFilename = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); strcpyW(feFile->szFilename, ptr + 1); /* skip over backslash */ } - - feFile->bFromWildcard = bFromWildcard; - h = FindFirstFileW(feFile->szFullPath, &feFile->wfd); - if (h != INVALID_HANDLE_VALUE) - { - FindClose(h); - if (IsAttribDir(feFile->wfd.dwFileAttributes)) - return TRUE; - } - else - feFile->wfd.dwFileAttributes &= ~FILE_ATTRIBUTE_DIRECTORY; - - return FALSE; + feFile->bFromWildcard = FALSE; } static LPWSTR wildcard_to_file(LPWSTR szWildCard, LPWSTR szFileName) @@ -868,6 +854,7 @@ static void parse_wildcard_files(FILE_LI { WIN32_FIND_DATAW wfd; HANDLE hFile = FindFirstFileW(szFile, &wfd); + FILE_ENTRY *file; LPWSTR szFullPath; BOOL res; @@ -875,9 +862,11 @@ static void parse_wildcard_files(FILE_LI { if (IsDotDir(wfd.cFileName)) continue; szFullPath = wildcard_to_file(szFile, wfd.cFileName); - if (add_file_to_entry(&flList->feFiles[(*pdwListIndex)++], - szFullPath, TRUE)) - flList->bAnyDirectories = TRUE; + file = &flList->feFiles[(*pdwListIndex)++]; + add_file_to_entry(file, szFullPath); + file->bFromWildcard = TRUE; + file->attributes = wfd.dwFileAttributes; + if (IsAttribDir(file->attributes)) flList->bAnyDirectories = TRUE; HeapFree(GetProcessHeap(), 0, szFullPath); } @@ -931,8 +920,13 @@ static HRESULT parse_file_list(FILE_LIST flList->bAnyFromWildcard = TRUE; i--; } - else if (add_file_to_entry(&flList->feFiles[i], szCurFile, FALSE)) - flList->bAnyDirectories = TRUE; + else + { + FILE_ENTRY *file = &flList->feFiles[i]; + add_file_to_entry(file, szCurFile); + file->attributes = GetFileAttributesW( file->szFullPath ); + if (IsAttribDir(file->attributes)) flList->bAnyDirectories = TRUE; + } /* record whether the file exists */ if (!PathFileExistsW(flList->feFiles[i].szFullPath)) @@ -1007,7 +1001,7 @@ static void copy_to_dir(LPSHFILEOPSTRUCT PathCombineW(szDestPath, feTo->szFullPath, feFrom->szFilename); - if (IsAttribFile(feFrom->wfd.dwFileAttributes)) + if (IsAttribFile(feFrom->attributes)) SHNotifyCopyFileW(feFrom->szFullPath, szDestPath, FALSE); else if (!(lpFileOp->fFlags & FOF_FILESONLY && feFrom->bFromWildcard)) copy_dir_to_dir(lpFileOp, feFrom, szDestPath); @@ -1057,7 +1051,7 @@ static HRESULT copy_files(LPSHFILEOPSTRU if (flFrom->dwNumFiles > 1 && flTo->dwNumFiles == 1 && !PathFileExistsW(flTo->feFiles[0].szFullPath) && - IsAttribFile(fileDest->wfd.dwFileAttributes)) + IsAttribFile(fileDest->attributes)) { bCancelIfAnyDirectories = TRUE; } @@ -1071,7 +1065,7 @@ static HRESULT copy_files(LPSHFILEOPSTRU if (!(lpFileOp->fFlags & FOF_MULTIDESTFILES) && flFrom->dwNumFiles != 1 && PathFileExistsW(fileDest->szFullPath) && - IsAttribFile(fileDest->wfd.dwFileAttributes)) + IsAttribFile(fileDest->attributes)) { return ERROR_CANCELLED; } @@ -1083,31 +1077,31 @@ static HRESULT copy_files(LPSHFILEOPSTRU if (lpFileOp->fFlags & FOF_MULTIDESTFILES) fileDest = &flTo->feFiles[i]; - if (IsAttribDir(entryToCopy->wfd.dwFileAttributes) && + if (IsAttribDir(entryToCopy->attributes) && !lstrcmpW(entryToCopy->szFullPath, fileDest->szDirectory)) { return ERROR_SUCCESS; } - if (IsAttribDir(entryToCopy->wfd.dwFileAttributes) && bCancelIfAnyDirectories) + if (IsAttribDir(entryToCopy->attributes) && bCancelIfAnyDirectories) return ERROR_CANCELLED; create_dest_dirs(fileDest->szDirectory); if (!strcmpW(entryToCopy->szFullPath, fileDest->szFullPath)) { - if (IsAttribFile(entryToCopy->wfd.dwFileAttributes)) + if (IsAttribFile(entryToCopy->attributes)) return ERROR_NO_MORE_SEARCH_HANDLES; else return ERROR_SUCCESS; } if ((flFrom->dwNumFiles > 1 && flTo->dwNumFiles == 1) || - (flFrom->dwNumFiles == 1 && IsAttribDir(fileDest->wfd.dwFileAttributes))) + (flFrom->dwNumFiles == 1 && IsAttribDir(fileDest->attributes))) { copy_to_dir(lpFileOp, entryToCopy, fileDest); } - else if (IsAttribDir(entryToCopy->wfd.dwFileAttributes)) + else if (IsAttribDir(entryToCopy->attributes)) { copy_dir_to_dir(lpFileOp, entryToCopy, fileDest->szFullPath); } @@ -1141,7 +1135,7 @@ static HRESULT delete_files(LPSHFILEOPST fileEntry = &flFrom->feFiles[i]; /* delete the file or directory */ - if (IsAttribFile(fileEntry->wfd.dwFileAttributes)) + if (IsAttribFile(fileEntry->attributes)) bPathExists = DeleteFileW(fileEntry->szFullPath); else if (!(lpFileOp->fFlags & FOF_FILESONLY && fileEntry->bFromWildcard)) bPathExists = SHELL_DeleteDirectoryW(fileEntry->szFullPath, bConfirm); @@ -1185,7 +1179,7 @@ static void move_to_dir(LPSHFILEOPSTRUCT PathCombineW(szDestPath, feTo->szFullPath, feFrom->szFilename); - if (IsAttribFile(feFrom->wfd.dwFileAttributes)) + if (IsAttribFile(feFrom->attributes)) SHNotifyMoveFileW(feFrom->szFullPath, szDestPath); else if (!(lpFileOp->fFlags & FOF_FILESONLY && feFrom->bFromWildcard)) move_dir_to_dir(lpFileOp, feFrom, szDestPath); @@ -1234,7 +1228,7 @@ static HRESULT move_files(LPSHFILEOPSTRU if (!PathFileExistsW(fileDest->szDirectory)) return ERROR_CANCELLED; - if (fileDest->bExists && IsAttribDir(fileDest->wfd.dwFileAttributes)) + if (fileDest->bExists && IsAttribDir(fileDest->attributes)) move_to_dir(lpFileOp, entryToMove, fileDest); else SHNotifyMoveFileW(entryToMove->szFullPath, fileDest->szFullPath);

1 0

Alexandre Julliard : shell32: Fixed handling of null-terminated file list in SHFileOperation.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: b222001defc8d9db67232aae68f2d3a83c4ecd5d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b222001defc8d9db67232aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 6 16:42:34 2006 +0100 shell32: Fixed handling of null-terminated file list in SHFileOperation. --- dlls/shell32/shlfileop.c | 28 +++++++++------------------- 1 files changed, 9 insertions(+), 19 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 18d1133..d6c9159 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -791,29 +791,19 @@ static DWORD count_wildcard_files(LPCWST static DWORD count_files(LPCWSTR szFileList) { DWORD dwCount = 0; - LPCWSTR p = szFileList; - LPCWSTR q = p + 1; - LPCWSTR str = p; + LPCWSTR str = szFileList; /* test empty list */ - if (!szFileList[0] && !szFileList[1]) - return -1; - - /* p,q search: stop when we reach double null terminator */ - while (*p || *q) - { - if (!*q) - { - if (StrPBrkW(str, wWildcardChars)) - dwCount += count_wildcard_files(str); - else - dwCount++; + if (!szFileList[0]) return -1; - str = q + 1; - } + while (*str) + { + if (StrPBrkW(str, wWildcardChars)) + dwCount += count_wildcard_files(str); + else + dwCount++; - p++; - q++; + str += lstrlenW(str) + 1; } return dwCount;

1 0

Aric Stewart : shell32: Skip dot directories in SHFileOperation.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: c29b7c352438669ee22961466360e926a831d313 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c29b7c352438669ee229614… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 3 10:08:32 2006 -0600 shell32: Skip dot directories in SHFileOperation. In ShFileOperation when generating a file list with * wildcards, for example for deletion, do not include the dot directories (. and ..) in the list, because that cause the operation to spiral out of control. --- dlls/shell32/shlfileop.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index e12df61..18d1133 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -779,7 +779,7 @@ static DWORD count_wildcard_files(LPCWST while (res) { - dwCount++; + if (!IsDotDir(wfd.cFileName)) dwCount++; res = FindNextFileW(hFile, &wfd); } @@ -879,18 +879,16 @@ static void parse_wildcard_files(FILE_LI WIN32_FIND_DATAW wfd; HANDLE hFile = FindFirstFileW(szFile, &wfd); LPWSTR szFullPath; - BOOL res = TRUE, bDir; - - while (res) + BOOL res; + + for (res = TRUE; res; res = FindNextFileW(hFile, &wfd)) { + if (IsDotDir(wfd.cFileName)) continue; szFullPath = wildcard_to_file(szFile, wfd.cFileName); - bDir = add_file_to_entry(&flList->feFiles[(*pdwListIndex)++], - szFullPath, TRUE); - HeapFree(GetProcessHeap(), 0, szFullPath); - res = FindNextFileW(hFile, &wfd); - - if (bDir) + if (add_file_to_entry(&flList->feFiles[(*pdwListIndex)++], + szFullPath, TRUE)) flList->bAnyDirectories = TRUE; + HeapFree(GetProcessHeap(), 0, szFullPath); } FindClose(hFile);

1 0

Alexandre Julliard : server: Avoid crash in set_thread_desktop if the thread doesn't have a queue.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 71b94726d9661d2f51afe4bd72539de656dcd0a3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=71b94726d9661d2f51afe4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 6 15:10:59 2006 +0100 server: Avoid crash in set_thread_desktop if the thread doesn't have a queue. --- server/winstation.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/winstation.c b/server/winstation.c index 30cbe18..da24be4 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -477,7 +477,7 @@ DECL_HANDLER(set_thread_desktop) else current->desktop = req->handle; /* FIXME: should we close the old one? */ - if (old_desktop != new_desktop) detach_thread_input( current ); + if (old_desktop != new_desktop && current->queue) detach_thread_input( current ); if (old_desktop) release_object( old_desktop ); release_object( new_desktop );

1 0

Alexandre Julliard : server: Return real parent and owner in the create_window request.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 4be3d4c12b916d2f17c22f09bcf087f7b8ce7390 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4be3d4c12b916d2f17c22f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 6 15:00:37 2006 +0100 server: Return real parent and owner in the create_window request. Remove computing of parent and owner handles on the client side. --- dlls/user/win.c | 38 +++++++++++++++++++------------------- include/wine/server_protocol.h | 4 +++- server/protocol.def | 2 ++ server/trace.c | 2 ++ server/window.c | 4 ++++ 5 files changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/user/win.c b/dlls/user/win.c index 237deeb..1fc2d7c 100644 --- a/dlls/user/win.c +++ b/dlls/user/win.c @@ -59,6 +59,7 @@ static WND *create_window_handle( HWND p { WORD index; WND *win; + HWND full_parent = 0, full_owner = 0; struct tagCLASS *class = NULL; user_handle_t handle = 0; int extra_bytes = 0; @@ -76,6 +77,8 @@ static WND *create_window_handle( HWND p if (!wine_server_call_err( req )) { handle = reply->handle; + full_parent = reply->parent; + full_owner = reply->owner; extra_bytes = reply->extra; class = reply->class_ptr; } @@ -106,6 +109,8 @@ static WND *create_window_handle( HWND p assert( index < NB_USER_HANDLES ); user_handles[index] = win; win->hwndSelf = handle; + win->parent = full_parent; + win->owner = full_owner; win->dwMagic = WND_MAGIC; win->cbWndExtra = extra_bytes; memset( win->wExtra, 0, extra_bytes ); @@ -915,7 +920,7 @@ static HWND WIN_CreateWindowEx( CREATEST /* Find the parent window */ - parent = GetDesktopWindow(); + parent = cs->hwndParent; owner = 0; if (cs->hwndParent == HWND_MESSAGE) @@ -924,24 +929,24 @@ static HWND WIN_CreateWindowEx( CREATEST * message window (style: WS_POPUP|WS_DISABLED) */ FIXME("Parent is HWND_MESSAGE\n"); + parent = GetDesktopWindow(); } else if (cs->hwndParent) { - /* Make sure parent is valid */ - if (!IsWindow( cs->hwndParent )) + if ((cs->style & (WS_CHILD|WS_POPUP)) != WS_CHILD) { - WARN("Bad parent %p\n", cs->hwndParent ); - return 0; - } - if ((cs->style & (WS_CHILD|WS_POPUP)) == WS_CHILD) - parent = WIN_GetFullHandle(cs->hwndParent); - else - owner = GetAncestor( cs->hwndParent, GA_ROOT ); + parent = GetDesktopWindow(); + owner = cs->hwndParent; + } } - else if ((cs->style & (WS_CHILD|WS_POPUP)) == WS_CHILD) + else { - WARN("No parent for child window\n" ); - return 0; /* WS_CHILD needs a parent, but WS_POPUP doesn't */ + if ((cs->style & (WS_CHILD|WS_POPUP)) == WS_CHILD) + { + WARN("No parent for child window\n" ); + return 0; /* WS_CHILD needs a parent, but WS_POPUP doesn't */ + } + parent = GetDesktopWindow(); } WIN_FixCoordinates(cs, &sw); /* fix default coordinates */ @@ -956,17 +961,12 @@ static HWND WIN_CreateWindowEx( CREATEST /* Create the window structure */ if (!(wndPtr = create_window_handle( parent, owner, classAtom, cs->hInstance, type ))) - { - TRACE("out of memory\n" ); - return 0; - } + return 0; hwnd = wndPtr->hwndSelf; /* Fill the window structure */ wndPtr->tid = GetCurrentThreadId(); - wndPtr->owner = owner; - wndPtr->parent = parent; wndPtr->hInstance = cs->hInstance; wndPtr->text = NULL; wndPtr->dwStyle = cs->style & ~WS_VISIBLE; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index a462751..0e9ae22 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2520,6 +2520,8 @@ struct create_window_reply { struct reply_header __header; user_handle_t handle; + user_handle_t parent; + user_handle_t owner; int extra; void* class_ptr; }; @@ -4358,6 +4360,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 229 +#define SERVER_PROTOCOL_VERSION 230 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index c3ea6a6..9163a36 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1789,6 +1789,8 @@ enum message_type void* instance; /* module instance */ @REPLY user_handle_t handle; /* created window */ + user_handle_t parent; /* full handle of parent */ + user_handle_t owner; /* full handle of owner */ int extra; /* number of extra bytes */ void* class_ptr; /* pointer to class in client address space */ @END diff --git a/server/trace.c b/server/trace.c index 3e5155a..0d5fac9 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2267,6 +2267,8 @@ static void dump_create_window_request( static void dump_create_window_reply( const struct create_window_reply *req ) { fprintf( stderr, " handle=%p,", req->handle ); + fprintf( stderr, " parent=%p,", req->parent ); + fprintf( stderr, " owner=%p,", req->owner ); fprintf( stderr, " extra=%d,", req->extra ); fprintf( stderr, " class_ptr=%p", req->class_ptr ); } diff --git a/server/window.c b/server/window.c index bc6c208..cde33be 100644 --- a/server/window.c +++ b/server/window.c @@ -1372,10 +1372,14 @@ DECL_HANDLER(create_window) set_error( STATUS_ACCESS_DENIED ); return; } + else /* owner must be a top-level window */ + while (!is_desktop_window(owner->parent)) owner = owner->parent; } if (!(win = create_window( parent, owner, req->atom, req->instance ))) return; reply->handle = win->handle; + reply->parent = win->parent ? win->parent->handle : 0; + reply->owner = win->owner; reply->extra = win->nb_extra_bytes; reply->class_ptr = get_class_client_ptr( win->class ); }

1 0

Alexandre Julliard : user: Allow creating windows of the desktop class.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: f874d20f54607dca0113e899c61af0bdaee9adba URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f874d20f54607dca0113e89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 6 12:44:38 2006 +0100 user: Allow creating windows of the desktop class. --- dlls/user/desktop.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user/desktop.c b/dlls/user/desktop.c index 0252512..1943dbf 100644 --- a/dlls/user/desktop.c +++ b/dlls/user/desktop.c @@ -117,8 +117,8 @@ static HBITMAP DESKTOP_LoadBitmap( HDC h */ static LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { - /* all messages are ignored */ - return 0; + if (message == WM_NCCREATE) return TRUE; + return 0; /* all other messages are ignored */ } /***********************************************************************

1 0

Alexandre Julliard : user: Allow some Wine internal messages to act on the desktop window.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 70d42f9d43dbadfdc1692ef574acc7e9b8ee01f2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=70d42f9d43dbadfdc1692ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 6 12:37:13 2006 +0100 user: Allow some Wine internal messages to act on the desktop window. --- dlls/user/message.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/user/message.c b/dlls/user/message.c index 3fc261d..8dc0b3c 100644 --- a/dlls/user/message.c +++ b/dlls/user/message.c @@ -1154,22 +1154,26 @@ static void reply_message( struct receiv */ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { - if (hwnd == GetDesktopWindow()) return 0; switch(msg) { case WM_WINE_DESTROYWINDOW: return WIN_DestroyWindow( hwnd ); case WM_WINE_SETWINDOWPOS: + if (hwnd == GetDesktopWindow()) return 0; return USER_Driver->pSetWindowPos( (WINDOWPOS *)lparam ); case WM_WINE_SHOWWINDOW: + if (hwnd == GetDesktopWindow()) return 0; return ShowWindow( hwnd, wparam ); case WM_WINE_SETPARENT: + if (hwnd == GetDesktopWindow()) return 0; return (LRESULT)SetParent( hwnd, (HWND)wparam ); case WM_WINE_SETWINDOWLONG: return (LRESULT)SetWindowLongW( hwnd, wparam, lparam ); case WM_WINE_ENABLEWINDOW: + if (hwnd == GetDesktopWindow()) return 0; return EnableWindow( hwnd, wparam ); case WM_WINE_SETACTIVEWINDOW: + if (hwnd == GetDesktopWindow()) return 0; return (LRESULT)SetActiveWindow( (HWND)wparam ); case WM_WINE_KEYBOARD_LL_HOOK: return HOOK_CallHooks( WH_KEYBOARD_LL, HC_ACTION, wparam, lparam, TRUE );

1 0

lostwages/wwn wn20060305_307.xml
by Jeremy Newman 06 Mar '06

06 Mar '06

ChangeSet ID: 23423 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/03/06 12:52:10 Modified files: wwn : wn20060305_307.xml Log message: Francois Gouget <fgouget(a)free.fr> Assorted spelling fixes Patch: http://cvs.winehq.org/patch.py?id=23423 Old revision New revision Changes Path 1.1 1.2 +9 -9 lostwages/wwn/wn20060305_307.xml Index: lostwages/wwn/wn20060305_307.xml diff -u -p lostwages/wwn/wn20060305_307.xml:1.1 lostwages/wwn/wn20060305_307.xml:1.2 --- lostwages/wwn/wn20060305_307.xml:1.1 6 Mar 2006 18:52:10 -0000 +++ lostwages/wwn/wn20060305_307.xml 6 Mar 2006 18:52:10 -0000 @@ -144,7 +144,7 @@ update a few weeks ago on that list wher Here's a list of (known) problems faced: <ol> - <li> missing support for some ioctl's (HDMA, serial). Added to Valgrind (now + <li> missing support for some ioctls (HDMA, serial). Added to Valgrind (now in branch, at least of x86)</li> <li> missing support for tkill syscall. Added to Valgrind (now in branch), Wine @@ -248,7 +248,7 @@ This week he announced the initial versi I've brought my DirectDraw over WineD3D patch in a form where I want to show it to the public for review. I've uploaded it to <a href="http://stud4.tuwien.ac.at/~e0526822/"> -http://stud4.tuwien.ac.at/~e0526822/</a>, where it is described in detail(below +http://stud4.tuwien.ac.at/~e0526822/</a>, where it is described in detail (below the game list). If there are no fundamental objections against it, I'll start sending patches @@ -260,7 +260,7 @@ for WineD3D. The changes I'll make in sm When WineD3D is ready, I'll send a patch for dlls/ddraw to wine-devel and wine-user for a broad regression testing, and when the regressions are out, -the ddraw can be replaced(From my POV, AJ has the last word of course ;) ) +the ddraw can be replaced (From my POV, AJ has the last word of course ;) ) </quote> DirectDraw sitting on top of WineD3D, the WineD3D layer can best decide @@ -277,20 +277,20 @@ Basically all rendering and screen setup There are a few changes to WineD3D: <ul> - <li> Initialization is split up in an OpenGL-free part and a + <li> Initialization is split up in an OpenGL-free part and an IWineD3DDevice::Init3D method which initializes the 3D functions. This split -is not yet complete, so a opengl lib must be installed and some ddraw +is not yet complete, so an opengl lib must be installed and some ddraw games (nfs3) crash in opengl calls called during initialization. The IWineD3DDevice::Relase code has been split up too. IWineD3DDevice has methods to setup the screen without a Direct3D swapchain</li> - <li> An secound surface implementation was added, IWineX11Surface, which + <li> An second surface implementation was added, IWineX11Surface, which handles 2D only-operations with the old surface_dib code. It will be renamed to WineGDISurface, and WineX11Surface will use Xrender, WineD3DSurface will get the ability to do 2D rendering with OpenGL</li> <li> DirectDraw rendering methods such as IWineD3DSurface::Blt, IWineD3DSurface::BltFast and IWineD3DSurface::Flip have been added, along with related calls.</li> - <li> Some DirectDraw data types will be added to to + <li> Some DirectDraw data types will be added to include/wine/wined3d_types.h, and d3d9 types which are used by the wined3d header and don't exist in d3d.h will be added to wined3d_types too. At the moment, those definitions reside in dlls/ddraw/d3d_compat.h.</li></ul> @@ -318,7 +318,7 @@ extensions in Wine, or even use the Linu Stefan Dösinger gave an example of it: <quote who="Stefan Dosinger"> I have done this with Kmail and others. You have to add a few registry keys in -HKCL and HKLM. Basically, you can launch any Linux app from wine by it's full +HKCL and HKLM. Basically, you can launch any Linux app from wine by its full path and pass command line arguments. There's of course the problem of converting Windows paths to Unix paths. @@ -327,7 +327,7 @@ http://www.winehq.com/site/fun_projects< described. For examples how to use Open Office, you have to google. I don't think that executing a Linux Plugin in a Win32 browser is possible, -but cossover allows you to do the reverse. +but CrossOver allows you to do the reverse. </quote> </section>

1 0

Mike McCormack : mpr: Stub implementations of some mpr functions.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 3289cf1a62963f7e09905b6f1d53445ce089ca3e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3289cf1a62963f7e09905b6… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Mar 5 00:55:30 2006 +0900 mpr: Stub implementations of some mpr functions. --- dlls/mpr/mpr.spec | 12 +++++---- dlls/mpr/nps.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 6 deletions(-) diff --git a/dlls/mpr/mpr.spec b/dlls/mpr/mpr.spec index c383c75..5346615 100644 --- a/dlls/mpr/mpr.spec +++ b/dlls/mpr/mpr.spec @@ -40,12 +40,12 @@ @ stdcall NPSNotifyRegisterA(long ptr) @ stdcall NPSSetCustomTextA(str) @ stdcall NPSSetExtendedErrorA(long str) -@ stub PwdChangePasswordA -@ stub PwdChangePasswordW -@ stub PwdGetPasswordStatusA -@ stub PwdGetPasswordStatusW -@ stub PwdSetPasswordStatusA -@ stub PwdSetPasswordStatusW +@ stdcall PwdChangePasswordA(str ptr long ptr) +@ stdcall PwdChangePasswordW(wstr ptr long ptr) +@ stdcall PwdGetPasswordStatusA(str long ptr) +@ stdcall PwdGetPasswordStatusW(wstr long ptr) +@ stdcall PwdSetPasswordStatusA(str long long) +@ stdcall PwdSetPasswordStatusW(wstr long long) @ stdcall WNetAddConnection2A(ptr str str long) @ stdcall WNetAddConnection2W(ptr wstr wstr long) @ stdcall WNetAddConnection3A(long ptr str str long) diff --git a/dlls/mpr/nps.c b/dlls/mpr/nps.c index 7fe1556..1fe5cdd 100644 --- a/dlls/mpr/nps.c +++ b/dlls/mpr/nps.c @@ -211,3 +211,71 @@ LPVOID WINAPI NPSNotifyGetContextA( NOTI FIXME( "(%p): stub\n", pfNotifyCallBack ); return NULL; } + +/***************************************************************** + * PwdGetPasswordStatusA [MPR.@] + */ +DWORD WINAPI PwdGetPasswordStatusA( LPCSTR lpProvider, DWORD dwIndex, LPDWORD status ) +{ + FIXME("%s %ld %p\n", debugstr_a(lpProvider), dwIndex, status ); + *status = 0; + return WN_SUCCESS; +} + +/***************************************************************** + * PwdGetPasswordStatusA [MPR.@] + */ +DWORD WINAPI PwdGetPasswordStatusW( LPCWSTR lpProvider, DWORD dwIndex, LPDWORD status ) +{ + FIXME("%s %ld %p\n", debugstr_w(lpProvider), dwIndex, status ); + *status = 0; + return WN_SUCCESS; +} + +/***************************************************************** + * PwdSetPasswordStatusA [MPR.@] + */ +DWORD WINAPI PwdSetPasswordStatusA( LPCSTR lpProvider, DWORD dwIndex, DWORD status ) +{ + FIXME("%s %ld %ld\n", debugstr_a(lpProvider), dwIndex, status ); + return WN_SUCCESS; +} + +/***************************************************************** + * PwdSetPasswordStatusW [MPR.@] + */ +DWORD WINAPI PwdSetPasswordStatusW( LPCWSTR lpProvider, DWORD dwIndex, DWORD status ) +{ + FIXME("%s %ld %ld\n", debugstr_w(lpProvider), dwIndex, status ); + return WN_SUCCESS; +} + +typedef struct _CHANGEPWDINFOA { + LPSTR lpUsername; + LPSTR lpPassword; + DWORD cbPassword; +} CHANGEPWDINFOA, *LPCHANGEPWDINFOA; + +typedef struct _CHANGEPWDINFOW { + LPWSTR lpUsername; + LPWSTR lpPassword; + DWORD cbPassword; +} CHANGEPWDINFOW, *LPCHANGEPWDINFOW; + +/***************************************************************** + * PwdChangePasswordA [MPR.@] + */ +DWORD WINAPI PwdChangePasswordA( LPCSTR lpProvider, HWND hWnd, DWORD flags, LPCHANGEPWDINFOA info ) +{ + FIXME("%s %p %lx %p\n", debugstr_a(lpProvider), hWnd, flags, info ); + return WN_SUCCESS; +} + +/***************************************************************** + * PwdChangePasswordA [MPR.@] + */ +DWORD WINAPI PwdChangePasswordW( LPCWSTR lpProvider, HWND hWnd, DWORD flags, LPCHANGEPWDINFOW info ) +{ + FIXME("%s %p %lx %p\n", debugstr_w(lpProvider), hWnd, flags, info ); + return WN_SUCCESS; +}

1 0

Michael Jung : shell32: Unicode'ify ISFHelper interface.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: cc15fcc4b0b47e8f914cde50fd6ebbca50d581b0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cc15fcc4b0b47e8f914cde5… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Sun Mar 5 13:25:23 2006 +0100 shell32: Unicode'ify ISFHelper interface. --- dlls/shell32/shellfolder.h | 4 ++- dlls/shell32/shfldr_fs.c | 56 ++++++++++++++++++++++-------------------- dlls/shell32/shfldr_unixfs.c | 37 +++++++++++++++++----------- dlls/shell32/shv_bg_cmenu.c | 6 ++--- 4 files changed, 56 insertions(+), 47 deletions(-) diff --git a/dlls/shell32/shellfolder.h b/dlls/shell32/shellfolder.h index 1e9bf24..f1bf477 100644 --- a/dlls/shell32/shellfolder.h +++ b/dlls/shell32/shellfolder.h @@ -46,8 +46,8 @@ DECLARE_INTERFACE_(ISFHelper,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** ISFHelper methods ***/ - STDMETHOD(GetUniqueName)(THIS_ LPSTR lpName, UINT uLen) PURE; - STDMETHOD(AddFolder)(THIS_ HWND hwnd, LPCSTR lpName, LPITEMIDLIST * ppidlOut) PURE; + STDMETHOD(GetUniqueName)(THIS_ LPWSTR lpName, UINT uLen) PURE; + STDMETHOD(AddFolder)(THIS_ HWND hwnd, LPCWSTR lpName, LPITEMIDLIST * ppidlOut) PURE; STDMETHOD(DeleteItems)(THIS_ UINT cidl, LPCITEMIDLIST * apidl) PURE; STDMETHOD(CopyItems)(THIS_ IShellFolder * pSFFrom, UINT cidl, LPCITEMIDLIST * apidl) PURE; }; diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 506236f..b8c7043 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1064,20 +1064,21 @@ static ULONG WINAPI ISFHelper_fnRelease */ static HRESULT WINAPI -ISFHelper_fnGetUniqueName (ISFHelper * iface, LPSTR lpName, UINT uLen) +ISFHelper_fnGetUniqueName (ISFHelper * iface, LPWSTR pwszName, UINT uLen) { IGenericSFImpl *This = impl_from_ISFHelper(iface); IEnumIDList *penum; HRESULT hr; - char szText[MAX_PATH]; - const char *szNewFolder = "New Folder"; + WCHAR wszText[MAX_PATH]; + const WCHAR wszNewFolder[] = {'N','e','w',' ','F','o','l','d','e','r',0 }; + const WCHAR wszFormat[] = {'%','s',' ','%','d',0 }; - TRACE ("(%p)(%s %u)\n", This, lpName, uLen); + TRACE ("(%p)(%p %u)\n", This, pwszName, uLen); - if (uLen < strlen (szNewFolder) + 4) + if (uLen < sizeof(wszNewFolder)/sizeof(WCHAR) + 3) return E_POINTER; - strcpy (lpName, szNewFolder); + lstrcpynW (pwszName, wszNewFolder, uLen); hr = IShellFolder_fnEnumObjects (_IShellFolder2_ (This), 0, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS | SHCONTF_INCLUDEHIDDEN, &penum); @@ -1090,9 +1091,9 @@ next: IEnumIDList_Reset (penum); while (S_OK == IEnumIDList_Next (penum, 1, &pidl, &dwFetched) && dwFetched) { - _ILSimpleGetText (pidl, szText, MAX_PATH); - if (0 == strcasecmp (szText, lpName)) { - sprintf (lpName, "%s %d", szNewFolder, i++); + _ILSimpleGetTextW (pidl, wszText, MAX_PATH); + if (0 == lstrcmpiW (wszText, pwszName)) { + snprintfW (pwszName, uLen, wszFormat, wszNewFolder, i++); if (i > 99) { hr = E_FAIL; break; @@ -1113,40 +1114,41 @@ next: */ static HRESULT WINAPI -ISFHelper_fnAddFolder (ISFHelper * iface, HWND hwnd, LPCSTR lpName, +ISFHelper_fnAddFolder (ISFHelper * iface, HWND hwnd, LPCWSTR pwszName, LPITEMIDLIST * ppidlOut) { IGenericSFImpl *This = impl_from_ISFHelper(iface); - char lpstrNewDir[MAX_PATH]; + WCHAR wszNewDir[MAX_PATH]; DWORD bRes; HRESULT hres = E_FAIL; - TRACE ("(%p)(%s %p)\n", This, lpName, ppidlOut); + TRACE ("(%p)(%s %p)\n", This, debugstr_w(pwszName), ppidlOut); - if (!WideCharToMultiByte(CP_ACP, 0, This->sPathTarget, -1, lpstrNewDir, MAX_PATH, NULL, NULL)) - lpstrNewDir[0] = '\0'; - PathAppendA(lpstrNewDir, lpName); + wszNewDir[0] = 0; + if (This->sPathTarget) + lstrcpynW(wszNewDir, This->sPathTarget, MAX_PATH); + PathAppendW(wszNewDir, pwszName); - bRes = CreateDirectoryA (lpstrNewDir, NULL); + bRes = CreateDirectoryW (wszNewDir, NULL); if (bRes) { - SHChangeNotify (SHCNE_MKDIR, SHCNF_PATHA, lpstrNewDir, NULL); + SHChangeNotify (SHCNE_MKDIR, SHCNF_PATHW, wszNewDir, NULL); hres = S_OK; if (ppidlOut) - hres = _ILCreateFromPathA(lpstrNewDir, ppidlOut); + hres = _ILCreateFromPathW(wszNewDir, ppidlOut); } else { - char lpstrText[128 + MAX_PATH]; - char lpstrTempText[128]; - char lpstrCaption[256]; + WCHAR wszText[128 + MAX_PATH]; + WCHAR wszTempText[128]; + WCHAR wszCaption[256]; /* Cannot Create folder because of permissions */ - LoadStringA (shell32_hInstance, IDS_CREATEFOLDER_DENIED, lpstrTempText, - sizeof (lpstrTempText)); - LoadStringA (shell32_hInstance, IDS_CREATEFOLDER_CAPTION, lpstrCaption, - sizeof (lpstrCaption)); - sprintf (lpstrText, lpstrTempText, lpstrNewDir); - MessageBoxA (hwnd, lpstrText, lpstrCaption, MB_OK | MB_ICONEXCLAMATION); + LoadStringW (shell32_hInstance, IDS_CREATEFOLDER_DENIED, wszTempText, + sizeof (wszTempText)); + LoadStringW (shell32_hInstance, IDS_CREATEFOLDER_CAPTION, wszCaption, + sizeof (wszCaption)); + sprintfW (wszText, wszTempText, wszNewDir); + MessageBoxW (hwnd, wszText, wszCaption, MB_OK | MB_ICONEXCLAMATION); } return hres; diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 7780adc..43ed10f 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1680,7 +1680,7 @@ static ULONG WINAPI UnixFolder_ISFHelper STATIC_CAST(IShellFolder2, ADJUST_THIS(UnixFolder, ISFHelper, iface))); } -static HRESULT WINAPI UnixFolder_ISFHelper_GetUniqueName(ISFHelper* iface, LPSTR lpName, UINT uLen) +static HRESULT WINAPI UnixFolder_ISFHelper_GetUniqueName(ISFHelper* iface, LPWSTR pwszName, UINT uLen) { UnixFolder *This = ADJUST_THIS(UnixFolder, ISFHelper, iface); IEnumIDList *pEnum; @@ -1688,23 +1688,26 @@ static HRESULT WINAPI UnixFolder_ISFHelp LPITEMIDLIST pidlElem; DWORD dwFetched; int i; - static const char szNewFolder[] = "New Folder"; + static const WCHAR wszNewFolder[] = { 'N','e','w',' ','F','o','l','d','e','r', 0 }; + static const WCHAR wszFormat[] = { '%','s',' ','%','d',0 }; - TRACE("(iface=%p, lpName=%p, uLen=%u)\n", iface, lpName, uLen); + TRACE("(iface=%p, pwszName=%p, uLen=%u)\n", iface, pwszName, uLen); - if (uLen < sizeof(szNewFolder)+3) + if (uLen < sizeof(wszNewFolder)/sizeof(WCHAR)+3) return E_INVALIDARG; hr = IShellFolder2_EnumObjects(STATIC_CAST(IShellFolder2, This), 0, SHCONTF_FOLDERS|SHCONTF_NONFOLDERS|SHCONTF_INCLUDEHIDDEN, &pEnum); if (SUCCEEDED(hr)) { - lstrcpyA(lpName, szNewFolder); + lstrcpynW(pwszName, wszNewFolder, uLen); IEnumIDList_Reset(pEnum); i = 2; while ((IEnumIDList_Next(pEnum, 1, &pidlElem, &dwFetched) == S_OK) && (dwFetched == 1)) { - if (!strcasecmp(_ILGetTextPointer(pidlElem), lpName)) { + WCHAR wszTemp[MAX_PATH]; + _ILSimpleGetTextW(pidlElem, wszTemp, MAX_PATH); + if (!lstrcmpiW(wszTemp, pwszName)) { IEnumIDList_Reset(pEnum); - sprintf(lpName, "%s %d", szNewFolder, i++); + snprintfW(pwszName, uLen, wszFormat, wszNewFolder, i++); if (i > 99) { hr = E_FAIL; break; @@ -1716,20 +1719,26 @@ static HRESULT WINAPI UnixFolder_ISFHelp return hr; } -static HRESULT WINAPI UnixFolder_ISFHelper_AddFolder(ISFHelper* iface, HWND hwnd, LPCSTR pszName, +static HRESULT WINAPI UnixFolder_ISFHelper_AddFolder(ISFHelper* iface, HWND hwnd, LPCWSTR pwszName, LPITEMIDLIST* ppidlOut) { UnixFolder *This = ADJUST_THIS(UnixFolder, ISFHelper, iface); char szNewDir[FILENAME_MAX]; + int cBaseLen; - TRACE("(iface=%p, hwnd=%p, pszName=%s, ppidlOut=%p)\n", iface, hwnd, pszName, ppidlOut); + TRACE("(iface=%p, hwnd=%p, pwszName=%s, ppidlOut=%p)\n", + iface, hwnd, debugstr_w(pwszName), ppidlOut); if (ppidlOut) *ppidlOut = NULL; - - lstrcpyA(szNewDir, This->m_pszPath); - lstrcatA(szNewDir, pszName); + if (!This->m_pszPath || !(This->m_dwAttributes & SFGAO_FILESYSTEM)) + return E_FAIL; + + lstrcpynA(szNewDir, This->m_pszPath, FILENAME_MAX); + cBaseLen = lstrlenA(szNewDir); + WideCharToMultiByte(CP_UNIXCP, 0, pwszName, -1, szNewDir+cBaseLen, FILENAME_MAX-cBaseLen, 0, 0); + if (mkdir(szNewDir, 0755)) { char szMessage[256 + FILENAME_MAX]; char szCaption[256]; @@ -1742,11 +1751,9 @@ static HRESULT WINAPI UnixFolder_ISFHelp return E_FAIL; } else { LPITEMIDLIST pidlRelative; - WCHAR wszName[MAX_PATH]; /* Inform the shell */ - MultiByteToWideChar(CP_UNIXCP, 0, pszName, -1, wszName, MAX_PATH); - if (UNIXFS_path_to_pidl(This, wszName, &pidlRelative)) { + if (UNIXFS_path_to_pidl(This, pwszName, &pidlRelative)) { LPITEMIDLIST pidlAbsolute = ILCombine(This->m_pidlLocation, pidlRelative); if (ppidlOut) *ppidlOut = pidlRelative; diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c index 669d080..38033c4 100644 --- a/dlls/shell32/shv_bg_cmenu.c +++ b/dlls/shell32/shv_bg_cmenu.c @@ -193,14 +193,14 @@ static void DoNewFolder( { BgCmImpl *This = (BgCmImpl *)iface; ISFHelper * psfhlp; - char szName[MAX_PATH]; + WCHAR wszName[MAX_PATH]; IShellFolder_QueryInterface(This->pSFParent, &IID_ISFHelper, (LPVOID*)&psfhlp); if (psfhlp) { LPITEMIDLIST pidl; - ISFHelper_GetUniqueName(psfhlp, szName, MAX_PATH); - ISFHelper_AddFolder(psfhlp, 0, szName, &pidl); + ISFHelper_GetUniqueName(psfhlp, wszName, MAX_PATH); + ISFHelper_AddFolder(psfhlp, 0, wszName, &pidl); if(psv) {

1 0

Vitaliy Margolen : wined3d: Fix retrieval of driver adapter versions.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 46ecb15c5ccab9ce4802d20879dfc92b9fff3c91 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=46ecb15c5ccab9ce4802d20… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sun Mar 5 13:07:44 2006 -0700 wined3d: Fix retrieval of driver adapter versions. --- dlls/wined3d/directx.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 39c41bd..1749635 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1015,8 +1015,11 @@ HRESULT WINAPI IWineD3DImpl_GetAdapterId reuse the values once we have a context which is valid. Values from a temporary context may differ from the final ones */ if (isGLInfoValid == FALSE) { + WineD3D_Context *fake_ctx = NULL; + if (glXGetCurrentContext() == NULL) fake_ctx = WineD3D_CreateFakeGLContext(); /* If we don't know the device settings, go query them now */ isGLInfoValid = IWineD3DImpl_FillGLCaps(&This->gl_info, IWineD3DImpl_GetAdapterDisplay(iface, Adapter)); + if (fake_ctx != NULL) WineD3D_ReleaseFakeGLContext(fake_ctx); } /* If it worked, return the information requested */

1 0

Eric Pouech : dbghelp: Added type for array index.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 34636b026bf62968a0c66e95b021010145e12341 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=34636b026bf62968a0c66e9… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Mar 5 21:48:18 2006 +0100 dbghelp: Added type for array index. - added type for array index - correctly parsing array index type in stabs, Dwarf2 and MSC formats - fixed SyGetTypeInfo accordingly --- dlls/dbghelp/dbghelp_private.h | 5 +++-- dlls/dbghelp/dwarf.c | 4 +++- dlls/dbghelp/msc.c | 12 +++++++----- dlls/dbghelp/stabs.c | 11 ++++++----- dlls/dbghelp/type.c | 20 ++++++++++++-------- 5 files changed, 31 insertions(+), 21 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index d7371a2..97bfd9d 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -197,7 +197,8 @@ struct symt_array struct symt symt; int start; int end; - struct symt* basetype; + struct symt* base_type; + struct symt* index_type; }; struct symt_basic @@ -475,7 +476,7 @@ extern BOOL symt_add_enum_elemen const char* name, int value); extern struct symt_array* symt_new_array(struct module* module, int min, int max, - struct symt* base); + struct symt* base, struct symt* index); extern struct symt_function_signature* symt_new_function_signature(struct module* module, struct symt* ret_type, diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 946852e..5a882cd 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1050,6 +1050,7 @@ static void dwarf2_parse_array_subrange_ } parent->start = min; parent->end = max; + parent->index_type = idx_type; TRACE("found min:%u max:%u\n", min, max); @@ -1087,7 +1088,8 @@ static struct symt_array* dwarf2_parse_a } } - symt = symt_new_array(module, min, max, ref_type); + /* FIXME: ugly as hell */ + symt = symt_new_array(module, min, max, ref_type, NULL); if (entry->have_child) { /** any interest to not have child ? */ ++ctx->level; diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 66b07b5..64bd903 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -388,10 +388,12 @@ static int codeview_add_type_pointer(str static int codeview_add_type_array(struct module* module, unsigned int typeno, const char* name, - unsigned int elemtype, unsigned int arr_len) + unsigned int elemtype, unsigned int indextype, + unsigned int arr_len) { struct symt* symt; struct symt* elem = codeview_get_type(elemtype, FALSE); + struct symt* index = codeview_get_type(indextype, FALSE); DWORD arr_max = 0; if (elem) @@ -400,7 +402,7 @@ static int codeview_add_type_array(struc symt_get_info(elem, TI_GET_LENGTH, &elem_size); if (elem_size) arr_max = arr_len / (DWORD)elem_size; } - symt = &symt_new_array(module, 0, arr_max, elem)->symt; + symt = &symt_new_array(module, 0, arr_max, elem, index)->symt; return codeview_add_type(typeno, symt); } @@ -792,21 +794,21 @@ static int codeview_parse_type_table(str p_name = (const struct p_string*)((const unsigned char*)&type->array_v1.arrlen + leaf_len); retv = codeview_add_type_array(module, curr_type, terminate_string(p_name), - type->array_v1.elemtype, value); + type->array_v1.elemtype, type->array_v1.idxtype, value); break; case LF_ARRAY_V2: leaf_len = numeric_leaf(&value, &type->array_v2.arrlen); p_name = (const struct p_string*)((const unsigned char*)&type->array_v2.arrlen + leaf_len); retv = codeview_add_type_array(module, curr_type, terminate_string(p_name), - type->array_v2.elemtype, value); + type->array_v2.elemtype, type->array_v2.idxtype, value); break; case LF_ARRAY_V3: leaf_len = numeric_leaf(&value, &type->array_v3.arrlen); c_name = (const char*)&type->array_v3.arrlen + leaf_len; retv = codeview_add_type_array(module, curr_type, c_name, - type->array_v3.elemtype, value); + type->array_v3.elemtype, type->array_v3.idxtype, value); break; case LF_BITFIELD_V1: diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 7f1714f..f3d6e35 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -765,22 +765,23 @@ static inline int stabs_pts_read_array(s struct symt** adt) { long lo, hi; - struct symt* rdt; + struct symt* range_dt; + struct symt* base_dt; /* ar<typeinfo_nodef>;<int>;<int>;<typeinfo> */ PTS_ABORTIF(ptd, *ptd->ptr++ != 'r'); - /* FIXME: range type is lost, always assume int */ - PTS_ABORTIF(ptd, stabs_pts_read_type_def(ptd, NULL, &rdt) == -1); + + PTS_ABORTIF(ptd, stabs_pts_read_type_def(ptd, NULL, &range_dt) == -1); PTS_ABORTIF(ptd, *ptd->ptr++ != ';'); /* ';' */ PTS_ABORTIF(ptd, stabs_pts_read_number(ptd, &lo) == -1); PTS_ABORTIF(ptd, *ptd->ptr++ != ';'); /* ';' */ PTS_ABORTIF(ptd, stabs_pts_read_number(ptd, &hi) == -1); PTS_ABORTIF(ptd, *ptd->ptr++ != ';'); /* ';' */ - PTS_ABORTIF(ptd, stabs_pts_read_type_def(ptd, NULL, &rdt) == -1); + PTS_ABORTIF(ptd, stabs_pts_read_type_def(ptd, NULL, &base_dt) == -1); - *adt = &symt_new_array(ptd->module, lo, hi, rdt)->symt; + *adt = &symt_new_array(ptd->module, lo, hi, base_dt, range_dt)->symt; return 0; } diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 4177aaa..54be69b 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -282,16 +282,17 @@ BOOL symt_add_enum_element(struct module } struct symt_array* symt_new_array(struct module* module, int min, int max, - struct symt* base) + struct symt* base, struct symt* index) { struct symt_array* sym; if ((sym = pool_alloc(&module->pool, sizeof(*sym)))) { - sym->symt.tag = SymTagArrayType; - sym->start = min; - sym->end = max; - sym->basetype = base; + sym->symt.tag = SymTagArrayType; + sym->start = min; + sym->end = max; + sym->base_type = base; + sym->index_type = index; symt_add_type(module, &sym->symt); } return sym; @@ -597,7 +598,7 @@ BOOL symt_get_info(const struct symt* ty X(DWORD64) = ((const struct symt_data*)type)->u.s.length; break; case SymTagArrayType: - if (!symt_get_info(((const struct symt_array*)type)->basetype, + if (!symt_get_info(((const struct symt_array*)type)->base_type, TI_GET_LENGTH, pInfo)) return FALSE; X(DWORD64) *= ((const struct symt_array*)type)->end - @@ -702,7 +703,7 @@ BOOL symt_get_info(const struct symt* ty { /* hierarchical => hierarchical */ case SymTagArrayType: - X(DWORD) = (DWORD)((const struct symt_array*)type)->basetype; + X(DWORD) = (DWORD)((const struct symt_array*)type)->base_type; break; case SymTagPointerType: X(DWORD) = (DWORD)((const struct symt_pointer*)type)->pointsto; @@ -753,11 +754,14 @@ BOOL symt_get_info(const struct symt* ty } else X(DWORD) = ((const struct symt_function_signature*)type)->call_conv; break; + case TI_GET_ARRAYINDEXTYPEID: + if (type->tag != SymTagArrayType) return FALSE; + X(DWORD) = (DWORD)((const struct symt_array*)type)->index_type; + break; #undef X case TI_GET_ADDRESSOFFSET: - case TI_GET_ARRAYINDEXTYPEID: case TI_GET_CLASSPARENTID: case TI_GET_SYMINDEX: case TI_GET_THISADJUST:

1 0

Eric Pouech : msvcrt: Some more fixes to name demangling.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: f7441f9e1a5017138a436d7cf524d0b4d596264b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f7441f9e1a5017138a436d7… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Mar 5 21:48:35 2006 +0100 msvcrt: Some more fixes to name demangling. --- dlls/msvcrt/tests/cpp.c | 1 + dlls/msvcrt/undname.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 8165ffd..94c7a58 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -972,6 +972,7 @@ static void test_demangle(void) {"??0aa.a@@QAE@XZ", "??0aa.a@@QAE@XZ"}, {"??0aa$_3a@@QAE@XZ", "public: __thiscall aa$_3a::aa$_3a(void)"}, {"??2?$aaa@AAUbbb@@AAUccc@@AAU2@@ddd@1eee@2@QAEHXZ", "public: int __thiscall eee::eee::ddd::ddd::aaa<struct bbb &,struct ccc &,struct ccc &>::operator new(void)"}, +{"?pSW@@3P6GHKPAX0PAU_tagSTACKFRAME@@0P6GH0K0KPAK@ZP6GPAX0K@ZP6GK0K@ZP6GK00PAU_tagADDRESS@@@Z@ZA", "int (__stdcall* pSW)(unsigned long,void *,void *,struct _tagSTACKFRAME *,void *,int (__stdcall*)(void *,unsigned long,void *,unsigned long,unsigned long *),void * (__stdcall*)(void *,unsigned long),unsigned long (__stdcall*)(void *,unsigned long),unsigned long (__stdcall*)(void *,void *,struct _tagADDRESS *))"}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index d2e7668..1cda196 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -851,7 +851,11 @@ static BOOL handle_data(struct parsed_sy case '3': case '4': case '5': { unsigned mark = sym->stack.num; - if (!demangle_datatype(sym, &ct, NULL, FALSE)) goto done; + struct array pmt; + + str_array_init(&pmt); + + if (!demangle_datatype(sym, &ct, &pmt, FALSE)) goto done; if (!get_modifier(*sym->current++, &modifier)) goto done; sym->stack.num = mark; }

1 0

Eric Pouech : dbghelp: Implemented TI_GET_COUNT in SymGetTypeInfo for function.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: e70617883b4e883d46dc68ce8d6dfde7c4d354e4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e70617883b4e883d46dc68c… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Mar 5 21:48:07 2006 +0100 dbghelp: Implemented TI_GET_COUNT in SymGetTypeInfo for function. --- dlls/dbghelp/type.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 4a336c5..4177aaa 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -551,13 +551,20 @@ BOOL symt_get_info(const struct symt* ty break; case TI_GET_COUNT: - /* it seems that FunctionType also react to GET_COUNT (same value as - * GET_CHILDREN_COUNT ?, except for C++ methods, where it seems to - * also include 'this' (GET_CHILDREN_COUNT+1) - */ - if (type->tag != SymTagArrayType) return FALSE; - X(DWORD) = ((const struct symt_array*)type)->end - - ((const struct symt_array*)type)->start + 1; + switch (type->tag) + { + case SymTagArrayType: + X(DWORD) = ((const struct symt_array*)type)->end - + ((const struct symt_array*)type)->start + 1; + break; + case SymTagFunctionType: + /* this seems to be wrong for (future) C++ methods, where 'this' parameter + * should be included in this value (and not in GET_CHILDREN_COUNT) + */ + X(DWORD) = vector_length(&((const struct symt_function_signature*)type)->vchildren); + break; + default: return FALSE; + } break; case TI_GET_DATAKIND:

1 0

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 March 2006