December 2006 - Wine-commits

appdb/include appData.php
by WineHQ 31 Dec '06

31 Dec '06

ChangeSet ID: 30845 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/12/31 13:48:07 Added files: include : appData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add file necessary for displaying queued item lists Patch: http://cvs.winehq.org/patch.py?id=30845 Old revision New revision Changes Path Added 1.1 +0 -0 appdb/include/appData.php Index: appdb/include/appData.php diff -u -p /dev/null appdb/include/appData.php:1.1 --- /dev/null 31 Dec 2006 19:48: 7 -0000 +++ appdb/include/appData.php 31 Dec 2006 19:48: 7 -0000 @@ -0,0 +1,56 @@ +<?php + +/** + * Functions related to application data + */ + +require_once(BASE."include/util.php"); + +class appData +{ + function listSubmittedBy($iUserId, $bQueued = true) + { + $hResult = query_parameters("SELECT appData.TYPE, appData.appId, + appData.versionId, appData.description, appData.submitTime, + appFamily.appName, appVersion.versionName FROM appData, + appFamily, appVersion + WHERE (appFamily.appId = appData.appId OR + (appData.versionId = appVersion.versionId AND appFamily.appId = + appVersion.appId)) AND (appFamily.queued = '?' OR + appVersion.queued = '?') AND appData.submitterId = '?' AND + appData.queued = '?' + ORDER BY appData.id", + "false", "false", $iUserId, $bQueued ? "true" : "false"); + + if(!$hResult || !mysql_num_rows($hResult)) + return false; + + $sReturn .= html_table_begin("width=\"100%\" align=\"center\""); + $sReturn .= html_tr(array( + "Version", + "Type", + "Description", + "Submission Date"), + "color4"); + + for($i = 1; $oRow = mysql_fetch_object($hResult); $i++) + { + $sReturn .= html_tr(array( + $oRow->versionId ? + "<a href=\"".BASE."appview.php?iVersionId=$oRow->versionId\">". + "$oRow->appName: $oRow->versionName</a>" : + "<a href=\"".BASE."appview.php?iAppId=$oRow->appId\">". + "$oRow->appName</a>", + $oRow->TYPE, + $oRow->description, + print_date(mysqltimestamp_to_unixtimestamp($oRow->submitTime))), + ($i % 2) ? "color0" : "color1"); + } + + $sReturn .= html_table_end(""); + + return $sReturn; + } +} + +?>

1 0

appdb/ ./README ./appsubmit.php ./testResults. ...
by WineHQ 31 Dec '06

31 Dec '06

ChangeSet ID: 30844 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/12/31 13:39:42 Modified files: . : README appsubmit.php testResults.php admin : adminTestResults.php cron : cleanup.php help : maintainer_guidelines.help maintainer_ratings.help include : application.php bugs.php distribution.php image.php monitor.php screenshot.php testData.php url.php version.php unit_test : test_user.php Log message: Francois Gouget <fgouget(a)free.fr> Assorted spelling fixes Patch: http://cvs.winehq.org/patch.py?id=30844 Old revision New revision Changes Path 1.8 1.9 +4 -4 appdb/README 1.56 1.57 +4 -4 appdb/appsubmit.php 1.21 1.22 +15 -15 appdb/testResults.php 1.16 1.17 +26 -26 appdb/admin/adminTestResults.php 1.31 1.32 +2 -2 appdb/cron/cleanup.php 1.5 1.6 +17 -17 appdb/help/maintainer_guidelines.help 1.4 1.5 +2 -2 appdb/help/maintainer_ratings.help 1.80 1.81 +4 -4 appdb/include/application.php 1.18 1.19 +1 -1 appdb/include/bugs.php 1.2 1.3 +7 -7 appdb/include/distribution.php 1.8 1.9 +12 -12 appdb/include/image.php 1.10 1.11 +4 -4 appdb/include/monitor.php 1.52 1.53 +2 -2 appdb/include/screenshot.php 1.14 1.15 +26 -26 appdb/include/testData.php 1.9 1.10 +1 -1 appdb/include/url.php 1.89 1.90 +7 -7 appdb/include/version.php 1.8 1.9 +2 -2 appdb/unit_test/test_user.php

