wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Henri Verbeet : d3d8/tests: Use explicit A calls.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: 45a1aae0a106b192ff854a8fc6a8ec9d59c9cc42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a1aae0a106b192ff854a8fc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 29 10:28:05 2013 +0100 d3d8/tests: Use explicit A calls. --- dlls/d3d8/tests/Makefile.in | 1 - dlls/d3d8/tests/device.c | 65 +++++++++++++++++++++++++---------------- dlls/d3d8/tests/stateblock.c | 8 ++-- dlls/d3d8/tests/visual.c | 10 +++--- 4 files changed, 49 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45a1aae0a106b192ff854…

1 0

Henri Verbeet : d3d8/tests: Avoid windowsx.h.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: f70672336e80a0f727284ec896032e490b120a90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f70672336e80a0f727284ec89… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 29 10:28:04 2013 +0100 d3d8/tests: Avoid windowsx.h. --- dlls/d3d8/tests/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 9db5335..2e2a0c0 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -22,11 +22,13 @@ */ #define COBJMACROS -#include <windowsx.h> #include <initguid.h> #include <d3d8.h> #include "wine/test.h" +#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) +#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) + static INT screen_width; static INT screen_height;

1 0

Henri Verbeet : wined3d: Avoid initializing some more variables.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: 3d226df3b90702507da2529b4f58deff06d3d2a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d226df3b90702507da2529b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 29 10:28:03 2013 +0100 wined3d: Avoid initializing some more variables. --- dlls/wined3d/state.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 15a0b5a..d31cadf 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -821,16 +821,16 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ const struct wined3d_gl_info *gl_info = context->gl_info; DWORD onesided_enable; DWORD twosided_enable; - GLint func = GL_ALWAYS; - GLint func_ccw = GL_ALWAYS; - GLint ref = 0; - GLuint mask = 0; - GLint stencilFail = GL_KEEP; - GLint depthFail = GL_KEEP; - GLint stencilPass = GL_KEEP; - GLint stencilFail_ccw = GL_KEEP; - GLint depthFail_ccw = GL_KEEP; - GLint stencilPass_ccw = GL_KEEP; + GLint func; + GLint func_ccw; + GLint ref; + GLuint mask; + GLint stencilFail; + GLint stencilFail_ccw; + GLint stencilPass; + GLint stencilPass_ccw; + GLint depthFail; + GLint depthFail_ccw; /* No stencil test without a stencil buffer. */ if (!state->fb->depth_stencil)

1 0

Alexandre Julliard : ntdll: Add an futimens syscall wrapper for Android.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: 61770be5f1d3f8c11025ed5ba8fa2902027eb58a URL: http://source.winehq.org/git/wine.git/?a=commit;h=61770be5f1d3f8c11025ed5ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 29 10:24:34 2013 +0100 ntdll: Add an futimens syscall wrapper for Android. --- dlls/ntdll/file.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 9dbc8fe..8c8f4cf 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -36,6 +36,9 @@ #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif +#ifdef HAVE_SYS_SYSCALL_H +# include <sys/syscall.h> +#endif #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif @@ -1654,6 +1657,15 @@ NTSTATUS WINAPI NtSetVolumeInformationFile( return 0; } +#if defined(__ANDROID__) && !defined(HAVE_FUTIMENS) +static int futimens( int fd, const struct timespec spec[2] ) +{ + return syscall( __NR_utimensat, fd, NULL, spec, 0 ); +} +#define UTIME_OMIT ((1 << 30) - 2) +#define HAVE_FUTIMENS +#endif /* __ANDROID__ */ + static NTSTATUS set_file_times( int fd, const LARGE_INTEGER *mtime, const LARGE_INTEGER *atime ) { NTSTATUS status = STATUS_SUCCESS;

1 0

