March 2007 - Wine-Commits - list.winehq.org

Peter Oberndorfer : ntdll: Make exception test not hang when creating process fails.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 1bfbcefb60bd4e0ffc0dbb7dc7d14bb4d319e75c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bfbcefb60bd4e0ffc0dbb7dc… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Fri Mar 2 16:12:54 2007 +0100 ntdll: Make exception test not hang when creating process fails. --- dlls/ntdll/tests/exception.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 08ec9c6..07f4bc6 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -591,6 +591,7 @@ static void test_debugger(void) PVOID code_mem_address = NULL; NTSTATUS status; SIZE_T size_read; + BOOL ret; int counter = 0; si.cb = sizeof(si); @@ -601,8 +602,10 @@ static void test_debugger(void) } sprintf(cmdline, "%s %s %s", my_argv[0], my_argv[1], "debuggee"); - ok(CreateProcess(NULL, cmdline, NULL, NULL, FALSE, DEBUG_PROCESS, NULL, NULL, - &si, &pi) != 0, "error: %u\n", GetLastError()); + ret = CreateProcess(NULL, cmdline, NULL, NULL, FALSE, DEBUG_PROCESS, NULL, NULL, &si, &pi); + ok(ret, "could not create child process error: %u\n", GetLastError()); + if (!ret) + return; do {

1 0

H. Verbeet : wined3d: gl_FogFragCoord is a scalar.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 25cd1c4d2828e144de84b9f5d106bac8b0a8cede URL: http://source.winehq.org/git/wine.git/?a=commit;h=25cd1c4d2828e144de84b9f5d… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Mar 2 14:58:50 2007 +0100 wined3d: gl_FogFragCoord is a scalar. --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 64deb4d..af038b5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1994,7 +1994,7 @@ void vshader_glsl_output_unpack( break; case WINED3DDECLUSAGE_FOG: - shader_addline(buffer, "gl_FogFragCoord%s = OUT%u%s;\n", reg_mask, i, reg_mask); + shader_addline(buffer, "gl_FogFragCoord = OUT%u%s;\n", i, reg_mask); break; default:

1 0

H. Verbeet : wined3d: The texldl instruction takes 3 arguments.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 71a0c6e48243fe5568d6711de1b81269782a1ddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=71a0c6e48243fe5568d6711de… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Mar 2 14:58:46 2007 +0100 wined3d: The texldl instruction takes 3 arguments. --- dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/vertexshader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index e362f65..59cc31e 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -733,7 +733,7 @@ CONST SHADER_OPCODE IWineD3DPixelShaderImpl_shader_ins[] = { {WINED3DSIO_DSY, "dsy", GLNAME_REQUIRE_GLSL, 1, 2, pshader_dsy, NULL, NULL, 0, 0}, {WINED3DSIO_TEXLDD, "texldd", GLNAME_REQUIRE_GLSL, 1, 5, pshader_texldd, NULL, NULL, WINED3DPS_VERSION(2,1), -1}, {WINED3DSIO_SETP, "setp", GLNAME_REQUIRE_GLSL, 1, 3, pshader_setp, NULL, NULL, 0, 0}, - {WINED3DSIO_TEXLDL, "texldl", GLNAME_REQUIRE_GLSL, 1, 2, pshader_texldl, NULL, NULL, 0, 0}, + {WINED3DSIO_TEXLDL, "texldl", GLNAME_REQUIRE_GLSL, 1, 3, pshader_texldl, NULL, NULL, 0, 0}, {WINED3DSIO_PHASE, "phase", GLNAME_REQUIRE_GLSL, 0, 0, pshader_nop, NULL, NULL, 0, 0}, {0, NULL, NULL, 0, 0, NULL, NULL, 0, 0} }; diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 5e79451..a298245 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -553,7 +553,7 @@ CONST SHADER_OPCODE IWineD3DVertexShaderImpl_shader_ins[] = { {WINED3DSIO_LABEL, "label", NULL, 0, 1, vshader_label, NULL, shader_glsl_label, WINED3DVS_VERSION(2,0), -1}, {WINED3DSIO_SETP, "setp", GLNAME_REQUIRE_GLSL, 1, 3, vshader_setp, NULL, NULL, 0, 0}, - {WINED3DSIO_TEXLDL, "texdl", GLNAME_REQUIRE_GLSL, 1, 2, vshader_texldl, NULL, NULL, 0, 0}, + {WINED3DSIO_TEXLDL, "texdl", GLNAME_REQUIRE_GLSL, 1, 3, vshader_texldl, NULL, NULL, 0, 0}, {0, NULL, NULL, 0, 0, NULL, NULL, 0, 0} };

1 0

H. Verbeet : wined3d: Properly check the clipplane index against the limit.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 3aaabf4e2772f6cd8415ffd44a7a283bbccd92dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aaabf4e2772f6cd8415ffd44… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Mar 2 14:58:40 2007 +0100 wined3d: Properly check the clipplane index against the limit. --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 0f107c3..64bce1c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2053,7 +2053,7 @@ static void transform_world(DWORD state, IWineD3DStateBlockImpl *stateblock, Win static void clipplane(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { UINT index = state - STATE_CLIPPLANE(0); - if(isStateDirty(context, STATE_TRANSFORM(WINED3DTS_VIEW)) || index > GL_LIMITS(clipplanes)) { + if(isStateDirty(context, STATE_TRANSFORM(WINED3DTS_VIEW)) || index >= GL_LIMITS(clipplanes)) { return; }

1 0

Paul Vriens : programs/winetest: Raise fileversion.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 1879eaa907430b1ffc28f71f16dded21d39944ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=1879eaa907430b1ffc28f71f1… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Mar 2 19:09:35 2007 +0100 programs/winetest: Raise fileversion. --- programs/winetest/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index b7ff003..f743ffc 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -482,7 +482,7 @@ run_tests (char *logname) report (R_FATAL, "Could not create directory: %s", tempdir); report (R_DIR, tempdir); - xprintf ("Version 3\n"); + xprintf ("Version 4\n"); strres = extract_rcdata (MAKEINTRESOURCE(WINE_BUILD), STRINGRES, &strsize); xprintf ("Tests from build "); if (strres) xprintf ("%.*s", strsize, strres);

1 0

Paul Vriens : shell32/tests: Rewording and cleanup.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: b564a9130cd9e57591e1a72a6f509dcaa5e34624 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b564a9130cd9e57591e1a72a6… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Mar 2 14:12:27 2007 +0100 shell32/tests: Rewording and cleanup. --- dlls/shell32/tests/shlfileop.c | 58 ++++++++++++++++++++-------------------- 1 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 801dbf4..ad710de 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -248,18 +248,18 @@ static void test_delete(void) shfo.hNameMappings = NULL; shfo.lpszProgressTitle = NULL; - ok(!SHFileOperationA(&shfo), "Deletion was successful\n"); - ok(file_exists("test4.txt"), "Directory should not be removed\n"); - ok(!file_exists("test1.txt"), "File should be removed\n"); + ok(!SHFileOperationA(&shfo), "Deletion was not successful\n"); + ok(file_exists("test4.txt"), "Directory should not have been removed\n"); + ok(!file_exists("test1.txt"), "File should have been removed\n"); ret = SHFileOperationA(&shfo); ok(!ret, "Directory exists, but is not removed, ret=%d\n", ret); - ok(file_exists("test4.txt"), "Directory should not be removed\n"); + ok(file_exists("test4.txt"), "Directory should not have been removed\n"); shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; - ok(!SHFileOperationA(&shfo), "Directory removed\n"); - ok(!file_exists("test4.txt"), "Directory should be removed\n"); + ok(!SHFileOperationA(&shfo), "Directory is not removed\n"); + ok(!file_exists("test4.txt"), "Directory should have been removed\n"); ret = SHFileOperationA(&shfo); ok(!ret, "The requested file does not exist, ret=%d\n", ret); @@ -267,33 +267,33 @@ static void test_delete(void) init_shfo_tests(); sprintf(buf, "%s\\%s", CURR_DIR, "test4.txt"); buf[strlen(buf) + 1] = '\0'; - ok(MoveFileA("test1.txt", "test4.txt\\test1.txt"), "Fill the subdirectory\n"); - ok(!SHFileOperationA(&shfo), "Directory removed\n"); - ok(!file_exists("test4.txt"), "Directory is removed\n"); + ok(MoveFileA("test1.txt", "test4.txt\\test1.txt"), "Filling the subdirectory failed\n"); + ok(!SHFileOperationA(&shfo), "Directory is not removed\n"); + ok(!file_exists("test4.txt"), "Directory is not removed\n"); init_shfo_tests(); shfo.pFrom = "test1.txt\0test4.txt\0"; - ok(!SHFileOperationA(&shfo), "Directory and a file removed\n"); - ok(!file_exists("test1.txt"), "The file should be removed\n"); - ok(!file_exists("test4.txt"), "Directory should be removed\n"); - ok(file_exists("test2.txt"), "This file should not be removed\n"); + ok(!SHFileOperationA(&shfo), "Directory and a file are not removed\n"); + ok(!file_exists("test1.txt"), "The file should have been removed\n"); + ok(!file_exists("test4.txt"), "Directory should have been removed\n"); + ok(file_exists("test2.txt"), "This file should not have been removed\n"); /* FOF_FILESONLY does not delete a dir matching a wildcard */ init_shfo_tests(); shfo.fFlags |= FOF_FILESONLY; shfo.pFrom = "*.txt\0"; - ok(!SHFileOperation(&shfo), "Failed to delete files\n"); - ok(!file_exists("test1.txt"), "test1.txt should be removed\n"); - ok(!file_exists("test_5.txt"), "test_5.txt should be removed\n"); - ok(file_exists("test4.txt"), "test4.txt should not be removed\n"); + ok(!SHFileOperation(&shfo), "Failed to delete files\n"); + ok(!file_exists("test1.txt"), "test1.txt should have been removed\n"); + ok(!file_exists("test_5.txt"), "test_5.txt should have been removed\n"); + ok(file_exists("test4.txt"), "test4.txt should not have been removed\n"); /* FOF_FILESONLY only deletes a dir if explicitly specified */ init_shfo_tests(); shfo.pFrom = "test_?.txt\0test4.txt\0"; - ok(!SHFileOperation(&shfo), "Failed to delete files\n"); - ok(!file_exists("test4.txt"), "test4.txt should be removed\n"); - ok(!file_exists("test_5.txt"), "test_5.txt should be removed\n"); - ok(file_exists("test1.txt"), "test1.txt should not be removed\n"); + ok(!SHFileOperation(&shfo), "Failed to delete files and directory\n"); + ok(!file_exists("test4.txt"), "test4.txt should have been removed\n"); + ok(!file_exists("test_5.txt"), "test_5.txt should have been removed\n"); + ok(file_exists("test1.txt"), "test1.txt should not have been removed\n"); /* try to delete an invalid filename */ init_shfo_tests(); @@ -301,7 +301,7 @@ static void test_delete(void) shfo.fFlags &= ~FOF_FILESONLY; shfo.fAnyOperationsAborted = FALSE; ret = SHFileOperation(&shfo); - ok(ret == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED, got %d\n", ret); + ok(ret == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED, got %d\n", ret); ok(!shfo.fAnyOperationsAborted, "Expected no aborted operations\n"); ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); @@ -310,7 +310,7 @@ static void test_delete(void) shfo.pFrom = "test1.txt\0"; shfo.wFunc = 0; ret = SHFileOperation(&shfo); - ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); /* try an invalid list, only one null terminator */ @@ -318,7 +318,7 @@ static void test_delete(void) shfo.pFrom = ""; shfo.wFunc = FO_DELETE; ret = SHFileOperation(&shfo); - ok(ret == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED, got %d\n", ret); + ok(ret == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED, got %d\n", ret); ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); /* delete a dir, and then a file inside the dir, same as @@ -327,8 +327,8 @@ static void test_delete(void) init_shfo_tests(); shfo.pFrom = "testdir2\0testdir2\\one.txt\0"; ret = SHFileOperation(&shfo); - ok(ret == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %d\n", ret); - ok(!file_exists("testdir2"), "Expected testdir2 to not exist\n"); + ok(ret == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %d\n", ret); + ok(!file_exists("testdir2"), "Expected testdir2 to not exist\n"); ok(!file_exists("testdir2\\one.txt"), "Expected testdir2\\one.txt to not exist\n"); /* try the FOF_NORECURSION flag, continues deleting subdirs */ @@ -336,9 +336,9 @@ static void test_delete(void) shfo.pFrom = "testdir2\0"; shfo.fFlags |= FOF_NORECURSION; ret = SHFileOperation(&shfo); - ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); - ok(!file_exists("testdir2\\one.txt"), "Expected testdir2\\one.txt to not exist\n"); - ok(!file_exists("testdir2\\nested"), "Expected testdir2\\nested to exist\n"); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ok(!file_exists("testdir2\\one.txt"), "Expected testdir2\\one.txt to not exist\n"); + ok(!file_exists("testdir2\\nested"), "Expected testdir2\\nested to exist\n"); } /* tests the FO_RENAME action */

