wine-commits December 2015

wine-commits@winehq.org

2 participants
327 discussions

Piotr Caban : winex11.drv: Ignore effect returned in IDropTarget:: DragEnter.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: a2f3d9740642ca6d4a7c63175f7e8db34120c2b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2f3d9740642ca6d4a7c63175… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:21:12 2015 +0100 winex11.drv: Ignore effect returned in IDropTarget::DragEnter. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 14 +++++--------- 1 … [View More]

1 0

Andrey Melnikov : gdi32: Handle NULL filename in GetICMProfileA().
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: d4d304f4365134a6aec0fad18989e3c5f1950fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4d304f4365134a6aec0fad18… Author: Andrey Melnikov <temnota.am(a)gmail.com> Date: Mon Dec 21 12:22:41 2015 +0300 gdi32: Handle NULL filename in GetICMProfileA(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Andrey Melnikov <temnota.am(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-… [View More]

1 0

Nikolay Sivov : ole2nls: Fix CompareString() prototype.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: e5d7d69f7225991ba6df6b1986cc04a3d2037940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d7d69f7225991ba6df6b198… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 21 12:15:59 2015 +0300 ole2nls: Fix CompareString() prototype. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2nls.dll16/ole2nls.c | 5 ++--- include/wine/winbase16.h … [View More]

1 0

Nikolay Sivov : user.exe: Fix MapDialogRect() to actually convert passed rectangle (Coverity).
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: eee6332e95d2a39b79e4410ebdfc075250277d89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eee6332e95d2a39b79e4410eb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 21 12:13:56 2015 +0300 user.exe: Fix MapDialogRect() to actually convert passed rectangle (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/dialog.c | 2 … [View More]

1 0

Nikolay Sivov : user32/tests: One more activation context test for interthread SendMessage.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: 69ec6f226e48949f020afe55b862d5e98618b5de URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ec6f226e48949f020afe55b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 21 12:10:27 2015 +0300 user32/tests: One more activation context test for interthread SendMessage. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 11 +++… [View More]

1 0

Sebastian Lackner : server: Fix assignment of primary_group in token_duplicate.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: 25b0a4981b137dcbf52dc18e85690fba11e2488b URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b0a4981b137dcbf52dc18e8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Dec 21 05:32:35 2015 +0100 server: Fix assignment of primary_group in token_duplicate. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/token.c | 4 +++- 1 file changed, … [View More]

1 0

Nikolay Sivov : kernel32/tests: Some tests for ZombifyActCtx().
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: fe2f86e93480698e0acce4c8ce67f8eb2b501518 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe2f86e93480698e0acce4c8c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 21 12:10:04 2015 +0300 kernel32/tests: Some tests for ZombifyActCtx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 74 ++++++++++++++++++++++++++… [View More]++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index fcce93b..64176cb 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -40,6 +40,7 @@ static BOOL (WINAPI *pIsDebuggerPresent)(void); static BOOL (WINAPI *pQueryActCtxW)(DWORD,HANDLE,PVOID,ULONG,PVOID,SIZE_T,SIZE_T*); static VOID (WINAPI *pReleaseActCtx)(HANDLE); static BOOL (WINAPI *pFindActCtxSectionGuid)(DWORD,const GUID*,ULONG,const GUID*,PACTCTX_SECTION_KEYED_DATA); +static BOOL (WINAPI *pZombifyActCtx)(HANDLE); static NTSTATUS(NTAPI *pRtlFindActivationContextSectionString)(DWORD,const GUID *,ULONG,PUNICODE_STRING,PACTCTX_SECTION_KEYED_DATA); static BOOLEAN (NTAPI *pRtlCreateUnicodeStringFromAsciiz)(PUNICODE_STRING, PCSZ); @@ -2425,6 +2426,7 @@ static BOOL init_funcs(void) X(QueryActCtxW); X(ReleaseActCtx); X(FindActCtxSectionGuid); + X(ZombifyActCtx); hLibrary = GetModuleHandleA("ntdll.dll"); X(RtlFindActivationContextSectionString); @@ -2435,6 +2437,77 @@ static BOOL init_funcs(void) return TRUE; } +static void test_ZombifyActCtx(void) +{ + ACTIVATION_CONTEXT_BASIC_INFORMATION basicinfo; + ULONG_PTR cookie; + HANDLE handle, current; + BOOL ret; + + SetLastError(0xdeadbeef); + ret = pZombifyActCtx(NULL); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + + handle = create_manifest("test.manifest", testdep_manifest3, __LINE__); + + ret = pGetCurrentActCtx(&current); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(current == NULL, "got %p\n", current); + + ret = pActivateActCtx(handle, &cookie); + ok(ret, "ActivateActCtx failed: %u\n", GetLastError()); + + ret = pGetCurrentActCtx(&current); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(handle == current, "got %p, %p\n", current, handle); + + memset(&basicinfo, 0xff, sizeof(basicinfo)); + ret = pQueryActCtxW(0, handle, 0, ActivationContextBasicInformation, + &basicinfo, sizeof(basicinfo), NULL); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(basicinfo.hActCtx == handle, "got %p\n", basicinfo.hActCtx); + ok(basicinfo.dwFlags == 0, "got %x\n", basicinfo.dwFlags); + + memset(&basicinfo, 0xff, sizeof(basicinfo)); + ret = pQueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, NULL, 0, ActivationContextBasicInformation, + &basicinfo, sizeof(basicinfo), NULL); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(basicinfo.hActCtx == handle, "got %p\n", basicinfo.hActCtx); + ok(basicinfo.dwFlags == 0, "got %x\n", basicinfo.dwFlags); + + ret = pZombifyActCtx(handle); +todo_wine + ok(ret, "got %d\n", ret); + + memset(&basicinfo, 0xff, sizeof(basicinfo)); + ret = pQueryActCtxW(0, handle, 0, ActivationContextBasicInformation, + &basicinfo, sizeof(basicinfo), NULL); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(basicinfo.hActCtx == handle, "got %p\n", basicinfo.hActCtx); + ok(basicinfo.dwFlags == 0, "got %x\n", basicinfo.dwFlags); + + memset(&basicinfo, 0xff, sizeof(basicinfo)); + ret = pQueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, NULL, 0, ActivationContextBasicInformation, + &basicinfo, sizeof(basicinfo), NULL); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(basicinfo.hActCtx == handle, "got %p\n", basicinfo.hActCtx); + ok(basicinfo.dwFlags == 0, "got %x\n", basicinfo.dwFlags); + + ret = pGetCurrentActCtx(&current); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(current == handle, "got %p\n", current); + + /* one more time */ + ret = pZombifyActCtx(handle); +todo_wine + ok(ret, "got %d\n", ret); + + ret = pDeactivateActCtx(0, cookie); + ok(ret, "DeactivateActCtx failed: %u\n", GetLastError()); + pReleaseActCtx(handle); +} + START_TEST(actctx) { int argc; @@ -2457,5 +2530,6 @@ START_TEST(actctx) test_actctx(); test_CreateActCtx(); test_findsectionstring(); + test_ZombifyActCtx(); run_child_process(); } [View Less]

