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

Alexandre Julliard : server: Return real parent and owner in the create_window request.
by Alexandre Julliard March 6, 2006

March 6, 2006

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

March 6, 2006

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

March 6, 2006

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

March 6, 2006

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

March 6, 2006

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

March 6, 2006

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

March 6, 2006

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

March 6, 2006

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

March 6, 2006

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(a)XZ", "??0aa.a@@QAE(a)XZ"}, {"??0aa$_3a@@QAE(a)XZ", "public: __thiscall aa$_3a::aa$_3a(void)"}, {"??2?$aaa(a)AAUbbb@@AAUccc@@AAU2@@ddd(a)1eee@2(a)QAEHXZ", "public: int __thiscall eee::eee::ddd::ddd::aaa<struct bbb &,struct ccc &,struct ccc &>::operator new(void)"}, +{"?pSW@@3P6GHKPAX0PAU_tagSTACKFRAME@@0P6GH0K0KPAK(a)ZP6GPAX0K@ZP6GK0K(a)ZP6GK00PAU_tagADDRESS@@@Z(a)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 March 6, 2006

March 6, 2006

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