November 2009 - Wine-commits

Nikolay Sivov : comctl32/toolbar: Use single handler for TB_GETBUTTONTEXTW/ TB_GETBUTTONTEXTA.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 7b19d8bba60c8205edeb179ea5853228b4839c43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b19d8bba60c8205edeb179ea… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Nov 8 06:23:52 2009 +0300 comctl32/toolbar: Use single handler for TB_GETBUTTONTEXTW/TB_GETBUTTONTEXTA. --- dlls/comctl32/toolbar.c | 39 ++++++++++++--------------------------- 1 files changed, 12 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index fd30c27..f7175a9 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3395,24 +3395,7 @@ TOOLBAR_GetButtonSize (const TOOLBAR_INFO *infoPtr) static LRESULT -TOOLBAR_GetButtonTextA (const TOOLBAR_INFO *infoPtr, INT Id, LPSTR lpText) -{ - INT nIndex; - LPWSTR lpTextW; - - nIndex = TOOLBAR_GetButtonIndex (infoPtr, Id, FALSE); - if (nIndex == -1) - return -1; - - lpTextW = TOOLBAR_GetText(infoPtr,&infoPtr->buttons[nIndex]); - - return WideCharToMultiByte( CP_ACP, 0, lpTextW, -1, - lpText, lpText ? 0x7fffffff : 0, NULL, NULL ) - 1; -} - - -static LRESULT -TOOLBAR_GetButtonTextW (const TOOLBAR_INFO *infoPtr, INT Id, LPWSTR lpStr) +TOOLBAR_GetButtonText (const TOOLBAR_INFO *infoPtr, INT Id, LPWSTR lpStr, BOOL isW) { INT nIndex; LPWSTR lpText; @@ -3424,14 +3407,17 @@ TOOLBAR_GetButtonTextW (const TOOLBAR_INFO *infoPtr, INT Id, LPWSTR lpStr) lpText = TOOLBAR_GetText(infoPtr,&infoPtr->buttons[nIndex]); - if (lpText) + if (isW) { - ret = strlenW (lpText); - - if (lpStr) - strcpyW (lpStr, lpText); + if (lpText) + { + ret = strlenW (lpText); + if (lpStr) strcpyW (lpStr, lpText); + } } - + else + ret = WideCharToMultiByte( CP_ACP, 0, lpText, -1, + (LPSTR)lpStr, lpStr ? 0x7fffffff : 0, NULL, NULL ) - 1; return ret; } @@ -6495,10 +6481,9 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_GetButtonSize (infoPtr); case TB_GETBUTTONTEXTA: - return TOOLBAR_GetButtonTextA (infoPtr, wParam, (LPSTR)lParam); - case TB_GETBUTTONTEXTW: - return TOOLBAR_GetButtonTextW (infoPtr, wParam, (LPWSTR)lParam); + return TOOLBAR_GetButtonText (infoPtr, wParam, (LPWSTR)lParam, + uMsg == TB_GETBUTTONTEXTW); case TB_GETDISABLEDIMAGELIST: return TOOLBAR_GetDisabledImageList (infoPtr, wParam);

1 0