1 0

Paul Vriens : msi/tests: Properly cleanup after each test.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 6efffc3829f0b03c2dbcaa54ba84d26742e98dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6efffc3829f0b03c2dbcaa54b… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Mar 2 17:04:46 2007 +0100 msi/tests: Properly cleanup after each test. --- dlls/msi/tests/install.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 534a64a..08c7e2e 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -28,7 +28,7 @@ #include "wine/test.h" -static const char *msifile = "winetest.msi"; +static const char *msifile = "msitest.msi"; CHAR CURR_DIR[MAX_PATH]; CHAR PROG_FILES_DIR[MAX_PATH]; @@ -964,7 +964,8 @@ static void delete_cab_files(void) CHAR path[MAX_PATH]; lstrcpyA(path, CURR_DIR); - lstrcatA(path, "\\*.cab\0"); + lstrcatA(path, "\\*.cab"); + path[strlen(path) + 1] = '\0'; shfl.hwnd = NULL; shfl.wFunc = FO_DELETE; @@ -1103,10 +1104,11 @@ static void test_mixedmedia(void) ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n"); - DeleteFile("maximus"); - DeleteFile("augustus"); - DeleteFile("caesar"); + /* Delete the files in the temp (current) folder */ + DeleteFile("msitest\\maximus"); + DeleteFile("msitest\\augustus"); RemoveDirectory("msitest"); + DeleteFile("caesar"); DeleteFile("test1.cab"); DeleteFile(msifile); } @@ -1204,6 +1206,9 @@ static void test_readonlyfile(void) ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n"); + /* Delete the files in the temp (current) folder */ + DeleteFile("msitest\\maximus"); + RemoveDirectory("msitest"); DeleteFile(msifile); }

