wine-commits January 2007

wine-commits@winehq.org

4 participants
893 discussions

Detlef Riekenberg : localspl/tests: Extend test for XcvDataPort_MonitorUI.
by Alexandre Julliard 17 Jan '07

17 Jan '07

Module: wine Branch: master Commit: 7ea06b59e9b02f58cb4e9787ca99eeb85c1cbebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ea06b59e9b02f58cb4e9787c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jan 16 00:36:11 2007 +0100 localspl/tests: Extend test for XcvDataPort_MonitorUI. --- dlls/localspl/tests/localmon.c | 36 ++++++++++++++++++++++++++++++++---- 1 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index edbd582..7a3464b 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -342,7 +342,7 @@ static void test_XcvClosePort(void) /* ########################### */ -static void test_XcvDataPort(void) +static void test_XcvDataPort_MonitorUI(void) { DWORD res; HANDLE hXcv; @@ -363,11 +363,20 @@ static void test_XcvDataPort(void) needed = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, NULL, 0, &needed); + if (res == ERROR_INVALID_PARAMETER) { + pXcvClosePort(hXcv); + skip("'MonitorUI' nor supported\n"); + return; + } ok( (res == ERROR_INSUFFICIENT_BUFFER) && (needed <= MAX_PATH), "returned %d with %u and 0x%x (expected 'ERROR_INSUFFICIENT_BUFFER' " " and '<= MAX_PATH')\n", res, GetLastError(), needed); - if (needed > MAX_PATH) goto xcv_cleanup; + if (needed > MAX_PATH) { + pXcvClosePort(hXcv); + skip("buffer overflow (%u)\n", needed); + return; + } len = needed; /* the command is required */ @@ -410,6 +419,7 @@ static void test_XcvDataPort(void) /* off by one: smaller */ + /* the buffer is not modified for NT4, w2k, XP */ needed = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len-1, &needed); @@ -424,7 +434,25 @@ static void test_XcvDataPort(void) ok( res == ERROR_SUCCESS, "returned %d with %u and 0x%x " "(expected 'ERROR_SUCCESS')\n", res, GetLastError(), needed); -xcv_cleanup: + + pXcvClosePort(hXcv); + + + /* small check without access-rights: */ + hXcv = (HANDLE) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvOpenPort(emptyW, 0, &hXcv); + ok(res, "returned %d with %u and %p (expected '!= 0')\n", res, GetLastError(), hXcv); + if (!res) return; + + /* The ACCESS_MASK is ignored for "MonitorUI" */ + memset(buffer, 0, len); + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, buffer, sizeof(buffer), &needed); + ok( res == ERROR_SUCCESS, "returned %d with %u and 0x%x " + "(expected 'ERROR_SUCCESS')\n", res, GetLastError(), needed); + pXcvClosePort(hXcv); } @@ -574,6 +602,6 @@ START_TEST(localmon) test_DeletePort(); test_EnumPorts(); test_XcvClosePort(); - test_XcvDataPort(); + test_XcvDataPort_MonitorUI(); test_XcvOpenPort(); }

1 0

appdb/ ./appsubmit.php ./testResults.php admin ...
by WineHQ 17 Jan '07

17 Jan '07

ChangeSet ID: 30882 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/16 21:18:49 Modified files: . : appsubmit.php testResults.php admin : adminAppQueue.php adminMaintainerQueue.php adminTestResults.php editAppFamily.php editAppNote.php editAppVersion.php editDistribution.php editVendor.php include : application.php distribution.php downloadurl.php maintainer.php note.php testData.php vendor.php version.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix naming of OutputEditor() to be outputEditor() Patch: http://cvs.winehq.org/patch.py?id=30882 Old revision New revision Changes Path 1.59 1.60 +4 -8 appdb/appsubmit.php 1.24 1.25 +1 -1 appdb/testResults.php 1.70 1.71 +6 -9 appdb/admin/adminAppQueue.php 1.36 1.37 +1 -1 appdb/admin/adminMaintainerQueue.php 1.18 1.19 +1 -1 appdb/admin/adminTestResults.php 1.44 1.45 +1 -1 appdb/admin/editAppFamily.php 1.30 1.31 +1 -1 appdb/admin/editAppNote.php 1.45 1.46 +3 -3 appdb/admin/editAppVersion.php 1.12 1.13 +1 -1 appdb/admin/editDistribution.php 1.16 1.17 +1 -1 appdb/admin/editVendor.php 1.84 1.85 +3 -3 appdb/include/application.php 1.4 1.5 +3 -3 appdb/include/distribution.php 1.7 1.8 +1 -1 appdb/include/downloadurl.php 1.22 1.23 +1 -1 appdb/include/maintainer.php 1.22 1.23 +3 -3 appdb/include/note.php 1.20 1.21 +4 -4 appdb/include/testData.php 1.8 1.9 +1 -1 appdb/include/vendor.php 1.93 1.94 +1 -1 appdb/include/version.php

