October 2006 - Wine-commits

Saulius Krasuckas : lz32/tests: More checks for various LZOpenFile[AW] operations on existing files.
by Alexandre Julliard 10 Oct '06

10 Oct '06

Module: wine Branch: master Commit: 346d02edbae207783fde8dd5943003c5955985ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=346d02edbae207783fde8dd59… Author: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Date: Tue Oct 10 19:34:40 2006 +0300 lz32/tests: More checks for various LZOpenFile[AW] operations on existing files. --- dlls/lz32/tests/lzexpand_main.c | 118 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 117 insertions(+), 1 deletions(-) diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index 8287634..593d98b 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -140,6 +140,7 @@ static void test_LZOpenFileA_existing_co operating systems. Doesn't seem to on my copy of Win98. */ if(file != LZERROR_BADINHANDLE) { + ok(file >= 0, "LZOpenFileA returns negative file descriptor for '%s'\n", filename); ok(test.cBytes == sizeof(OFSTRUCT), "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == 0, "LZOpenFileA set test.nErrCode to %d\n", @@ -168,6 +169,7 @@ static void test_LZOpenFileA_existing_co /* b, using dotless file name. */ file = LZOpenFileA(dotless, &test, OF_EXIST); if(file != LZERROR_BADINHANDLE) { + ok(file >= 0, "LZOpenFileA returns negative file descriptor for '%s'\n", dotless); ok(test.cBytes == sizeof(OFSTRUCT), "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == 0, "LZOpenFileA set test.nErrCode to %d\n", @@ -198,6 +200,7 @@ static void test_LZOpenFileA_existing_co /* c, using extensionless file name. */ file = LZOpenFileA(extless, &test, OF_EXIST); if(file != LZERROR_BADINHANDLE) { + ok(file >= 0, "LZOpenFileA returns negative file descriptor for '%s'\n", extless); ok(test.cBytes == sizeof(OFSTRUCT), "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == 0, "LZOpenFileA set test.nErrCode to %d\n", @@ -345,6 +348,7 @@ static void test_LZOpenFileA(void) DWORD retval; INT file; static char badfilename_[] = "badfilename_"; + char expected[MAX_PATH]; SetLastError(0xfaceabee); /* Check for nonexistent file. */ @@ -355,38 +359,94 @@ static void test_LZOpenFileA(void) "GetLastError() returns %ld\n", GetLastError()); LZClose(file); + memset(&test, 0xA5, sizeof(test)); + full_file_path_name_in_a_CWD(filename_, expected, FALSE); + /* Create an empty file. */ file = LZOpenFileA(filename_, &test, OF_CREATE); ok(file >= 0, "LZOpenFileA failed on creation\n"); + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFileA set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == ERROR_SUCCESS, + "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); + ok(lstrcmpA(test.szPathName, expected) == 0, + "LZOpenFileA returned '%s', but was expected to return '%s'\n", + test.szPathName, expected); LZClose(file); + retval = GetFileAttributesA(filename_); ok(retval != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA: error %ld\n", GetLastError()); /* Check various opening options: */ + memset(&test, 0xA5, sizeof(test)); + /* a, for reading. */ file = LZOpenFileA(filename_, &test, OF_READ); ok(file >= 0, "LZOpenFileA failed on read\n"); + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFileA set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == ERROR_SUCCESS, + "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); + ok(lstrcmpA(test.szPathName, expected) == 0, + "LZOpenFileA returned '%s', but was expected to return '%s'\n", + test.szPathName, expected); LZClose(file); + memset(&test, 0xA5, sizeof(test)); + /* b, for writing. */ file = LZOpenFileA(filename_, &test, OF_WRITE); ok(file >= 0, "LZOpenFileA failed on write\n"); + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFileA set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == ERROR_SUCCESS, + "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); + ok(lstrcmpA(test.szPathName, expected) == 0, + "LZOpenFileA returned '%s', but was expected to return '%s'\n", + test.szPathName, expected); LZClose(file); + memset(&test, 0xA5, sizeof(test)); + /* c, for reading and writing. */ file = LZOpenFileA(filename_, &test, OF_READWRITE); ok(file >= 0, "LZOpenFileA failed on read/write\n"); + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFileA set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == ERROR_SUCCESS, + "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); + ok(lstrcmpA(test.szPathName, expected) == 0, + "LZOpenFileA returned '%s', but was expected to return '%s'\n", + test.szPathName, expected); LZClose(file); + memset(&test, 0xA5, sizeof(test)); + /* d, for checking file existance. */ file = LZOpenFileA(filename_, &test, OF_EXIST); ok(file >= 0, "LZOpenFileA failed on read/write\n"); + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFileA set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == ERROR_SUCCESS, + "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); + ok(lstrcmpA(test.szPathName, expected) == 0, + "LZOpenFileA returned '%s', but was expected to return '%s'\n", + test.szPathName, expected); LZClose(file); + memset(&test, 0xA5, sizeof(test)); + /* Delete the file then make sure it doesn't exist anymore. */ file = LZOpenFileA(filename_, &test, OF_DELETE); ok(file >= 0, "LZOpenFileA failed on delete\n"); + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFileA set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == ERROR_SUCCESS, + "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); + ok(lstrcmpA(test.szPathName, expected) == 0, + "LZOpenFileA returned '%s', but was expected to return '%s'\n", + test.szPathName, expected); LZClose(file); retval = GetFileAttributesA(filename_); @@ -690,6 +750,7 @@ static void test_LZOpenFileW(void) DWORD retval; INT file; static WCHAR badfilenameW[] = {'b','a','d','f','i','l','e','n','a','m','e','.','x','t','n',0}; + char expected[MAX_PATH]; SetLastError(0xfaceabee); /* Check for nonexistent file. */ @@ -704,39 +765,94 @@ static void test_LZOpenFileW(void) ok(file == LZERROR_BADINHANDLE, "LZOpenFileW succeeded on nonexistent file\n"); LZClose(file); + memset(&test, 0xA5, sizeof(test)); + full_file_path_name_in_a_CWD(filename_, expected, FALSE); + /* Create an empty file. */ file = LZOpenFileW(filenameW_, &test, OF_CREATE); ok(file >= 0, "LZOpenFile failed on creation\n"); - + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFileW set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == ERROR_SUCCESS, + "LZOpenFileW set test.nErrCode to %d\n", test.nErrCode); + ok(lstrcmpA(test.szPathName, expected) == 0, + "LZOpenFileW returned '%s', but was expected to return '%s'\n", + test.szPathName, expected); LZClose(file); + retval = GetFileAttributesW(filenameW_); ok(retval != INVALID_FILE_ATTRIBUTES, "GetFileAttributes: error %ld\n", GetLastError()); /* Check various opening options: */ + memset(&test, 0xA5, sizeof(test)); + /* a, for reading. */ file = LZOpenFileW(filenameW_, &test, OF_READ); ok(file >= 0, "LZOpenFileW failed on read\n"); + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFileW set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == ERROR_SUCCESS, + "LZOpenFileW set test.nErrCode to %d\n", test.nErrCode); + ok(lstrcmpA(test.szPathName, expected) == 0, + "LZOpenFileW returned '%s', but was expected to return '%s'\n", + test.szPathName, expected); LZClose(file); + memset(&test, 0xA5, sizeof(test)); + /* b, for writing. */ file = LZOpenFileW(filenameW_, &test, OF_WRITE); ok(file >= 0, "LZOpenFileW failed on write\n"); + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFileW set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == ERROR_SUCCESS, + "LZOpenFileW set test.nErrCode to %d\n", test.nErrCode); + ok(lstrcmpA(test.szPathName, expected) == 0, + "LZOpenFileW returned '%s', but was expected to return '%s'\n", + test.szPathName, expected); LZClose(file); + memset(&test, 0xA5, sizeof(test)); + /* c, for reading and writing. */ file = LZOpenFileW(filenameW_, &test, OF_READWRITE); ok(file >= 0, "LZOpenFileW failed on read/write\n"); + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFileW set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == ERROR_SUCCESS, + "LZOpenFileW set test.nErrCode to %d\n", test.nErrCode); + ok(lstrcmpA(test.szPathName, expected) == 0, + "LZOpenFileW returned '%s', but was expected to return '%s'\n", + test.szPathName, expected); LZClose(file); + memset(&test, 0xA5, sizeof(test)); + /* d, for checking file existance. */ file = LZOpenFileW(filenameW_, &test, OF_EXIST); ok(file >= 0, "LZOpenFileW failed on read/write\n"); + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFileW set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == ERROR_SUCCESS, + "LZOpenFileW set test.nErrCode to %d\n", test.nErrCode); + ok(lstrcmpA(test.szPathName, expected) == 0, + "LZOpenFileW returned '%s', but was expected to return '%s'\n", + test.szPathName, expected); LZClose(file); + memset(&test, 0xA5, sizeof(test)); + /* Delete the file then make sure it doesn't exist anymore. */ file = LZOpenFileW(filenameW_, &test, OF_DELETE); ok(file >= 0, "LZOpenFileW failed on delete\n"); + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFileW set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == ERROR_SUCCESS, + "LZOpenFileW set test.nErrCode to %d\n", test.nErrCode); + ok(lstrcmpA(test.szPathName, expected) == 0, + "LZOpenFileW returned '%s', but was expected to return '%s'\n", + test.szPathName, expected); LZClose(file); retval = GetFileAttributesW(filenameW_);