1 0

Paul Vriens : advapi32/tests: Make use of skip.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: d478f5daddef392ee6fc337f7d1cdf8688f9c002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d478f5daddef392ee6fc337f7… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Mar 2 14:09:19 2007 +0100 advapi32/tests: Make use of skip. --- dlls/advapi32/tests/lsa.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 2daf65d..07dd611 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -54,6 +54,8 @@ static BOOL init(void) if (pLsaClose && pLsaFreeMemory && pLsaOpenPolicy && pLsaQueryInformationPolicy && pConvertSidToStringSidA) return TRUE; + else + skip("Needed functions are not available\n"); } return FALSE;

1 0

appdb/ include/maintainer.php include/objectMa ...
by WineHQ March 4, 2007

March 4, 2007

ChangeSet ID: 30941 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/04 17:22:57 Modified files: include : maintainer.php objectManager.php sidebar_admin.php Removed files: admin : adminMaintainerQueue.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Let ObjectManager handle maintainer requests Patch: http://cvs.winehq.org/patch.py?id=30941 Old revision New revision Changes Path 1.37 Removed +0 -0 appdb/admin/adminMaintainerQueue.php 1.25 1.26 +78 -26 appdb/include/maintainer.php 1.3 1.4 +53 -16 appdb/include/objectManager.php 1.26 1.27 +8 -4 appdb/include/sidebar_admin.php