1 0

appdb/include html.php
by WineHQ 17 Jan '07

17 Jan '07

ChangeSet ID: 30881 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/16 21:17:26 Modified files: include : html.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Replace tabs by four spaces Patch: http://cvs.winehq.org/patch.py?id=30881 Old revision New revision Changes Path 1.11 1.12 +93 -93 appdb/include/html.php

1 0

appdb/include downloadurl.php
by WineHQ 17 Jan '07

17 Jan '07

ChangeSet ID: 30880 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/16 21:16:22 Modified files: include : downloadurl.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add more downloadurl functions and use them in processForm() Patch: http://cvs.winehq.org/patch.py?id=30880 Old revision New revision Changes Path 1.6 1.7 +62 -16 appdb/include/downloadurl.php Index: appdb/include/downloadurl.php diff -u -p appdb/include/downloadurl.php:1.6 appdb/include/downloadurl.php:1.7 --- appdb/include/downloadurl.php:1.6 17 Jan 2007 3:16:22 -0000 +++ appdb/include/downloadurl.php 17 Jan 2007 3:16:22 -0000 @@ -21,7 +21,7 @@ class downloadurl { $hResult = query_parameters("SELECT id, versionId, description, url, submitTime, submitterId, queued FROM appData WHERE id = '?'", - $this->iId); + $iId); if($hResult && mysql_num_rows($hResult)) { @@ -139,11 +139,12 @@ class downloadurl while($oRow = mysql_fetch_object($hResult)) { + $oDownloadurl = new downloadurl($oRow->id); + /* Remove URL */ if($aValues["bRemove$oRow->id"]) { - if(!query_parameters("DELETE FROM appData WHERE id = '?'", - $oRow->id)) + if(!$oDownloadurl->delete()) return FALSE; $sWhatChangedRemove .= "Removed\nURL: $oRow->url\n". @@ -155,10 +156,11 @@ class downloadurl $aValues["sUrl$oRow->id"] != $oRow->url) && $aValues["sDescription$oRow->id"] && $aValues["sUrl$oRow->id"]) { - if(!query_parameters("UPDATE appData SET description = '?', - url = '?' WHERE id = '?'", - $aValues["sDescription$oRow->id"], - $aValues["sUrl$oRow->id"], $oRow->id)) + $oDownloadurl->sDescription = + $aValues["sDescription$oRow->id"]; + $oDownloadurl->sUrl = $aValues["sUrl$oRow->id"]; + + if(!$oDownloadurl->update()) return FALSE; $sWhatChangedModify .= "Modified\nOld URL: $oRow->url\nOld ". @@ -172,12 +174,12 @@ class downloadurl /* Insert new URL */ if($aValues["sDescriptionNew"] && $aValues["sUrlNew"]) { - if(!query_parameters("INSERT INTO appData (versionId, TYPE, - description, url, submitterId, queued) - VALUES('?', '?', '?', '?', '?', '?')", - $aValues["iVersionId"], "downloadurl", - $aValues["sDescriptionNew"], $aValues["sUrlNew"], - $_SESSION["current"]->iUserId, "false")) + $oDownloadurl = new downloadurl(); + $oDownloadurl->iVersionId = $aValues["iVersionId"]; + $oDownloadurl->sUrl = $aValues["sUrlNew"]; + $oDownloadurl->sDescription = $aValues["sDescriptionNew"]; + + if(!$oDownloadurl->create()) return FALSE; $sWhatChanged = "Added\nURL: ".$aValues["sUrlNew"]."\nDescription: ". @@ -206,12 +208,12 @@ class downloadurl return TRUE; } - function canEdit($iVersionId) + function canEdit($iVersionId = NULL) { $oUser = new User($_SESSION['current']->iUserId); - if($oUser->hasPriv("admin") || maintainer::isUserMaintainer($oUser, - $iVersionId)) + if($oUser->hasPriv("admin") || ($iVersionId && + maintainer::isUserMaintainer($oUser, $iVersionId))) { return TRUE; } else @@ -219,6 +221,50 @@ class downloadurl return FALSE; } } + + function create() + { + if(!$this->sUrl or !$this->sDescription or !$this->iVersionId) + return FALSE; + + $hResult = query_parameters("INSERT INTO appData (versionId, type, + description, url, queued, submitterId) + VALUES('?','?','?','?','?','?')", + $this->iVersionId, "downloadurl", $this->sDescription, + $this->sUrl, downloadurl::canEdit($this->iVersionId) ? + "false" : "true", $_SESSION['current']->iUserId); + + if(!$hResult) + return FALSE; + + return TRUE; + } + + function update() + { + if(!$this->bQueued && !$this->canEdit($this->iVersionId)) + return FALSE; + + $hResult = query_parameters("UPDATE appData SET + description = '?', url = '?' WHERE id = '?'", + $this->sDescription, $this->sUrl, $this->iId); + + if(!$hResult) + return FALSE; + + return TRUE; + } + + function delete() + { + if(!downloadurl::canEdit($this->iVersionId)) + return FALSE; + + if(!query_parameters("DELETE FROM appData WHERE id = '?'", $this->iId)) + return FALSE; + + return TRUE; + } } ?>