Nikolay Sivov : comctl32/toolbar: Call handlers in more general way.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 073486569ad483c0a221241b6fa8237ccfbf909d URL: http://source.winehq.org/git/wine.git/?a=commit;h=073486569ad483c0a221241b6… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Nov 8 06:34:47 2009 +0300 comctl32/toolbar: Call handlers in more general way. --- dlls/comctl32/toolbar.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index f7175a9..9481840 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -6421,11 +6421,9 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_AddBitmap (infoPtr, (INT)wParam, (TBADDBITMAP*)lParam); case TB_ADDBUTTONSA: - return TOOLBAR_AddButtonsT(infoPtr, wParam, (LPTBBUTTON)lParam, FALSE); - case TB_ADDBUTTONSW: - return TOOLBAR_AddButtonsT(infoPtr, wParam, (LPTBBUTTON)lParam, TRUE); - + return TOOLBAR_AddButtonsT (infoPtr, wParam, (LPTBBUTTON)lParam, + uMsg == TB_ADDBUTTONSW); case TB_ADDSTRINGA: return TOOLBAR_AddStringA (infoPtr, (HINSTANCE)wParam, lParam); @@ -6472,11 +6470,9 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_GetButton (infoPtr, wParam, (TBBUTTON*)lParam); case TB_GETBUTTONINFOA: - return TOOLBAR_GetButtonInfoT(infoPtr, wParam, (LPTBBUTTONINFOW)lParam, FALSE); - case TB_GETBUTTONINFOW: - return TOOLBAR_GetButtonInfoT(infoPtr, wParam, (LPTBBUTTONINFOW)lParam, TRUE); - + return TOOLBAR_GetButtonInfoT (infoPtr, wParam, (LPTBBUTTONINFOW)lParam, + uMsg == TB_GETBUTTONINFOW); case TB_GETBUTTONSIZE: return TOOLBAR_GetButtonSize (infoPtr); @@ -6554,10 +6550,9 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_Indeterminate (infoPtr, wParam, LOWORD(lParam)); case TB_INSERTBUTTONA: - return TOOLBAR_InsertButtonT(infoPtr, wParam, (TBBUTTON*)lParam, FALSE); - case TB_INSERTBUTTONW: - return TOOLBAR_InsertButtonT(infoPtr, wParam, (TBBUTTON*)lParam, TRUE); + return TOOLBAR_InsertButtonT(infoPtr, wParam, (TBBUTTON*)lParam, + uMsg == TB_INSERTBUTTONW); /* case TB_INSERTMARKHITTEST: */ /* 4.71 */

1 0

Jacek Caban : mshtml: Correctly handle NULL nschannel in channelbsc_load_stream (Coverity).
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: aa714ca16903d139a025bce4177a27597415a323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa714ca16903d139a025bce41… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 14:51:43 2009 +0100 mshtml: Correctly handle NULL nschannel in channelbsc_load_stream (Coverity). --- dlls/mshtml/navigate.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 3a1644c..727eaef 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1142,12 +1142,16 @@ HRESULT channelbsc_load_stream(nsChannelBSC *bscallback, IStream *stream) { HRESULT hres; - const char text_html[] = "text/html"; + if(!bscallback->nschannel) { + ERR("NULL nschannel\n"); + return E_FAIL; + } - add_nsrequest(bscallback); + bscallback->nschannel->content_type = heap_strdupA("text/html"); + if(!bscallback->nschannel->content_type) + return E_OUTOFMEMORY; - if(bscallback->nschannel) - bscallback->nschannel->content_type = heap_strdupA(text_html); + add_nsrequest(bscallback); hres = read_stream_data(bscallback, stream); IBindStatusCallback_OnStopBinding(STATUSCLB(&bscallback->bsc), hres, ERROR_SUCCESS);

1 0

Jacek Caban : mshtml: Get rid of no longer needed bind_complete in set_moniker.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 7f6630ee44e9f4bc2185056e9f15deecabe38e8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f6630ee44e9f4bc2185056e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 14:52:09 2009 +0100 mshtml: Get rid of no longer needed bind_complete in set_moniker. --- dlls/mshtml/persist.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 805d7f0..f3d23bd 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -152,7 +152,7 @@ static void set_downloading_proc(task_t *_task) } } -static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BOOL *bind_complete) +static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc) { nsChannelBSC *bscallback; LPOLESTR url = NULL; @@ -268,8 +268,6 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO IUnknown_Release((IUnknown*)bscallback); CoTaskMemFree(url); - if(bind_complete) - *bind_complete = FALSE; return S_OK; } @@ -357,19 +355,15 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva IMoniker *pimkName, LPBC pibc, DWORD grfMode) { HTMLDocument *This = PERSISTMON_THIS(iface); - BOOL bind_complete = FALSE; HRESULT hres; TRACE("(%p)->(%x %p %p %08x)\n", This, fFullyAvailable, pimkName, pibc, grfMode); - hres = set_moniker(This, pimkName, pibc, &bind_complete); + hres = set_moniker(This, pimkName, pibc); if(FAILED(hres)) return hres; - if(!bind_complete) - return start_binding(This->window, NULL, (BSCallback*)This->window->bscallback, pibc); - - return S_OK; + return start_binding(This->window, NULL, (BSCallback*)This->window->bscallback, pibc); } static HRESULT WINAPI PersistMoniker_Save(IPersistMoniker *iface, IMoniker *pimkName, @@ -626,7 +620,7 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM return hres; } - hres = set_moniker(This, mon, NULL, NULL); + hres = set_moniker(This, mon, NULL); IMoniker_Release(mon); if(FAILED(hres)) return hres;