1 0

Saulius Krasuckas : lz32/tests: Be more verbose and aware of root directory .
by Alexandre Julliard 10 Oct '06

10 Oct '06

Module: wine Branch: master Commit: f29042b3a670aad22c139d858538f6f4c9827ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f29042b3a670aad22c139d858… Author: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Date: Tue Oct 10 19:36:56 2006 +0300 lz32/tests: Be more verbose and aware of root directory. --- dlls/lz32/tests/lzexpand_main.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index 593d98b..613317f 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -77,14 +77,18 @@ static void full_file_path_name_in_a_CWD char shortname[MAX_PATH]; retval = GetCurrentDirectoryA(MAX_PATH, dst); - ok(retval > 0, "GetCurrentDirectoryA returned %ld, GLE=0x%lx\n", + ok(retval > 0, "GetCurrentDirectoryA returned %ld, GLE=%ld\n", retval, GetLastError()); - lstrcatA(dst, "\\"); + if(dst[retval-1] != '\\') + /* Append backslash only when it's missing */ + lstrcatA(dst, "\\"); lstrcatA(dst, src); if(expect_short) { memcpy(shortname, dst, MAX_PATH); - GetShortPathName(shortname, dst, MAX_PATH-1); + retval = GetShortPathName(shortname, dst, MAX_PATH-1); + ok(retval > 0, "GetShortPathName returned %ld for '%s', GLE=%ld\n", + retval, dst, GetLastError()); } } @@ -95,7 +99,7 @@ static void create_file(char *fname) DWORD retval; file = LZOpenFileA(fname, &ofs, OF_CREATE); - ok(file >= 0, "LZOpenFileA failed on creation\n"); + ok(file >= 0, "LZOpenFileA failed to create '%s'\n", fname); LZClose(file); retval = GetFileAttributesA(fname); ok(retval != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA('%s'): error %ld\n", ofs.szPathName, GetLastError()); @@ -108,7 +112,7 @@ static void delete_file(char *fname) DWORD retval; file = LZOpenFileA(fname, &ofs, OF_DELETE); - ok(file >= 0, "LZOpenFileA failed on delete\n"); + ok(file >= 0, "LZOpenFileA failed to delete '%s'\n", fname); LZClose(file); retval = GetFileAttributesA(fname); ok(retval == INVALID_FILE_ATTRIBUTES, "GetFileAttributesA succeeded on deleted file ('%s')\n", ofs.szPathName);

1 0

Saulius Krasuckas : lz32/tests: WinME sometimes returns short filenames.
by Alexandre Julliard 10 Oct '06

10 Oct '06

Module: wine Branch: master Commit: e05035da18267b46eb69e704ae29eda33e26f4f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e05035da18267b46eb69e704a… Author: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Date: Tue Oct 10 19:38:13 2006 +0300 lz32/tests: WinME sometimes returns short filenames. --- dlls/lz32/tests/lzexpand_main.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index 613317f..6c5f150 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -353,6 +353,7 @@ static void test_LZOpenFileA(void) INT file; static char badfilename_[] = "badfilename_"; char expected[MAX_PATH]; + char short_expected[MAX_PATH]; SetLastError(0xfaceabee); /* Check for nonexistent file. */ @@ -384,6 +385,7 @@ static void test_LZOpenFileA(void) /* Check various opening options: */ memset(&test, 0xA5, sizeof(test)); + full_file_path_name_in_a_CWD(filename_, short_expected, TRUE); /* a, for reading. */ file = LZOpenFileA(filename_, &test, OF_READ); @@ -392,9 +394,10 @@ static void test_LZOpenFileA(void) "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_SUCCESS, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); - ok(lstrcmpA(test.szPathName, expected) == 0, - "LZOpenFileA returned '%s', but was expected to return '%s'\n", - test.szPathName, expected); + ok(lstrcmpA(test.szPathName, expected) == 0 || + lstrcmpA(test.szPathName, short_expected) == 0, /* Win9x */ + "LZOpenFileA returned '%s', but was expected to return '%s' or '%s'\n", + test.szPathName, expected, short_expected); LZClose(file); memset(&test, 0xA5, sizeof(test)); @@ -406,9 +409,10 @@ static void test_LZOpenFileA(void) "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_SUCCESS, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); - ok(lstrcmpA(test.szPathName, expected) == 0, - "LZOpenFileA returned '%s', but was expected to return '%s'\n", - test.szPathName, expected); + ok(lstrcmpA(test.szPathName, expected) == 0 || + lstrcmpA(test.szPathName, short_expected) == 0, /* Win9x */ + "LZOpenFileA returned '%s', but was expected to return '%s' or '%s'\n", + test.szPathName, expected, short_expected); LZClose(file); memset(&test, 0xA5, sizeof(test)); @@ -420,9 +424,10 @@ static void test_LZOpenFileA(void) "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_SUCCESS, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); - ok(lstrcmpA(test.szPathName, expected) == 0, - "LZOpenFileA returned '%s', but was expected to return '%s'\n", - test.szPathName, expected); + ok(lstrcmpA(test.szPathName, expected) == 0 || + lstrcmpA(test.szPathName, short_expected) == 0, /* Win9x */ + "LZOpenFileA returned '%s', but was expected to return '%s' or '%s'\n", + test.szPathName, expected, short_expected); LZClose(file); memset(&test, 0xA5, sizeof(test)); @@ -434,9 +439,10 @@ static void test_LZOpenFileA(void) "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_SUCCESS, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); - ok(lstrcmpA(test.szPathName, expected) == 0, - "LZOpenFileA returned '%s', but was expected to return '%s'\n", - test.szPathName, expected); + ok(lstrcmpA(test.szPathName, expected) == 0 || + lstrcmpA(test.szPathName, short_expected) == 0, /* Win9x */ + "LZOpenFileA returned '%s', but was expected to return '%s' or '%s'\n", + test.szPathName, expected, short_expected); LZClose(file); memset(&test, 0xA5, sizeof(test)); @@ -448,9 +454,10 @@ static void test_LZOpenFileA(void) "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_SUCCESS, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); - ok(lstrcmpA(test.szPathName, expected) == 0, - "LZOpenFileA returned '%s', but was expected to return '%s'\n", - test.szPathName, expected); + ok(lstrcmpA(test.szPathName, expected) == 0 || + lstrcmpA(test.szPathName, short_expected) == 0, /* Win9x */ + "LZOpenFileA returned '%s', but was expected to return '%s' or '%s'\n", + test.szPathName, expected, short_expected); LZClose(file); retval = GetFileAttributesA(filename_);