1 0

Mikołaj Zalewski : comctl32: toolbar: Fix the TB_SETBITMAPSIZE for width or height zero (with testcase).
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: 292cb4d2ac07a09aff9a88bf3d793cc8528f5bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=292cb4d2ac07a09aff9a88bf3… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Jan 16 15:41:44 2007 +0100 comctl32: toolbar: Fix the TB_SETBITMAPSIZE for width or height zero (with testcase). --- dlls/comctl32/tests/toolbar.c | 10 ++++++++++ dlls/comctl32/toolbar.c | 7 +++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index f1f3187..164644e 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -330,6 +330,16 @@ static void test_add_bitmap(void) ok(SendMessageA(hToolbar, TB_SETBITMAPSIZE, 0, MAKELONG(30, 30)) == TRUE, "TB_SETBITMAPSIZE failed\n"); UpdateWindow(hToolbar); CHECK_IMAGELIST(8, 30, 30); + /* when the width or height is zero, set it to 1 */ + ok(SendMessageA(hToolbar, TB_SETBITMAPSIZE, 0, MAKELONG(0, 0)) == TRUE, "TB_SETBITMAPSIZE failed\n"); + UpdateWindow(hToolbar); + CHECK_IMAGELIST(208, 1, 1); + ok(SendMessageA(hToolbar, TB_SETBITMAPSIZE, 0, MAKELONG(0, 5)) == TRUE, "TB_SETBITMAPSIZE failed\n"); + UpdateWindow(hToolbar); + CHECK_IMAGELIST(208, 1, 5); + ok(SendMessageA(hToolbar, TB_SETBITMAPSIZE, 0, MAKELONG(5, 0)) == TRUE, "TB_SETBITMAPSIZE failed\n"); + UpdateWindow(hToolbar); + CHECK_IMAGELIST(41, 5, 1); /* the control can add bitmaps to an existing image list */ rebuild_toolbar(&hToolbar); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 85ada79..2dca16e 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4489,8 +4489,11 @@ TOOLBAR_SetBitmapSize (HWND hwnd, WPARAM if (wParam != 0) FIXME("wParam is %d. Perhaps image list index?\n", wParam); - if ((LOWORD(lParam) <= 0) || (HIWORD(lParam)<=0)) - lParam = MAKELPARAM(16, 15); + if (LOWORD(lParam) == 0) + lParam = MAKELPARAM(1, HIWORD(lParam)); + + if (HIWORD(lParam)==0) + lParam = MAKELPARAM(LOWORD(lParam), 1); if (infoPtr->nNumButtons > 0) WARN("%d buttons, undoc increase to bitmap size : %d-%d -> %d-%d\n",

1 0

James Hawkins : advapi32: Add tests for RegQueryValue.
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: 6cc4510b719a0014afe948c59fb274c362a45b70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cc4510b719a0014afe948c59… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jan 16 04:16:11 2007 -0600 advapi32: Add tests for RegQueryValue. --- dlls/advapi32/tests/registry.c | 117 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 117 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 45756c6..c016f6f 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -746,6 +746,122 @@ static void test_regconnectregistry( voi } +static void test_reg_query_value(void) +{ + HKEY subkey; + CHAR val[MAX_PATH]; + WCHAR valW[5]; + LONG size, ret; + + static const WCHAR expected[] = {'d','a','t','a',0}; + static const WCHAR set[] = {'d','a','t','a'}; + + ret = RegCreateKeyA(hkey_main, "subkey", &subkey); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + ret = RegSetValueA(subkey, NULL, REG_SZ, "data", 4); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + /* try an invalid hkey */ + SetLastError(0xdeadbeef); + size = MAX_PATH; + ret = RegQueryValueA((HKEY)0xcafebabe, "subkey", val, &size); + ok(ret == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", ret); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); + + /* try a NULL hkey */ + SetLastError(0xdeadbeef); + size = MAX_PATH; + ret = RegQueryValueA(NULL, "subkey", val, &size); + ok(ret == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", ret); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); + + /* try a NULL value */ + size = MAX_PATH; + ret = RegQueryValueA(hkey_main, "subkey", NULL, &size); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ok(size == 5, "Expected 5, got %d\n", size); + + /* try a NULL size */ + SetLastError(0xdeadbeef); + val[0] = '\0'; + ret = RegQueryValueA(hkey_main, "subkey", val, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); + ok(lstrlenA(val) == 0, "Expected val to be untouched, got %s\n", val); + + /* try a NULL value and size */ + ret = RegQueryValueA(hkey_main, "subkey", NULL, NULL); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + /* try a size too small */ + SetLastError(0xdeadbeef); + val[0] = '\0'; + size = 1; + ret = RegQueryValueA(hkey_main, "subkey", val, &size); + ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", ret); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); + ok(lstrlenA(val) == 0, "Expected val to be untouched, got %s\n", val); + ok(size == 5, "Expected 5, got %d\n", size); + + /* successfully read the value using 'subkey' */ + size = MAX_PATH; + ret = RegQueryValueA(hkey_main, "subkey", val, &size); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ok(!lstrcmpA(val, "data"), "Expected 'data', got '%s'\n", val); + ok(size == 5, "Expected 5, got %d\n", size); + + /* successfully read the value using the subkey key */ + size = MAX_PATH; + ret = RegQueryValueA(subkey, NULL, val, &size); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ok(!lstrcmpA(val, "data"), "Expected 'data', got '%s'\n", val); + ok(size == 5, "Expected 5, got %d\n", size); + + /* unicode - try size too small */ + SetLastError(0xdeadbeef); + valW[0] = '\0'; + size = 0; + ret = RegQueryValueW(subkey, NULL, valW, &size); + ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", ret); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); + ok(lstrlenW(valW) == 0, "Expected valW to be untouched\n"); + ok(size == sizeof(expected), "Got wrong size: %d\n", size); + + /* unicode - try size in WCHARS */ + SetLastError(0xdeadbeef); + size = sizeof(valW) / sizeof(WCHAR); + ret = RegQueryValueW(subkey, NULL, valW, &size); + ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", ret); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); + ok(lstrlenW(valW) == 0, "Expected valW to be untouched\n"); + ok(size == sizeof(expected), "Got wrong size: %d\n", size); + + /* unicode - successfully read the value */ + size = sizeof(valW); + ret = RegQueryValueW(subkey, NULL, valW, &size); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ok(!lstrcmpW(valW, expected), "Got wrong value\n"); + ok(size == sizeof(expected), "Got wrong size: %d\n", size); + + /* unicode - set the value without a NULL terminator */ + ret = RegSetValueW(subkey, NULL, REG_SZ, set, sizeof(set)); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + + /* unicode - read the unterminated value, value is terminated for us */ + memset(valW, 'a', sizeof(valW)); + size = sizeof(valW); + ret = RegQueryValueW(subkey, NULL, valW, &size); + todo_wine + { + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ok(!lstrcmpW(valW, expected), "Got wrong value\n"); + ok(size == sizeof(expected), "Got wrong size: %d\n", size); + } + + RegDeleteKeyA(subkey, ""); +} + START_TEST(registry) { setup_main_key(); @@ -758,6 +874,7 @@ START_TEST(registry) test_reg_create_key(); test_reg_close_key(); test_reg_delete_key(); + test_reg_query_value(); /* SaveKey/LoadKey require the SE_BACKUP_NAME privilege to be set */ if (set_privileges(SE_BACKUP_NAME, TRUE) &&