1 0

Jacek Caban : mshtml: Moved GeckoUrl registry to mshtml.inf.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: ca32265d88d60c2e0d81822d2738a164b6310ad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca32265d88d60c2e0d81822d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 14:52:24 2009 +0100 mshtml: Moved GeckoUrl registry to mshtml.inf. --- dlls/mshtml/mshtml.inf | 7 ++++++- tools/wine.inf.in | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/mshtml.inf b/dlls/mshtml/mshtml.inf index aa7e814..f493a3b 100644 --- a/dlls/mshtml/mshtml.inf +++ b/dlls/mshtml/mshtml.inf @@ -3,7 +3,7 @@ Signature="$CHICAGO$" [RegisterDll] -AddReg=Classes.Reg, Protocols.Reg, IE.Reg, FileAssoc.Reg +AddReg=Classes.Reg, Protocols.Reg, IE.Reg, FileAssoc.Reg, WineGecko.Reg [UnregisterDll] @@ -270,6 +270,11 @@ HKLM,"Software\Microsoft\Internet Explorer\AboutURLs","mozilla",2,"res://mshtml. HKLM,"Software\Microsoft\Internet Explorer\Default Behaviors","VML",, "CLSID:10072CEC-8CC1-11D1-986E-00A0C955B42E" HKLM,"Software\Microsoft\Internet Explorer\Default Behaviors","TIME",, "CLSID:476C391C-3E0D-11D2-B948-00C04FA32195" + +[WineGecko.Reg] +HKCU,Software\Wine\MSHTML,"GeckoUrl",,"http://source.winehq.org/winegecko.php" + + [FileAssoc.Reg] ;; AVI diff --git a/tools/wine.inf.in b/tools/wine.inf.in index cdd5218..03e6142 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -540,7 +540,6 @@ HKLM,System\CurrentControlSet\Control\Session Manager,,,"" HKLM,System\CurrentControlSet\Control\VMM32Files,,,"" HKCU,AppEvents\Schemes\Apps\Explorer\Navigating\.Current,,,"" HKCU,Software\Microsoft\Protected Storage System Provider,,,"" -HKCU,Software\Wine\MSHTML,"GeckoUrl",,"http://source.winehq.org/winegecko.php" HKLM,HARDWARE\DEVICEMAP\PARALLEL PORTS,,,"" HKLM,HARDWARE\DEVICEMAP\SERIALCOMM,,,"" ; Some apps requires at least four subkeys of Active Setup\Installed Components

1 0