1 0

Sebastian Lackner : ntdll: ProcessDebugFlags should return debug_children flag instead of !debugger_present.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: 1980834c7d7ee3eb32fa9ece20673d9c39a74b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1980834c7d7ee3eb32fa9ece2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Dec 21 05:18:50 2015 +0100 ntdll: ProcessDebugFlags should return debug_children flag instead of !debugger_present. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/… [View More]process.c | 2 +- dlls/ntdll/tests/info.c | 12 ++---------- include/wine/server_protocol.h | 5 +++-- server/debugger.c | 2 +- server/process.c | 5 +++-- server/protocol.def | 3 ++- server/request.h | 1 + server/trace.c | 1 + 8 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index ca9462a..5a5c3ef 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -339,7 +339,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( req->handle = wine_server_obj_handle( ProcessHandle ); if ((ret = wine_server_call( req )) == STATUS_SUCCESS) { - *(DWORD *)ProcessInformation = !reply->debugger_present; + *(DWORD *)ProcessInformation = reply->debug_children; } } SERVER_END_REQ; diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 88d0417..a521447 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1345,11 +1345,7 @@ static void test_query_process_debug_flags(int argc, char **argv) status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugFlags, &debug_flags, sizeof(debug_flags), NULL); ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status); - if (!expected_flags) - ok(debug_flags == expected_flags, "Expected flag %x, got %x.\n", expected_flags, debug_flags); - else - todo_wine - ok(debug_flags == expected_flags, "Expected flag %x, got %x.\n", expected_flags, debug_flags); + ok(debug_flags == expected_flags, "Expected flag %x, got %x.\n", expected_flags, debug_flags); if (!(test_flags[i] & CREATE_SUSPENDED)) { @@ -1379,11 +1375,7 @@ static void test_query_process_debug_flags(int argc, char **argv) status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugFlags, &debug_flags, sizeof(debug_flags), NULL); ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status); - if (expected_flags) - ok(debug_flags == expected_flags, "Expected flag %x, got %x.\n", expected_flags, debug_flags); - else - todo_wine - ok(debug_flags == expected_flags, "Expected flag %x, got %x.\n", expected_flags, debug_flags); + ok(debug_flags == expected_flags, "Expected flag %x, got %x.\n", expected_flags, debug_flags); ret = DebugActiveProcess(pi.dwProcessId); ok(ret, "DebugActiveProcess failed, last error %#x.\n", GetLastError()); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 4e33260..f0dc65a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -857,7 +857,8 @@ struct get_process_info_reply int exit_code; int priority; cpu_type_t cpu; - int debugger_present; + short int debugger_present; + short int debug_children; }; @@ -6153,6 +6154,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 490 +#define SERVER_PROTOCOL_VERSION 491 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/debugger.c b/server/debugger.c index 374f2ad..810e8d3 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -443,6 +443,7 @@ static int debugger_attach( struct process *process, struct thread *debugger ) resume_process( process ); return 0; } + process->debug_children = 0; return 1; error: @@ -483,7 +484,6 @@ int debugger_detach( struct process *process, struct thread *debugger ) /* remove relationships between process and its debugger */ process->debugger = NULL; - process->debug_children = 0; if (!set_process_debug_flag( process, 0 )) clear_error(); /* ignore error */ /* from this function */ diff --git a/server/process.c b/server/process.c index e00b429..8433002 100644 --- a/server/process.c +++ b/server/process.c @@ -513,7 +513,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit process->priority = PROCESS_PRIOCLASS_NORMAL; process->suspend = 0; process->is_system = 0; - process->debug_children = 0; + process->debug_children = 1; process->is_terminating = 0; process->job = NULL; process->console = NULL; @@ -1228,7 +1228,7 @@ DECL_HANDLER(new_process) else if (parent->debugger && parent->debug_children) { set_process_debugger( process, parent->debugger ); - process->debug_children = 1; + /* debug_children is set to 1 by default */ } if (!(req->create_flags & CREATE_NEW_PROCESS_GROUP)) @@ -1359,6 +1359,7 @@ DECL_HANDLER(get_process_info) reply->end_time = process->end_time; reply->cpu = process->cpu; reply->debugger_present = !!process->debugger; + reply->debug_children = process->debug_children; release_object( process ); } } diff --git a/server/protocol.def b/server/protocol.def index 04814c9..bfb9089 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -818,7 +818,8 @@ struct rawinput_device int exit_code; /* process exit code */ int priority; /* priority class */ cpu_type_t cpu; /* CPU that this process is running on */ - int debugger_present; /* process is being debugged */ + short int debugger_present; /* process is being debugged */ + short int debug_children; /* inherit debugger to child processes */ @END diff --git a/server/request.h b/server/request.h index 48f4d46..9653f0c 100644 --- a/server/request.h +++ b/server/request.h @@ -760,6 +760,7 @@ C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, exit_code) == 48 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, priority) == 52 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, cpu) == 56 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, debugger_present) == 60 ); +C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, debug_children) == 62 ); C_ASSERT( sizeof(struct get_process_info_reply) == 64 ); C_ASSERT( FIELD_OFFSET(struct set_process_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_process_info_request, mask) == 16 ); diff --git a/server/trace.c b/server/trace.c index 4ec7aad..405a1c9 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1279,6 +1279,7 @@ static void dump_get_process_info_reply( const struct get_process_info_reply *re fprintf( stderr, ", priority=%d", req->priority ); dump_cpu_type( ", cpu=", &req->cpu ); fprintf( stderr, ", debugger_present=%d", req->debugger_present ); + fprintf( stderr, ", debug_children=%d", req->debug_children ); } static void dump_set_process_info_request( const struct set_process_info_request *req ) [View Less]

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/… [View More]

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 … [View More]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@sys@tr2@std@@YA_JPEBD@Z"); SET(p_tr2_sys__Last_write_time_set, "?_Last_write_time@sys@tr2@std@@YAXPEBD_J@Z"); + SET(p_tr2_sys__Open_dir, + "?_Open_dir@sys@tr2@std@@YAPEAXAEAY0BAE@DPEBDAEAHAEAW4file_type@123@@Z"); + SET(p_tr2_sys__Read_dir, + "?_Read_dir@sys@tr2@std@@YAPEADAEAY0BAE@DPEAXAEAW4file_type@123@@Z"); + SET(p_tr2_sys__Close_dir, + "?_Close_dir@sys@tr2@std@@YAXPEAX@Z"); SET(p__Thrd_current, "_Thrd_current"); } else { @@ -303,6 +312,12 @@ static BOOL init(void) "?_Last_write_time@sys@tr2@std@@YA_JPBD@Z"); SET(p_tr2_sys__Last_write_time_set, "?_Last_write_time@sys@tr2@std@@YAXPBD_J@Z"); + SET(p_tr2_sys__Open_dir, + "?_Open_dir@sys@tr2@std@@YAPAXAAY0BAE@DPBDAAHAAW4file_type@123@@Z"); + SET(p_tr2_sys__Read_dir, + "?_Read_dir@sys@tr2@std@@YAPADAAY0BAE@DPAXAAW4file_type@123@@Z"); + SET(p_tr2_sys__Close_dir, + "?_Close_dir@sys@tr2@std@@YAXPAX@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(); [View Less]

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
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