November 2009 - Wine-Commits

Piotr Caban : msxml3: Ignore nanoseconds in xmlnode_get_nodeTypedValue.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: 5f26c60982631ec1c180caafc56f467071728ce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f26c60982631ec1c180caafc… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Nov 18 19:02:15 2009 +0100 msxml3: Ignore nanoseconds in xmlnode_get_nodeTypedValue. --- dlls/msxml3/node.c | 9 --------- dlls/msxml3/tests/domdoc.c | 6 +++--- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index b949037..1ddbc07 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -999,16 +999,7 @@ inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) if(*p == '.') { - int ms; - p++; - ms = (*(p++) - '0') * 10; - if(isdigitW(*p)) ms += *(p++) - '0'; - ms *= 10; - if(isdigitW(*p)) ms += *(p++) - '0'; - - st.wMilliseconds = ms; - while(isdigitW(*p)) p++; } } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 6e08ca9..f84d748 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4103,7 +4103,7 @@ static void test_NodeTypeValue(void) hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); ok(hr == S_OK, "ret %08x\n", hr ); ok(V_VT(&v) == VT_DATE, "incorrect type\n"); - double_eq(40135.13996666666, V_DATE(&v)); + double_eq(40135.13996527778, V_DATE(&v)); VariantClear( &v ); IXMLDOMNode_Release(pNode); @@ -4142,7 +4142,7 @@ static void test_NodeTypeValue(void) hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); ok(hr == S_OK, "ret %08x\n", hr ); ok(V_VT(&v) == VT_DATE, "incorrect type\n"); - double_eq(0.581392511574074, V_DATE(&v)); + double_eq(0.5813888888888888, V_DATE(&v)); VariantClear( &v ); IXMLDOMNode_Release(pNode); @@ -4155,7 +4155,7 @@ static void test_NodeTypeValue(void) hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); ok(hr == S_OK, "ret %08x\n", hr ); ok(V_VT(&v) == VT_DATE, "incorrect type\n"); - double_eq(1.112513078703703, V_DATE(&v)); + double_eq(1.112511574074074, V_DATE(&v)); VariantClear( &v ); IXMLDOMNode_Release(pNode);

1 0

Paul Vriens : rsaenh/tests: Fix some test failures on W2K.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: 8fe8d61a627273963d9dbde1efcc49c6704361c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fe8d61a627273963d9dbde1e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 18 20:58:35 2009 +0100 rsaenh/tests: Fix some test failures on W2K. --- dlls/rsaenh/tests/rsaenh.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index bf6ed0f..b56f4d4 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -72,9 +72,15 @@ static void uniquecontainer(char *unique) HKEY hkey; char guid[MAX_PATH]; DWORD size = MAX_PATH; + HRESULT ret; /* Get the MachineGUID */ - RegOpenKeyExA(HKEY_LOCAL_MACHINE, szCryptography, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); + ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, szCryptography, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); + if (ret == ERROR_ACCESS_DENIED) + { + /* Windows 2000 can't handle KEY_WOW64_64KEY */ + RegOpenKeyA(HKEY_LOCAL_MACHINE, szCryptography, &hkey); + } RegQueryValueExA(hkey, szMachineGuid, NULL, NULL, (LPBYTE)guid, &size); RegCloseKey(hkey);

1 0