1 0

H. Verbeet : d3d9: Win64 printf format warning fixes.
by Alexandre Julliard 10 Oct '06

10 Oct '06

Module: wine Branch: master Commit: cb4ad6e52cfe5f293f5b97f7c3c1e131317d44fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb4ad6e52cfe5f293f5b97f7c… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Oct 10 19:23:22 2006 +0200 d3d9: Win64 printf format warning fixes. --- dlls/d3d9/Makefile.in | 1 - dlls/d3d9/basetexture.c | 4 ++-- dlls/d3d9/cubetexture.c | 6 +++--- dlls/d3d9/d3d9_main.c | 10 +++++----- dlls/d3d9/device.c | 12 ++++++------ dlls/d3d9/directx.c | 4 ++-- dlls/d3d9/indexbuffer.c | 4 ++-- dlls/d3d9/pixelshader.c | 4 ++-- dlls/d3d9/query.c | 6 +++--- dlls/d3d9/resource.c | 4 ++-- dlls/d3d9/stateblock.c | 4 ++-- dlls/d3d9/surface.c | 6 +++--- dlls/d3d9/swapchain.c | 4 ++-- dlls/d3d9/texture.c | 6 +++--- dlls/d3d9/vertexbuffer.c | 4 ++-- dlls/d3d9/vertexdeclaration.c | 4 ++-- dlls/d3d9/vertexshader.c | 8 ++++---- dlls/d3d9/volume.c | 6 +++--- dlls/d3d9/volumetexture.c | 6 +++--- 19 files changed, 51 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb4ad6e52cfe5f293f5b9…