1 0

lostwages/ include/winehq.conf news/2007030201.xml
by Alexandre Julliard March 2, 2007

March 2, 2007

ChangeSet ID: 30940 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2007/03/02 11:30:52 Modified files: include : winehq.conf Added files: news : 2007030201.xml Log message: Release 0.9.32 Patch: http://cvs.winehq.org/patch.py?id=30940 Old revision New revision Changes Path 1.54 1.55 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2007030201.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.54 lostwages/include/winehq.conf:1.55 --- lostwages/include/winehq.conf:1.54 2 Mar 2007 17:30:52 -0000 +++ lostwages/include/winehq.conf 2 Mar 2007 17:30:52 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.31 +snapshot_date: 0.9.32 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2007030201.xml diff -u -p /dev/null lostwages/news/2007030201.xml:1.1 --- /dev/null 2 Mar 2007 17:30:53 -0000 +++ lostwages/news/2007030201.xml 2 Mar 2007 17:30:53 -0000 @@ -0,0 +1,24 @@ +<news> +<date>March 2, 2007</date> +<title>Wine 0.9.32 Released</title> +<body> +<p>Wine 0.9.32 was released today, with the following main changes:</p> + +<ul> +<li>Many Direct3D fixes and performance improvements.</li> +<li>Several new features in the builtin cmd.exe.</li> +<li>Improvements to HTML help support.</li> +<li>Lots of bug fixes.</li> +</ul> + +<p> +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.32.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.32">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. +</p> +</body> +</news>

1 0