Vincent Povirk : ole32: Always invalidate stream objects when deleting the stream.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: 9d0c4c971d56a74aac9599e5771bbbdd57906f6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d0c4c971d56a74aac9599e57… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 18 10:22:50 2009 -0600 ole32: Always invalidate stream objects when deleting the stream. --- dlls/ole32/storage32.c | 23 ++++++++++++----------- dlls/ole32/tests/storage32.c | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index df0305d..96e3e00 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -823,17 +823,6 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( */ if (STGM_CREATE_MODE(grfMode) == STGM_CREATE) { - StgStreamImpl *strm; - - LIST_FOR_EACH_ENTRY(strm, &This->strmHead, StgStreamImpl, StrmListEntry) - { - if (strm->dirEntry == currentEntryRef) - { - TRACE("Stream deleted %p\n", strm); - strm->parentStorage = NULL; - list_remove(&strm->StrmListEntry); - } - } IStorage_DestroyElement(iface, pwcsName); } else @@ -1914,6 +1903,18 @@ static HRESULT deleteStreamContents( IStream *pis; HRESULT hr; ULARGE_INTEGER size; + StgStreamImpl *strm; + + /* Invalidate any open stream objects. */ + LIST_FOR_EACH_ENTRY(strm, &parentStorage->strmHead, StgStreamImpl, StrmListEntry) + { + if (strm->dirEntry == indexToDelete) + { + TRACE("Stream deleted %p\n", strm); + strm->parentStorage = NULL; + list_remove(&strm->StrmListEntry); + } + } size.u.HighPart = 0; size.u.LowPart = 0; diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index b908ea5..8fa300f 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1121,7 +1121,7 @@ static void test_substorage_share(void) ok(r==S_OK, "IStorage->DestroyElement failed, hr=%08x\n", r); r = IStream_Write(stm, "this shouldn't work\n", 20, NULL); - todo_wine ok(r==STG_E_REVERTED, "IStream_Write should fail %08x\n", r); + ok(r==STG_E_REVERTED, "IStream_Write should fail %08x\n", r); IStorage_Release(stm); }

1 0

Vincent Povirk : ole32: Invalidate child streams when a non-top-level storage is freed.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: 55604eb36c4d569464a9f154ff30b4fdd4987c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55604eb36c4d569464a9f154f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 18 10:16:13 2009 -0600 ole32: Invalidate child streams when a non-top-level storage is freed. --- dlls/ole32/storage32.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index b6de7ae..df0305d 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3485,6 +3485,8 @@ static void StorageInternalImpl_Destroy( StorageBaseImpl *iface) { StorageInternalImpl* This = (StorageInternalImpl*) iface; + StorageBaseImpl_DeleteAll(&This->base); + HeapFree(GetProcessHeap(), 0, This); }

1 0

Nicolas Le Cam : widl: Don' t generate memset calls with zero length parameter.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: ca38b8b9515a506e89f9ef0ac3fc4e2f0da8d867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca38b8b9515a506e89f9ef0ac… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Wed Nov 18 19:39:08 2009 +0100 widl: Don't generate memset calls with zero length parameter. --- tools/widl/typegen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index fdb2379..68e9da1 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3298,7 +3298,7 @@ void print_phase_basetype(FILE *file, int indent, const char *local_var_prefix, size = 0; } - if (phase == PHASE_MARSHAL) + if (phase == PHASE_MARSHAL && alignment > 1) print_file(file, indent, "MIDL_memset(__frame->_StubMsg.Buffer, 0, (0x%x - (ULONG_PTR)__frame->_StubMsg.Buffer) & 0x%x);\n", alignment, alignment - 1); print_file(file, indent, "__frame->_StubMsg.Buffer = (unsigned char *)(((ULONG_PTR)__frame->_StubMsg.Buffer + %u) & ~0x%x);\n", alignment - 1, alignment - 1);

1 0

Piotr Caban : msxml3: Implemented xmlnode_get_nodeTypedValue 'i1' data type handling.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: f4f7198610efcac150dd8373c9fd9a4e30c40d30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f7198610efcac150dd8373c… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Nov 18 19:02:07 2009 +0100 msxml3: Implemented xmlnode_get_nodeTypedValue 'i1' data type handling. --- dlls/msxml3/node.c | 2 ++ dlls/msxml3/tests/domdoc.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 4910605..b949037 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1035,6 +1035,8 @@ inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) V_VT(v) = VT_CY; else if(!lstrcmpiW(type, szBoolean)) V_VT(v) = VT_BOOL; + else if(!lstrcmpiW(type, szI1)) + V_VT(v) = VT_I1; else { FIXME("Type handling not yet implemented\n"); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 7c8fddf..6e08ca9 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -161,6 +161,7 @@ static const CHAR szTypeValueXML[] = " <date dt:dt=\"date\">3721-11-01</date>\n" " <time dt:dt=\"time\">13:57:12.31321</time>\n" " <timetz dt:dt=\"time.tz\">23:21:01.13+03:21</timetz>\n" +" <i1 dt:dt=\"i1\">-13</i1>\n" "</root>"; static const CHAR szBasicTransformSSXMLPart1[] = @@ -4159,6 +4160,19 @@ static void test_NodeTypeValue(void) IXMLDOMNode_Release(pNode); } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/i1"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_I1, "incorrect type\n"); + ok(V_I1(&v) == -13, "incorrect value\n"); + VariantClear( &v ); + + IXMLDOMNode_Release(pNode); + } } IXMLDOMDocument2_Release(doc);

1 0