1 0

H. Verbeet : ddraw/tests: Win64 printf format warning fixes.
by Alexandre Julliard 10 Oct '06

10 Oct '06

Module: wine Branch: master Commit: 37cb9de85174ea7e347aa4e7d127480a3d399bbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=37cb9de85174ea7e347aa4e7d… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Oct 10 19:23:33 2006 +0200 ddraw/tests: Win64 printf format warning fixes. --- dlls/ddraw/tests/Makefile.in | 1 dlls/ddraw/tests/d3d.c | 88 +++++++++++++++++++++-------------------- dlls/ddraw/tests/ddrawmodes.c | 64 +++++++++++++++--------------- dlls/ddraw/tests/dsurface.c | 50 ++++++++++++----------- dlls/ddraw/tests/refcount.c | 86 ++++++++++++++++++++-------------------- 5 files changed, 144 insertions(+), 145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=37cb9de85174ea7e347aa…

1 0

H. Verbeet : d3d8: Win64 printf format warning fixes.
by Alexandre Julliard 10 Oct '06

10 Oct '06

Module: wine Branch: master Commit: c6e0ca28d549c795f8820088c2e66b06c72da0be URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6e0ca28d549c795f8820088c… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Oct 10 19:23:08 2006 +0200 d3d8: Win64 printf format warning fixes. --- dlls/d3d8/Makefile.in | 1 - dlls/d3d8/basetexture.c | 4 ++-- dlls/d3d8/cubetexture.c | 4 ++-- dlls/d3d8/d3d8_main.c | 2 +- dlls/d3d8/device.c | 38 +++++++++++++++++++------------------- dlls/d3d8/directx.c | 4 ++-- dlls/d3d8/indexbuffer.c | 4 ++-- dlls/d3d8/pixelshader.c | 4 ++-- dlls/d3d8/resource.c | 4 ++-- dlls/d3d8/stateblock.c | 4 ++-- dlls/d3d8/surface.c | 6 +++--- dlls/d3d8/swapchain.c | 4 ++-- dlls/d3d8/texture.c | 4 ++-- dlls/d3d8/vertexbuffer.c | 4 ++-- dlls/d3d8/vertexshader.c | 4 ++-- dlls/d3d8/volume.c | 6 +++--- dlls/d3d8/volumetexture.c | 6 +++--- 17 files changed, 51 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c6e0ca28d549c795f8820…