Alexandre Julliard : advapi32/tests: Use the function pointer to call RegDeleteKeyExA.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: 8b11533dcf1724512f3fa17bd8650a6cfefbba41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b11533dcf1724512f3fa17bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 29 10:23:56 2013 +0100 advapi32/tests: Use the function pointer to call RegDeleteKeyExA. --- dlls/advapi32/tests/registry.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 47de094..6c3a5f0 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2105,7 +2105,7 @@ static void test_redirection(void) err = RegOpenKeyExA(HKEY_CLASSES_ROOT, "Interface", 0, KEY_ALL_ACCESS, &native); ok(err == ERROR_SUCCESS, "got %i\n", err); - RegDeleteKeyExA(native, "AWineTest", 0, 0); + pRegDeleteKeyExA(native, "AWineTest", 0, 0); /* write subkey in opposite bit mode */ err = RegOpenKeyExA(HKEY_CLASSES_ROOT, "Interface", 0, KEY_ALL_ACCESS | opposite, &op_key); @@ -2128,7 +2128,7 @@ static void test_redirection(void) broken(err == ERROR_SUCCESS), /* before Win7, HKCR is reflected instead of redirected */ "got %i\n", err); - err = RegDeleteKeyExA(op_key, "AWineTest", opposite, 0); + err = pRegDeleteKeyExA(op_key, "AWineTest", opposite, 0); ok(err == ERROR_SUCCESS, "got %i\n", err); RegCloseKey(op_key);

1 0

Frédéric Delanoy : ntdll/tests: Use BOOL type where appropriate.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: 81b181fe72b3d605b74a781294f69fa1de7c9cc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81b181fe72b3d605b74a78129… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 28 22:18:05 2013 +0100 ntdll/tests: Use BOOL type where appropriate. --- dlls/ntdll/tests/error.c | 6 +++--- dlls/ntdll/tests/info.c | 2 +- dlls/ntdll/tests/time.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index d9c83b3..862f0a9 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -50,7 +50,7 @@ static ULONG (WINAPI *pRtlNtStatusToDosError)(NTSTATUS Status); static int strict; -static int prepare_test(void) +static BOOL prepare_test(void) { HMODULE ntdll; int argc; @@ -61,12 +61,12 @@ static int prepare_test(void) if (!pRtlNtStatusToDosError) { win_skip("RtlNtStatusToDosError is not available\n"); - return 0; + return FALSE; } argc = winetest_get_mainargs(&argv); strict=(argc >= 3 && strcmp(argv[2],"strict")==0); - return 1; + return TRUE; } static void cmp_call(NTSTATUS win_nt, ULONG win32, const char* message) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 87f3c9c..d4f1e9e 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -259,7 +259,7 @@ static void test_query_process(void) DWORD last_pid; ULONG ReturnLength; int i = 0, k = 0; - int is_nt = 0; + BOOL is_nt = FALSE; SYSTEM_BASIC_INFORMATION sbi; /* Copy of our winternl.h structure turned into a private one */ diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index ff80b84..48f4640 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -33,9 +33,9 @@ static const int MonthLengths[2][12] = { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } }; -static inline int IsLeapYear(int Year) +static inline BOOL IsLeapYear(int Year) { - return Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0) ? 1 : 0; + return Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0); } /* start time of the tests */

1 0