Roderick Colenbrander : wgl: Add support for WGL_ARB_create_context_profile which is required for OpenGL 3 .2.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: 9a8542638989c6ced3393e8a225810eff59a26da URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a8542638989c6ced3393e8a2… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Nov 17 11:50:25 2009 +0100 wgl: Add support for WGL_ARB_create_context_profile which is required for OpenGL 3.2. --- dlls/winex11.drv/opengl.c | 7 +++++++ include/wine/wgl.h | 9 +++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index de56bd9..19e3fe3 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2249,6 +2249,10 @@ HGLRC X11DRV_wglCreateContextAttribsARB(X11DRV_PDEVICE *physDev, HGLRC hShareCon pContextAttribList[0] = GLX_CONTEXT_FLAGS_ARB; pContextAttribList[1] = pAttribList[1]; break; + case WGL_CONTEXT_PROFILE_MASK_ARB: + pContextAttribList[0] = GLX_CONTEXT_PROFILE_MASK_ARB; + pContextAttribList[1] = pAttribList[1]; + break; default: ERR("Unhandled attribList pair: %#x %#x\n", pAttribList[0], pAttribList[1]); } @@ -3540,6 +3544,9 @@ static void X11DRV_WineGL_LoadExtensions(void) if(glxRequireExtension("GLX_ARB_create_context")) { register_extension(&WGL_ARB_create_context); + + if(glxRequireExtension("GLX_ARB_create_context_profile")) + register_extension_string("WGL_ARB_create_context_profile"); } if(glxRequireExtension("GLX_ARB_fbconfig_float")) diff --git a/include/wine/wgl.h b/include/wine/wgl.h index a102109..7a99de2 100644 --- a/include/wine/wgl.h +++ b/include/wine/wgl.h @@ -200,7 +200,11 @@ #define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092 #define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093 #define WGL_CONTEXT_FLAGS_ARB 0x2094 +#define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126 +#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001 +#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002 #define ERROR_INVALID_VERSION_ARB 0x2095 +#define ERROR_INVALID_PROFILE_ARB 0x2096 #ifndef GLX_ARB_create_context #define GLX_CONTEXT_DEBUG_BIT_ARB 0x00000001 #define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002 @@ -208,6 +212,11 @@ #define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092 #define GLX_CONTEXT_FLAGS_ARB 0x2094 #endif +#ifndef GLX_ARB_create_context_profile +#define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126 +#define GLX_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001 +#define GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002 +#endif /** * WGL_ATI_pixel_format_float / WGL_ARB_color_buffer_float

1 0

Huw Davies : wineps.drv: Add support for top-down dibs.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: eed649a5e18aaabef42e58da0e7a557046b665dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=eed649a5e18aaabef42e58da0… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 18 16:39:27 2009 +0000 wineps.drv: Add support for top-down dibs. --- dlls/wineps.drv/bitmap.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index 9f5f11d..c450bca 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -242,6 +242,7 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w if (!get_bitmap_info( info, &fullSrcWidth, &fullSrcHeight, &bpp, &compression )) return FALSE; stride = get_dib_width_bytes(fullSrcWidth, bpp); + if(fullSrcHeight < 0) stride = -stride; /* top-down */ TRACE("full size=%dx%d bpp=%d compression=%d rop=%08x\n", fullSrcWidth, fullSrcHeight, bpp, compression, dwRop); @@ -272,6 +273,7 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w PSDRV_WriteImageMaskHeader(physDev, info, xDst, yDst, widthDst, heightDst, widthSrc, heightSrc); src_ptr = bits; + if(stride < 0) src_ptr += (fullSrcHeight + 1) * stride; src_ptr += (ySrc * stride); if(xSrc & 7) FIXME("This won't work...\n"); @@ -287,6 +289,7 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w PSDRV_WriteImageHeader(physDev, info, xDst, yDst, widthDst, heightDst, widthSrc, heightSrc); src_ptr = bits; + if(stride < 0) src_ptr += (fullSrcHeight + 1) * stride; src_ptr += (ySrc * stride); if(xSrc & 1) FIXME("This won't work...\n"); @@ -302,6 +305,7 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w PSDRV_WriteImageHeader(physDev, info, xDst, yDst, widthDst, heightDst, widthSrc, heightSrc); src_ptr = bits; + if(stride < 0) src_ptr += (fullSrcHeight + 1) * stride; src_ptr += (ySrc * stride); bitmap_size = heightSrc * widthSrc; dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); @@ -318,6 +322,7 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w src_ptr = bits; + if(stride < 0) src_ptr += (fullSrcHeight + 1) * stride; src_ptr += (ySrc * stride); bitmap_size = heightSrc * widthSrc * 3; dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); @@ -350,6 +355,7 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w widthSrc, heightSrc); src_ptr = bits; + if(stride < 0) src_ptr += (fullSrcHeight + 1) * stride; src_ptr += (ySrc * stride); bitmap_size = heightSrc * widthSrc * 3; dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); @@ -372,6 +378,7 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w widthSrc, heightSrc); src_ptr = bits; + if(stride < 0) src_ptr += (fullSrcHeight + 1) * stride; src_ptr += (ySrc * stride); bitmap_size = heightSrc * widthSrc * 3; dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size);

