December 2015 - Wine-commits

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

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

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

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

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

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

YongHao Hu : msvcp110: Add tr2_sys__Read_dir implementation.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: 2ed5d0afc1e516c65a2f606ead009e666ffc29ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ed5d0afc1e516c65a2f606ea… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Mon Dec 21 12:15:34 2015 +0800 msvcp110: Add tr2_sys__Read_dir implementation. Signed-off-by: YongHao Hu <christopherwuy(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/ios.c | 26 ++++++++++++++++++++++++++ 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index a77a5c8..9751854 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1711,8 +1711,8 @@ @ stub -arch=win32 ?_Raise_handler(a)std@@3P6AXABVexception(a)stdext@@@ZA @ stub -arch=win64 ?_Raise_handler(a)std@@3P6AXAEBVexception(a)stdext@@@ZEA @ cdecl ?_Random_device(a)std@@YAIXZ() _Random_device -@ stub -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPADPADPAXAAW4file_type(a)123@@Z -@ stub -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEADPEADPEAXAEAW4file_type(a)123@@Z +@ cdecl -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPADPADPAXAAW4file_type(a)123@@Z(ptr ptr ptr) tr2_sys__Read_dir +@ cdecl -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEADPEADPEAXAEAW4file_type(a)123@@Z(ptr ptr ptr) tr2_sys__Read_dir @ stub -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPA_WPA_WPAXAAW4file_type(a)123@@Z @ stub -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEA_WPEA_WPEAXAEAW4file_type(a)123@@Z @ stub -arch=arm ?_Release(a)_Pad@std@@QAAXXZ diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 4668129..4a136a2 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1672,8 +1672,8 @@ @ stub -arch=win32 ?_Raise_handler(a)std@@3P6AXABVexception(a)stdext@@@ZA @ stub -arch=win64 ?_Raise_handler(a)std@@3P6AXAEBVexception(a)stdext@@@ZEA @ cdecl ?_Random_device(a)std@@YAIXZ() _Random_device -@ stub -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPADAAY0BAE(a)DPAXAAW4file_type@123@@Z -@ stub -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)DPEAXAEAW4file_type@123@@Z +@ cdecl -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPADAAY0BAE(a)DPAXAAW4file_type@123@@Z(ptr ptr ptr) tr2_sys__Read_dir +@ cdecl -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)DPEAXAEAW4file_type@123@@Z(ptr ptr ptr) tr2_sys__Read_dir @ stub -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_WPAXAAW4file_type@123@@Z @ stub -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_WPEAXAEAW4file_type@123@@Z @ stub -arch=arm ?_Release(a)_Pad@std@@QAAXXZ diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 9a1b6da..53f8b0b 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1672,8 +1672,8 @@ @ stub -arch=win32 ?_Raise_handler(a)std@@3P6AXABVexception(a)stdext@@@ZA @ stub -arch=win64 ?_Raise_handler(a)std@@3P6AXAEBVexception(a)stdext@@@ZEA @ cdecl ?_Random_device(a)std@@YAIXZ() msvcp120.?_Random_device(a)std@@YAIXZ -@ stub -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPADAAY0BAE(a)DPAXAAW4file_type@123@@Z -@ stub -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)DPEAXAEAW4file_type@123@@Z +@ cdecl -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPADAAY0BAE(a)DPAXAAW4file_type@123@@Z(ptr ptr ptr) msvcp120.?_Read_dir(a)sys@tr2(a)std@@YAPADAAY0BAE(a)DPAXAAW4file_type@123@@Z +@ cdecl -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)DPEAXAEAW4file_type@123@@Z(ptr ptr ptr) msvcp120.?_Read_dir(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)DPEAXAEAW4file_type@123@@Z @ stub -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_WPAXAAW4file_type@123@@Z @ stub -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_WPEAXAEAW4file_type@123@@Z @ stub -arch=arm ?_Release(a)_Pad@std@@QAAXXZ diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 5242b53..f01cf6d 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14478,6 +14478,32 @@ void* __cdecl tr2_sys__Open_dir(char* target, char const* dest, int* err_code, e return handle; } +/* ?_Read_dir(a)sys@tr2(a)std@@YAPADAAY0BAE(a)DPAXAAW4file_type@123@@Z */ +/* ?_Read_dir(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)DPEAXAEAW4file_type@123@@Z */ +char* __cdecl tr2_sys__Read_dir(char* target, void* handle, enum file_type* type) +{ + WIN32_FIND_DATAA data; + TRACE("(%p %p %p)\n", target, handle, type); + if(!FindNextFileA(handle, &data)) { + *type = status_unknown; + *target = '\0'; + return target; + } + while(!strcmp(data.cFileName, ".") || !strcmp(data.cFileName, "..")) { + if(!FindNextFileA(handle, &data)) { + *type = status_unknown; + return NULL; + } + } + + strcpy(target, data.cFileName); + if(data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + *type = directory_file; + else + *type = regular_file; + return target; +} + /* ??0strstream(a)std@@QAE(a)PADHH@Z */ /* ??0strstream(a)std@@QEAA(a)PEAD_JH@Z */ #if STREAMSIZE_BITS == 64

1 0

YongHao Hu : msvcp110: Add tr2_sys__Close_dir implementation.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: f142ca1f923519f9ae2ce493d6c538cac889eeab URL: http://source.winehq.org/git/wine.git/?a=commit;h=f142ca1f923519f9ae2ce493d… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Mon Dec 21 12:15:47 2015 +0800 msvcp110: Add tr2_sys__Close_dir implementation. Signed-off-by: YongHao Hu <christopherwuy(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/ios.c | 9 +++++++++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 9751854..6c8aee4 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1161,8 +1161,8 @@ @ cdecl -arch=win64 ?_Callfns(a)ios_base@std@@AEAAXW4event(a)12@@Z(ptr long) ios_base_Callfns @ extern -arch=win32 ?_Clocptr(a)_Locimp@locale(a)std@@0PAV123(a)A locale__Locimp__Clocptr @ extern -arch=win64 ?_Clocptr(a)_Locimp@locale(a)std@@0PEAV123(a)EA locale__Locimp__Clocptr -@ stub -arch=win32 ?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z -@ stub -arch=win64 ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z(ptr) tr2_sys__Close_dir +@ cdecl -arch=win64 ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z(ptr) tr2_sys__Close_dir @ cdecl -arch=win32 ?_Copy_file(a)sys@tr2(a)std@@YAHPBD0_N(a)Z(str str long) tr2_sys__Copy_file @ cdecl -arch=win64 ?_Copy_file(a)sys@tr2(a)std@@YAHPEBD0_N(a)Z(str str long) tr2_sys__Copy_file @ cdecl -arch=win32 ?_Copy_file(a)sys@tr2(a)std@@YAHPB_W0_N(a)Z(wstr wstr long) tr2_sys__Copy_file_wchar diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 4a136a2..e3200a2 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1126,8 +1126,8 @@ @ cdecl -arch=win64 ?_Callfns(a)ios_base@std@@AEAAXW4event(a)12@@Z(ptr long) ios_base_Callfns @ extern -arch=win32 ?_Clocptr(a)_Locimp@locale(a)std@@0PAV123(a)A locale__Locimp__Clocptr @ extern -arch=win64 ?_Clocptr(a)_Locimp@locale(a)std@@0PEAV123(a)EA locale__Locimp__Clocptr -@ stub -arch=win32 ?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z -@ stub -arch=win64 ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z(ptr) tr2_sys__Close_dir +@ cdecl -arch=win64 ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z(ptr) tr2_sys__Close_dir @ cdecl -arch=win32 ?_Copy_file(a)sys@tr2(a)std@@YAHPBD0_N(a)Z(str str long) tr2_sys__Copy_file @ cdecl -arch=win64 ?_Copy_file(a)sys@tr2(a)std@@YAHPEBD0_N(a)Z(str str long) tr2_sys__Copy_file @ cdecl -arch=win32 ?_Copy_file(a)sys@tr2(a)std@@YAHPB_W0_N(a)Z(wstr wstr long) tr2_sys__Copy_file_wchar diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 53f8b0b..655e0e6 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1126,8 +1126,8 @@ @ cdecl -arch=win64 ?_Callfns(a)ios_base@std@@AEAAXW4event(a)12@@Z(ptr long) msvcp120.?_Callfns(a)ios_base@std@@AEAAXW4event(a)12@@Z @ extern -arch=win32 ?_Clocptr(a)_Locimp@locale(a)std@@0PAV123(a)A msvcp120.?_Clocptr(a)_Locimp@locale(a)std@@0PAV123(a)A @ extern -arch=win64 ?_Clocptr(a)_Locimp@locale(a)std@@0PEAV123(a)EA msvcp120.?_Clocptr(a)_Locimp@locale(a)std@@0PEAV123(a)EA -@ stub -arch=win32 ?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z -@ stub -arch=win64 ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z(ptr) msvcp120.?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z +@ cdecl -arch=win64 ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z(ptr) msvcp120.?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z @ cdecl -arch=win32 ?_Copy_file(a)sys@tr2(a)std@@YAHPBD0_N(a)Z(str str long) msvcp120.?_Copy_file(a)sys@tr2(a)std@@YAHPBD0_N(a)Z @ cdecl -arch=win64 ?_Copy_file(a)sys@tr2(a)std@@YAHPEBD0_N(a)Z(str str long) msvcp120.?_Copy_file(a)sys@tr2(a)std@@YAHPEBD0_N(a)Z @ cdecl -arch=win32 ?_Copy_file(a)sys@tr2(a)std@@YAHPB_W0_N(a)Z(wstr wstr long) msvcp120.?_Copy_file(a)sys@tr2(a)std@@YAHPB_W0_N(a)Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index f01cf6d..7440aff 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14504,6 +14504,15 @@ char* __cdecl tr2_sys__Read_dir(char* target, void* handle, enum file_type* type return target; } +/* ?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z */ +/* ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z */ +void __cdecl tr2_sys__Close_dir(void* handle) +{ + TRACE("(%p)\n", handle); + + FindClose(handle); +} + /* ??0strstream(a)std@@QAE(a)PADHH@Z */ /* ??0strstream(a)std@@QEAA(a)PEAD_JH@Z */ #if STREAMSIZE_BITS == 64

1 0

YongHao Hu : msvcp120/tests: Add tests of tr2_sys__Open_dir, tr2_sys__Read_dir and tr2_sys__Close_dir.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: 67dc02fdebbe930c67fb5cc348b7ebc082ff63ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=67dc02fdebbe930c67fb5cc34… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Mon Dec 21 12:16:10 2015 +0800 msvcp120/tests: Add tests of tr2_sys__Open_dir, tr2_sys__Read_dir and tr2_sys__Close_dir. Signed-off-by: YongHao Hu <christopherwuy(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 109 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 12ca12d..6ea024a 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -129,6 +129,9 @@ static enum file_type (__cdecl *p_tr2_sys__Stat)(char const*, int *); static enum file_type (__cdecl *p_tr2_sys__Lstat)(char const*, int *); static __int64 (__cdecl *p_tr2_sys__Last_write_time)(char const*); static void (__cdecl *p_tr2_sys__Last_write_time_set)(char const*, __int64); +static void* (__cdecl *p_tr2_sys__Open_dir)(char*, char const*, int *, enum file_type*); +static char* (__cdecl *p_tr2_sys__Read_dir)(char*, void*, enum file_type*); +static void (__cdecl *p_tr2_sys__Close_dir)(void*); /* thrd */ typedef struct @@ -256,6 +259,12 @@ static BOOL init(void) "?_Last_write_time(a)sys@tr2(a)std@@YA_JPEBD(a)Z"); SET(p_tr2_sys__Last_write_time_set, "?_Last_write_time(a)sys@tr2(a)std@@YAXPEBD_J(a)Z"); + SET(p_tr2_sys__Open_dir, + "?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z"); + SET(p_tr2_sys__Read_dir, + "?_Read_dir(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)DPEAXAEAW4file_type@123@@Z"); + SET(p_tr2_sys__Close_dir, + "?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z"); SET(p__Thrd_current, "_Thrd_current"); } else { @@ -303,6 +312,12 @@ static BOOL init(void) "?_Last_write_time(a)sys@tr2(a)std@@YA_JPBD(a)Z"); SET(p_tr2_sys__Last_write_time_set, "?_Last_write_time(a)sys@tr2(a)std@@YAXPBD_J(a)Z"); + SET(p_tr2_sys__Open_dir, + "?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)DPBDAAHAAW4file_type@123@@Z"); + SET(p_tr2_sys__Read_dir, + "?_Read_dir(a)sys@tr2(a)std@@YAPADAAY0BAE(a)DPAXAAW4file_type@123@@Z"); + SET(p_tr2_sys__Close_dir, + "?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z"); #ifdef __i386__ SET(p_i386_Thrd_current, "_Thrd_current"); @@ -1211,6 +1226,99 @@ static void test_tr2_sys__Last_write_time(void) ok(ret == 1, "test_tr2_sys__Remove_dir(): expect 1 got %d\n", ret); } +static void test_tr2_sys__dir_operation(void) +{ + char *file_name, first_file_name[MAX_PATH], dest[MAX_PATH], longer_path[MAX_PATH]; + HANDLE file, result_handle; + enum file_type type; + int err, num_of_f1 = 0, num_of_f2 = 0, num_of_sub_dir = 0, num_of_other_files = 0; + + CreateDirectoryA("tr2_test_dir", NULL); + file = CreateFileA("tr2_test_dir/f1", 0, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + CloseHandle(file); + file = CreateFileA("tr2_test_dir/f2", 0, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + CloseHandle(file); + CreateDirectoryA("tr2_test_dir/sub_dir", NULL); + file = CreateFileA("tr2_test_dir/sub_dir/sub_f1", 0, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + CloseHandle(file); + + memset(longer_path, 0, MAX_PATH); + GetCurrentDirectoryA(MAX_PATH, longer_path); + strcat(longer_path, "\\tr2_test_dir\\"); + while(lstrlenA(longer_path) < MAX_PATH-1) + strcat(longer_path, "s"); + ok(lstrlenA(longer_path) == MAX_PATH-1, "tr2_sys__Open_dir(): expect MAX_PATH, got %d\n", lstrlenA(longer_path)); + memset(first_file_name, 0, MAX_PATH); + type = err = 0xdeadbeef; + result_handle = NULL; + result_handle = p_tr2_sys__Open_dir(first_file_name, longer_path, &err, &type); + ok(result_handle == NULL, "tr2_sys__Open_dir(): expect NULL, got %p\n", result_handle); + ok(!*first_file_name, "tr2_sys__Open_dir(): expect: 0, got %s\n", first_file_name); + ok(err == ERROR_BAD_PATHNAME, "tr2_sys__Open_dir(): expect: ERROR_BAD_PATHNAME, got %d\n", err); + ok((int)type == 0xdeadbeef, "tr2_sys__Open_dir(): expect 0xdeadbeef, got %d\n", type); + + memset(first_file_name, 0, MAX_PATH); + memset(dest, 0, MAX_PATH); + err = type = 0xdeadbeef; + result_handle = NULL; + result_handle = p_tr2_sys__Open_dir(first_file_name, "tr2_test_dir", &err, &type); + ok(result_handle != NULL, "tr2_sys__Open_dir(): expect: not NULL, got %p\n", result_handle); + ok(err == ERROR_SUCCESS, "tr2_sys__Open_dir(): expect: ERROR_SUCCESS, got %d\n", err); + file_name = first_file_name; + while(*file_name) { + if (!strcmp(file_name, "f1")) { + ++num_of_f1; + ok(type == regular_file, "expect regular_file, got %d\n", type); + }else if(!strcmp(file_name, "f2")) { + ++num_of_f2; + ok(type == regular_file, "expect regular_file, got %d\n", type); + }else if(!strcmp(file_name, "sub_dir")) { + ++num_of_sub_dir; + ok(type == directory_file, "expect directory_file, got %d\n", type); + }else { + ++num_of_other_files; + } + file_name = p_tr2_sys__Read_dir(dest, result_handle, &type); + } + p_tr2_sys__Close_dir(result_handle); + ok(result_handle != NULL, "tr2_sys__Open_dir(): expect: not NULL, got %p\n", result_handle); + ok(num_of_f1 == 1, "found f1 %d times\n", num_of_f1); + ok(num_of_f2 == 1, "found f2 %d times\n", num_of_f2); + ok(num_of_sub_dir == 1, "found sub_dir %d times\n", num_of_sub_dir); + ok(num_of_other_files == 0, "found %d other files\n", num_of_other_files); + + memset(first_file_name, 0, MAX_PATH); + err = type = 0xdeadbeef; + result_handle = file; + result_handle = p_tr2_sys__Open_dir(first_file_name, "not_exist", &err, &type); + ok(result_handle == NULL, "tr2_sys__Open_dir(): expect: NULL, got %p\n", result_handle); + todo_wine ok(err == ERROR_BAD_PATHNAME, "tr2_sys__Open_dir(): expect: ERROR_BAD_PATHNAME, got %d\n", err); + ok((int)type == 0xdeadbeef, "tr2_sys__Open_dir(): expect: 0xdeadbeef, got %d\n", type); + ok(!*first_file_name, "tr2_sys__Open_dir(): expect: 0, got %s\n", first_file_name); + + CreateDirectoryA("empty_dir", NULL); + memset(first_file_name, 0, MAX_PATH); + err = type = 0xdeadbeef; + result_handle = file; + result_handle = p_tr2_sys__Open_dir(first_file_name, "empty_dir", &err, &type); + ok(result_handle == NULL, "tr2_sys__Open_dir(): expect: NULL, got %p\n", result_handle); + ok(err == ERROR_SUCCESS, "tr2_sys__Open_dir(): expect: ERROR_SUCCESS, got %d\n", err); + ok(type == status_unknown, "tr2_sys__Open_dir(): expect: status_unknown, got %d\n", type); + ok(!*first_file_name, "tr2_sys__Open_dir(): expect: 0, got %s\n", first_file_name); + p_tr2_sys__Close_dir(result_handle); + ok(result_handle == NULL, "tr2_sys__Open_dir(): expect: NULL, got %p\n", result_handle); + + ok(RemoveDirectoryA("empty_dir"), "expect empty_dir to exist\n"); + ok(DeleteFileA("tr2_test_dir/sub_dir/sub_f1"), "expect tr2_test_dir/sub_dir/sub_f1 to exist\n"); + ok(RemoveDirectoryA("tr2_test_dir/sub_dir"), "expect tr2_test_dir/sub_dir to exist\n"); + ok(DeleteFileA("tr2_test_dir/f1"), "expect tr2_test_dir/f1 to exist\n"); + ok(DeleteFileA("tr2_test_dir/f2"), "expect tr2_test_dir/f2 to exist\n"); + ok(RemoveDirectoryA("tr2_test_dir"), "expect tr2_test_dir to exist\n"); +} + static int __cdecl thrd_thread(void *arg) { _Thrd_t *thr = arg; @@ -1464,6 +1572,7 @@ START_TEST(msvcp120) test_tr2_sys__Statvfs(); test_tr2_sys__Stat(); test_tr2_sys__Last_write_time(); + test_tr2_sys__dir_operation(); test_thrd(); test_cnd();

1 0

Sebastian Lackner : kernel32/tests: Remove unnecessary call to GetExitCodeProcess in process tests.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: 6cf682d207129771b97a2cd9d7495c64217944da URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cf682d207129771b97a2cd9d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Dec 21 05:26:09 2015 +0100 kernel32/tests: Remove unnecessary call to GetExitCodeProcess in process tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 6dc1f5e..f186c94 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2729,7 +2729,6 @@ static void test_StartupNoConsole(void) char buffer[MAX_PATH]; STARTUPINFOA startup; PROCESS_INFORMATION info; - DWORD code; if (!pNtCurrentTeb) { @@ -2746,7 +2745,6 @@ static void test_StartupNoConsole(void) ok(CreateProcessA(NULL, buffer, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, &startup, &info), "CreateProcess\n"); ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); - ok(GetExitCodeProcess(info.hProcess, &code), "Getting exit code\n"); WritePrivateProfileStringA(NULL, NULL, NULL, resfile); okChildInt("StartupInfoA", "hStdInput", (UINT)INVALID_HANDLE_VALUE); okChildInt("StartupInfoA", "hStdOutput", (UINT)INVALID_HANDLE_VALUE);

1 0