Jacek Caban : mshtml: Download Gecko in DllRegisterServer.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 10b0b86cbc655099e3a070198bdfd4662e931b71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10b0b86cbc655099e3a070198… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 14:52:43 2009 +0100 mshtml: Download Gecko in DllRegisterServer. --- dlls/mshtml/main.c | 11 +++++++---- dlls/mshtml/nsembed.c | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 548c50c..6a358e5 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -391,9 +391,6 @@ static HRESULT register_server(BOOL do_register) if(FAILED(hres)) ERR("typelib registration failed: %08x\n", hres); - if(do_register && SUCCEEDED(hres)) - load_gecko(TRUE); - return hres; } @@ -405,7 +402,13 @@ static HRESULT register_server(BOOL do_register) */ HRESULT WINAPI DllRegisterServer(void) { - return register_server(TRUE); + HRESULT hres; + + hres = register_server(TRUE); + if(SUCCEEDED(hres)) + load_gecko(FALSE); + + return hres; } /*********************************************************************** diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 6207c13..2150a0f 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1615,7 +1615,7 @@ NSContainer *NSContainer_Create(HTMLDocumentObj *doc, NSContainer *parent) NSContainer *ret; nsresult nsres; - if(!load_gecko(FALSE)) + if(!load_gecko(TRUE)) return NULL; ret = heap_alloc_zero(sizeof(NSContainer));

1 0

Henri Verbeet : server: Store the Unix name in the fd.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 27705d51e1a3145d6f70cfeffad677adbf02d373 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27705d51e1a3145d6f70cfeff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 12 15:10:12 2009 +0100 server: Store the Unix name in the fd. --- include/wine/server_protocol.h | 20 +++++++++++++++++++- server/fd.c | 25 +++++++++++++++++++++++++ server/protocol.def | 9 +++++++++ server/request.h | 5 +++++ server/trace.c | 14 ++++++++++++++ 5 files changed, 72 insertions(+), 1 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d2b159a..fd52bfb 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1207,6 +1207,21 @@ struct alloc_file_handle_reply +struct get_handle_unix_name_request +{ + struct request_header __header; + obj_handle_t handle; +}; +struct get_handle_unix_name_reply +{ + struct reply_header __header; + data_size_t name_len; + /* VARARG(name,string); */ + char __pad_12[4]; +}; + + + struct get_handle_fd_request { struct request_header __header; @@ -4678,6 +4693,7 @@ enum request REQ_create_file, REQ_open_file_object, REQ_alloc_file_handle, + REQ_get_handle_unix_name, REQ_get_handle_fd, REQ_flush_file, REQ_lock_file, @@ -4925,6 +4941,7 @@ union generic_request struct create_file_request create_file_request; struct open_file_object_request open_file_object_request; struct alloc_file_handle_request alloc_file_handle_request; + struct get_handle_unix_name_request get_handle_unix_name_request; struct get_handle_fd_request get_handle_fd_request; struct flush_file_request flush_file_request; struct lock_file_request lock_file_request; @@ -5170,6 +5187,7 @@ union generic_reply struct create_file_reply create_file_reply; struct open_file_object_reply open_file_object_reply; struct alloc_file_handle_reply alloc_file_handle_reply; + struct get_handle_unix_name_reply get_handle_unix_name_reply; struct get_handle_fd_reply get_handle_fd_reply; struct flush_file_reply flush_file_reply; struct lock_file_reply lock_file_reply; @@ -5375,6 +5393,6 @@ union generic_reply struct free_user_handle_reply free_user_handle_reply; }; -#define SERVER_PROTOCOL_VERSION 392 +#define SERVER_PROTOCOL_VERSION 393 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/fd.c b/server/fd.c index 72ebcfe..f57ed97 100644 --- a/server/fd.c +++ b/server/fd.c @@ -190,6 +190,7 @@ struct fd unsigned int access; /* file access (FILE_READ_DATA etc.) */ unsigned int options; /* file options (FILE_DELETE_ON_CLOSE, FILE_SYNCHRONOUS...) */ unsigned int sharing; /* file sharing mode */ + char *unix_name; /* unix file name */ int unix_fd; /* unix file descriptor */ unsigned int no_fd_status;/* status to return when unix_fd is -1 */ unsigned int signaled :1; /* is the fd signaled? */ @@ -1368,6 +1369,7 @@ static void fd_destroy( struct object *obj ) if (fd->completion) release_object( fd->completion ); remove_fd_locks( fd ); + free( fd->unix_name ); list_remove( &fd->inode_entry ); if (fd->poll_index != -1) remove_poll_user( fd, fd->poll_index ); if (fd->inode) @@ -1438,6 +1440,7 @@ static struct fd *alloc_fd_object(void) fd->options = 0; fd->sharing = 0; fd->unix_fd = -1; + fd->unix_name = NULL; fd->signaled = 1; fd->fs_locks = 1; fd->poll_index = -1; @@ -1470,6 +1473,7 @@ struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *use fd->access = 0; fd->options = options; fd->sharing = 0; + fd->unix_name = NULL; fd->unix_fd = -1; fd->signaled = 0; fd->fs_locks = 0; @@ -1577,6 +1581,9 @@ struct fd *open_fd( const char *name, int flags, mode_t *mode, unsigned int acce } else rw_mode = O_RDONLY; + if (!(fd->unix_name = mem_alloc( strlen(name) + 1 ))) goto error; + strcpy( fd->unix_name, name ); + if ((fd->unix_fd = open( name, rw_mode | (flags & ~O_TRUNC), *mode )) == -1) { /* if we tried to open a directory for write access, retry read-only */ @@ -2003,6 +2010,24 @@ DECL_HANDLER(open_file_object) if (root) release_object( root ); } +/* get the Unix name from a file handle */ +DECL_HANDLER(get_handle_unix_name) +{ + struct fd *fd; + + if ((fd = get_handle_fd_obj( current->process, req->handle, 0 ))) + { + if (fd->unix_name) + { + data_size_t name_len = strlen( fd->unix_name ); + reply->name_len = name_len; + if (name_len <= get_reply_max_size()) set_reply_data( fd->unix_name, name_len ); + else set_error( STATUS_BUFFER_OVERFLOW ); + } + release_object( fd ); + } +} + /* get a Unix fd to access a file */ DECL_HANDLER(get_handle_fd) { diff --git a/server/protocol.def b/server/protocol.def index a0e1702..ca44e38 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1003,6 +1003,15 @@ enum event_op { PULSE_EVENT, SET_EVENT, RESET_EVENT }; @END +/* Get the Unix name from a file handle */ +(a)REQ(get_handle_unix_name) + obj_handle_t handle; /* file handle */ +(a)REPLY + data_size_t name_len; /* unix name length */ + VARARG(name,string); /* unix name */ +(a)END + + /* Get a Unix fd to access a file */ @REQ(get_handle_fd) obj_handle_t handle; /* handle to the file */ diff --git a/server/request.h b/server/request.h index 87b6a75..8aa8a9d 100644 --- a/server/request.h +++ b/server/request.h @@ -148,6 +148,7 @@ DECL_HANDLER(open_semaphore); DECL_HANDLER(create_file); DECL_HANDLER(open_file_object); DECL_HANDLER(alloc_file_handle); +DECL_HANDLER(get_handle_unix_name); DECL_HANDLER(get_handle_fd); DECL_HANDLER(flush_file); DECL_HANDLER(lock_file); @@ -394,6 +395,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_create_file, (req_handler)req_open_file_object, (req_handler)req_alloc_file_handle, + (req_handler)req_get_handle_unix_name, (req_handler)req_get_handle_fd, (req_handler)req_flush_file, (req_handler)req_lock_file, @@ -846,6 +848,9 @@ C_ASSERT( FIELD_OFFSET(struct alloc_file_handle_request, attributes) == 16 ); C_ASSERT( FIELD_OFFSET(struct alloc_file_handle_request, fd) == 20 ); C_ASSERT( FIELD_OFFSET(struct alloc_file_handle_reply, handle) == 8 ); C_ASSERT( sizeof(struct alloc_file_handle_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_handle_unix_name_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct get_handle_unix_name_reply, name_len) == 8 ); +C_ASSERT( sizeof(struct get_handle_unix_name_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_handle_fd_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_handle_fd_reply, type) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_handle_fd_reply, removable) == 12 ); diff --git a/server/trace.c b/server/trace.c index b7dec85..a529e5b 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1457,6 +1457,17 @@ static void dump_alloc_file_handle_reply( const struct alloc_file_handle_reply * fprintf( stderr, " handle=%04x", req->handle ); } +static void dump_get_handle_unix_name_request( const struct get_handle_unix_name_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); +} + +static void dump_get_handle_unix_name_reply( const struct get_handle_unix_name_reply *req ) +{ + fprintf( stderr, " name_len=%u", req->name_len ); + dump_varargs_string( ", name=", cur_size ); +} + static void dump_get_handle_fd_request( const struct get_handle_fd_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -3832,6 +3843,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_create_file_request, (dump_func)dump_open_file_object_request, (dump_func)dump_alloc_file_handle_request, + (dump_func)dump_get_handle_unix_name_request, (dump_func)dump_get_handle_fd_request, (dump_func)dump_flush_file_request, (dump_func)dump_lock_file_request, @@ -4075,6 +4087,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_create_file_reply, (dump_func)dump_open_file_object_reply, (dump_func)dump_alloc_file_handle_reply, + (dump_func)dump_get_handle_unix_name_reply, (dump_func)dump_get_handle_fd_reply, (dump_func)dump_flush_file_reply, (dump_func)dump_lock_file_reply, @@ -4318,6 +4331,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "create_file", "open_file_object", "alloc_file_handle", + "get_handle_unix_name", "get_handle_fd", "flush_file", "lock_file",