Frédéric Delanoy : msi/tests: Use BOOL type where appropriate.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: ec1888b7d323c1d16729d7a8d6313f3dab350d71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec1888b7d323c1d16729d7a8d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 28 22:18:03 2013 +0100 msi/tests: Use BOOL type where appropriate. --- dlls/msi/tests/msi.c | 16 ++++++++-------- dlls/msi/tests/record.c | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index c2deb31..95fe97f 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -13062,7 +13062,7 @@ done: static void test_MsiEnumComponents(void) { UINT r; - int found1, found2; + BOOL found1, found2; DWORD index; char comp1[39], comp2[39], guid[39]; char comp_squashed1[33], comp_squashed2[33]; @@ -13105,11 +13105,11 @@ static void test_MsiEnumComponents(void) index = 0; guid[0] = 0; - found1 = found2 = 0; + found1 = found2 = FALSE; while (!MsiEnumComponentsA( index, guid )) { - if (!strcmp( guid, comp1 )) found1 = 1; - if (!strcmp( guid, comp2 )) found2 = 1; + if (!strcmp( guid, comp1 )) found1 = TRUE; + if (!strcmp( guid, comp2 )) found2 = TRUE; ok( guid[0], "empty guid\n" ); guid[0] = 0; index++; @@ -13128,7 +13128,7 @@ done: static void test_MsiEnumComponentsEx(void) { UINT r; - int found1, found2; + BOOL found1, found2; DWORD len, index; MSIINSTALLCONTEXT context; char comp1[39], comp2[39], guid[39], sid[128]; @@ -13181,7 +13181,7 @@ static void test_MsiEnumComponentsEx(void) context = 0xdeadbeef; sid[0] = 0; len = sizeof(sid); - found1 = found2 = 0; + found1 = found2 = FALSE; while (!pMsiEnumComponentsExA( "S-1-1-0", MSIINSTALLCONTEXT_ALL, index, guid, &context, sid, &len )) { if (!strcmp( comp1, guid )) @@ -13189,14 +13189,14 @@ static void test_MsiEnumComponentsEx(void) ok( context == MSIINSTALLCONTEXT_MACHINE, "got %u\n", context ); ok( !sid[0], "got \"%s\"\n", sid ); ok( !len, "unexpected length %u\n", len ); - found1 = 1; + found1 = TRUE; } if (!strcmp( comp2, guid )) { ok( context == MSIINSTALLCONTEXT_USERUNMANAGED, "got %u\n", context ); ok( sid[0], "empty sid\n" ); ok( len == strlen(sid), "unexpected length %u\n", len ); - found2 = 1; + found2 = TRUE; } index++; guid[0] = 0; diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 90d8bb8..38d0f76 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -41,7 +41,7 @@ static BOOL create_temp_file(char *name) handle = CreateFileA(name, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if(handle==INVALID_HANDLE_VALUE) - return 0; + return FALSE; for(i=0; i<26; i++) buffer[i]=i+'a'; r = WriteFile(handle,buffer,sizeof buffer,&sz,NULL);

1 0

Dmitry Timoshkov : ntdll/tests: Add tests for reading 0 bytes at end of file.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: 3a41ebfbf27c33f0c22a5baada44cd6c2adcbd59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a41ebfbf27c33f0c22a5baad… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 29 16:10:02 2013 +0900 ntdll/tests: Add tests for reading 0 bytes at end of file. --- dlls/ntdll/tests/file.c | 147 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 147 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 09a61b8..d9e85fd 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2131,6 +2131,20 @@ todo_wine ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); ok(bytes == 0, "bytes %u\n", bytes); + bytes = -1; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, 0, &bytes, NULL); + ok(ret, "ReadFile error %d\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + ok(bytes == 0, "bytes %u\n", bytes); + + bytes = -1; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, NULL, 0, &bytes, NULL); + ok(ret, "ReadFile error %d\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + ok(bytes == 0, "bytes %u\n", bytes); + S(U(ovl)).Offset = sizeof(contents); S(U(ovl)).OffsetHigh = 0; ovl.Internal = -1; @@ -2146,6 +2160,23 @@ todo_wine ok((NTSTATUS)ovl.Internal == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#lx\n", ovl.Internal); ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); + S(U(ovl)).Offset = sizeof(contents); + S(U(ovl)).OffsetHigh = 0; + ovl.Internal = -1; + ovl.InternalHigh = -1; + ovl.hEvent = 0; + bytes = -1; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, 0, &bytes, &ovl); +todo_wine + ok(ret, "ReadFile error %d\n", GetLastError()); +todo_wine + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + ok(bytes == 0, "bytes %u\n", bytes); +todo_wine + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); + ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); + U(iob).Status = -1; iob.Information = -1; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), NULL, NULL); @@ -2157,6 +2188,16 @@ todo_wine U(iob).Status = -1; iob.Information = -1; + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, 0, NULL, NULL); +todo_wine + ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); +todo_wine + ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); +todo_wine + ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + + U(iob).Status = -1; + iob.Information = -1; offset.QuadPart = sizeof(contents); status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", status); @@ -2167,6 +2208,17 @@ todo_wine U(iob).Status = -1; iob.Information = -1; + offset.QuadPart = sizeof(contents); + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, 0, &offset, NULL); +todo_wine + ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); +todo_wine + ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); +todo_wine + ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + + U(iob).Status = -1; + iob.Information = -1; offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); ok(status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", status); @@ -2175,6 +2227,17 @@ todo_wine todo_wine ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + U(iob).Status = -1; + iob.Information = -1; + offset.QuadPart = (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */; + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, 0, &offset, NULL); +todo_wine + ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); +todo_wine + ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); +todo_wine + ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + for (i = -20; i < 0; i++) { if (i == -2) continue; @@ -2392,6 +2455,68 @@ todo_wine off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); ok(off == 0, "expected 0, got %u\n", off); + offset.QuadPart = sizeof(contents); + S(U(ovl)).Offset = offset.u.LowPart; + S(U(ovl)).OffsetHigh = offset.u.HighPart; + ovl.Internal = -1; + ovl.InternalHigh = -1; + ovl.hEvent = 0; + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, 0, &bytes, &ovl); + /* ReadFile return value depends on Windows version and testing it is not practical */ + if (!ret) +todo_wine + ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); + ret = GetLastError(); + ok(bytes == 0, "bytes %u\n", bytes); + + off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); + ok(off == 0, "expected 0, got %u\n", off); + + if (ret == ERROR_IO_PENDING) + { + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); + ok(ret, "GetOverlappedResult should report TRUE\n"); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + ok(bytes == 0, "expected 0, read %u\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); + ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); + } + + offset.QuadPart = sizeof(contents); + S(U(ovl)).Offset = offset.u.LowPart; + S(U(ovl)).OffsetHigh = offset.u.HighPart; + ovl.Internal = -1; + ovl.InternalHigh = -1; + ovl.hEvent = 0; + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, NULL, 0, &bytes, &ovl); + /* ReadFile return value depends on Windows version and testing it is not practical */ + if (!ret) +todo_wine + ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); + ret = GetLastError(); + ok(bytes == 0, "bytes %u\n", bytes); + + off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); + ok(off == 0, "expected 0, got %u\n", off); + + if (ret == ERROR_IO_PENDING) + { + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); + ok(ret, "GetOverlappedResult should report TRUE\n"); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + ok(bytes == 0, "expected 0, read %u\n", bytes); + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); + ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); + } + U(iob).Status = -1; iob.Information = -1; offset.QuadPart = sizeof(contents); @@ -2411,6 +2536,28 @@ todo_wine off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); ok(off == 0, "expected 0, got %u\n", off); + U(iob).Status = -1; + iob.Information = -1; + offset.QuadPart = sizeof(contents); + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, 0, &offset, NULL); + if (status == STATUS_PENDING) + { + ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); + ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + } + else + { +todo_wine + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", status); +todo_wine + ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); +todo_wine + ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); + } + + off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); + ok(off == 0, "expected 0, got %u\n", off); + S(U(ovl)).Offset = 0; S(U(ovl)).OffsetHigh = 0; ovl.Internal = -1;

1 0

Dmitry Timoshkov : kernel32/tests: Add tests for GetLongPathName/ GetShortPathName and relative paths.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: 4befefa94d1f40298812a4e17b3853f26d41507a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4befefa94d1f40298812a4e17… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 29 16:10:07 2013 +0900 kernel32/tests: Add tests for GetLongPathName/GetShortPathName and relative paths. --- dlls/kernel32/tests/path.c | 67 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index e884c0c..fe699b2 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1930,6 +1930,72 @@ static void init_pointers(void) #undef MAKEFUNC } +static void test_relative_path(void) +{ + char path[MAX_PATH], buf[MAX_PATH]; + HANDLE file; + int ret; + + if (!pGetLongPathNameA) return; + + GetTempPathA(MAX_PATH, path); + ret = SetCurrentDirectoryA(path); + ok(ret, "SetCurrentDirectory error %d\n", GetLastError()); + + ret = CreateDirectoryA("foo", NULL); + ok(ret, "CreateDirectory error %d\n", GetLastError()); + file = CreateFileA("foo\\file", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "failed to create temp file\n"); + CloseHandle(file); + ret = CreateDirectoryA("bar", NULL); + ok(ret, "CreateDirectory error %d\n", GetLastError()); + ret = SetCurrentDirectoryA("bar"); + ok(ret, "SetCurrentDirectory error %d\n", GetLastError()); + + ret = GetFileAttributesA("..\\foo\\file"); + ok(ret != INVALID_FILE_ATTRIBUTES, "GetFileAttributes error %d\n", GetLastError()); + + strcpy(buf, "deadbeef"); + ret = pGetLongPathNameA(".", buf, MAX_PATH); + ok(ret, "GetLongPathName error %d\n", GetLastError()); +todo_wine + ok(!strcmp(buf, "."), "expected ., got %s\n", buf); + strcpy(buf, "deadbeef"); + ret = GetShortPathNameA(".", buf, MAX_PATH); + ok(ret, "GetShortPathName error %d\n", GetLastError()); +todo_wine + ok(!strcmp(buf, "."), "expected ., got %s\n", buf); + + strcpy(buf, "deadbeef"); + ret = pGetLongPathNameA("..", buf, MAX_PATH); + ok(ret, "GetLongPathName error %d\n", GetLastError()); +todo_wine + ok(!strcmp(buf, ".."), "expected .., got %s\n", buf); + strcpy(buf, "deadbeef"); + ret = GetShortPathNameA("..", buf, MAX_PATH); + ok(ret, "GetShortPathName error %d\n", GetLastError()); +todo_wine + ok(!strcmp(buf, ".."), "expected .., got %s\n", buf); + + strcpy(buf, "deadbeef"); + ret = pGetLongPathNameA("..\\foo\\file", buf, MAX_PATH); +todo_wine + ok(ret, "GetLongPathName error %d\n", GetLastError()); +todo_wine + ok(!strcmp(buf, "..\\foo\\file"), "expected ..\\foo\\file, got %s\n", buf); + strcpy(buf, "deadbeef"); + ret = GetShortPathNameA("..\\foo\\file", buf, MAX_PATH); +todo_wine + ok(ret, "GetShortPathName error %d\n", GetLastError()); +todo_wine + ok(!strcmp(buf, "..\\foo\\file"), "expected ..\\foo\\file, got %s\n", buf); + + SetCurrentDirectoryA(".."); + DeleteFileA("foo\\file"); + RemoveDirectoryA("foo"); + RemoveDirectoryA("bar"); +} + START_TEST(path) { CHAR origdir[MAX_PATH],curdir[MAX_PATH], curDrive, otherDrive; @@ -1944,6 +2010,7 @@ START_TEST(path) if (!pActivateActCtx) win_skip("Activation contexts not supported, some tests will be skipped\n"); + test_relative_path(); test_InitPathA(curdir, &curDrive, &otherDrive); test_CurrentDirectoryA(origdir,curdir); test_PathNameA(curdir, curDrive, otherDrive);

1 0

Dmitry Timoshkov : atl100: Print file name in the failure message and fix a typo.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: 454243aa54bcab77b9b695ee2b1256965a089065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=454243aa54bcab77b9b695ee2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 29 16:08:42 2013 +0900 atl100: Print file name in the failure message and fix a typo. --- dlls/atl100/registrar.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/atl100/registrar.c b/dlls/atl100/registrar.c index b255e12..90c5b5b 100644 --- a/dlls/atl100/registrar.c +++ b/dlls/atl100/registrar.c @@ -511,13 +511,13 @@ static HRESULT file_register(Registrar *This, LPCOLESTR fileName, BOOL do_regist HeapFree(GetProcessHeap(), 0, regstrw); }else { - WARN("Failed to read faile\n"); + WARN("Failed to read file %s\n", debugstr_w(fileName)); hres = HRESULT_FROM_WIN32(GetLastError()); } HeapFree(GetProcessHeap(), 0, regstra); CloseHandle(file); }else { - WARN("Could not open file\n"); + WARN("Could not open file %s\n", debugstr_w(fileName)); hres = HRESULT_FROM_WIN32(GetLastError()); }

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
76
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 October 2013