July 2006 - Wine-commits - list.winehq.org

appdb/. account.php addcomment.php appbrowse.p ...
by WineHQ 06 Jul '06

06 Jul '06

ChangeSet ID: 26251 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/06 13:37:35 Modified files: . : account.php addcomment.php appbrowse.php appimage.php appview.php deletecomment.php index.php maintainerdelete.php maintainersubmit.php preferences.php screenshots.php search.php viewbugs.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Update the comments in some files Patch: http://cvs.winehq.org/patch.py?id=26251 Old revision New revision Changes Path 1.28 1.29 +13 -4 appdb/account.php 1.27 1.28 +16 -16 appdb/addcomment.php 1.17 1.18 +7 -3 appdb/appbrowse.php 1.21 1.22 +20 -8 appdb/appimage.php 1.87 1.88 +19 -7 appdb/appview.php 1.26 1.27 +19 -10 appdb/deletecomment.php 1.35 1.36 +10 -8 appdb/index.php 1.20 1.21 +19 -7 appdb/maintainerdelete.php 1.28 1.29 +17 -7 appdb/maintainersubmit.php 1.29 1.30 +25 -10 appdb/preferences.php 1.35 1.36 +24 -16 appdb/screenshots.php 1.18 1.19 +10 -6 appdb/search.php 1.6 1.7 +11 -5 appdb/viewbugs.php

1 0

appdb/ ./account.php ./addcomment.php ./appbro ...
by WineHQ 06 Jul '06

06 Jul '06

ChangeSet ID: 26250 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/06 12:59:52 Modified files: . : account.php addcomment.php appbrowse.php appimage.php appsubmit.php appview.php commentview.php deletecomment.php distributionView.php maintainerdelete.php maintainersubmit.php preferences.php testResults.php vendorview.php viewbugs.php admin : addAppNote.php addCategory.php adminAppDataQueue.php adminAppQueue.php adminBugs.php adminMaintainerQueue.php adminMaintainers.php adminScreenshots.php adminTestResults.php adminUsers.php editAppFamily.php editAppNote.php editAppVersion.php editBundle.php editDistribution.php editVendor.php moveAppVersion.php include : application.php util.php version.php vote.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Remove unnecessary exit calls after redirect() and util_show_error_page() calls Patch: http://cvs.winehq.org/patch.py?id=26250 Old revision New revision Changes Path 1.27 1.28 +0 -2 appdb/account.php 1.26 1.27 +1 -4 appdb/addcomment.php 1.16 1.17 +1 -4 appdb/appbrowse.php 1.20 1.21 +1 -6 appdb/appimage.php 1.47 1.48 +0 -7 appdb/appsubmit.php 1.86 1.87 +0 -9 appdb/appview.php 1.10 1.11 +0 -3 appdb/commentview.php 1.25 1.26 +0 -1 appdb/deletecomment.php 1.13 1.14 +0 -3 appdb/distributionView.php 1.19 1.20 +0 -3 appdb/maintainerdelete.php 1.27 1.28 +0 -7 appdb/maintainersubmit.php 1.28 1.29 +0 -3 appdb/preferences.php 1.8 1.9 +0 -1 appdb/testResults.php 1.18 1.19 +0 -3 appdb/vendorview.php 1.5 1.6 +2 -6 appdb/viewbugs.php 1.26 1.27 +0 -2 appdb/admin/addAppNote.php 1.12 1.13 +1 -3 appdb/admin/addCategory.php 1.26 1.27 +0 -3 appdb/admin/adminAppDataQueue.php 1.61 1.62 +2 -9 appdb/admin/adminAppQueue.php 1.7 1.8 +0 -4 appdb/admin/adminBugs.php 1.26 1.27 +1 -3 appdb/admin/adminMaintainerQueue.php 1.23 1.24 +0 -3 appdb/admin/adminMaintainers.php 1.10 1.11 +1 -5 appdb/admin/adminScreenshots.php 1.8 1.9 +0 -3 appdb/admin/adminTestResults.php 1.10 1.11 +1 -3 appdb/admin/adminUsers.php 1.39 1.40 +0 -6 appdb/admin/editAppFamily.php 1.25 1.26 +0 -6 appdb/admin/editAppNote.php 1.37 1.38 +0 -6 appdb/admin/editAppVersion.php 1.12 1.13 +0 -3 appdb/admin/editBundle.php 1.6 1.7 +0 -4 appdb/admin/editDistribution.php 1.12 1.13 +0 -3 appdb/admin/editVendor.php 1.6 1.7 +0 -6 appdb/admin/moveAppVersion.php 1.56 1.57 +0 -3 appdb/include/application.php 1.64 1.65 +1 -0 appdb/include/util.php 1.64 1.65 +3 -11 appdb/include/version.php 1.20 1.21 +0 -3 appdb/include/vote.php