1 0

Henri Verbeet : ntdll: Implement the FileNameInformation class for NtQueryInformationFile().
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: cd6d01ac9d969c1473e86d7faac6ef5ac38a4156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd6d01ac9d969c1473e86d7fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 12 15:10:13 2009 +0100 ntdll: Implement the FileNameInformation class for NtQueryInformationFile(). --- dlls/ntdll/file.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 228646f..3b132ff 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1486,6 +1486,40 @@ NTSTATUS WINAPI NtSetVolumeInformationFile( return 0; } +static NTSTATUS server_get_unix_name( HANDLE handle, ANSI_STRING *unix_name ) +{ + data_size_t size = 1024; + NTSTATUS ret; + char *name; + + for (;;) + { + name = RtlAllocateHeap( GetProcessHeap(), 0, size + 1 ); + if (!name) return STATUS_NO_MEMORY; + unix_name->MaximumLength = size + 1; + + SERVER_START_REQ( get_handle_unix_name ) + { + req->handle = wine_server_obj_handle( handle ); + wine_server_set_reply( req, name, size ); + ret = wine_server_call( req ); + size = reply->name_len; + } + SERVER_END_REQ; + + if (!ret) + { + name[size] = 0; + unix_name->Buffer = name; + unix_name->Length = size; + break; + } + RtlFreeHeap( GetProcessHeap(), 0, name ); + if (ret != STATUS_BUFFER_OVERFLOW) break; + } + return ret; +} + /****************************************************************************** * NtQueryInformationFile [NTDLL.@] * ZwQueryInformationFile [NTDLL.@] @@ -1774,6 +1808,42 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, SERVER_END_REQ; } break; + case FileNameInformation: + { + FILE_NAME_INFORMATION *info = ptr; + ANSI_STRING unix_name; + + if (!(io->u.Status = server_get_unix_name( hFile, &unix_name ))) + { + LONG name_len = len - FIELD_OFFSET(FILE_NAME_INFORMATION, FileName); + UNICODE_STRING nt_name; + + io->u.Status = wine_unix_to_nt_file_name( &unix_name, &nt_name ); + RtlFreeAnsiString( &unix_name ); + + if (!io->u.Status) + { + const WCHAR *ptr = nt_name.Buffer; + const WCHAR *end = ptr + (nt_name.Length / sizeof(WCHAR)); + + /* Skip the volume mount point. */ + while (ptr != end && *ptr == '\\') ++ptr; + while (ptr != end && *ptr != '\\') ++ptr; + while (ptr != end && *ptr == '\\') ++ptr; + while (ptr != end && *ptr != '\\') ++ptr; + + info->FileNameLength = (end - ptr) * sizeof(WCHAR); + if (name_len < info->FileNameLength) io->u.Status = STATUS_BUFFER_OVERFLOW; + else name_len = info->FileNameLength; + + memcpy( info->FileName, ptr, name_len ); + RtlFreeUnicodeString( &nt_name ); + + io->Information = FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + name_len; + } + } + } + break; default: FIXME("Unsupported class (%d)\n", class); io->u.Status = STATUS_NOT_IMPLEMENTED;