1 0

appdb/tables prefs_list.sql
by WineHQ 31 Dec '06

31 Dec '06

ChangeSet ID: 30843 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/12/31 12:33:50 Modified files: tables : prefs_list.sql Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix the description of the 'confirm comment deletion' option (id 6). Patch: http://cvs.winehq.org/patch.py?id=30843 Old revision New revision Changes Path 1.4 1.5 +1 -1 appdb/tables/prefs_list.sql Index: appdb/tables/prefs_list.sql diff -u -p appdb/tables/prefs_list.sql:1.4 appdb/tables/prefs_list.sql:1.5 --- appdb/tables/prefs_list.sql:1.4 31 Dec 2006 18:33:50 -0000 +++ appdb/tables/prefs_list.sql 31 Dec 2006 18:33:50 -0000 @@ -17,7 +17,7 @@ INSERT INTO prefs_list VALUES (0, 'sideb INSERT INTO prefs_list VALUES (0, 'window:query', 'no', 'yes|no', 'Display query results in a new window'); INSERT INTO prefs_list VALUES (0, 'window:help', 'no', 'yes|no', 'Display help in a new window'); INSERT INTO prefs_list VALUES (0, 'window:offsite', 'no', 'yes|no', 'Display offsite URLs in a new window'); -INSERT INTO prefs_list VALUES (0, 'confirm_comment_deletion', 'yes', 'yes|no', 'Asks why you are deleting a comment before to delete it'); +INSERT INTO prefs_list VALUES (0, 'confirm_comment_deletion', 'yes', 'yes|no', 'Ask why you are deleting a comment before deleting it'); INSERT INTO prefs_list VALUES (0, 'query:mode', 'view', 'view|edit', 'Default API details mode'); INSERT INTO prefs_list VALUES (0, 'query:hide_header', 'no', 'yes|no', 'Hide apidb header in query results'); INSERT INTO prefs_list VALUES (0, 'query:hide_sidebar', 'no', 'yes|no', 'Hide apidb sidebar in query results');

1 0

appdb/. testResults.php
by WineHQ 30 Dec '06

30 Dec '06