1 0

H. Verbeet : d3d8/tests: Win64 printf format warning fixes.
by Alexandre Julliard 10 Oct '06

10 Oct '06

Module: wine Branch: master Commit: a5d034201078e384e9e192025fa47d97712328c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d034201078e384e9e192025… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Oct 10 19:23:14 2006 +0200 d3d8/tests: Win64 printf format warning fixes. --- dlls/d3d8/tests/Makefile.in | 1 - dlls/d3d8/tests/d3d8_main.c | 36 ++++++++++++++++++------------------ dlls/d3d8/tests/device.c | 8 ++++---- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/d3d8/tests/Makefile.in b/dlls/d3d8/tests/Makefile.in index 5a2f52d..4af5df3 100644 --- a/dlls/d3d8/tests/Makefile.in +++ b/dlls/d3d8/tests/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ TESTDLL = d3d8.dll IMPORTS = user32 kernel32 EXTRALIBS = -ldxerr8 -EXTRADEFS = -DWINE_NO_LONG_AS_INT CTESTS = \ d3d8_main.c \ diff --git a/dlls/d3d8/tests/d3d8_main.c b/dlls/d3d8/tests/d3d8_main.c index f70b6d8..a001f31 100644 --- a/dlls/d3d8/tests/d3d8_main.c +++ b/dlls/d3d8/tests/d3d8_main.c @@ -32,37 +32,37 @@ static void test_ValidateVertexShader(vo 0x0000FFFF}; ret=ValidateVertexShader(0,0,0,0,0); - ok(ret==E_FAIL,"ValidateVertexShader returned %lx but expected E_FAIL\n",ret); + ok(ret==E_FAIL,"ValidateVertexShader returned %x but expected E_FAIL\n",ret); ret=ValidateVertexShader(0,0,0,1,0); - ok(ret==E_FAIL,"ValidateVertexShader returned %lx but expected E_FAIL\n",ret); + ok(ret==E_FAIL,"ValidateVertexShader returned %x but expected E_FAIL\n",ret); ret=ValidateVertexShader(simple_vs,0,0,0,0); - ok(ret==S_OK,"ValidateVertexShader returned %lx but expected S_OK\n",ret); + ok(ret==S_OK,"ValidateVertexShader returned %x but expected S_OK\n",ret); ret=ValidateVertexShader(simple_vs,0,0,1,0); - ok(ret==S_OK,"ValidateVertexShader returned %lx but expected S_OK\n",ret); + ok(ret==S_OK,"ValidateVertexShader returned %x but expected S_OK\n",ret); /* seems to do some version checking */ *simple_vs=0xFFFE0100; /* vs_1_0 */ ret=ValidateVertexShader(simple_vs,0,0,0,0); - ok(ret==S_OK,"ValidateVertexShader returned %lx but expected S_OK\n",ret); + ok(ret==S_OK,"ValidateVertexShader returned %x but expected S_OK\n",ret); *simple_vs=0xFFFE0102; /* bogus version */ ret=ValidateVertexShader(simple_vs,0,0,1,0); - ok(ret==E_FAIL,"ValidateVertexShader returned %lx but expected E_FAIL\n",ret); + ok(ret==E_FAIL,"ValidateVertexShader returned %x but expected E_FAIL\n",ret); /* I've seen that applications pass 2nd and 3rd parameter always as 0;simple test with non-zero parameters */ *simple_vs=0xFFFE0101; /* vs_1_1 */ ret=ValidateVertexShader(simple_vs,simple_vs,0,1,0); - ok(ret==E_FAIL,"ValidateVertexShader returned %lx but expected E_FAIL\n",ret); + ok(ret==E_FAIL,"ValidateVertexShader returned %x but expected E_FAIL\n",ret); ret=ValidateVertexShader(simple_vs,0,simple_vs,1,0); - ok(ret==E_FAIL,"ValidateVertexShader returned %lx but expected E_FAIL\n",ret); + ok(ret==E_FAIL,"ValidateVertexShader returned %x but expected E_FAIL\n",ret); /* I've seen 4th parameter is always passed as either 0 or 1, but passing other values doesn't seem to hurt*/ ret=ValidateVertexShader(simple_vs,0,0,12345,0); - ok(ret==S_OK,"ValidateVertexShader returned %lx but expected S_OK\n",ret); + ok(ret==S_OK,"ValidateVertexShader returned %x but expected S_OK\n",ret); /* What is 5th parameter ???? Following works ok */ ret=ValidateVertexShader(simple_vs,0,0,1,simple_vs); - ok(ret==S_OK,"ValidateVertexShader returned %lx but expected S_OK\n",ret); + ok(ret==S_OK,"ValidateVertexShader returned %x but expected S_OK\n",ret); } static void test_ValidatePixelShader(void) @@ -77,30 +77,30 @@ static void test_ValidatePixelShader(voi 0x0000FFFF}; /* END */ ret=ValidatePixelShader(0,0,0,0); - ok(ret==E_FAIL,"ValidatePixelShader returned %lx but expected E_FAIL\n",ret); + ok(ret==E_FAIL,"ValidatePixelShader returned %x but expected E_FAIL\n",ret); ret=ValidatePixelShader(0,0,1,0); - ok(ret==E_FAIL,"ValidatePixelShader returned %lx but expected E_FAIL\n",ret); + ok(ret==E_FAIL,"ValidatePixelShader returned %x but expected E_FAIL\n",ret); ret=ValidatePixelShader(simple_ps,0,0,0); - ok(ret==S_OK,"ValidatePixelShader returned %lx but expected S_OK\n",ret); + ok(ret==S_OK,"ValidatePixelShader returned %x but expected S_OK\n",ret); ret=ValidatePixelShader(simple_ps,0,1,0); - ok(ret==S_OK,"ValidatePixelShader returned %lx but expected S_OK\n",ret); + ok(ret==S_OK,"ValidatePixelShader returned %x but expected S_OK\n",ret); /* seems to do some version checking */ *simple_ps=0xFFFF0105; /* bogus version */ ret=ValidatePixelShader(simple_ps,0,1,0); - ok(ret==E_FAIL,"ValidatePixelShader returned %lx but expected E_FAIL\n",ret); + ok(ret==E_FAIL,"ValidatePixelShader returned %x but expected E_FAIL\n",ret); /* I've seen that applications pass 2nd parameter always as 0;simple test with non-zero parameter */ *simple_ps=0xFFFF0101; /* ps_1_1 */ ret=ValidatePixelShader(simple_ps,simple_ps,1,0); - ok(ret==E_FAIL,"ValidatePixelShader returned %lx but expected E_FAIL\n",ret); + ok(ret==E_FAIL,"ValidatePixelShader returned %x but expected E_FAIL\n",ret); /* I've seen 3rd parameter is always passed as either 0 or 1, but passing other values doesn't seem to hurt*/ ret=ValidatePixelShader(simple_ps,0,12345,0); - ok(ret==S_OK,"ValidatePixelShader returned %lx but expected S_OK\n",ret); + ok(ret==S_OK,"ValidatePixelShader returned %x but expected S_OK\n",ret); /* What is 4th parameter ???? Following works ok */ ret=ValidatePixelShader(simple_ps,0,1,simple_ps); - ok(ret==S_OK,"ValidatePixelShader returned %lx but expected S_OK\n",ret); + ok(ret==S_OK,"ValidatePixelShader returned %x but expected S_OK\n",ret); } START_TEST(d3d8_main) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 901b4ba..e735502 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -270,13 +270,13 @@ static void test_refcount(void) BYTE *data; /* Vertex buffers can be locked multiple times */ hr = IDirect3DVertexBuffer8_Lock(pVertexBuffer, 0, 0, &data, 0); - ok(hr == D3D_OK, "IDirect3DVertexBuffer8::Lock failed with %08lx\n", hr); + ok(hr == D3D_OK, "IDirect3DVertexBuffer8::Lock failed with %08x\n", hr); hr = IDirect3DVertexBuffer8_Lock(pVertexBuffer, 0, 0, &data, 0); - ok(hr == D3D_OK, "IDirect3DVertexBuffer8::Lock failed with %08lx\n", hr); + ok(hr == D3D_OK, "IDirect3DVertexBuffer8::Lock failed with %08x\n", hr); hr = IDirect3DVertexBuffer8_Unlock(pVertexBuffer); - ok(hr == D3D_OK, "IDirect3DVertexBuffer8::Unlock failed with %08lx\n", hr); + ok(hr == D3D_OK, "IDirect3DVertexBuffer8::Unlock failed with %08x\n", hr); hr = IDirect3DVertexBuffer8_Unlock(pVertexBuffer); - ok(hr == D3D_OK, "IDirect3DVertexBuffer8::Unlock failed with %08lx\n", hr); + ok(hr == D3D_OK, "IDirect3DVertexBuffer8::Unlock failed with %08x\n", hr); } cleanup:

1 0

Karsten Elfenbein : wined3d: Corrected names in checkGLcall text.
by Alexandre Julliard 10 Oct '06

10 Oct '06

Module: wine Branch: master Commit: f2d77d103f4bce44c05d759aae848f1584fa8bd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2d77d103f4bce44c05d759aa… Author: Karsten Elfenbein <kelfe(a)gmx.de> Date: Tue Oct 10 18:58:39 2006 +0200 wined3d: Corrected names in checkGLcall text. --- dlls/wined3d/query.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index b7c87c3..b0c1482 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -163,12 +163,12 @@ static HRESULT WINAPI IWineD3DQueryImpl GLuint queryId = ((WineQueryOcclusionData *)This->extendedData)->queryId; GL_EXTCALL(glGetQueryObjectuivARB(queryId, GL_QUERY_RESULT_AVAILABLE_ARB, &available)); - checkGLcall("glGetQueryObjectiv(GL_QUERY_RESULT_AVAILABLE)\n"); + checkGLcall("glGetQueryObjectuivARB(GL_QUERY_RESULT_AVAILABLE)\n"); TRACE("(%p) : available %d.\n", This, available); if (available || dwGetDataFlags & WINED3DGETDATA_FLUSH) { GL_EXTCALL(glGetQueryObjectuivARB(queryId, GL_QUERY_RESULT_ARB, &samples)); - checkGLcall("glGetQueryObjectuiv(GL_QUERY_RESULT)\n"); + checkGLcall("glGetQueryObjectuivARB(GL_QUERY_RESULT)\n"); TRACE("(%p) : Returning %d samples.\n", This, samples); *data = samples; res = S_OK;

1 0

H. Verbeet : wined3d: Improve shader_dump_decl_usage() TRACEs.
by Alexandre Julliard 10 Oct '06

10 Oct '06

Module: wine Branch: master Commit: 94a86c12245a7cd5b85533f600b85659c775c05e URL: http://source.winehq.org/git/wine.git/?a=commit;h=94a86c12245a7cd5b85533f60… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Oct 10 19:23:01 2006 +0200 wined3d: Improve shader_dump_decl_usage() TRACEs. --- dlls/wined3d/baseshader.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 3903fe5..d53f2c8 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -421,50 +421,50 @@ static void shader_dump_decl_usage( switch(usage) { case D3DDECLUSAGE_POSITION: - TRACE("%s%d", "position", idx); + TRACE("position%d", idx); break; case D3DDECLUSAGE_BLENDINDICES: - TRACE("%s", "blend"); + TRACE("blend"); break; case D3DDECLUSAGE_BLENDWEIGHT: - TRACE("%s", "weight"); + TRACE("weight"); break; case D3DDECLUSAGE_NORMAL: - TRACE("%s%d", "normal", idx); + TRACE("normal%d", idx); break; case D3DDECLUSAGE_PSIZE: - TRACE("%s", "psize"); + TRACE("psize"); break; case D3DDECLUSAGE_COLOR: if(idx == 0) { - TRACE("%s", "color"); + TRACE("color"); } else { - TRACE("%s%d", "specular", (idx - 1)); + TRACE("specular%d", (idx - 1)); } break; case D3DDECLUSAGE_TEXCOORD: - TRACE("%s%d", "texture", idx); + TRACE("texture%d", idx); break; case D3DDECLUSAGE_TANGENT: - TRACE("%s", "tangent"); + TRACE("tangent"); break; case D3DDECLUSAGE_BINORMAL: - TRACE("%s", "binormal"); + TRACE("binormal"); break; case D3DDECLUSAGE_TESSFACTOR: - TRACE("%s", "tessfactor"); + TRACE("tessfactor"); break; case D3DDECLUSAGE_POSITIONT: - TRACE("%s%d", "positionT", idx); + TRACE("positionT%d", idx); break; case D3DDECLUSAGE_FOG: - TRACE("%s", "fog"); + TRACE("fog"); break; case D3DDECLUSAGE_DEPTH: - TRACE("%s", "depth"); + TRACE("depth"); break; case D3DDECLUSAGE_SAMPLE: - TRACE("%s", "sample"); + TRACE("sample"); break; default: FIXME("unknown_semantics(%08x)", usage);

1 0

Michael Stefaniuc : uxtheme/tests: Fix Win64 printf format warnings.
by Alexandre Julliard 10 Oct '06

10 Oct '06

Module: wine Branch: master Commit: f2a294f3d2970af1a14c3a65e9fcf75852917ec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2a294f3d2970af1a14c3a65e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 10 15:51:05 2006 +0200 uxtheme/tests: Fix Win64 printf format warnings. --- dlls/uxtheme/tests/system.c | 114 ++++++++++++++++++++++--------------------- 1 files changed, 57 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f2a294f3d2970af1a14c3…

1 0