1 0

Henri Verbeet : ntdll/tests: Add some tests for the NtQueryInformationFile( ) FileNameInformation class.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 4422e67126af09c2a0b07f914b924c6bdc1a7736 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4422e67126af09c2a0b07f914… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 12 15:10:14 2009 +0100 ntdll/tests: Add some tests for the NtQueryInformationFile() FileNameInformation class. --- dlls/ntdll/tests/file.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 76 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 2c23915..fba3bb7 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -34,6 +34,7 @@ #include "wine/test.h" #include "winternl.h" +#include "winuser.h" #ifndef IO_COMPLETION_ALL_ACCESS #define IO_COMPLETION_ALL_ACCESS 0x001F0003 @@ -938,6 +939,80 @@ static void test_iocompletion(void) } } +static void test_file_name_information(void) +{ + WCHAR *file_name, *volume_prefix, *expected; + FILE_NAME_INFORMATION *info; + UINT file_name_size; + IO_STATUS_BLOCK io; + UINT info_size; + HRESULT hr; + HANDLE h; + UINT len; + + file_name_size = GetSystemDirectoryW( NULL, 0 ); + file_name = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*file_name) ); + volume_prefix = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*volume_prefix) ); + expected = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*volume_prefix) ); + + len = GetSystemDirectoryW( file_name, file_name_size ); + ok(len == file_name_size - 1, + "GetSystemDirectoryW returned %u, expected %u.\n", + len, file_name_size - 1); + + len = GetVolumePathNameW( file_name, volume_prefix, file_name_size ); + ok(len, "GetVolumePathNameW failed.\n"); + + len = lstrlenW( volume_prefix ); + if (len && volume_prefix[len - 1] == '\\') --len; + memcpy( expected, file_name + len, (file_name_size - len - 1) * sizeof(WCHAR) ); + expected[file_name_size - len - 1] = '\0'; + + /* A bit more than we actually need, but it keeps the calculation simple. */ + info_size = sizeof(*info) + (file_name_size * sizeof(WCHAR)); + info = HeapAlloc( GetProcessHeap(), 0, info_size ); + + h = CreateFileW( file_name, GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0 ); + ok(h != INVALID_HANDLE_VALUE, "Failed to open file.\n"); + + memset( info, 0xcc, info_size ); + hr = pNtQueryInformationFile( h, &io, info, sizeof(*info), FileNameInformation ); + ok(hr == STATUS_BUFFER_OVERFLOW, "NtQueryInformationFile returned %#x, expected %#x.\n", + hr, STATUS_BUFFER_OVERFLOW); + ok(U(io).Status == STATUS_BUFFER_OVERFLOW, "io.Status is %#x, expected %#x.\n", + U(io).Status, STATUS_BUFFER_OVERFLOW); + ok(info->FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), "info->FileNameLength is %u, expected %u.\n", + info->FileNameLength, lstrlenW( expected ) * sizeof(WCHAR)); + ok(info->FileName[2] == 0xcccc, "info->FileName[2] is %#x, expected 0xcccc.\n", info->FileName[2]); + ok(CharLowerW((LPWSTR)(UINT_PTR)info->FileName[1]) == CharLowerW((LPWSTR)(UINT_PTR)expected[1]), + "info->FileName[1] is %p, expected %p.\n", + CharLowerW((LPWSTR)(UINT_PTR)info->FileName[1]), CharLowerW((LPWSTR)(UINT_PTR)expected[1])); + ok(io.Information == sizeof(*info), "io.Information is %lu, expected %u.\n", io.Information, sizeof(*info)); + + memset( info, 0xcc, info_size ); + hr = pNtQueryInformationFile( h, &io, info, info_size, FileNameInformation ); + ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#x, expected %#x.\n", hr, STATUS_SUCCESS); + ok(U(io).Status == STATUS_SUCCESS, "io.Status is %#x, expected %#x.\n", U(io).Status, STATUS_SUCCESS); + ok(info->FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), "info->FileNameLength is %u, expected %u.\n", + info->FileNameLength, lstrlenW( expected ) * sizeof(WCHAR)); + ok(info->FileName[info->FileNameLength / sizeof(WCHAR)] == 0xcccc, "info->FileName[%u] is %#x, expected 0xcccc.\n", + info->FileNameLength / sizeof(WCHAR), info->FileName[info->FileNameLength / sizeof(WCHAR)]); + info->FileName[info->FileNameLength / sizeof(WCHAR)] = '\0'; + ok(!lstrcmpiW( info->FileName, expected ), "info->FileName is %s, expected %s.\n", + wine_dbgstr_w( info->FileName ), wine_dbgstr_w( expected )); + ok(io.Information == FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + info->FileNameLength, + "io.Information is %lu, expected %u.\n", + io.Information, FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + info->FileNameLength); + + CloseHandle( h ); + HeapFree( GetProcessHeap(), 0, info ); + HeapFree( GetProcessHeap(), 0, expected ); + HeapFree( GetProcessHeap(), 0, volume_prefix ); + HeapFree( GetProcessHeap(), 0, file_name ); +} + START_TEST(file) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -972,4 +1047,5 @@ START_TEST(file) test_file_basic_information(); test_file_all_information(); test_file_both_information(); + test_file_name_information(); }

