October 2013 - Wine-commits

Nikolay Sivov : quartz/tests: Enable compilation with -D__WINESRC__.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: ff3521718d13c21440cfca4472b9dddac143f4ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff3521718d13c21440cfca447… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 29 19:27:07 2013 +0400 quartz/tests: Enable compilation with -D__WINESRC__. --- dlls/quartz/tests/Makefile.in | 1 - dlls/quartz/tests/filtergraph.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index d4f7c41..ae5fbac 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = quartz.dll IMPORTS = oleaut32 ole32 advapi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ avisplitter.c \ diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 6e839a8..68ac884 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1643,7 +1643,7 @@ static void test_render_filter_priority(void) ok(hr == E_POINTER, "IFilterGraph2_Disconnect failed. Expected E_POINTER, received %08x\n", hr); get_connected_filter_name(ptestfilter, ConnectedFilterName2); - ok(lstrcmp(ConnectedFilterName1, ConnectedFilterName2), + ok(strcmp(ConnectedFilterName1, ConnectedFilterName2), "expected connected filters to be different but got %s both times\n", ConnectedFilterName1); IFilterGraph2_Release(pgraph2); @@ -1699,7 +1699,7 @@ static void test_render_filter_priority(void) ok(hr == S_OK, "IFilterGraph2_Render failed with %08x\n", hr); get_connected_filter_name(ptestfilter, ConnectedFilterName1); - ok(!lstrcmp(ConnectedFilterName1, "TestfilterInstance3") || !lstrcmp(ConnectedFilterName1, "TestfilterInstance2"), + ok(!strcmp(ConnectedFilterName1, "TestfilterInstance3") || !strcmp(ConnectedFilterName1, "TestfilterInstance2"), "unexpected connected filter: %s\n", ConnectedFilterName1); IFilterGraph2_Release(pgraph2); @@ -1751,9 +1751,9 @@ static void test_render_filter_priority(void) ok(hr == S_OK, "IFilterGraph2_Render failed with %08x\n", hr); get_connected_filter_name(ptestfilter, ConnectedFilterName2); - ok(!lstrcmp(ConnectedFilterName2, "TestfilterInstance3") || !lstrcmp(ConnectedFilterName2, "TestfilterInstance2"), + ok(!strcmp(ConnectedFilterName2, "TestfilterInstance3") || !strcmp(ConnectedFilterName2, "TestfilterInstance2"), "unexpected connected filter: %s\n", ConnectedFilterName2); - ok(lstrcmp(ConnectedFilterName1, ConnectedFilterName2), + ok(strcmp(ConnectedFilterName1, ConnectedFilterName2), "expected connected filters to be different but got %s both times\n", ConnectedFilterName1); IFilterGraph2_Release(pgraph2); @@ -1847,7 +1847,7 @@ static void test_render_filter_priority(void) ok(hr == S_OK, "IFilterGraph2_Render failed with %08x\n", hr); get_connected_filter_name(ptestfilter, ConnectedFilterName1); - ok(!lstrcmp(ConnectedFilterName1, "TestfilterInstance3"), + ok(!strcmp(ConnectedFilterName1, "TestfilterInstance3"), "unexpected connected filter: %s\n", ConnectedFilterName1); }

1 0

Nikolay Sivov : ntdll: Suppress a warning on 'description' attribute of ' comClass'.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: cb0ef08839e515d7a9053923d27ef8899978a263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb0ef08839e515d7a9053923d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 29 21:35:30 2013 +0400 ntdll: Suppress a warning on 'description' attribute of 'comClass'. --- dlls/ntdll/actctx.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 73f82d9..bf6e47b 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1510,6 +1510,10 @@ static BOOL parse_com_class_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll, str { entity->u.comclass.miscstatusdocprint = parse_com_class_misc(&attr_value); } + else if (xmlstr_cmp(&attr_name, descriptionW)) + { + /* not stored */ + } else { WARN("unknown attr %s=%s\n", debugstr_xmlstr(&attr_name), debugstr_xmlstr(&attr_value));

1 0

Stefan Dösinger : ddraw/tests: Accept nvidia return values in test_rt_caps.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: 81ed93d4f7bc3cdb16b2cb9b824b771dd9112f2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=81ed93d4f7bc3cdb16b2cb9b8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 28 23:35:46 2013 +0100 ddraw/tests: Accept nvidia return values in test_rt_caps. --- dlls/ddraw/tests/ddraw2.c | 24 +++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 25 +++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=81ed93d4f7bc3cdb16b2c…

1 0

Vincent Povirk : windowscodecs: Implement WICSetEncoderFormat_Proxy.
by Alexandre Julliard 29 Oct '13

29 Oct '13

Module: wine Branch: master Commit: 4d30c057bf2aaad7985713cd98000756d2e6b61a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d30c057bf2aaad7985713cd9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Oct 28 16:43:22 2013 -0500 windowscodecs: Implement WICSetEncoderFormat_Proxy. --- dlls/windowscodecs/proxy.c | 40 +++++++++++++++++++++++++++++++++ dlls/windowscodecs/windowscodecs.spec | 2 +- 2 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index 2f727b4..91fb6e6 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -633,3 +633,43 @@ HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT SDKVersion, IWICImagingFactory return ComponentFactory_CreateInstance(NULL, &IID_IWICImagingFactory, (void**)ppIImagingFactory); } + +HRESULT WINAPI WICSetEncoderFormat_Proxy(IWICBitmapSource *pSourceIn, + IWICPalette *pIPalette, IWICBitmapFrameEncode *pIFrameEncode, + IWICBitmapSource **ppSourceOut) +{ + HRESULT hr; + WICPixelFormatGUID pixelformat, framepixelformat; + + TRACE("%p,%p,%p,%p\n", pSourceIn, pIPalette, pIFrameEncode, ppSourceOut); + + if (pIPalette) FIXME("ignoring palette\n"); + + if (!pSourceIn || !pIFrameEncode || !ppSourceOut) + return E_INVALIDARG; + + *ppSourceOut = NULL; + + hr = IWICBitmapSource_GetPixelFormat(pSourceIn, &pixelformat); + + if (SUCCEEDED(hr)) + { + framepixelformat = pixelformat; + hr = IWICBitmapFrameEncode_SetPixelFormat(pIFrameEncode, &framepixelformat); + } + + if (SUCCEEDED(hr)) + { + if (IsEqualGUID(&pixelformat, &framepixelformat)) + { + *ppSourceOut = pSourceIn; + IWICBitmapSource_AddRef(pSourceIn); + } + else + { + hr = WICConvertBitmapSource(&framepixelformat, pSourceIn, ppSourceOut); + } + } + + return hr; +} diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 3d70084..9497aec 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -114,4 +114,4 @@ @ stub WICMapShortNameToGuid @ stub WICMatchMetadataContent @ stub WICSerializeMetadataContent -@ stub WICSetEncoderFormat_Proxy +@ stdcall WICSetEncoderFormat_Proxy(ptr ptr ptr ptr)

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

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 : 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

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

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

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