1 0

appdb/ ./account.php ./addcomment.php ./appbro ...
by WineHQ 06 Jul '06

06 Jul '06

ChangeSet ID: 26249 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/06 12:27:55 Modified files: . : account.php addcomment.php appbrowse.php appimage.php appsubmit.php appview.php commentview.php deletecomment.php distributionView.php index.php maintainerdelete.php maintainersubmit.php preferences.php screenshots.php search.php testResults.php vendorview.php viewScreenshots.php viewbugs.php votestats.php admin : addAppNote.php addCategory.php adminAppDataQueue.php adminAppQueue.php adminBugs.php adminCommentView.php adminMaintainerQueue.php adminMaintainers.php adminScreenshots.php adminTestResults.php adminUsers.php deleteAny.php editAppFamily.php editAppNote.php editAppVersion.php editBundle.php editDistribution.php editVendor.php moveAppVersion.php help : appdb_faq.help index.php maintainer_guidelines.help include : application.php bugs.php category.php comment.php distributions.php form_login.php monitor.php note.php screenshot.php sidebar.php sidebar_login.php testResults.php url.php user.php util.php version.php vote.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Prefix all GPC variables according to our coding standard Patch: http://cvs.winehq.org/patch.py?id=26249 Old revision New revision Changes Path 1.26 1.27 +5 -5 appdb/account.php 1.25 1.26 +20 -20 appdb/addcomment.php 1.15 1.16 +12 -12 appdb/appbrowse.php 1.19 1.20 +9 -9 appdb/appimage.php 1.46 1.47 +46 -45 appdb/appsubmit.php 1.85 1.86 +28 -28 appdb/appview.php 1.9 1.10 +5 -5 appdb/commentview.php 1.24 1.25 +10 -10 appdb/deletecomment.php 1.12 1.13 +6 -6 appdb/distributionView.php 1.34 1.35 +5 -11 appdb/index.php 1.18 1.19 +16 -16 appdb/maintainerdelete.php 1.26 1.27 +25 -25 appdb/maintainersubmit.php 1.27 1.28 +8 -8 appdb/preferences.php 1.34 1.35 +24 -24 appdb/screenshots.php 1.17 1.18 +2 -2 appdb/search.php 1.7 1.8 +14 -14 appdb/testResults.php 1.17 1.18 +8 -8 appdb/vendorview.php 1.3 1.4 +12 -12 appdb/viewScreenshots.php 1.4 1.5 +9 -9 appdb/viewbugs.php 1.22 1.23 +11 -11 appdb/votestats.php 1.25 1.26 +1 -1 appdb/admin/addAppNote.php 1.11 1.12 +14 -14 appdb/admin/addCategory.php 1.25 1.26 +26 -26 appdb/admin/adminAppDataQueue.php 1.60 1.61 +51 -51 appdb/admin/adminAppQueue.php 1.6 1.7 +34 -34 appdb/admin/adminBugs.php 1.13 1.14 +11 -11 appdb/admin/adminCommentView.php 1.25 1.26 +23 -23 appdb/admin/adminMaintainerQueue.php 1.22 1.23 +11 -11 appdb/admin/adminMaintainers.php 1.9 1.10 +25 -25 appdb/admin/adminScreenshots.php 1.7 1.8 +20 -20 appdb/admin/adminTestResults.php 1.9 1.10 +5 -5 appdb/admin/adminUsers.php 1.18 1.19 +12 -12 appdb/admin/deleteAny.php 1.38 1.39 +14 -14 appdb/admin/editAppFamily.php 1.24 1.25 +2 -2 appdb/admin/editAppNote.php 1.36 1.37 +19 -19 appdb/admin/editAppVersion.php 1.11 1.12 +12 -12 appdb/admin/editBundle.php 1.5 1.6 +4 -4 appdb/admin/editDistribution.php 1.11 1.12 +4 -4 appdb/admin/editVendor.php 1.5 1.6 +14 -14 appdb/admin/moveAppVersion.php 1.8 1.9 +1 -1 appdb/help/appdb_faq.help 1.8 1.9 +3 -3 appdb/help/index.php 1.4 1.5 +5 -5 appdb/help/maintainer_guidelines.help 1.55 1.56 +50 -50 appdb/include/application.php 1.12 1.13 +9 -9 appdb/include/bugs.php 1.19 1.20 +1 -1 appdb/include/category.php 1.23 1.24 +15 -15 appdb/include/comment.php 1.9 1.10 +1 -1 appdb/include/distributions.php 1.6 1.7 +6 -6 appdb/include/form_login.php 1.7 1.8 +4 -4 appdb/include/monitor.php 1.13 1.14 +1 -1 appdb/include/note.php 1.41 1.42 +10 -10 appdb/include/screenshot.php 1.19 1.20 +4 -4 appdb/include/sidebar.php 1.14 1.15 +4 -4 appdb/include/sidebar_login.php 1.28 1.29 +7 -7 appdb/include/testResults.php 1.7 1.8 +6 -6 appdb/include/url.php 1.74 1.75 +1 -1 appdb/include/user.php 1.63 1.64 +19 -19 appdb/include/util.php 1.63 1.64 +56 -56 appdb/include/version.php 1.19 1.20 +16 -16 appdb/include/vote.php