1 0

James Hawkins : oleaut32: Initialize nrofnames to keep from freeing unused memory in the error case.
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: c8eb80763956d5b618d5f5ab30ddabb72d81a736 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8eb80763956d5b618d5f5ab3… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jan 16 04:15:20 2007 -0600 oleaut32: Initialize nrofnames to keep from freeing unused memory in the error case. --- dlls/oleaut32/tmarshal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 6a5a6d3..1740476 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -1751,7 +1751,7 @@ TMStubImpl_Invoke( HRESULT hres; DWORD *args = NULL, res, *xargs, nrofargs; marshal_state buf; - UINT nrofnames; + UINT nrofnames = 0; BSTR names[10]; BSTR iname = NULL; ITypeInfo *tinfo = NULL;

1 0

H. Verbeet : wined3d: Add a glsl_src_param_t type, pass it to shader_glsl_add_src_param() instead of three separate character arrays.
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: e3cc00cf479bda321bd3b7f6b1da8bae3732cd7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3cc00cf479bda321bd3b7f6b… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:37:04 2007 +0100 wined3d: Add a glsl_src_param_t type, pass it to shader_glsl_add_src_param() instead of three separate character arrays. --- dlls/wined3d/glsl_shader.c | 450 ++++++++++++++++++++------------------------ 1 files changed, 208 insertions(+), 242 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e3cc00cf479bda321bd3b…

1 0

H. Verbeet : wined3d: Add a glsl_dst_param_t type, pass it to shader_glsl_add_dst_param() instead of three separate character arrays.
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: 04e6250c87b54e7171b9e0ee215fbb7e79b2700a URL: http://source.winehq.org/git/wine.git/?a=commit;h=04e6250c87b54e7171b9e0ee2… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:36:58 2007 +0100 wined3d: Add a glsl_dst_param_t type, pass it to shader_glsl_add_dst_param() instead of three separate character arrays. --- dlls/wined3d/glsl_shader.c | 53 ++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b640f72..4c5b489 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -36,6 +36,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); #define GLINFO_LOCATION (*gl_info) typedef struct { + char reg_name[50]; + char mask_str[6]; +} glsl_dst_param_t; + +typedef struct { const char *name; DWORD coord_mask; } glsl_sample_function_t; @@ -764,28 +769,25 @@ static void shader_glsl_add_src_param(SH * Also, return the actual register name and swizzle in case the * caller needs this information as well. */ static DWORD shader_glsl_add_dst_param(SHADER_OPCODE_ARG* arg, const DWORD param, - const DWORD addr_token, char *reg_name, char *write_mask, char *out_str) { + const DWORD addr_token, glsl_dst_param_t *dst_param) { BOOL is_color = FALSE; - DWORD mask; - write_mask[0] = reg_name[0] = out_str[0] = 0; - shader_glsl_get_register_name(param, addr_token, reg_name, &is_color, arg); + dst_param->mask_str[0] = '\0'; + dst_param->reg_name[0] = '\0'; - mask = shader_glsl_get_write_mask(param, write_mask); - sprintf(out_str, "%s%s", reg_name, write_mask); - - return mask; + shader_glsl_get_register_name(param, addr_token, dst_param->reg_name, &is_color, arg); + return shader_glsl_get_write_mask(param, dst_param->mask_str); } /* Append the destination part of the instruction to the buffer, return the effective write mask */ static DWORD shader_glsl_append_dst(SHADER_BUFFER *buffer, SHADER_OPCODE_ARG *arg) { - char reg_name[50], write_mask[6], reg_str[100]; + glsl_dst_param_t dst_param; DWORD mask; int shift; shift = (arg->dst & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; - mask = shader_glsl_add_dst_param(arg, arg->dst, arg->dst_addr, reg_name, write_mask, reg_str); - shader_addline(buffer, "%s = %s(", reg_str, shift_glsl_tab[shift]); + mask = shader_glsl_add_dst_param(arg, arg->dst, arg->dst_addr, &dst_param); + shader_addline(buffer, "%s%s = %s(", dst_param.reg_name, dst_param.mask_str, shift_glsl_tab[shift]); return mask; } @@ -796,15 +798,14 @@ void shader_glsl_add_instruction_modifie DWORD mask = arg->dst & WINED3DSP_DSTMOD_MASK; if (arg->opcode->dst_token && mask != 0) { - char dst_reg[50]; - char dst_mask[6]; - char dst_str[100]; - - shader_glsl_add_dst_param(arg, arg->dst, 0, dst_reg, dst_mask, dst_str); + glsl_dst_param_t dst_param; + + shader_glsl_add_dst_param(arg, arg->dst, 0, &dst_param); if (mask & WINED3DSPDM_SATURATE) { /* _SAT means to clamp the value of the register to between 0 and 1 */ - shader_addline(arg->buffer, "%s%s = clamp(%s%s, 0.0, 1.0);\n", dst_reg, dst_mask, dst_reg, dst_mask); + shader_addline(arg->buffer, "%s%s = clamp(%s%s, 0.0, 1.0);\n", dst_param.reg_name, + dst_param.mask_str, dst_param.reg_name, dst_param.mask_str); } if (mask & WINED3DSPDM_MSAMPCENTROID) { FIXME("_centroid modifier not handled\n"); @@ -1613,14 +1614,11 @@ void pshader_glsl_texdp3(SHADER_OPCODE_A /** Process the WINED3DSIO_TEXDEPTH instruction in GLSL: * Calculate the depth as dst.x / dst.y */ void pshader_glsl_texdepth(SHADER_OPCODE_ARG* arg) { - - char dst_str[100]; - char dst_reg[50]; - char dst_mask[6]; - - shader_glsl_add_dst_param(arg, arg->dst, 0, dst_reg, dst_mask, dst_str); + glsl_dst_param_t dst_param; + + shader_glsl_add_dst_param(arg, arg->dst, 0, &dst_param); - shader_addline(arg->buffer, "gl_FragDepth = %s.x / %s.y;\n", dst_reg, dst_reg); + shader_addline(arg->buffer, "gl_FragDepth = %s.x / %s.y;\n", dst_param.reg_name, dst_param.reg_name); } /** Process the WINED3DSIO_TEXM3X2DEPTH instruction in GLSL: @@ -1876,11 +1874,10 @@ void pshader_glsl_texreg2rgb(SHADER_OPCO /** Process the WINED3DSIO_TEXKILL instruction in GLSL. * If any of the first 3 components are < 0, discard this pixel */ void pshader_glsl_texkill(SHADER_OPCODE_ARG* arg) { + glsl_dst_param_t dst_param; - char dst_str[100], dst_name[50], dst_mask[6]; - - shader_glsl_add_dst_param(arg, arg->dst, 0, dst_name, dst_mask, dst_str); - shader_addline(arg->buffer, "if (any(lessThan(%s.xyz, vec3(0.0)))) discard;\n", dst_name); + shader_glsl_add_dst_param(arg, arg->dst, 0, &dst_param); + shader_addline(arg->buffer, "if (any(lessThan(%s.xyz, vec3(0.0)))) discard;\n", dst_param.reg_name); } /** Process the WINED3DSIO_DP2ADD instruction in GLSL.

1 0

H. Verbeet : wined3d: Simplify shader_glsl_get_write_mask().
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: 6f3fae4e042d90b93d3455705943bdb467fb3b64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f3fae4e042d90b93d3455705… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:36:52 2007 +0100 wined3d: Simplify shader_glsl_get_write_mask(). --- dlls/wined3d/glsl_shader.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f0fe216..b640f72 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -705,13 +705,11 @@ static DWORD shader_glsl_get_write_mask( if ((shader_get_regtype(param) == WINED3DSPR_RASTOUT) && ((param & WINED3DSP_REGNUM_MASK) != 0)) { mask = WINED3DSP_WRITEMASK_0; } else { - if (mask != WINED3DSP_WRITEMASK_ALL) { - *ptr++ = '.'; - if (param & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; - if (param & WINED3DSP_WRITEMASK_1) *ptr++ = 'y'; - if (param & WINED3DSP_WRITEMASK_2) *ptr++ = 'z'; - if (param & WINED3DSP_WRITEMASK_3) *ptr++ = 'w'; - } + *ptr++ = '.'; + if (param & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; + if (param & WINED3DSP_WRITEMASK_1) *ptr++ = 'y'; + if (param & WINED3DSP_WRITEMASK_2) *ptr++ = 'z'; + if (param & WINED3DSP_WRITEMASK_3) *ptr++ = 'w'; } *ptr = '\0';

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2007