wine-commits December 2015

wine-commits@winehq.org

2 participants
327 discussions

Nikolay Sivov : gdi32: Initialize 'param' field (Coverity).
by Alexandre Julliard 22 Dec '15

22 Dec '15

Module: wine Branch: master Commit: 1aa53bc470e81ca70b33c6d2c07744febff6d74b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aa53bc470e81ca70b33c6d2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 22 01:14:25 2015 +0300 gdi32: Initialize 'param' field (Coverity). For consistency with the rest of the code, initialize both 'free' and 'param' fields. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/bitblt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index a944e71..6b8a8b5 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -828,6 +828,7 @@ static DWORD get_image_dib_info( dib_info *dib, BITMAPINFO *info, bits->ptr = dib->bits.ptr; bits->is_copy = FALSE; bits->free = NULL; + bits->param = NULL; if (dib->stride < 0) bits->ptr = (char *)bits->ptr + (dib->height - 1) * dib->stride; src->x += dib->rect.left; src->y += dib->rect.top;

1 0

Nikolay Sivov : winemenubuilder: Simplify MIME types list management.
by Alexandre Julliard 22 Dec '15

22 Dec '15

Module: wine Branch: master Commit: f2538c6e26e5f2b415acfc43f24978d2a6f7eebb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2538c6e26e5f2b415acfc43f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 22 01:23:29 2015 +0300 winemenubuilder: Simplify MIME types list management. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 53 ++++++++++++------------------ 1 file changed, 21 insertions(+), 32 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index e6fd042..2b7340f 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2102,16 +2102,13 @@ static void free_native_mime_types(struct list *native_mime_types) HeapFree(GetProcessHeap(), 0, mime_type_entry->mimeType); HeapFree(GetProcessHeap(), 0, mime_type_entry); } - HeapFree(GetProcessHeap(), 0, native_mime_types); } -static BOOL build_native_mime_types(const char *xdg_data_home, struct list **mime_types) +static BOOL build_native_mime_types(const char *xdg_data_home, struct list *mime_types) { char *xdg_data_dirs; BOOL ret; - *mime_types = NULL; - xdg_data_dirs = getenv("XDG_DATA_DIRS"); if (xdg_data_dirs == NULL) xdg_data_dirs = heap_printf("/usr/local/share/:/usr/share/"); @@ -2120,39 +2117,29 @@ static BOOL build_native_mime_types(const char *xdg_data_home, struct list **mim if (xdg_data_dirs) { - *mime_types = HeapAlloc(GetProcessHeap(), 0, sizeof(struct list)); - if (*mime_types) - { - const char *begin; - char *end; + const char *begin; + char *end; - list_init(*mime_types); - ret = add_mimes(xdg_data_home, *mime_types); - if (ret) + ret = add_mimes(xdg_data_home, mime_types); + if (ret) + { + for (begin = xdg_data_dirs; (end = strchr(begin, ':')); begin = end + 1) { - for (begin = xdg_data_dirs; (end = strchr(begin, ':')); begin = end + 1) - { - *end = '\0'; - ret = add_mimes(begin, *mime_types); - *end = ':'; - if (!ret) - break; - } - if (ret) - ret = add_mimes(begin, *mime_types); + *end = '\0'; + ret = add_mimes(begin, mime_types); + *end = ':'; + if (!ret) + break; } + if (ret) + ret = add_mimes(begin, mime_types); } - else - ret = FALSE; HeapFree(GetProcessHeap(), 0, xdg_data_dirs); } else ret = FALSE; - if (!ret && *mime_types) - { - free_native_mime_types(*mime_types); - *mime_types = NULL; - } + if (!ret) + free_native_mime_types(mime_types); return ret; } @@ -2557,7 +2544,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package { static const WCHAR openW[] = {'o','p','e','n',0}; struct wine_rb_tree mimeProgidTree; - struct list *nativeMimeTypes = NULL; + struct list nativeMimeTypes; LSTATUS ret = 0; int i; BOOL hasChanged = FALSE; @@ -2567,6 +2554,8 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package WINE_ERR("wine_rb_init failed\n"); return FALSE; } + + list_init(&nativeMimeTypes); if (!build_native_mime_types(xdg_data_home, &nativeMimeTypes)) { WINE_ERR("could not build native MIME types\n"); @@ -2634,7 +2623,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package if (contentTypeW) strlwrW(contentTypeW); - if (!freedesktop_mime_type_for_extension(nativeMimeTypes, extensionA, extensionW, &mimeTypeA)) + if (!freedesktop_mime_type_for_extension(&nativeMimeTypes, extensionA, extensionW, &mimeTypeA)) goto end; if (mimeTypeA == NULL) @@ -2780,7 +2769,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package } wine_rb_destroy(&mimeProgidTree, winemenubuilder_rb_destroy, NULL); - free_native_mime_types(nativeMimeTypes); + free_native_mime_types(&nativeMimeTypes); return hasChanged; }

1 0

Nikolay Sivov : regedit: Fix potential buffer leak, simplify error handling (Coverity).
by Alexandre Julliard 22 Dec '15

22 Dec '15

Module: wine Branch: master Commit: c9fb3b7f8f1924e58ccc36caa73617f366853d3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9fb3b7f8f1924e58ccc36caa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 22 00:55:00 2015 +0300 regedit: Fix potential buffer leak, simplify error handling (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/treeview.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 008e6a1..7afc7bf 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -95,17 +95,17 @@ static BOOL get_item_path(HWND hwndTV, HTREEITEM hItem, HKEY* phKey, LPWSTR* pKe LPWSTR GetItemPath(HWND hwndTV, HTREEITEM hItem, HKEY* phRootKey) { - int pathLen = 0, maxLen; + int pathLen = 0, maxLen = 1024; WCHAR *pathBuffer; - pathBuffer = HeapAlloc(GetProcessHeap(), 0, 1024*sizeof(WCHAR)); + if (!hItem) { + hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CARET, 0); + if (!hItem) return NULL; + } + + pathBuffer = HeapAlloc(GetProcessHeap(), 0, maxLen*sizeof(WCHAR)); if (!pathBuffer) return NULL; *pathBuffer = 0; - maxLen = HeapSize(GetProcessHeap(), 0, pathBuffer); - if (maxLen == (SIZE_T) - 1) return NULL; - maxLen = maxLen / sizeof(WCHAR); - if (!hItem) hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CARET, 0); - if (!hItem) return NULL; if (!get_item_path(hwndTV, hItem, phRootKey, &pathBuffer, &pathLen, &maxLen)) return NULL; return pathBuffer; }

1 0

Nikolay Sivov : dxdiagn: Improve error handling when converting to VT_BSTR (Coverity).
by Alexandre Julliard 22 Dec '15

22 Dec '15

Module: wine Branch: master Commit: 0aa56cabe4bfaa3effe338431795a7f1b24ccece URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aa56cabe4bfaa3effe338431… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 22 00:51:36 2015 +0300 dxdiagn: Improve error handling when converting to VT_BSTR (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxdiagn/provider.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 2890c61..5665d01 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -346,6 +346,7 @@ static inline HRESULT add_bool_property(IDxDiagContainerImpl_Container *node, co static inline HRESULT add_ull_as_bstr_property(IDxDiagContainerImpl_Container *node, const WCHAR *propName, ULONGLONG data ) { IDxDiagContainerImpl_Property *prop; + HRESULT hr; prop = allocate_property_information(propName); if (!prop) @@ -354,7 +355,12 @@ static inline HRESULT add_ull_as_bstr_property(IDxDiagContainerImpl_Container *n V_VT(&prop->vProp) = VT_UI8; V_UI8(&prop->vProp) = data; - VariantChangeType(&prop->vProp, &prop->vProp, 0, VT_BSTR); + hr = VariantChangeType(&prop->vProp, &prop->vProp, 0, VT_BSTR); + if (FAILED(hr)) + { + free_property_information(prop); + return hr; + } list_add_tail(&node->properties, &prop->entry); ++node->nProperties;

1 0

Thomas Faller : ntdll: Fix valgrind heap realloc notifications.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: a0b8f178df8ed704fc732f5aef3b2e1f623512fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0b8f178df8ed704fc732f5ae… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Wed Dec 16 22:00:58 2015 +0100 ntdll: Fix valgrind heap realloc notifications. Valgrind can't handle a realloc if the new size is zero. Signed-off-by: Thomas Faller <tfaller1(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index a908f19..f928ebf 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -266,7 +266,8 @@ static inline void notify_free( void const *ptr ) static inline void notify_realloc( void const *ptr, SIZE_T size_old, SIZE_T size_new ) { #ifdef VALGRIND_RESIZEINPLACE_BLOCK - VALGRIND_RESIZEINPLACE_BLOCK( ptr, size_old, size_new, 0 ); + /* zero is not a valid size */ + VALGRIND_RESIZEINPLACE_BLOCK( ptr, size_old ? size_old : 1, size_new ? size_new : 1, 0 ); #endif }

1 0

Nikolay Sivov : ntdll: Trace RTL_BITMAP api arguments as unsigned when appropriate.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: 86df15cbf1e1bc323a05e5a6c15b982c4fd7b92a URL: http://source.winehq.org/git/wine.git/?a=commit;h=86df15cbf1e1bc323a05e5a6c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 17 16:06:50 2015 +0300 ntdll: Trace RTL_BITMAP api arguments as unsigned when appropriate. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/rtlbitmap.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/rtlbitmap.c b/dlls/ntdll/rtlbitmap.c index 20d6a02..318f6fc 100644 --- a/dlls/ntdll/rtlbitmap.c +++ b/dlls/ntdll/rtlbitmap.c @@ -74,7 +74,7 @@ static const signed char NTDLL_mostSignificant[16] = { */ VOID WINAPI RtlInitializeBitMap(PRTL_BITMAP lpBits, PULONG lpBuff, ULONG ulSize) { - TRACE("(%p,%p,%d)\n", lpBits,lpBuff,ulSize); + TRACE("(%p,%p,%u)\n", lpBits,lpBuff,ulSize); lpBits->SizeOfBitMap = ulSize; lpBits->Buffer = lpBuff; } @@ -130,7 +130,7 @@ VOID WINAPI RtlSetBits(PRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount) { LPBYTE lpOut; - TRACE("(%p,%d,%d)\n", lpBits, ulStart, ulCount); + TRACE("(%p,%u,%u)\n", lpBits, ulStart, ulCount); if (!lpBits || !ulCount || ulStart >= lpBits->SizeOfBitMap || @@ -191,7 +191,7 @@ VOID WINAPI RtlClearBits(PRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount) { LPBYTE lpOut; - TRACE("(%p,%d,%d)\n", lpBits, ulStart, ulCount); + TRACE("(%p,%u,%u)\n", lpBits, ulStart, ulCount); if (!lpBits || !ulCount || ulStart >= lpBits->SizeOfBitMap || @@ -254,7 +254,7 @@ BOOLEAN WINAPI RtlAreBitsSet(PCRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount) LPBYTE lpOut; ULONG ulRemainder; - TRACE("(%p,%d,%d)\n", lpBits, ulStart, ulCount); + TRACE("(%p,%u,%u)\n", lpBits, ulStart, ulCount); if (!lpBits || !ulCount || ulStart >= lpBits->SizeOfBitMap || @@ -327,7 +327,7 @@ BOOLEAN WINAPI RtlAreBitsClear(PCRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount LPBYTE lpOut; ULONG ulRemainder; - TRACE("(%p,%d,%d)\n", lpBits, ulStart, ulCount); + TRACE("(%p,%u,%u)\n", lpBits, ulStart, ulCount); if (!lpBits || !ulCount || ulStart >= lpBits->SizeOfBitMap || @@ -395,7 +395,7 @@ ULONG WINAPI RtlFindSetBits(PCRTL_BITMAP lpBits, ULONG ulCount, ULONG ulHint) { ULONG ulPos, ulEnd; - TRACE("(%p,%d,%d)\n", lpBits, ulCount, ulHint); + TRACE("(%p,%u,%u)\n", lpBits, ulCount, ulHint); if (!lpBits || !ulCount || ulCount > lpBits->SizeOfBitMap) return ~0U; @@ -442,7 +442,7 @@ ULONG WINAPI RtlFindClearBits(PCRTL_BITMAP lpBits, ULONG ulCount, ULONG ulHint) { ULONG ulPos, ulEnd; - TRACE("(%p,%d,%d)\n", lpBits, ulCount, ulHint); + TRACE("(%p,%u,%u)\n", lpBits, ulCount, ulHint); if (!lpBits || !ulCount || ulCount > lpBits->SizeOfBitMap) return ~0U; @@ -489,7 +489,7 @@ ULONG WINAPI RtlFindSetBitsAndClear(PRTL_BITMAP lpBits, ULONG ulCount, ULONG ulH { ULONG ulPos; - TRACE("(%p,%d,%d)\n", lpBits, ulCount, ulHint); + TRACE("(%p,%u,%u)\n", lpBits, ulCount, ulHint); ulPos = RtlFindSetBits(lpBits, ulCount, ulHint); if (ulPos != ~0U) @@ -514,7 +514,7 @@ ULONG WINAPI RtlFindClearBitsAndSet(PRTL_BITMAP lpBits, ULONG ulCount, ULONG ulH { ULONG ulPos; - TRACE("(%p,%d,%d)\n", lpBits, ulCount, ulHint); + TRACE("(%p,%u,%u)\n", lpBits, ulCount, ulHint); ulPos = RtlFindClearBits(lpBits, ulCount, ulHint); if (ulPos != ~0U) @@ -870,7 +870,7 @@ ULONG WINAPI RtlFindNextForwardRunSet(PCRTL_BITMAP lpBits, ULONG ulStart, PULONG { ULONG ulSize = 0; - TRACE("(%p,%d,%p)\n", lpBits, ulStart, lpPos); + TRACE("(%p,%u,%p)\n", lpBits, ulStart, lpPos); if (lpBits && ulStart < lpBits->SizeOfBitMap && lpPos) *lpPos = NTDLL_FindSetRun(lpBits, ulStart, &ulSize); @@ -897,7 +897,7 @@ ULONG WINAPI RtlFindNextForwardRunClear(PCRTL_BITMAP lpBits, ULONG ulStart, PULO { ULONG ulSize = 0; - TRACE("(%p,%d,%p)\n", lpBits, ulStart, lpPos); + TRACE("(%p,%u,%p)\n", lpBits, ulStart, lpPos); if (lpBits && ulStart < lpBits->SizeOfBitMap && lpPos) *lpPos = NTDLL_FindClearRun(lpBits, ulStart, &ulSize); @@ -922,7 +922,7 @@ ULONG WINAPI RtlFindNextForwardRunClear(PCRTL_BITMAP lpBits, ULONG ulStart, PULO */ ULONG WINAPI RtlFindLastBackwardRunSet(PCRTL_BITMAP lpBits, ULONG ulStart, PULONG lpPos) { - FIXME("(%p,%d,%p)-stub!\n", lpBits, ulStart, lpPos); + FIXME("(%p,%u,%p)-stub!\n", lpBits, ulStart, lpPos); return 0; } @@ -943,7 +943,7 @@ ULONG WINAPI RtlFindLastBackwardRunSet(PCRTL_BITMAP lpBits, ULONG ulStart, PULON */ ULONG WINAPI RtlFindLastBackwardRunClear(PCRTL_BITMAP lpBits, ULONG ulStart, PULONG lpPos) { - FIXME("(%p,%d,%p)-stub!\n", lpBits, ulStart, lpPos); + FIXME("(%p,%u,%p)-stub!\n", lpBits, ulStart, lpPos); return 0; } @@ -1021,7 +1021,7 @@ static ULONG NTDLL_FindRuns(PCRTL_BITMAP lpBits, PRTL_BITMAP_RUN lpSeries, ULONG WINAPI RtlFindSetRuns(PCRTL_BITMAP lpBits, PRTL_BITMAP_RUN lpSeries, ULONG ulCount, BOOLEAN bLongest) { - TRACE("(%p,%p,%d,%d)\n", lpBits, lpSeries, ulCount, bLongest); + TRACE("(%p,%p,%u,%d)\n", lpBits, lpSeries, ulCount, bLongest); return NTDLL_FindRuns(lpBits, lpSeries, ulCount, bLongest, NTDLL_FindSetRun); } @@ -1043,7 +1043,7 @@ ULONG WINAPI RtlFindSetRuns(PCRTL_BITMAP lpBits, PRTL_BITMAP_RUN lpSeries, ULONG WINAPI RtlFindClearRuns(PCRTL_BITMAP lpBits, PRTL_BITMAP_RUN lpSeries, ULONG ulCount, BOOLEAN bLongest) { - TRACE("(%p,%p,%d,%d)\n", lpBits, lpSeries, ulCount, bLongest); + TRACE("(%p,%p,%u,%d)\n", lpBits, lpSeries, ulCount, bLongest); return NTDLL_FindRuns(lpBits, lpSeries, ulCount, bLongest, NTDLL_FindClearRun); }

1 0

Piotr Caban : ntdll: Fix NtQueryDirectoryFile behavior on short file names on case insensitive file systems.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: a8ef26149308f577151f14a2d359868754c7ea20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8ef26149308f577151f14a2d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 18:42:04 2015 +0100 ntdll: Fix NtQueryDirectoryFile behavior on short file names on case insensitive file systems. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 14 -------------- dlls/ntdll/tests/directory.c | 41 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 38 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 4faafe9..23ebf48 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2120,15 +2120,6 @@ static int read_directory_stat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG } else io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; } - else if (!case_sensitive && ret && (errno == ENOENT || errno == ENOTDIR)) - { - /* If the file does not exist, return that info. - * If the file DOES exist, return failure and fallback to the next - * read_directory_* function (we need to return the case-preserved - * filename stored on the filesystem). */ - ret = 0; - io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; - } else { ret = -1; @@ -2214,11 +2205,6 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer } else io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; } - else if ((errno == ENOENT || errno == ENOTDIR) && !get_dir_case_sensitivity(".")) - { - io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; - ret = 0; - } } else ret = -1; diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index 730b0f1..7b1002a 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -60,6 +60,7 @@ static struct testfile_s { int nfound; /* How many were found (expect 1) */ WCHAR nameW[20]; /* unicode version of name (filled in later) */ } testfiles[] = { + { 0, 0, FILE_ATTRIBUTE_NORMAL, "longfilename.tmp", NULL, "normal" }, { 0, 0, FILE_ATTRIBUTE_NORMAL, "n.tmp", NULL, "normal" }, { 1, 0, FILE_ATTRIBUTE_HIDDEN, "h.tmp", NULL, "hidden" }, { 1, 0, FILE_ATTRIBUTE_SYSTEM, "s.tmp", NULL, "system" }, @@ -234,10 +235,17 @@ static void test_flags_NtQueryDirectoryFile(OBJECT_ATTRIBUTES *attr, const char static void test_NtQueryDirectoryFile(void) { OBJECT_ATTRIBUTES attr; - UNICODE_STRING ntdirname; + UNICODE_STRING ntdirname, mask; char testdirA[MAX_PATH]; WCHAR testdirW[MAX_PATH]; int i; + IO_STATUS_BLOCK io; + WCHAR short_name[12]; + UINT data_size; + BYTE data[8192]; + FILE_BOTH_DIRECTORY_INFORMATION *fbdi = (FILE_BOTH_DIRECTORY_INFORMATION*)data; + DWORD status; + HANDLE dirh; /* Clean up from prior aborted run, if any, then set up test files */ ok(GetTempPathA(MAX_PATH, testdirA), "couldn't get temp dir\n"); @@ -260,8 +268,6 @@ static void test_NtQueryDirectoryFile(void) for (i = 0; testfiles[i].name; i++) { - UNICODE_STRING mask; - if (testfiles[i].nameW[0] == '.') continue; /* . and .. as masks are broken on Windows */ mask.Buffer = testfiles[i].nameW; mask.Length = mask.MaximumLength = lstrlenW(testfiles[i].nameW) * sizeof(WCHAR); @@ -271,6 +277,35 @@ static void test_NtQueryDirectoryFile(void) test_flags_NtQueryDirectoryFile(&attr, testdirA, &mask, TRUE, FALSE); } + /* short path passed as mask */ + status = pNtOpenFile(&dirh, SYNCHRONIZE | FILE_LIST_DIRECTORY, &attr, &io, FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT | FILE_DIRECTORY_FILE); + ok(status == STATUS_SUCCESS, "failed to open dir '%s'\n", testdirA); + if (status != STATUS_SUCCESS) { + skip("can't test if we can't open the directory\n"); + return; + } + mask.Buffer = testfiles[0].nameW; + mask.Length = mask.MaximumLength = lstrlenW(testfiles[0].nameW) * sizeof(WCHAR); + data_size = offsetof(FILE_BOTH_DIRECTORY_INFORMATION, FileName[256]); + pNtQueryDirectoryFile(dirh, 0, NULL, NULL, &io, data, data_size, + FileBothDirectoryInformation, TRUE, &mask, FALSE); + ok(U(io).Status == STATUS_SUCCESS, "failed to query directory; status %x\n", U(io).Status); + ok(fbdi->ShortName[0], "ShortName is empty\n"); + + mask.Length = mask.MaximumLength = fbdi->ShortNameLength; + memcpy(short_name, fbdi->ShortName, mask.Length); + mask.Buffer = short_name; + pNtQueryDirectoryFile(dirh, 0, NULL, NULL, &io, data, data_size, + FileBothDirectoryInformation, TRUE, &mask, TRUE); + ok(U(io).Status == STATUS_SUCCESS, "failed to query directory status %x\n", U(io).Status); + ok(fbdi->FileNameLength == strlen(testfiles[0].name)*sizeof(WCHAR) && + !memcmp(fbdi->FileName, testfiles[0].nameW, fbdi->FileNameLength), + "incorrect long file name: %s\n", wine_dbgstr_wn(fbdi->FileName, + fbdi->FileNameLength/sizeof(WCHAR))); + + pNtClose(dirh); + done: tear_down_attribute_test(testdirA); pRtlFreeUnicodeString(&ntdirname);

1 0

Changhui Liu : hidclass.sys: Properly print 80 bytes in first line when tracing ParseDescriptor.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: 0125ef6dd757b2be8295e0f10f4f0e0657a5486a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0125ef6dd757b2be8295e0f10… Author: Changhui Liu <liuchanghui(a)linuxdeepin.com> Date: Fri Dec 18 14:48:56 2015 +0800 hidclass.sys: Properly print 80 bytes in first line when tracing ParseDescriptor. Signed-off-by: Changhui Liu <liuchanghui(a)linuxdeepin.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index eb0b42a..9a26f0f4 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -1030,7 +1030,7 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) for (cidx = 0; cidx < length; cidx++) { TRACE("%x ",descriptor[cidx]); - if (cidx % 80 == 0) + if ((cidx+1) % 80 == 0) TRACE("\n"); } TRACE("\n");

1 0

Changhui Liu : hidclass.sys: Initialize ext-> irp_queue immediately after HID_CreateDevice.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: acdd869e5d2b2fa01c60eddab7445b71ac21881a URL: http://source.winehq.org/git/wine.git/?a=commit;h=acdd869e5d2b2fa01c60eddab… Author: Changhui Liu <liuchanghui(a)linuxdeepin.com> Date: Fri Dec 18 14:40:16 2015 +0800 hidclass.sys: Initialize ext->irp_queue immediately after HID_CreateDevice. Signed-off-by: Changhui Liu <liuchanghui(a)linuxdeepin.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 1ae3bb0..24dd140 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -132,6 +132,9 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) return status; } + ext = device->DeviceExtension; + InitializeListHead(&ext->irp_queue); + TRACE("Created device %p\n",device); status = minidriver->AddDevice(minidriver->minidriver.DriverObject, device); if (status != STATUS_SUCCESS) @@ -160,7 +163,6 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) return status; } - ext = device->DeviceExtension; ext->information.VendorID = attr.VendorID; ext->information.ProductID = attr.ProductID; ext->information.VersionNumber = attr.VersionNumber; @@ -233,7 +235,6 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) HID_LinkDevice(device, serial, interface); ext->poll_interval = DEFAULT_POLL_INTERVAL; - InitializeListHead(&ext->irp_queue); ext->ring_buffer = RingBuffer_Create(sizeof(HID_XFER_PACKET) + ext->preparseData->caps.InputReportByteLength);

1 0

Joachim Priesner : wbemprox: Iterate over all drives instead of just the first four.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: 29862da337cdfa50da0402a9b6e8593c951867dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=29862da337cdfa50da0402a9b… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Mon Dec 21 13:00:32 2015 +0100 wbemprox: Iterate over all drives instead of just the first four. Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 2ff3f50..b7db266 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1176,7 +1176,7 @@ static enum fill_status fill_cdromdrive( struct table *table, const struct expr if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; - for (i = 0; i < sizeof(drives); i++) + for (i = 0; i < 26; i++) { if (drives & (1 << i)) { @@ -1598,7 +1598,7 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c dirstack = alloc_dirstack(2); - for (i = 0; i < sizeof(drives); i++) + for (i = 0; i < 26; i++) { if (!(drives & (1 << i))) continue; @@ -1719,7 +1719,7 @@ static enum fill_status fill_directory( struct table *table, const struct expr * dirstack = alloc_dirstack(2); - for (i = 0; i < sizeof(drives); i++) + for (i = 0; i < 26; i++) { if (!(drives & (1 << i))) continue; @@ -1831,7 +1831,7 @@ static enum fill_status fill_diskdrive( struct table *table, const struct expr * if (!resize_table( table, 2, sizeof(*rec) )) return FILL_STATUS_FAILED; - for (i = 0; i < sizeof(drives); i++) + for (i = 0; i < 26; i++) { if (drives & (1 << i)) { @@ -1895,7 +1895,7 @@ static enum fill_status fill_diskpartition( struct table *table, const struct ex if (!resize_table( table, 4, sizeof(*rec) )) return FILL_STATUS_FAILED; - for (i = 0; i < sizeof(drives); i++) + for (i = 0; i < 26; i++) { if (drives & (1 << i)) { @@ -1962,7 +1962,7 @@ static enum fill_status fill_logicaldisk( struct table *table, const struct expr if (!resize_table( table, 4, sizeof(*rec) )) return FILL_STATUS_FAILED; - for (i = 0; i < sizeof(drives); i++) + for (i = 0; i < 26; i++) { if (drives & (1 << i)) {

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2015