ChangeSet ID: 30842 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/12/30 00:20:06 Modified files: . : testResults.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix a typo in the rejected testing results queue, where it says 'testng' (bug #4156). Patch: http://cvs.winehq.org/patch.py?id=30842 Old revision New revision Changes Path 1.20 1.21 +1 -1 appdb/testResults.php Index: appdb/testResults.php diff -u -p appdb/testResults.php:1.20 appdb/testResults.php:1.21 --- appdb/testResults.php:1.20 30 Dec 2006 6:20: 6 -0000 +++ appdb/testResults.php 30 Dec 2006 6:20: 6 -0000 @@ -199,7 +199,7 @@ else // if ($aClean['sSub']) is not defi { //no Test Results in queue echo html_frame_start("Rejected Testing Results","90%"); - echo '<p><b>The Rejected Testng Results Queue is empty.</b></p>',"\n"; + echo '<p><b>The Rejected Testing Results Queue is empty.</b></p>',"\n"; echo html_frame_end(" "); } else

1 0

appdb/admin adminMaintainerQueue.php
by WineHQ 30 Dec '06

30 Dec '06

ChangeSet ID: 30841 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/12/30 00:15:33 Modified files: admin : adminMaintainerQueue.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> If the admin has not modified the field for a personalized response to a maintainer application, do not include it in the e-mail sent to the user. Patch: http://cvs.winehq.org/patch.py?id=30841 Old revision New revision Changes Path 1.34 1.35 +8 -2 appdb/admin/adminMaintainerQueue.php Index: appdb/admin/adminMaintainerQueue.php diff -u -p appdb/admin/adminMaintainerQueue.php:1.34 appdb/admin/adminMaintainerQueue.php:1.35 --- appdb/admin/adminMaintainerQueue.php:1.34 30 Dec 2006 6:15:33 -0000 +++ appdb/admin/adminMaintainerQueue.php 30 Dec 2006 6:15:33 -0000 @@ -11,6 +11,9 @@ require_once(BASE."include/maintainer.ph require_once(BASE."include/application.php"); require_once(BASE."include/mail.php"); +/* The initial help text displayed in the admin's response field */ +$sReplyTextHelp = "Enter a personalized reason for accepting or rejecting the user's maintainer request here"; + $aClean = array(); //array of filtered user input $aClean['sSub'] = makeSafe( $_REQUEST['sSub'] ); @@ -19,10 +22,13 @@ $aClean['sAdd'] = makeSafe( $_REQUEST['s $aClean['sReject'] = makeSafe( $_REQUEST['sReject'] ); $aClean['sReplyText'] = makeSafe( $_REQUEST['sReplyText'] ); +/* If the admin's response text has not been modified, it should not be included in the e-mail sent to the rejected/accepted maintainer */ +if($aClean['sReplyText'] == $sReplyTextHelp) + $aClean['sReplyText'] = ""; + if(!$_SESSION['current']->hasPriv("admin")) util_show_error_page_and_exit("Insufficient privileges."); - if ($aClean['sSub']) { if ($aClean['iMaintainerId']) @@ -61,7 +67,7 @@ if ($aClean['sSub']) //email response echo '<tr valign=top><td class=color0><b>Email reply</b></td>',"\n"; - echo "<td><textarea name='sReplyText' rows=10 cols=35>Enter a personalized reason for acceptance or rejection of the users maintainer request here</textarea></td></tr>\n"; + echo "<td><textarea name='sReplyText' rows=10 cols=35>$sReplyTextHelp</textarea></td></tr>\n"; /* Add button */ echo '<tr valign=top><td class=color3 align=center colspan=2>' ,"\n";

1 0

appdb/include maintainer.php
by WineHQ 30 Dec '06

30 Dec '06

ChangeSet ID: 30840 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/12/30 00:13:46 Modified files: include : maintainer.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add a URL to the application/version and a few line breaks. Patch: http://cvs.winehq.org/patch.py?id=30840 Old revision New revision Changes Path 1.21 1.22 +9 -3 appdb/include/maintainer.php Index: appdb/include/maintainer.php diff -u -p appdb/include/maintainer.php:1.21 appdb/include/maintainer.php:1.22 --- appdb/include/maintainer.php:1.21 30 Dec 2006 6:13:46 -0000 +++ appdb/include/maintainer.php 30 Dec 2006 6:13:46 -0000 @@ -82,13 +82,19 @@ class maintainer $sEmail = $oUser->sEmail; if ($sEmail) { + if($this->iVersionId) + $sURL = APPDB_ROOT."appview.php?iVersionId=$this->iVersionId"; + else + $sURL = APPDB_ROOT."appview.php?iAppId=$this->iAppId"; + $sSubject = "Application Maintainer Request Report"; - $sMsg = "Your application to be the maintainer of ".$oApp->sName." ".$oVersion->sName." has been accepted. "; - $sMsg .= $sReplyText; + $sMsg = "Your application to be the maintainer of ".$oApp->sName." ".$oVersion->sName." has been accepted.\n"; + $sMsg .= "$sURL\n"; + $sMsg .= "$sReplyText\n"; $sMsg .= "We appreciate your help in making the Application Database better for all users.\n\n"; mail_appdb($sEmail, $sSubject ,$sMsg); - } + } } } else {

1 0

Rob Shearman : include: Add function declarations for CoAllowSetForegroundWindow and CoRegisterChannelHook to objbase .h.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: b787df47e884abbf2361d7a46a04b6d9c4373f4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b787df47e884abbf2361d7a46… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Dec 29 14:43:28 2006 +0000 include: Add function declarations for CoAllowSetForegroundWindow and CoRegisterChannelHook to objbase.h. --- include/objbase.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/objbase.h b/include/objbase.h index 85af95a..63cfd97 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -399,6 +399,7 @@ HRESULT WINAPI CoRevertToSelf(void); /* misc */ HRESULT WINAPI CoGetTreatAsClass(REFCLSID clsidOld, LPCLSID pClsidNew); HRESULT WINAPI CoTreatAsClass(REFCLSID clsidOld, REFCLSID clsidNew); +HRESULT WINAPI CoAllowSetForegroundWindow(IUnknown *pUnk, LPVOID lpvReserved); HRESULT WINAPI CoCreateGuid(GUID* pguid); BOOL WINAPI CoIsOle1Class(REFCLSID rclsid); @@ -407,6 +408,7 @@ BOOL WINAPI CoDosDateTimeToFileTime(WORD BOOL WINAPI CoFileTimeToDosDateTime(FILETIME* lpFileTime, WORD* lpDosDate, WORD* lpDosTime); HRESULT WINAPI CoFileTimeNow(FILETIME* lpFileTime); HRESULT WINAPI CoRegisterMessageFilter(LPMESSAGEFILTER lpMessageFilter,LPMESSAGEFILTER *lplpMessageFilter); +HRESULT WINAPI CoRegisterChannelHook(REFGUID ExtensionGuid, IChannelHook *pChannelHook); typedef enum tagCOWAIT_FLAGS {

1 0

Rob Shearman : ole32: Add tests for channel hooks.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: 638182bbbaf90cbe91596689aa435e860e639080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=638182bbbaf90cbe91596689a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Dec 29 14:44:14 2006 +0000 ole32: Add tests for channel hooks. --- dlls/ole32/tests/Makefile.in | 2 +- dlls/ole32/tests/marshal.c | 220 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 221 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/Makefile.in b/dlls/ole32/tests/Makefile.in index 1be0be0..f34aef3 100644 --- a/dlls/ole32/tests/Makefile.in +++ b/dlls/ole32/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = ole32.dll -IMPORTS = oleaut32 ole32 user32 gdi32 kernel32 +IMPORTS = oleaut32 ole32 user32 gdi32 advapi32 kernel32 EXTRALIBS = -luuid CTESTS = \ diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index e8e3530..3c8281a 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -47,6 +47,8 @@ static const IID IID_IWineTest = {0xa1, 0xa2, 0x5d, 0x5a, 0x36, 0x54, 0xd3, 0xbd} }; /* 5201163f-8164-4fd0-a1a2-5d5a3654d3bd */ +#define EXTENTID_WineTest IID_IWineTest + static void test_cocreateinstance_proxy(void) { IUnknown *pProxy; @@ -2182,6 +2184,221 @@ static void test_CoGetInterfaceAndReleas ok(hr == E_INVALIDARG, "hr %08x\n", hr); } +static const char *debugstr_iid(REFIID riid) +{ + static char name[256]; + HKEY hkeyInterface; + WCHAR bufferW[39]; + char buffer[39]; + LONG name_size = sizeof(name); + StringFromGUID2(riid, bufferW, sizeof(bufferW)/sizeof(bufferW[0])); + WideCharToMultiByte(CP_ACP, 0, bufferW, sizeof(bufferW)/sizeof(bufferW[0]), buffer, sizeof(buffer), NULL, NULL); + if (RegOpenKeyEx(HKEY_CLASSES_ROOT, "Interface", 0, KEY_QUERY_VALUE, &hkeyInterface) != ERROR_SUCCESS) + { + memcpy(name, buffer, sizeof(buffer)); + goto done; + } + if (RegQueryValue(hkeyInterface, buffer, name, &name_size) != ERROR_SUCCESS) + { + memcpy(name, buffer, sizeof(buffer)); + goto done; + } + RegCloseKey(hkeyInterface); +done: + return name; +} + +static HRESULT WINAPI TestChannelHook_QueryInterface(IChannelHook *iface, REFIID riid, void **ppv) +{ + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IChannelHook)) + { + *ppv = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI TestChannelHook_AddRef(IChannelHook *iface) +{ + return 2; +} + +static ULONG WINAPI TestChannelHook_Release(IChannelHook *iface) +{ + return 1; +} + +static void WINAPI TestChannelHook_ClientGetSize( + IChannelHook *iface, + REFGUID uExtent, + REFIID riid, + ULONG *pDataSize ) +{ + SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; + trace("TestChannelHook_ClientGetBuffer\n"); + trace("\t%s method %d\n", debugstr_iid(riid), info->iMethod); + trace("\tcid: %s\n", debugstr_iid(&info->uCausality)); + ok(info->cbSize == sizeof(*info), "info->cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); + todo_wine { + ok(info->dwServerPid == GetCurrentProcessId(), "info->dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); + } + ok(!info->pObject, "info->pObject should be NULL\n"); + ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n"); + + *pDataSize = 1; +} + +static void WINAPI TestChannelHook_ClientFillBuffer( + IChannelHook *iface, + REFGUID uExtent, + REFIID riid, + ULONG *pDataSize, + void *pDataBuffer ) +{ + SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; + trace("TestChannelHook_ClientFillBuffer\n"); + ok(info->cbSize == sizeof(*info), "info->cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); + todo_wine { + ok(info->dwServerPid == GetCurrentProcessId(), "info->dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); + } + ok(!info->pObject, "info->pObject should be NULL\n"); + ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n"); + + *(unsigned char *)pDataBuffer = 0xcc; + *pDataSize = 1; +} + +static void WINAPI TestChannelHook_ClientNotify( + IChannelHook *iface, + REFGUID uExtent, + REFIID riid, + ULONG cbDataSize, + void *pDataBuffer, + DWORD lDataRep, + HRESULT hrFault ) +{ + SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; + trace("TestChannelHook_ClientNotify hrFault = 0x%08x\n", hrFault); + ok(info->cbSize == sizeof(*info), "info->cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); + todo_wine { + ok(info->dwServerPid == GetCurrentProcessId(), "info->dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); + ok(info->pObject != NULL, "info->pObject shouldn't be NULL\n"); + } + ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n"); +} + +static void WINAPI TestChannelHook_ServerNotify( + IChannelHook *iface, + REFGUID uExtent, + REFIID riid, + ULONG cbDataSize, + void *pDataBuffer, + DWORD lDataRep ) +{ + SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; + trace("TestChannelHook_ServerNotify\n"); + ok(info->cbSize == sizeof(*info), "info->cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); + ok(info->dwServerPid == GetCurrentProcessId(), "info->dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); + ok(info->pObject != NULL, "info->pObject shouldn't be NULL\n"); + ok(cbDataSize == 1, "cbDataSize should have been 1 instead of %d\n", cbDataSize); + ok(*(unsigned char *)pDataBuffer == 0xcc, "pDataBuffer should have contained 0xcc instead of 0x%x\n", *(unsigned char *)pDataBuffer); + ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n"); +} + +static void WINAPI TestChannelHook_ServerGetSize( + IChannelHook *iface, + REFGUID uExtent, + REFIID riid, + HRESULT hrFault, + ULONG *pDataSize ) +{ + SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; + trace("TestChannelHook_ServerGetSize\n"); + trace("\t%s method %d\n", debugstr_iid(riid), info->iMethod); + ok(info->cbSize == sizeof(*info), "info->cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); + ok(info->dwServerPid == GetCurrentProcessId(), "info->dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); + ok(info->pObject != NULL, "info->pObject shouldn't be NULL\n"); + ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n"); + if (hrFault != S_OK) + trace("\thrFault = 0x%08x\n", hrFault); + + *pDataSize = 0; +} + +static void WINAPI TestChannelHook_ServerFillBuffer( + IChannelHook *iface, + REFGUID uExtent, + REFIID riid, + ULONG *pDataSize, + void *pDataBuffer, + HRESULT hrFault ) +{ + trace("TestChannelHook_ServerFillBuffer\n"); + ok(0, "TestChannelHook_ServerFillBuffer shouldn't be called\n"); +} + +static const IChannelHookVtbl TestChannelHookVtbl = +{ + TestChannelHook_QueryInterface, + TestChannelHook_AddRef, + TestChannelHook_Release, + TestChannelHook_ClientGetSize, + TestChannelHook_ClientFillBuffer, + TestChannelHook_ClientNotify, + TestChannelHook_ServerNotify, + TestChannelHook_ServerGetSize, + TestChannelHook_ServerFillBuffer, +}; + +static IChannelHook TestChannelHook = { &TestChannelHookVtbl }; + +static void test_channel_hook(void) +{ + IStream *pStream = NULL; + IClassFactory *cf = NULL; + DWORD tid; + IUnknown *proxy = NULL; + HANDLE thread; + HRESULT hr; + + hr = CoRegisterChannelHook(&EXTENTID_WineTest, &TestChannelHook); + ok_ole_success(hr, CoRegisterChannelHook); + + hr = CoRegisterMessageFilter(&MessageFilter, NULL); + ok_ole_success(hr, CoRegisterMessageFilter); + + cLocks = 0; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); + ok_ole_success(hr, CreateStreamOnHGlobal); + tid = start_host_object2(pStream, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &MessageFilter, &thread); + + ok_more_than_one_lock(); + + IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(pStream, &IID_IClassFactory, (void **)&cf); + ok_ole_success(hr, CoUnmarshalInterface); + IStream_Release(pStream); + + ok_more_than_one_lock(); + + hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (LPVOID*)&proxy); + ok_ole_success(hr, IClassFactory_CreateInstance); + IUnknown_Release(proxy); + + IClassFactory_Release(cf); + + ok_no_locks(); + + end_host_object(tid, thread); + + hr = CoRegisterMessageFilter(NULL, NULL); + ok_ole_success(hr, CoRegisterMessageFilter); +} + START_TEST(marshal) { WNDCLASS wndclass; @@ -2240,6 +2457,9 @@ START_TEST(marshal) test_CoGetInterfaceAndReleaseStream(); + /* must be last test as channel hooks can't be unregistered */ + test_channel_hook(); + CoUninitialize(); return;

1 0

H. Verbeet : wined3d: Cleanup shader_glsl_get_input_register_swizzle().
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: 0fae42da5071bf356a9f462e87b787877e39f18f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fae42da5071bf356a9f462e8… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Dec 29 15:31:43 2006 +0100 wined3d: Cleanup shader_glsl_get_input_register_swizzle(). --- dlls/wined3d/glsl_shader.c | 65 +++++++++++++++---------------------------- 1 files changed, 23 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4c00036..4aed644 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -733,54 +733,35 @@ static void shader_glsl_get_write_mask(c *ptr = '\0'; } -static void shader_glsl_get_input_register_swizzle( - const DWORD param, - BOOL is_color, - char *reg_mask) { - - const char swizzle_reg_chars_color_fix[] = "zyxw"; - const char swizzle_reg_chars[] = "xyzw"; - const char* swizzle_regs = NULL; - - /** operand input */ - DWORD swizzle = (param & WINED3DVS_SWIZZLE_MASK) >> WINED3DVS_SWIZZLE_SHIFT; +static void shader_glsl_get_swizzle(const DWORD param, BOOL fixup, char *swizzle_str) { + /* For registers of type WINED3DDECLTYPE_D3DCOLOR, data is stored as "bgra", + * but addressed as "rgba". To fix this we need to swap the register's x + * and z components. */ + const char *swizzle_chars = fixup ? "zyxw" : "xyzw"; + char *ptr = swizzle_str; + + /* swizzle bits fields: wwzzyyxx */ + DWORD swizzle = (param & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; DWORD swizzle_x = swizzle & 0x03; DWORD swizzle_y = (swizzle >> 2) & 0x03; DWORD swizzle_z = (swizzle >> 4) & 0x03; DWORD swizzle_w = (swizzle >> 6) & 0x03; - if (is_color) { - swizzle_regs = swizzle_reg_chars_color_fix; - } else { - swizzle_regs = swizzle_reg_chars; + /* If the swizzle is the default swizzle (ie, "xyzw"), we don't need to + * generate a swizzle string. Unless we need to our own swizzling. */ + if ((WINED3DSP_NOSWIZZLE >> WINED3DSP_SWIZZLE_SHIFT) != swizzle || fixup) { + *ptr++ = '.'; + if (swizzle_x == swizzle_y && swizzle_x == swizzle_z && swizzle_x == swizzle_w) { + *ptr++ = swizzle_chars[swizzle_x]; + } else { + *ptr++ = swizzle_chars[swizzle_x]; + *ptr++ = swizzle_chars[swizzle_y]; + *ptr++ = swizzle_chars[swizzle_z]; + *ptr++ = swizzle_chars[swizzle_w]; + } } - /** - * swizzle bits fields: - * WWZZYYXX - */ - if ((WINED3DVS_NOSWIZZLE >> WINED3DVS_SWIZZLE_SHIFT) == swizzle) { - if (is_color) { - sprintf(reg_mask, ".%c%c%c%c", - swizzle_regs[swizzle_x], - swizzle_regs[swizzle_y], - swizzle_regs[swizzle_z], - swizzle_regs[swizzle_w]); - } - return ; - } - if (swizzle_x == swizzle_y && - swizzle_x == swizzle_z && - swizzle_x == swizzle_w) - { - sprintf(reg_mask, ".%c", swizzle_regs[swizzle_x]); - } else { - sprintf(reg_mask, ".%c%c%c%c", - swizzle_regs[swizzle_x], - swizzle_regs[swizzle_y], - swizzle_regs[swizzle_z], - swizzle_regs[swizzle_w]); - } + *ptr = '\0'; } /** From a given parameter token, generate the corresponding GLSL string. @@ -801,7 +782,7 @@ static void shader_glsl_add_param( shader_glsl_get_register_name(param, addr_token, reg_name, &is_color, arg); if (is_input) { - shader_glsl_get_input_register_swizzle(param, is_color, reg_mask); + shader_glsl_get_swizzle(param, is_color, reg_mask); shader_glsl_gen_modifier(param, reg_name, reg_mask, out_str); } else { shader_glsl_get_write_mask(param, reg_mask);

1 0

H. Verbeet : wined3d: Cleanup & merge pshader_get_input_register_swizzle() and vshader_program_add_input_param_swizzle().
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: c8fc7df8a32c6fe0ba2403e5b98d903d9cc9172d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8fc7df8a32c6fe0ba2403e5b… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Dec 29 15:32:01 2006 +0100 wined3d: Cleanup & merge pshader_get_input_register_swizzle() and vshader_program_add_input_param_swizzle(). --- dlls/wined3d/arb_program_shader.c | 95 ++++++++++--------------------------- 1 files changed, 25 insertions(+), 70 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b3b6792..a8e4c9a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -220,82 +220,35 @@ static void shader_arb_get_write_mask(co *ptr = '\0'; } -static void pshader_get_input_register_swizzle(const DWORD instr, char *swzstring) { - static const char swizzle_reg_chars[] = "rgba"; - DWORD swizzle = (instr & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; +static void shader_arb_get_swizzle(const DWORD param, BOOL fixup, char *swizzle_str) { + /* For registers of type WINED3DDECLTYPE_D3DCOLOR, data is stored as "bgra", + * but addressed as "rgba". To fix this we need to swap the register's x + * and z components. */ + const char *swizzle_chars = fixup ? "zyxw" : "xyzw"; + char *ptr = swizzle_str; + + /* swizzle bits fields: wwzzyyxx */ + DWORD swizzle = (param & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; DWORD swizzle_x = swizzle & 0x03; DWORD swizzle_y = (swizzle >> 2) & 0x03; DWORD swizzle_z = (swizzle >> 4) & 0x03; DWORD swizzle_w = (swizzle >> 6) & 0x03; - /** - * swizzle bits fields: - * WWZZYYXX - */ - *swzstring = 0; - if ((WINED3DSP_NOSWIZZLE >> WINED3DSP_SWIZZLE_SHIFT) != swizzle) { - if (swizzle_x == swizzle_y && - swizzle_x == swizzle_z && - swizzle_x == swizzle_w) { - sprintf(swzstring, ".%c", swizzle_reg_chars[swizzle_x]); + + /* If the swizzle is the default swizzle (ie, "xyzw"), we don't need to + * generate a swizzle string. Unless we need to our own swizzling. */ + if ((WINED3DSP_NOSWIZZLE >> WINED3DSP_SWIZZLE_SHIFT) != swizzle || fixup) { + *ptr++ = '.'; + if (swizzle_x == swizzle_y && swizzle_x == swizzle_z && swizzle_x == swizzle_w) { + *ptr++ = swizzle_chars[swizzle_x]; } else { - sprintf(swzstring, ".%c%c%c%c", - swizzle_reg_chars[swizzle_x], - swizzle_reg_chars[swizzle_y], - swizzle_reg_chars[swizzle_z], - swizzle_reg_chars[swizzle_w]); + *ptr++ = swizzle_chars[swizzle_x]; + *ptr++ = swizzle_chars[swizzle_y]; + *ptr++ = swizzle_chars[swizzle_z]; + *ptr++ = swizzle_chars[swizzle_w]; } } -} - -/* TODO: merge with pixel shader */ -static void vshader_program_add_input_param_swizzle(const DWORD param, int is_color, char *hwLine) { - static const char swizzle_reg_chars_color_fix[] = "zyxw"; - static const char swizzle_reg_chars[] = "xyzw"; - const char* swizzle_regs = NULL; - char tmpReg[255]; - - /** operand input */ - DWORD swizzle = (param & WINED3DVS_SWIZZLE_MASK) >> WINED3DVS_SWIZZLE_SHIFT; - DWORD swizzle_x = swizzle & 0x03; - DWORD swizzle_y = (swizzle >> 2) & 0x03; - DWORD swizzle_z = (swizzle >> 4) & 0x03; - DWORD swizzle_w = (swizzle >> 6) & 0x03; - if (is_color) { - swizzle_regs = swizzle_reg_chars_color_fix; - } else { - swizzle_regs = swizzle_reg_chars; - } - - /** - * swizzle bits fields: - * WWZZYYXX - */ - if ((WINED3DVS_NOSWIZZLE >> WINED3DVS_SWIZZLE_SHIFT) == swizzle) { - if (is_color) { - sprintf(tmpReg, ".%c%c%c%c", - swizzle_regs[swizzle_x], - swizzle_regs[swizzle_y], - swizzle_regs[swizzle_z], - swizzle_regs[swizzle_w]); - strcat(hwLine, tmpReg); - } - return ; - } - if (swizzle_x == swizzle_y && - swizzle_x == swizzle_z && - swizzle_x == swizzle_w) - { - sprintf(tmpReg, ".%c", swizzle_regs[swizzle_x]); - strcat(hwLine, tmpReg); - } else { - sprintf(tmpReg, ".%c%c%c%c", - swizzle_regs[swizzle_x], - swizzle_regs[swizzle_y], - swizzle_regs[swizzle_z], - swizzle_regs[swizzle_w]); - strcat(hwLine, tmpReg); - } + *ptr = '\0'; } static void pshader_get_register_name( @@ -412,7 +365,9 @@ static void vshader_program_add_param(SH shader_arb_get_write_mask(param, write_mask); strcat(hwLine, write_mask); } else { - vshader_program_add_input_param_swizzle(param, is_color, hwLine); + char swizzle[6]; + shader_arb_get_swizzle(param, is_color, swizzle); + strcat(hwLine, swizzle); } } @@ -470,7 +425,7 @@ static void pshader_gen_input_modifier_l /* Get register name */ pshader_get_register_name(instr, regstr); - pshader_get_input_register_swizzle(instr, swzstr); + shader_arb_get_swizzle(instr, FALSE, swzstr); switch (instr & WINED3DSP_SRCMOD_MASK) { case WINED3DSPSM_NONE:

1 0