1 0

Henri Verbeet : ntdll: Fix the FileNameInformation info size.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 85d93d689e15f9394211c353d2959d5966f4f15d URL: http://source.winehq.org/git/wine.git/?a=commit;h=85d93d689e15f9394211c353d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 12 15:10:15 2009 +0100 ntdll: Fix the FileNameInformation info size. --- dlls/ntdll/file.c | 2 +- dlls/ntdll/tests/file.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 3b132ff..b62c7c2 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1551,7 +1551,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, sizeof(FILE_INTERNAL_INFORMATION), /* FileInternalInformation */ sizeof(FILE_EA_INFORMATION), /* FileEaInformation */ sizeof(FILE_ACCESS_INFORMATION), /* FileAccessInformation */ - sizeof(FILE_NAME_INFORMATION)-sizeof(WCHAR), /* FileNameInformation */ + sizeof(FILE_NAME_INFORMATION), /* FileNameInformation */ sizeof(FILE_RENAME_INFORMATION)-sizeof(WCHAR), /* FileRenameInformation */ 0, /* FileLinkInformation */ sizeof(FILE_NAMES_INFORMATION)-sizeof(WCHAR), /* FileNamesInformation */ diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index fba3bb7..ba6b07e 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -977,6 +977,9 @@ static void test_file_name_information(void) NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0 ); ok(h != INVALID_HANDLE_VALUE, "Failed to open file.\n"); + hr = pNtQueryInformationFile( h, &io, info, sizeof(*info) - 1, FileNameInformation ); + ok(hr == STATUS_INFO_LENGTH_MISMATCH, "NtQueryInformationFile returned %#x.\n", hr); + memset( info, 0xcc, info_size ); hr = pNtQueryInformationFile( h, &io, info, sizeof(*info), FileNameInformation ); ok(hr == STATUS_BUFFER_OVERFLOW, "NtQueryInformationFile returned %#x, expected %#x.\n",

1 0