1 0

Alexandre Julliard : ntdll: Make the various directory info size functions depend on the info class.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: 551ddfe4028f5b63ddda703956a1132a59def666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=551ddfe4028f5b63ddda70395… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 17:54:06 2009 +0100 ntdll: Make the various directory info size functions depend on the info class. --- dlls/ntdll/directory.c | 47 ++++++++++++++++++++++++++++++----------------- 1 files changed, 30 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index ef5b17e..602b08c 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -154,8 +154,6 @@ union file_directory_info FILE_BOTH_DIRECTORY_INFORMATION both; }; -static const unsigned int max_dir_info_size = FIELD_OFFSET( FILE_BOTH_DIR_INFORMATION, FileName[MAX_DIR_ENTRY_LEN] ); - static int show_dot_files = -1; /* at some point we may want to allow Winelib apps to set this */ @@ -221,6 +219,23 @@ static inline BOOL is_ignored_file( const struct stat *st ) return FALSE; } +static inline unsigned int dir_info_size( FILE_INFORMATION_CLASS class, unsigned int len ) +{ + switch (class) + { + case FileBothDirectoryInformation: + return (FIELD_OFFSET( FILE_BOTH_DIR_INFORMATION, FileName[len] ) + 3) & ~3; + default: + assert(0); + } +} + +static inline unsigned int max_dir_info_size( FILE_INFORMATION_CLASS class ) +{ + return dir_info_size( class, MAX_DIR_ENTRY_LEN ); +} + + /*********************************************************************** * get_default_com_device * @@ -990,7 +1005,7 @@ static union file_directory_info *append_entry( void *info_ptr, IO_STATUS_BLOCK if (!show_dot_files && long_name[0] == '.' && long_name[1] && (long_name[1] != '.' || long_name[2])) attributes |= FILE_ATTRIBUTE_HIDDEN; - total_len = (FIELD_OFFSET(FILE_BOTH_DIR_INFORMATION, FileName[long_len]) + 3) & ~3; + total_len = dir_info_size( class, long_len ); if (io->Information + total_len > max_length) { total_len = max_length - io->Information; @@ -1082,7 +1097,7 @@ static int read_directory_vfat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG if (restart_scan) lseek( fd, 0, SEEK_SET ); - if (length < max_dir_info_size) /* we may have to return a partial entry here */ + if (length < max_dir_info_size(class)) /* we may have to return a partial entry here */ { off_t old_pos = lseek( fd, 0, SEEK_CUR ); @@ -1132,7 +1147,7 @@ static int read_directory_vfat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG last_info = info; if (single_entry) break; /* check if we still have enough space for the largest possible entry */ - if (io->Information + max_dir_info_size > length) break; + if (io->Information + max_dir_info_size(class) > length) break; } if (ioctl( fd, VFAT_IOCTL_READDIR_BOTH, (long)de ) == -1) break; } @@ -1169,7 +1184,7 @@ static int read_directory_getdents( int fd, IO_STATUS_BLOCK *io, void *buffer, U } if (restart_scan) lseek( fd, 0, SEEK_SET ); - else if (length < max_dir_info_size) /* we may have to return a partial entry here */ + else if (length < max_dir_info_size(class)) /* we may have to return a partial entry here */ { old_pos = lseek( fd, 0, SEEK_CUR ); if (old_pos == -1 && errno == ENOENT) @@ -1209,8 +1224,7 @@ static int read_directory_getdents( int fd, IO_STATUS_BLOCK *io, void *buffer, U /* make sure we have enough room for both entries */ if (fake_dot_dot) { - static const ULONG min_info_size = (FIELD_OFFSET(FILE_BOTH_DIR_INFORMATION, FileName[1]) + - FIELD_OFFSET(FILE_BOTH_DIR_INFORMATION, FileName[2]) + 3) & ~3; + const ULONG min_info_size = dir_info_size( class, 1 ) + dir_info_size( class, 2 ); if (length < min_info_size || single_entry) { FIXME( "not enough room %u/%u for fake . and .. entries\n", length, single_entry ); @@ -1226,7 +1240,7 @@ static int read_directory_getdents( int fd, IO_STATUS_BLOCK *io, void *buffer, U last_info = info; /* check if we still have enough space for the largest possible entry */ - if (last_info && io->Information + max_dir_info_size > length) + if (last_info && io->Information + max_dir_info_size(class) > length) { lseek( fd, 0, SEEK_SET ); /* reset pos to first entry */ res = 0; @@ -1248,7 +1262,7 @@ static int read_directory_getdents( int fd, IO_STATUS_BLOCK *io, void *buffer, U break; } /* check if we still have enough space for the largest possible entry */ - if (single_entry || io->Information + max_dir_info_size > length) + if (single_entry || io->Information + max_dir_info_size(class) > length) { if (res > 0) lseek( fd, de->d_off, SEEK_SET ); /* set pos to next entry */ break; @@ -1372,8 +1386,7 @@ static int read_directory_getdirentries( int fd, IO_STATUS_BLOCK *io, void *buff /* make sure we have enough room for both entries */ if (fake_dot_dot) { - static const ULONG min_info_size = (FIELD_OFFSET(FILE_BOTH_DIR_INFORMATION, FileName[1]) + - FIELD_OFFSET(FILE_BOTH_DIR_INFORMATION, FileName[2]) + 3) & ~3; + const ULONG min_info_size = dir_info_size( class, 1 ) + dir_info_size( class, 2 ); if (length < min_info_size || single_entry) { FIXME( "not enough room %u/%u for fake . and .. entries\n", length, single_entry ); @@ -1392,7 +1405,7 @@ static int read_directory_getdirentries( int fd, IO_STATUS_BLOCK *io, void *buff restart_info_pos = io->Information; /* check if we still have enough space for the largest possible entry */ - if (last_info && io->Information + max_dir_info_size > length) + if (last_info && io->Information + max_dir_info_size(class) > length) { lseek( fd, 0, SEEK_SET ); /* reset pos to first entry */ res = 0; @@ -1426,7 +1439,7 @@ static int read_directory_getdirentries( int fd, IO_STATUS_BLOCK *io, void *buff goto restart; } /* if we have to return but the buffer contains more data, restart with a smaller size */ - if (res > 0 && (single_entry || io->Information + max_dir_info_size > length)) + if (res > 0 && (single_entry || io->Information + max_dir_info_size(class) > length)) { lseek( fd, (unsigned long)restart_pos, SEEK_SET ); size = (char *)de - data; @@ -1444,7 +1457,7 @@ static int read_directory_getdirentries( int fd, IO_STATUS_BLOCK *io, void *buff if (size < initial_size) break; /* already restarted once, give up now */ size = min( size, length - io->Information ); /* if size is too small don't bother to continue */ - if (size < max_dir_info_size && last_info) break; + if (size < max_dir_info_size(class) && last_info) break; restart_last_info = last_info; restart_info_pos = io->Information; restart: @@ -1530,7 +1543,7 @@ static void read_directory_readdir( int fd, IO_STATUS_BLOCK *io, void *buffer, U } if (single_entry) break; /* check if we still have enough space for the largest possible entry */ - if (io->Information + max_dir_info_size > length) break; + if (io->Information + max_dir_info_size(class) > length) break; } } @@ -1638,7 +1651,7 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HANDLE handle, HANDLE event, switch (info_class) { case FileBothDirectoryInformation: - if (length < sizeof(FILE_BOTH_DIR_INFORMATION)) return io->u.Status = STATUS_INFO_LENGTH_MISMATCH; + if (length < dir_info_size( info_class, 1 )) return io->u.Status = STATUS_INFO_LENGTH_MISMATCH; break; default: FIXME( "Unsupported file info class %d\n", info_class );

1 0

Alexandre Julliard : ntdll: Pass the NtQueryDirectoryFile info class down into the various helper functions .
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: ee9b19ab5f20e43d016c98fd517a4347823a205a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee9b19ab5f20e43d016c98fd5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 17:47:37 2009 +0100 ntdll: Pass the NtQueryDirectoryFile info class down into the various helper functions. --- dlls/ntdll/directory.c | 96 ++++++++++++++++++++++++++---------------------- 1 files changed, 52 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee9b19ab5f20e43d016c9…

1 0