1 0

appdb/cron .htaccess
by WineHQ 06 Jul '06

06 Jul '06

ChangeSet ID: 26248 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/06 10:54:58 Modified files: cron : .htaccess Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Make sure the .htaccess file in cron/ disables magic quotes like the one in the lowest level appdb directory Patch: http://cvs.winehq.org/patch.py?id=26248 Old revision New revision Changes Path 1.1 1.2 +7 -0 appdb/cron/.htaccess Index: appdb/cron/.htaccess diff -u -p appdb/cron/.htaccess:1.1 appdb/cron/.htaccess:1.2 --- appdb/cron/.htaccess:1.1 6 Jul 2006 15:54:58 -0000 +++ appdb/cron/.htaccess 6 Jul 2006 15:54:58 -0000 @@ -1 +1,8 @@ Deny from all + +#Modify PHP configuration +php_value register_globals 0 +php_value short_open_tag 0 +php_value register_long_arrays 0 +php_value magic_quotes_gpc 0 +

1 0

Saulius Krasuckas : kernel/tests: More tests for OpenFile.
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: 05bdf67d2e6b8dd50b8722861ec0602de6ba2c81 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=05bdf67d2e6b8dd50b87228… Author: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Date: Thu Jul 6 11:04:51 2006 +0300 kernel/tests: More tests for OpenFile. --- dlls/kernel/tests/file.c | 141 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 130 insertions(+), 11 deletions(-) diff --git a/dlls/kernel/tests/file.c b/dlls/kernel/tests/file.c index a0e8181..e3506a9 100644 --- a/dlls/kernel/tests/file.c +++ b/dlls/kernel/tests/file.c @@ -1451,56 +1451,175 @@ static void test_OpenFile(void) DWORD retval; static const char *file = "\\regsvr32.exe"; + static const char *foo = ".\\foo-bar-foo.baz"; + static const char *foo_too_long = ".\\foo-bar-foo.baz+++++++++++++++" + "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" + "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" + "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" + "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" + "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"; + static const char *backslash = "\\"; char buff[MAX_PATH]; + char buff_long[4*MAX_PATH]; + char filled_0xA5[OFS_MAXPATHNAME]; UINT length; /* Check for existing file */ length = GetSystemDirectoryA(buff, MAX_PATH); - if ((length + lstrlen(file) < MAX_PATH)) + if (length + lstrlen(file) < MAX_PATH) { - lstrcatA(buff, file); + lstrcatA(buff, file); + memset(&ofs, 0xA5, sizeof(ofs)); + SetLastError(0xfaceabee); + + hFile = OpenFile(buff, &ofs, OF_EXIST); + ok( hFile == TRUE, "%s not found : %ld\n", buff, GetLastError() ); + ok( GetLastError() == 0xfaceabee || GetLastError() == ERROR_SUCCESS, + "GetLastError() returns %ld\n", GetLastError() ); + ok( ofs.cBytes == sizeof(ofs), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); + ok( ofs.nErrCode == ERROR_SUCCESS, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); + ok( lstrcmpiA(ofs.szPathName, buff) == 0, + "OpenFile returned '%s', but was expected to return '%s' or string filled with 0xA5\n", + ofs.szPathName, buff ); + } + + memset(&filled_0xA5, 0xA5, OFS_MAXPATHNAME); + length = GetCurrentDirectoryA(MAX_PATH, buff); - hFile = OpenFile(buff, &ofs, OF_EXIST); - ok( hFile == TRUE, "%s not found : %ld\n", buff, GetLastError()); + /* Check for nonexistent file */ + if (length + lstrlenA(foo + 1) < MAX_PATH) + { + lstrcatA(buff, foo + 1); /* Avoid '.' during concatenation */ + memset(&ofs, 0xA5, sizeof(ofs)); + SetLastError(0xfaceabee); + + hFile = OpenFile(foo, &ofs, OF_EXIST); + ok( hFile == HFILE_ERROR, "hFile != HFILE_ERROR : %ld\n", GetLastError()); + ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() returns %ld\n", GetLastError() ); + todo_wine + ok( ofs.cBytes == 0xA5, "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); + ok( ofs.nErrCode == ERROR_FILE_NOT_FOUND, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); + ok( lstrcmpiA(ofs.szPathName, buff) == 0 || strncmp(ofs.szPathName, filled_0xA5, OFS_MAXPATHNAME) == 0, + "OpenFile returned '%s', but was expected to return '%s' or string filled with 0xA5\n", + ofs.szPathName, buff ); } - /* Check for nonexistent file */ - SetLastError(0xfaceabee); - hFile = OpenFile(".\\foo-bar-foo.baz", &ofs, OF_EXIST); - ok( hFile == HFILE_ERROR, "hFile != HFILE_ERROR : %ld\n", GetLastError()); - ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() returns %ld\n", GetLastError() ); + length = GetCurrentDirectoryA(MAX_PATH, buff_long); + length += lstrlenA(foo_too_long + 1); + + /* Check for nonexistent file with too long filename */ + if (length >= OFS_MAXPATHNAME && length < sizeof(buff_long)) + { + lstrcatA(buff_long, foo_too_long + 1); /* Avoid '.' during concatenation */ + memset(&ofs, 0xA5, sizeof(ofs)); + SetLastError(0xfaceabee); + + hFile = OpenFile(foo_too_long, &ofs, OF_EXIST); + ok( hFile == HFILE_ERROR, "hFile != HFILE_ERROR : %ld\n", GetLastError()); + ok( GetLastError() == ERROR_INVALID_DATA || GetLastError() == ERROR_FILENAME_EXCED_RANGE, + "GetLastError() returns %ld\n", GetLastError() ); + todo_wine + ok( ofs.cBytes == 0xA5, "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); + ok( ofs.nErrCode == ERROR_INVALID_DATA || ofs.nErrCode == ERROR_FILENAME_EXCED_RANGE, + "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); + ok( strncmp(ofs.szPathName, filled_0xA5, OFS_MAXPATHNAME) == 0, + "OpenFile returned '%s', but was expected to return string filled with 0xA5\n", + ofs.szPathName ); + } + + length = GetCurrentDirectoryA(MAX_PATH, buff); + length += lstrlenA(backslash); + length += lstrlenA(filename); + if (length >= MAX_PATH) + { + trace("Buffer too small, requested length = %d, but MAX_PATH = %d. Skipping test.\n", length, MAX_PATH); + return; + } + lstrcatA(buff, backslash); + lstrcatA(buff, filename); + + memset(&ofs, 0xA5, sizeof(ofs)); + SetLastError(0xfaceabee); /* Create an empty file */ hFile = OpenFile(filename, &ofs, OF_CREATE); ok( hFile != HFILE_ERROR, "OpenFile failed to create nonexistent file\n" ); + ok( GetLastError() == 0xfaceabee || GetLastError() == ERROR_SUCCESS, + "GetLastError() returns %ld\n", GetLastError() ); + ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); + ok( ofs.nErrCode == ERROR_SUCCESS, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); ret = CloseHandle((HANDLE)hFile); ok( ret == TRUE, "CloseHandle() returns %d\n", ret ); retval = GetFileAttributesA(filename); ok( retval != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA: error %ld\n", GetLastError() ); - /* Check various opening options */ + memset(&ofs, 0xA5, sizeof(ofs)); + SetLastError(0xfaceabee); + /* Check various opening options: */ + /* for reading only, */ hFile = OpenFile(filename, &ofs, OF_READ); ok( hFile != HFILE_ERROR, "OpenFile failed on read\n" ); + ok( GetLastError() == 0xfaceabee || GetLastError() == ERROR_SUCCESS, + "GetLastError() returns %ld\n", GetLastError() ); + ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); + ok( ofs.nErrCode == ERROR_SUCCESS, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); + ok( lstrcmpiA(ofs.szPathName, buff) == 0, + "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); ret = CloseHandle((HANDLE)hFile); ok( ret == TRUE, "CloseHandle() returns %d\n", ret ); + memset(&ofs, 0xA5, sizeof(ofs)); + SetLastError(0xfaceabee); + /* for writing only, */ hFile = OpenFile(filename, &ofs, OF_WRITE); ok( hFile != HFILE_ERROR, "OpenFile failed on write\n" ); + ok( GetLastError() == 0xfaceabee || GetLastError() == ERROR_SUCCESS, + "GetLastError() returns %ld\n", GetLastError() ); + ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); + ok( ofs.nErrCode == ERROR_SUCCESS, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); + ok( lstrcmpiA(ofs.szPathName, buff) == 0, + "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); ret = CloseHandle((HANDLE)hFile); ok( ret == TRUE, "CloseHandle() returns %d\n", ret ); + memset(&ofs, 0xA5, sizeof(ofs)); + SetLastError(0xfaceabee); + /* for reading and writing, */ hFile = OpenFile(filename, &ofs, OF_READWRITE); ok( hFile != HFILE_ERROR, "OpenFile failed on read/write\n" ); + ok( GetLastError() == 0xfaceabee || GetLastError() == ERROR_SUCCESS, + "GetLastError() returns %ld\n", GetLastError() ); + ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); + ok( ofs.nErrCode == ERROR_SUCCESS, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); + ok( lstrcmpiA(ofs.szPathName, buff) == 0, + "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); ret = CloseHandle((HANDLE)hFile); ok( ret == TRUE, "CloseHandle() returns %d\n", ret ); + memset(&ofs, 0xA5, sizeof(ofs)); + SetLastError(0xfaceabee); + /* for checking file presence. */ hFile = OpenFile(filename, &ofs, OF_EXIST); ok( hFile == 1, "OpenFile failed on finding our created file\n" ); - + ok( GetLastError() == 0xfaceabee || GetLastError() == ERROR_SUCCESS, + "GetLastError() returns %ld\n", GetLastError() ); + ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); + ok( ofs.nErrCode == ERROR_SUCCESS, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); + ok( lstrcmpiA(ofs.szPathName, buff) == 0, + "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); + + memset(&ofs, 0xA5, sizeof(ofs)); + SetLastError(0xfaceabee); /* Delete the file and make sure it doesn't exist anymore */ hFile = OpenFile(filename, &ofs, OF_DELETE); ok( hFile == 1, "OpenFile failed on delete (%d)\n", hFile ); + ok( GetLastError() == 0xfaceabee || GetLastError() == ERROR_SUCCESS, + "GetLastError() returns %ld\n", GetLastError() ); + ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); + ok( ofs.nErrCode == ERROR_SUCCESS, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); + ok( lstrcmpiA(ofs.szPathName, buff) == 0, + "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); retval = GetFileAttributesA(filename); ok( retval == INVALID_FILE_ATTRIBUTES, "GetFileAttributesA succeeded on deleted file\n" );

1 0

Jason Green : wined3d: Fix D3DSIO_M#X# instruction for both ARB and GLSL shaders.
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: 3529e0ceeb633a3dbc2335f2c74727734468e23e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3529e0ceeb633a3dbc2335f… Author: Jason Green <jave27(a)gmail.com> Date: Wed Jul 5 22:35:56 2006 -0400 wined3d: Fix D3DSIO_M#X# instruction for both ARB and GLSL shaders. This instruction was being handled incorrectly in the case where the 2nd src argument contained a relatively addressed constant. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 47791bc..e4d7e4d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -809,6 +809,7 @@ void vshader_hw_mnxn(SHADER_OPCODE_ARG* tmpArg.buffer = arg->buffer; tmpArg.src[0] = arg->src[0]; tmpArg.src_addr[0] = arg->src_addr[0]; + tmpArg.src_addr[1] = arg->src_addr[1]; tmpArg.reg_maps = arg->reg_maps; switch(arg->opcode->opcode) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d15874c..d7ec6a2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -995,6 +995,7 @@ void shader_glsl_mnxn(SHADER_OPCODE_ARG* tmpArg.buffer = arg->buffer; tmpArg.src[0] = arg->src[0]; tmpArg.src_addr[0] = arg->src_addr[0]; + tmpArg.src_addr[1] = arg->src_addr[1]; tmpArg.reg_maps = arg->reg_maps; switch(arg->opcode->opcode) { @@ -1025,7 +1026,6 @@ void shader_glsl_mnxn(SHADER_OPCODE_ARG* for (i = 0; i < nComponents; i++) { tmpArg.dst = ((arg->dst) & ~D3DSP_WRITEMASK_ALL)|(D3DSP_WRITEMASK_0<<i); tmpArg.src[1] = arg->src[1]+i; - tmpArg.src_addr[1] = arg->src[1]+i; shader_glsl_dot(&tmpArg); } }

1 0

Ivan Gyurdiev : wined3d: Clean up drawPrimitive/drawPrimitiveDrawStrided.
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: 0472e9cd490a12c8eacdcdc2dff3223abc842e30 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0472e9cd490a12c8eacdcdc… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Tue Jul 4 03:08:39 2006 -0600 wined3d: Clean up drawPrimitive/drawPrimitiveDrawStrided. --- dlls/wined3d/drawprim.c | 302 +++++++++++++++++++---------------------------- 1 files changed, 120 insertions(+), 182 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=0472e9cd490a12c8eac…

1 0

Paul Vriens : wininet: Return NULL handle if no connection is established.
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: 7687e0477c1eb041926710c01f696d09571af637 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7687e0477c1eb041926710c… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Jul 4 20:06:58 2006 +0200 wininet: Return NULL handle if no connection is established. --- dlls/wininet/ftp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 7589a78..03540e6 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1577,7 +1577,7 @@ lend: } /*********************************************************************** - * FTP_FtpRenameFileA (Internal) + * FTP_FtpRenameFileW (Internal) * * Rename a file on the ftp server * @@ -1806,6 +1806,7 @@ lerror: { HeapFree(GetProcessHeap(), 0, lpwfs); WININET_FreeHandle( handle ); + handle = NULL; lpwfs = NULL; }

1 0

Ivan Gyurdiev : wined3d: Implement FVF to DECL9 conversion (with tests).
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: 1309844913ddca81ca0ead2b8a040de9766225d8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1309844913ddca81ca0ead2… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Tue Jul 4 02:53:13 2006 -0600 wined3d: Implement FVF to DECL9 conversion (with tests). --- dlls/d3d9/d3d9_private.h | 7 + dlls/d3d9/device.c | 22 ++ dlls/d3d9/tests/vertexdeclaration.c | 473 +++++++++++++++++++++++++++++++++++ dlls/d3d9/vertexdeclaration.c | 156 ++++++++++++ dlls/wined3d/device.c | 14 - 5 files changed, 657 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=1309844913ddca81ca0…

1 0

Ivan Gyurdiev : wined3d: Fix STREAM flag override.
by Alexandre Julliard 06 Jul '06

06 Jul '06

Module: wine Branch: refs/heads/master Commit: bbe7b40a71e18be90a6f4fbd2300a6c82af95a87 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bbe7b40a71e18be90a6f4fb… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Tue Jul 4 01:27:25 2006 -0600 wined3d: Fix STREAM flag override. --- dlls/wined3d/device.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index edaa221..860eba5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2424,7 +2424,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3D_OK; } - /* Not recording... */ + /* Same stream object: no action */ + if (oldSrc == pStreamData) + return WINED3D_OK; + /* Need to do a getParent and pass the reffs up */ /* MSDN says ..... When an application no longer holds a references to this interface, the interface will automatically be freed. which suggests that we shouldn't be ref counting? and do need a _release on the stream source to reset the stream source

1 0