January 2007 - Wine-commits

Paul Vriens : mshtml/tests: Cast-qual warning fix.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: 6338caa9eda8eda98dad9a89a8e71c6ea37bd168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6338caa9eda8eda98dad9a89a… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jan 12 14:26:05 2007 +0100 mshtml/tests: Cast-qual warning fix. --- dlls/mshtml/tests/htmldoc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index ac26ca8..0815c01 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -1803,11 +1803,12 @@ static void test_Load(IPersistMoniker *p { IBindCtx *bind; HRESULT hres; + static WCHAR sz_html_clientsite_objectparam[] = SZ_HTML_CLIENTSITE_OBJECTPARAM; test_readyState((IUnknown*)persist); CreateBindCtx(0, &bind); - IBindCtx_RegisterObjectParam(bind, (LPOLESTR)SZ_HTML_CLIENTSITE_OBJECTPARAM, + IBindCtx_RegisterObjectParam(bind, sz_html_clientsite_objectparam, (IUnknown*)&ClientSite); SET_EXPECT(GetDisplayName);

1 0

Paul Vriens : crypt32/tests: Cast-qual warning fixes.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: 259c06ffc93d690fa5105b1451e519aa1c92b72e URL: http://source.winehq.org/git/wine.git/?a=commit;h=259c06ffc93d690fa5105b145… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jan 12 15:51:02 2007 +0100 crypt32/tests: Cast-qual warning fixes. --- dlls/crypt32/tests/cert.c | 113 ++++++++++++++++++++++----------------------- 1 files changed, 56 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=259c06ffc93d690fa5105…

1 0

Bill Medland : odbccp32: Remove A->W cross-call.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: 68d30e9a168b17ac5f2799a1e5fd16fcaae2f5a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d30e9a168b17ac5f2799a1e… Author: Bill Medland <billmedland(a)shaw.ca> Date: Fri Jan 12 07:12:57 2007 -0800 odbccp32: Remove A->W cross-call. --- dlls/odbccp32/odbccp32.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 8575b0d..eab71cc 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -36,6 +36,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(odbc); +/* Registry key namess */ +static const WCHAR drivers_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','O','D','B','C','I','N','S','T','.','I','N','I','\\','O','D','B','C',' ','D','r','i','v','e','r','s',0}; + /* MSDN documentation suggests that the error subsystem handles errors 1 to 8 * only and experimentation (Windows 2000) shows that the errors are process- * wide so go for the simple solution; static arrays. @@ -282,8 +285,8 @@ BOOL WINAPI SQLGetInstalledDriversW(LPWS { push_error(ODBC_ERROR_INVALID_BUFF_LEN, odbc_error_invalid_buff_len); } - else if ((reg_ret = RegOpenKeyExA (HKEY_LOCAL_MACHINE /* The drivers does not depend on the config mode */, - "Software\\ODBC\\ODBCINST.INI\\ODBC Drivers", 0, KEY_READ /* Maybe overkill */, + else if ((reg_ret = RegOpenKeyExW (HKEY_LOCAL_MACHINE /* The drivers does not depend on the config mode */, + drivers_key, 0, KEY_READ /* Maybe overkill */, &hDrivers)) == ERROR_SUCCESS) { DWORD index = 0;

1 0

Hans Leidekker : usp10: Initialise the caller supplied ABC structure in ScriptPlace.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: fb46c5f1c1e3f6bb7c21010fd2741d9082b80f82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb46c5f1c1e3f6bb7c21010fd… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Jan 12 13:13:10 2007 +0100 usp10: Initialise the caller supplied ABC structure in ScriptPlace. Fixes a regression found by Lei Zhang. --- dlls/usp10/usp10.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 35cf0b2..4aab525 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1244,6 +1244,8 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRI if (!(lpABC = usp_zero_alloc(sizeof(ABC) * cGlyphs))) return E_OUTOFMEMORY; + memset(pABC, 0, sizeof(ABC)); + /* FIXME: set pGoffset to more reasonable values */ if (!GetCharABCWidthsI(((ScriptCache *)*psc)->hdc, 0, cGlyphs, (WORD *) pwGlyphs, lpABC )) {

1 0

Paul Vriens : oleaut32/tests: Cast-qual warnings fixes.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: 23bbca535fcd5906cd8a2e7d3814925adbe1c210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23bbca535fcd5906cd8a2e7d3… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jan 12 13:25:24 2007 +0100 oleaut32/tests: Cast-qual warnings fixes. --- dlls/oleaut32/tests/olefont.c | 30 +++++++++++++----------------- 1 files changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 5a02502..7fc0422 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -40,6 +40,10 @@ #include <olectl.h> #include <ocidl.h> +static WCHAR MSSansSerif_font[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f',0}; +static WCHAR system_font[] = { 'S','y','s','t','e','m',0 }; +static WCHAR arial_font[] = { 'A','r','i','a','l',0 }; + static HMODULE hOleaut32; static HRESULT (WINAPI *pOleCreateFontIndirect)(LPFONTDESC,REFIID,LPVOID*); @@ -56,7 +60,6 @@ static void test_ifont_sizes(long lo_siz long hfont_height, const char * test_name) { FONTDESC fd; - static const WCHAR fname[] = { 'S','y','s','t','e','m',0 }; LPVOID pvObj = NULL; IFont* ifnt = NULL; HFONT hfont; @@ -65,7 +68,7 @@ static void test_ifont_sizes(long lo_siz HRESULT hres; fd.cbSizeofstruct = sizeof(FONTDESC); - fd.lpstrName = (WCHAR*)fname; + fd.lpstrName = system_font; S(fd.cySize).Lo = lo_size; S(fd.cySize).Hi = hi_size; fd.sWeight = 0; @@ -262,12 +265,11 @@ static void test_font_events_disp(void) HRESULT hr; DWORD dwCookie; IFontDisp *pFontDisp; - static const WCHAR wszMSSansSerif[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f',0}; DISPPARAMS dispparams; VARIANTARG vararg; fontdesc.cbSizeofstruct = sizeof(fontdesc); - fontdesc.lpstrName = (LPOLESTR)wszMSSansSerif; + fontdesc.lpstrName = MSSansSerif_font; fontdesc.cySize.int64 = 12 * 10000; /* 12 pt */ fontdesc.sWeight = FW_NORMAL; fontdesc.sCharset = 0; @@ -484,8 +486,6 @@ static void test_Invoke(void) static void test_IsEqual() { FONTDESC fd; - static const WCHAR system_font[] = { 'S','y','s','t','e','m',0 }; - static const WCHAR arial_font[] = { 'A','r','i','a','l',0 }; LPVOID pvObj = NULL; LPVOID pvObj2 = NULL; IFont* ifnt = NULL; @@ -494,7 +494,7 @@ static void test_IsEqual() /* Basic font description */ fd.cbSizeofstruct = sizeof(FONTDESC); - fd.lpstrName = (WCHAR*)system_font; + fd.lpstrName = system_font; S(fd.cySize).Lo = 100; S(fd.cySize).Hi = 100; fd.sWeight = 0; @@ -521,12 +521,12 @@ static void test_IsEqual() "IFont_IsEqual: (NULL) Expected 0x80004003 but got 0x%08x\n",hres); /* Test strName */ - fd.lpstrName = (WCHAR*)arial_font; + fd.lpstrName = arial_font; pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (strName) Expected S_FALSE but got 0x%08x\n",hres); - fd.lpstrName = (WCHAR*)system_font; + fd.lpstrName = system_font; IFont_Release(ifnt2); /* Test lo font size */ @@ -602,8 +602,6 @@ static void test_IsEqual() static void test_ReleaseHfont(void) { FONTDESC fd; - static const WCHAR system_font[] = { 'S','y','s','t','e','m',0 }; - static const WCHAR arial_font[] = { 'A','r','i','a','l',0 }; LPVOID pvObj1 = NULL; LPVOID pvObj2 = NULL; IFont* ifnt1 = NULL; @@ -614,7 +612,7 @@ static void test_ReleaseHfont(void) /* Basic font description */ fd.cbSizeofstruct = sizeof(FONTDESC); - fd.lpstrName = (WCHAR*)system_font; + fd.lpstrName = system_font; S(fd.cySize).Lo = 100; S(fd.cySize).Hi = 100; fd.sWeight = 0; @@ -627,7 +625,7 @@ static void test_ReleaseHfont(void) pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj1); ifnt1 = pvObj1; IFont_get_hFont(ifnt1,&hfnt1); - fd.lpstrName = (WCHAR*)arial_font; + fd.lpstrName = arial_font; pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); ifnt2 = pvObj2; IFont_get_hFont(ifnt2,&hfnt2); @@ -674,8 +672,6 @@ static void test_ReleaseHfont(void) static void test_AddRefHfont(void) { FONTDESC fd; - static const WCHAR system_font[] = { 'S','y','s','t','e','m',0 }; - static const WCHAR arial_font[] = { 'A','r','i','a','l',0 }; LPVOID pvObj1 = NULL; LPVOID pvObj2 = NULL; LPVOID pvObj3 = NULL; @@ -689,7 +685,7 @@ static void test_AddRefHfont(void) /* Basic font description */ fd.cbSizeofstruct = sizeof(FONTDESC); - fd.lpstrName = (WCHAR*)system_font; + fd.lpstrName = system_font; S(fd.cySize).Lo = 100; S(fd.cySize).Hi = 100; fd.sWeight = 0; @@ -702,7 +698,7 @@ static void test_AddRefHfont(void) pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj1); ifnt1 = pvObj1; IFont_get_hFont(ifnt1,&hfnt1); - fd.lpstrName = (WCHAR*)arial_font; + fd.lpstrName = arial_font; pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); ifnt2 = pvObj2; IFont_get_hFont(ifnt2,&hfnt2);

1 0

Paul Vriens : user32/tests: Cast-qual warning fixes.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: 53b225b7ab9cc884226412cd64ad70b57c5fdb1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=53b225b7ab9cc884226412cd6… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jan 12 13:49:08 2007 +0100 user32/tests: Cast-qual warning fixes. --- dlls/user32/tests/win.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 3dde99a..a420e28 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1056,7 +1056,7 @@ static void test_shell_window(void) /************** MDI test ****************/ -static const char mdi_lParam_test_message[] = "just a test string"; +static char mdi_lParam_test_message[] = "just a test string"; static void test_MDI_create(HWND parent, HWND mdi_client, INT first_id) {

1 0

Paul Vriens : secur32/tests: Cast-qual warning fixes.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: 6c3efd1c32b1f9054e82a684da6ab54a599f252d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c3efd1c32b1f9054e82a684d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jan 12 14:01:16 2007 +0100 secur32/tests: Cast-qual warning fixes. --- dlls/secur32/tests/schannel.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index ca870f4..0bbd96b 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -42,9 +42,9 @@ static const BYTE bigCert[] = { 0x30, 0x 0x4c, 0x61, 0x6e, 0x67, 0x00, 0x30, 0x07, 0x30, 0x02, 0x06, 0x00, 0x03, 0x01, 0x00, 0xa3, 0x16, 0x30, 0x14, 0x30, 0x12, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x08, 0x30, 0x06, 0x01, 0x01, 0xff, 0x02, 0x01, 0x01 }; -static const WCHAR cspNameW[] = { 'W','i','n','e','C','r','y','p','t','T','e', +static WCHAR cspNameW[] = { 'W','i','n','e','C','r','y','p','t','T','e', 'm','p',0 }; -static const BYTE privKey[] = { +static BYTE privKey[] = { 0x07, 0x02, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x52, 0x53, 0x41, 0x32, 0x00, 0x02, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x79, 0x10, 0x1c, 0xd0, 0x6b, 0x10, 0x18, 0x30, 0x94, 0x61, 0xdc, 0x0e, 0xcb, 0x96, 0x4e, 0x21, 0x3f, 0x79, 0xcd, @@ -116,12 +116,13 @@ static void testAcquireSecurityContext(v PCCERT_CONTEXT certs[2]; HCRYPTPROV csp; static CHAR unisp_name_a[] = UNISP_NAME_A; + static WCHAR ms_def_prov_w[] = MS_DEF_PROV_W; BOOL ret; HCRYPTKEY key; CRYPT_KEY_PROV_INFO keyProvInfo; - keyProvInfo.pwszContainerName = (LPWSTR)cspNameW; - keyProvInfo.pwszProvName = (LPWSTR)MS_DEF_PROV_W; + keyProvInfo.pwszContainerName = cspNameW; + keyProvInfo.pwszProvName = ms_def_prov_w; keyProvInfo.dwProvType = PROV_RSA_FULL; keyProvInfo.dwFlags = 0; keyProvInfo.cProvParam = 0; @@ -253,7 +254,7 @@ static void testAcquireSecurityContext(v ret = CryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, CRYPT_NEWKEYSET); ok(ret, "CryptAcquireContextW failed: %08x\n", GetLastError()); - ret = CryptImportKey(csp, (LPBYTE)privKey, sizeof(privKey), 0, 0, &key); + ret = CryptImportKey(csp, privKey, sizeof(privKey), 0, 0, &key); ok(ret, "CryptImportKey failed: %08x\n", GetLastError()); if (ret) {

1 0

Alexandre Julliard : ntdll: Moved the check for removable file in load_dll to the server.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: 5bd513640b52b62f379f2d15dc49cffbb899d191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bd513640b52b62f379f2d15d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 12 14:42:43 2007 +0100 ntdll: Moved the check for removable file in load_dll to the server. --- dlls/ntdll/loader.c | 3 --- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/virtual.c | 16 ---------------- server/fd.c | 8 +++++++- server/file.c | 6 ++++++ server/file.h | 2 ++ server/process.c | 2 +- 7 files changed, 16 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 98b83b7..999687a 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1438,9 +1438,6 @@ static NTSTATUS load_native_dll( LPCWSTR nt = RtlImageNtHeader( module ); - /* don't keep the file open if the mapping is from removable media */ - if (!VIRTUAL_HasMapping( module )) file = 0; - SERVER_START_REQ( load_dll ) { req->handle = file; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index a7ef8df..3444998 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -111,7 +111,6 @@ extern NTSTATUS DIR_get_unix_cwd( char * /* virtual memory */ extern NTSTATUS VIRTUAL_HandleFault(LPCVOID addr); -extern BOOL VIRTUAL_HasMapping( LPCVOID addr ); extern void VIRTUAL_SetForceExec( BOOL enable ); extern void VIRTUAL_UseLargeAddressSpace(void); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index fe33566..2ad3cfb 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1291,22 +1291,6 @@ NTSTATUS VIRTUAL_HandleFault( LPCVOID ad return ret; } -/*********************************************************************** - * VIRTUAL_HasMapping - * - * Check if the specified view has an associated file mapping. - */ -BOOL VIRTUAL_HasMapping( LPCVOID addr ) -{ - FILE_VIEW *view; - BOOL ret = FALSE; - - RtlEnterCriticalSection( &csVirtual ); - if ((view = VIRTUAL_FindView( addr ))) ret = (view->mapping != 0); - RtlLeaveCriticalSection( &csVirtual ); - return ret; -} - /*********************************************************************** * VIRTUAL_SetForceExec diff --git a/server/fd.c b/server/fd.c index d20360a..389c6a7 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1668,6 +1668,12 @@ int is_same_file_fd( struct fd *fd1, str return fd1->inode == fd2->inode; } +/* check if fd is on a removable device */ +int is_fd_removable( struct fd *fd ) +{ + return (fd->inode && fd->inode->device->removable); +} + /* handler for close_handle that refuses to close fd-associated handles in other processes */ int fd_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) { @@ -1966,7 +1972,7 @@ DECL_HANDLER(get_handle_fd) reply->type = fd->fd_ops->get_file_info( fd, &reply->flags ); if (reply->type != FD_TYPE_INVALID) { - if (fd->inode && fd->inode->device->removable) reply->flags |= FD_FLAG_REMOVABLE; + if (is_fd_removable(fd)) reply->flags |= FD_FLAG_REMOVABLE; if (!req->cached) { int unix_fd = get_unix_fd( fd ); diff --git a/server/file.c b/server/file.c index 6647138..050f723 100644 --- a/server/file.c +++ b/server/file.c @@ -319,6 +319,12 @@ int get_file_unix_fd( struct file *file return get_unix_fd( file->fd ); } +struct file *grab_file_unless_removable( struct file *file ) +{ + if (is_fd_removable( file->fd )) return NULL; + return (struct file *)grab_object( file ); +} + /* extend a file beyond the current end of file */ static int extend_file( struct file *file, file_pos_t new_size ) { diff --git a/server/file.h b/server/file.h index 6edb59f..836d438 100644 --- a/server/file.h +++ b/server/file.h @@ -55,6 +55,7 @@ extern void *get_fd_user( struct fd *fd extern void set_fd_user( struct fd *fd, const struct fd_ops *ops, struct object *user ); extern int get_unix_fd( struct fd *fd ); extern int is_same_file_fd( struct fd *fd1, struct fd *fd2 ); +extern int is_fd_removable( struct fd *fd ); extern int fd_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); extern void fd_poll_event( struct fd *fd, int event ); extern int check_fd_events( struct fd *fd, int events ); @@ -104,6 +105,7 @@ extern struct file *get_file_obj( struct unsigned int access ); extern int get_file_unix_fd( struct file *file ); extern int is_same_file( struct file *file1, struct file *file2 ); +extern struct file *grab_file_unless_removable( struct file *file ); extern int grow_file( struct file *file, file_pos_t size ); extern struct file *create_temp_file( int access ); extern void file_set_error(void); diff --git a/server/process.c b/server/process.c index 001afcb..1c53f49 100644 --- a/server/process.c +++ b/server/process.c @@ -492,7 +492,7 @@ static struct process_dll *process_load_ free( dll ); return NULL; } - if (file) dll->file = (struct file *)grab_object( file ); + if (file) dll->file = grab_file_unless_removable( file ); list_add_tail( &process->dlls, &dll->entry ); } return dll;

1 0

Alexandre Julliard : ntdll: Duplicate the mapping handle on the server side for NtMapViewOfSection.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: 4cbe867a8504a4aedd1ddc4f8a5429c1cc1aea3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cbe867a8504a4aedd1ddc4f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 12 14:55:31 2007 +0100 ntdll: Duplicate the mapping handle on the server side for NtMapViewOfSection. --- dlls/ntdll/virtual.c | 39 ++++++++++++++++----------------------- include/wine/server_protocol.h | 3 ++- server/mapping.c | 16 ++++++++++++++-- server/protocol.def | 1 + server/trace.c | 2 ++ 5 files changed, 35 insertions(+), 26 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 2ad3cfb..64a8b8e 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -934,7 +934,7 @@ static int do_relocations( char *base, c * Map an executable (PE format) image into memory. */ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_size, SIZE_T mask, - SIZE_T header_size, int shared_fd, BOOL removable, PVOID *addr_ptr ) + SIZE_T header_size, int shared_fd, HANDLE dup_mapping, PVOID *addr_ptr ) { IMAGE_DOS_HEADER *dos; IMAGE_NT_HEADERS *nt; @@ -975,7 +975,7 @@ static NTSTATUS map_image( HANDLE hmappi if (!st.st_size) goto error; header_size = min( header_size, st.st_size ); if (map_file_into_view( view, fd, 0, header_size, 0, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, - removable ) != STATUS_SUCCESS) goto error; + !dup_mapping ) != STATUS_SUCCESS) goto error; dos = (IMAGE_DOS_HEADER *)ptr; nt = (IMAGE_NT_HEADERS *)(ptr + dos->e_lfanew); header_end = ptr + ROUND_SIZE( 0, header_size ); @@ -1019,7 +1019,7 @@ static NTSTATUS map_image( HANDLE hmappi /* in that case Windows simply maps in the whole file */ if (map_file_into_view( view, fd, 0, total_size, 0, VPROT_COMMITTED | VPROT_READ, - removable ) != STATUS_SUCCESS) goto error; + !dup_mapping ) != STATUS_SUCCESS) goto error; /* check that all sections are loaded at the right offset */ if (nt->OptionalHeader.FileAlignment != nt->OptionalHeader.SectionAlignment) goto error; @@ -1121,7 +1121,7 @@ static NTSTATUS map_image( HANDLE hmappi end < file_start || map_file_into_view( view, fd, sec->VirtualAddress, file_size, file_start, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, - removable ) != STATUS_SUCCESS) + !dup_mapping ) != STATUS_SUCCESS) { ERR_(module)( "Could not map section %.8s, file probably truncated\n", sec->Name ); goto error; @@ -1195,11 +1195,7 @@ static NTSTATUS map_image( HANDLE hmappi } done: - if (!removable) /* don't keep handle open on removable media */ - NtDuplicateObject( NtCurrentProcess(), hmapping, - NtCurrentProcess(), &view->mapping, - 0, 0, DUPLICATE_SAME_ACCESS ); - + view->mapping = dup_mapping; RtlLeaveCriticalSection( &csVirtual ); *addr_ptr = ptr; @@ -1208,6 +1204,7 @@ static NTSTATUS map_image( HANDLE hmappi error: if (view) delete_view( view ); RtlLeaveCriticalSection( &csVirtual ); + if (dup_mapping) NtClose( dup_mapping ); return status; } @@ -1837,13 +1834,12 @@ NTSTATUS WINAPI NtMapViewOfSection( HAND NTSTATUS res; SIZE_T size = 0; SIZE_T mask = get_mask( zero_bits ); - int unix_handle = -1, flags, needs_close; + int unix_handle = -1, needs_close; int prot; void *base; struct file_view *view; DWORD size_low, size_high, header_size, shared_size; - HANDLE shared_file; - BOOL removable = FALSE; + HANDLE dup_mapping, shared_file; LARGE_INTEGER offset; offset.QuadPart = offset_ptr ? offset_ptr->QuadPart : 0; @@ -1871,14 +1867,14 @@ NTSTATUS WINAPI NtMapViewOfSection( HAND size_low = reply->size_low; size_high = reply->size_high; header_size = reply->header_size; + dup_mapping = reply->mapping; shared_file = reply->shared_file; shared_size = reply->shared_size; } SERVER_END_REQ; if (res) return res; - if ((res = server_get_unix_fd( handle, 0, &unix_handle, &needs_close, NULL, &flags ))) return res; - removable = (flags & FD_FLAG_REMOVABLE) != 0; + if ((res = server_get_unix_fd( handle, 0, &unix_handle, &needs_close, NULL, NULL ))) goto done; if (prot & VPROT_IMAGE) { @@ -1889,14 +1885,14 @@ NTSTATUS WINAPI NtMapViewOfSection( HAND if ((res = server_get_unix_fd( shared_file, FILE_READ_DATA|FILE_WRITE_DATA, &shared_fd, &shared_needs_close, NULL, NULL ))) goto done; res = map_image( handle, unix_handle, base, size_low, mask, header_size, - shared_fd, removable, addr_ptr ); + shared_fd, dup_mapping, addr_ptr ); if (shared_needs_close) close( shared_fd ); NtClose( shared_file ); } else { res = map_image( handle, unix_handle, base, size_low, mask, header_size, - -1, removable, addr_ptr ); + -1, dup_mapping, addr_ptr ); } if (needs_close) close( unix_handle ); if (!res) *size_ptr = size_low; @@ -1926,7 +1922,6 @@ NTSTATUS WINAPI NtMapViewOfSection( HAND res = STATUS_INVALID_PARAMETER; goto done; } - removable = FALSE; /* fall through */ case PAGE_READONLY: case PAGE_WRITECOPY: @@ -1964,16 +1959,13 @@ NTSTATUS WINAPI NtMapViewOfSection( HAND TRACE("handle=%p size=%lx offset=%x%08x\n", handle, size, offset.u.HighPart, offset.u.LowPart ); - res = map_file_into_view( view, unix_handle, 0, size, offset.QuadPart, prot, removable ); + res = map_file_into_view( view, unix_handle, 0, size, offset.QuadPart, prot, !dup_mapping ); if (res == STATUS_SUCCESS) { - if (!removable) /* don't keep handle open on removable media */ - NtDuplicateObject( NtCurrentProcess(), handle, - NtCurrentProcess(), &view->mapping, - 0, 0, DUPLICATE_SAME_ACCESS ); - *addr_ptr = view->base; *size_ptr = size; + view->mapping = dup_mapping; + dup_mapping = 0; /* don't close it */ } else { @@ -1985,6 +1977,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HAND RtlLeaveCriticalSection( &csVirtual ); done: + if (dup_mapping) NtClose( dup_mapping ); if (needs_close) close( unix_handle ); return res; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ce55bf0..03969ff 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1535,6 +1535,7 @@ struct get_mapping_info_reply int protect; int header_size; void* base; + obj_handle_t mapping; obj_handle_t shared_file; int shared_size; }; @@ -4436,6 +4437,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 263 +#define SERVER_PROTOCOL_VERSION 264 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/mapping.c b/server/mapping.c index fe99879..9b123e2 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -432,6 +432,7 @@ DECL_HANDLER(open_mapping) DECL_HANDLER(get_mapping_info) { struct mapping *mapping; + struct fd *fd; if ((mapping = (struct mapping *)get_handle_obj( current->process, req->handle, 0, &mapping_ops ))) @@ -443,9 +444,20 @@ DECL_HANDLER(get_mapping_info) reply->base = mapping->base; reply->shared_file = 0; reply->shared_size = mapping->shared_size; + if ((fd = get_obj_fd( &mapping->obj ))) + { + if (!is_fd_removable(fd)) + reply->mapping = alloc_handle( current->process, mapping, 0, 0 ); + release_object( fd ); + } if (mapping->shared_file) - reply->shared_file = alloc_handle( current->process, mapping->shared_file, - GENERIC_READ|GENERIC_WRITE, 0 ); + { + if (!(reply->shared_file = alloc_handle( current->process, mapping->shared_file, + GENERIC_READ|GENERIC_WRITE, 0 ))) + { + if (reply->mapping) close_handle( current->process, reply->mapping ); + } + } release_object( mapping ); } } diff --git a/server/protocol.def b/server/protocol.def index a71bcee..3f7fbd5 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1159,6 +1159,7 @@ enum char_info_mode int protect; /* protection flags */ int header_size; /* header size (for VPROT_IMAGE mapping) */ void* base; /* default base addr (for VPROT_IMAGE mapping) */ + obj_handle_t mapping; /* duplicate mapping handle unless removable */ obj_handle_t shared_file; /* shared mapping file handle */ int shared_size; /* shared mapping size */ @END diff --git a/server/trace.c b/server/trace.c index 1770a6d..5defbda 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1570,6 +1570,7 @@ static void dump_get_mapping_info_reply( fprintf( stderr, " protect=%d,", req->protect ); fprintf( stderr, " header_size=%d,", req->header_size ); fprintf( stderr, " base=%p,", req->base ); + fprintf( stderr, " mapping=%p,", req->mapping ); fprintf( stderr, " shared_file=%p,", req->shared_file ); fprintf( stderr, " shared_size=%d", req->shared_size ); } @@ -3966,6 +3967,7 @@ static const struct { "FILE_LOCK_CONFLICT", STATUS_FILE_LOCK_CONFLICT }, { "HANDLES_CLOSED", STATUS_HANDLES_CLOSED }, { "HANDLE_NOT_CLOSABLE", STATUS_HANDLE_NOT_CLOSABLE }, + { "ILLEGAL_FUNCTION", STATUS_ILLEGAL_FUNCTION }, { "INSTANCE_NOT_AVAILABLE", STATUS_INSTANCE_NOT_AVAILABLE }, { "INVALID_CID", STATUS_INVALID_CID }, { "INVALID_FILE_FOR_SECTION", STATUS_INVALID_FILE_FOR_SECTION },

1 0

Alexandre Julliard : ntdll: Fix handling of 64-bit sizes in NtMapViewOfSection.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: 3c55f78f52bda377733ec9689e6ca3942033b2e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c55f78f52bda377733ec9689… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 12 15:01:44 2007 +0100 ntdll: Fix handling of 64-bit sizes in NtMapViewOfSection. --- dlls/ntdll/virtual.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 64a8b8e..e4bc27e 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1874,6 +1874,10 @@ NTSTATUS WINAPI NtMapViewOfSection( HAND SERVER_END_REQ; if (res) return res; + size = ((ULONGLONG)size_high << 32) | size_low; + if (sizeof(size) == sizeof(size_low) && size_high) + ERR( "Sizes larger than 4Gb (%x%08x) not supported on this platform\n", size_high, size_low ); + if ((res = server_get_unix_fd( handle, 0, &unix_handle, &needs_close, NULL, NULL ))) goto done; if (prot & VPROT_IMAGE) @@ -1884,32 +1888,28 @@ NTSTATUS WINAPI NtMapViewOfSection( HAND if ((res = server_get_unix_fd( shared_file, FILE_READ_DATA|FILE_WRITE_DATA, &shared_fd, &shared_needs_close, NULL, NULL ))) goto done; - res = map_image( handle, unix_handle, base, size_low, mask, header_size, + res = map_image( handle, unix_handle, base, size, mask, header_size, shared_fd, dup_mapping, addr_ptr ); if (shared_needs_close) close( shared_fd ); NtClose( shared_file ); } else { - res = map_image( handle, unix_handle, base, size_low, mask, header_size, + res = map_image( handle, unix_handle, base, size, mask, header_size, -1, dup_mapping, addr_ptr ); } if (needs_close) close( unix_handle ); - if (!res) *size_ptr = size_low; + if (!res) *size_ptr = size; return res; } - if (size_high) - ERR("Sizes larger than 4Gb not supported\n"); - - if ((offset.u.LowPart >= size_low) || - (*size_ptr > size_low - offset.u.LowPart)) + if ((offset.QuadPart >= size) || (*size_ptr > size - offset.QuadPart)) { res = STATUS_INVALID_PARAMETER; goto done; } if (*size_ptr) size = ROUND_SIZE( offset.u.LowPart, *size_ptr ); - else size = size_low - offset.u.LowPart; + else size = size - offset.QuadPart; switch(protect) {

1 0