December 2006 - Wine-commits

appdb/include testData.php
by WineHQ 27 Dec '06

27 Dec '06

ChangeSet ID: 30821 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/12/26 21:19:43 Modified files: include : testData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix the testData's mailSubmitter() so it actually displays the application name. Patch: http://cvs.winehq.org/patch.py?id=30821 Old revision New revision Changes Path 1.11 1.12 +11 -4 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.11 appdb/include/testData.php:1.12 --- appdb/include/testData.php:1.11 27 Dec 2006 3:19:43 -0000 +++ appdb/include/testData.php 27 Dec 2006 3:19:43 -0000 @@ -252,29 +252,36 @@ class testData{ if($this->iSubmitterId) { $oSubmitter = new User($this->iSubmitterId); + + /* Get the full app/version name to display */ + $oVersion = new Version($this->iVersionId); + $sAppName = application::lookup_name($oVersion->iAppId); + $sVersionName = version::lookup_name($oVersion->iVersionId); + $sName = "$sAppName: $sVersionName"; + switch($sAction) { case "add": $sSubject = "Submitted testing data accepted"; - $sMsg = "The testing data you submitted (".$oApp->sName." ".$this->sName.") has been accepted."; + $sMsg = "The testing data you submitted for '$sName' has been accepted."; $sMsg .= APPDB_ROOT."appview.php?iVersionId=".$this->iVersionId."&iTestingId=".$this->iTestingId."\n"; $sMsg .= "Administrators Responce:\n"; break; case "reject": $sSubject = "Submitted testing data rejected"; - $sMsg = "The testing data you submitted (".$oApp->sName." ".$this->sName.") has been rejected."; + $sMsg = "The testing data you submitted for '$sName' has been rejected."; $sMsg .= APPDB_ROOT."testResults.php?sSub=view&iTestingId=".$this->iTestingId."\n"; $sMsg .= "Reason given:\n"; break; case "delete": $sSubject = "Submitted testing data deleted"; - $sMsg = "The testing data you submitted (".$oApp->sName." ".$this->sName.") has been deleted."; + $sMsg = "The testing data you submitted for '$sName' has been deleted."; $sMsg .= "Reason given:\n"; break; } $sMsg .= $aClean['sReplyText']."\n"; $sMsg .= "We appreciate your help in making the Application Database better for all users."; - + mail_appdb($oSubmitter->sEmail, $sSubject ,$sMsg); } }

1 0

appdb/help generic.help
by WineHQ 27 Dec '06

27 Dec '06

ChangeSet ID: 30820 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/12/26 21:10:53 Modified files: help : generic.help Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> - Fix the ancient use of --debugmsg - Add an explanation for how to run a program with Wine - Refer users with sound problems to winecfg Patch: http://cvs.winehq.org/patch.py?id=30820 Old revision New revision Changes Path 1.10 1.11 +3 -2 appdb/help/generic.help Index: appdb/help/generic.help diff -u -p appdb/help/generic.help:1.10 appdb/help/generic.help:1.11 --- appdb/help/generic.help:1.10 27 Dec 2006 3:10:53 -0000 +++ appdb/help/generic.help 27 Dec 2006 3:10:53 -0000 @@ -17,14 +17,14 @@ for a certain program doesn't exist. </ul> -<li> Run your program</li> +<li> Run your program (something like ‘wine yourprogram.exe’, or tell your file manager to open .exe files with 'wine').</li> <li> If it gives an error about missing files, or does not start at all, try running it from the directory where it was installed.</li> <li> Many newer games contain copy protection, which is often not supported in Wine. Cracks are available from sites such as <a href="http://www.megagames.com/trainers.html" target="_blank">MegaGames</a>.</li> <li> In case of failure, try different builtin, native DLL settings: -Run Wine with --debugmsg +loaddll to find out which +Run Wine with ‘WINEDEBUG=+loaddll wine yourprogram.exe’ to find out which DLLs are loaded as native or builtin. Then make sure appropriate native versions are in the c:\windows\system32 directory as configured in Winecfg’s DLL overrides tab. There are four options you can choose from when setting @@ -37,6 +37,7 @@ dll overrides.</li> (builtin) </pre> +<li> For sound problems, run ‘winecfg’ and look at the audio tab.</li> <li> In case of persisting failure, you may want to read over the <a href="http://www.winehq.org/site/documentation">Wine Documentation</a>

1 0

Alex Villacís Lasso : oleaut32: Fix VarMod( VT_DECIMAL) test by properly initializing the DECIMAL to use.
by Alexandre Julliard 26 Dec '06

26 Dec '06

Module: wine Branch: master Commit: c290f623e0644f1f2d547ad26a5cf778e43109a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c290f623e0644f1f2d547ad26… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sun Dec 24 16:08:35 2006 -0500 oleaut32: Fix VarMod(VT_DECIMAL) test by properly initializing the DECIMAL to use. Fix Wine handling of VT_DECIMAL in VarMod. --- dlls/oleaut32/tests/vartest.c | 34 ++++++++++++++++++++++++---------- dlls/oleaut32/variant.c | 20 +++++++------------- 2 files changed, 31 insertions(+), 23 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 554c96f..845e433 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2261,12 +2261,12 @@ static void test_VarMod(void) case VT_BOOL: case VT_DATE: case VT_CY: + case VT_DECIMAL: hexpected = S_OK; break; case VT_ERROR: case VT_VARIANT: case VT_UNKNOWN: - case VT_DECIMAL: case VT_RECORD: lValid = FALSE; break; @@ -2296,13 +2296,13 @@ static void test_VarMod(void) case VT_R8: case VT_BOOL: case VT_DATE: + case VT_DECIMAL: case VT_CY: hexpected = S_OK; break; case VT_ERROR: case VT_VARIANT: case VT_UNKNOWN: - case VT_DECIMAL: case VT_RECORD: rValid = FALSE; break; @@ -2341,18 +2341,18 @@ static void test_VarMod(void) } else if((l == VT_NULL) && (r == VT_RECORD)) { hexpected = DISP_E_TYPEMISMATCH; - } else if((l == VT_NULL) && (r == VT_DECIMAL)) + } else if((l == VT_I8) && (r == VT_DECIMAL)) { - hexpected = E_INVALIDARG; + hexpected = S_OK; + } else if((l == VT_DECIMAL) && (r == VT_I8)) + { + hexpected = S_OK; } else if((l == VT_UNKNOWN) || ((r == VT_UNKNOWN) && lFound && lValid)) { hexpected = DISP_E_TYPEMISMATCH; } else if((l == VT_NULL) && rFound) { hexpected = S_OK; - } else if((l == VT_DECIMAL) || ((r == VT_DECIMAL) && lFound && lValid)) - { - hexpected = E_INVALIDARG; } else if(l == VT_RECORD) { hexpected = DISP_E_TYPEMISMATCH; @@ -2399,8 +2399,16 @@ static void test_VarMod(void) V_R8(&v1) = 100; else if(l == VT_UI8) V_UI8(&v1) = 100; + else if(l == VT_I8) + V_I8(&v1) = 100; else if(l == VT_DATE) V_DATE(&v1) = 1000; + else if (l == VT_DECIMAL) + { + V_DECIMAL(&v1).Hi32 = 0; + V_DECIMAL(&v1).Lo64 = 100; + V_DECIMAL(&v1).signscale = 0; + } else V_I4(&v1) = 10000; @@ -2412,8 +2420,16 @@ static void test_VarMod(void) V_R8(&v2) = 100; else if(r == VT_UI8) V_UI8(&v2) = 100; + else if(r == VT_I8) + V_I8(&v2) = 100; else if(r == VT_DATE) V_DATE(&v2) = 1000; + else if (r == VT_DECIMAL) + { + V_DECIMAL(&v2).Hi32 = 0; + V_DECIMAL(&v2).Lo64 = 100; + V_DECIMAL(&v2).signscale = 0; + } else V_I4(&v2) = 10000; @@ -2478,7 +2494,6 @@ static void test_VarMod(void) "VarMod: expected 0x%x,%d,%d, got 0x%X,%d,%d\n", S_OK, VT_I4, 0, hres, V_VT(&vDst), V_I4(&vDst)); /* some decimals */ - todo_wine { V_VT(&v1) = VT_DECIMAL; V_VT(&v2) = VT_DECIMAL; VarDecFromI4(100, &V_DECIMAL(&v1)); @@ -2494,7 +2509,6 @@ static void test_VarMod(void) hres = pVarMod(&v1,&v2,&vDst); ok(hres == S_OK && V_VT(&vDst) == VT_I4 && V_I4(&vDst) == 0, "VarMod: expected 0x%x,%d,%d, got 0x%X,%d,%d\n", S_OK, VT_I4, 0, hres, V_VT(&vDst), V_I4(&vDst)); - } VARMOD2(UINT,I4,100,10,I4,0,S_OK); @@ -5170,7 +5184,7 @@ static void test_VarCat(void) hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, - "VarCat: VT_INT concat with VT_BOOL (TRUE) returned inncorrect result\n"); + "VarCat: VT_INT concat with VT_BOOL (TRUE) returned incorrect result\n"); VariantClear(&left); VariantClear(&right); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 66c3d07..f586d8a 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5032,14 +5032,12 @@ HRESULT WINAPI VarMod(LPVARIANT left, LP case VT_EMPTY: case VT_DATE : case VT_BSTR : + case VT_DECIMAL: break; case VT_VARIANT: case VT_UNKNOWN: V_VT(result) = VT_EMPTY; return DISP_E_TYPEMISMATCH; - case VT_DECIMAL: - V_VT(result) = VT_EMPTY; - return E_INVALIDARG; case VT_ERROR: return DISP_E_TYPEMISMATCH; case VT_RECORD: @@ -5086,6 +5084,12 @@ HRESULT WINAPI VarMod(LPVARIANT left, LP } case VT_EMPTY: case VT_DATE : + case VT_DECIMAL: + if(V_VT(left) == VT_ERROR) + { + V_VT(result) = VT_EMPTY; + return DISP_E_TYPEMISMATCH; + } case VT_BSTR: if(V_VT(left) == VT_NULL) { @@ -5116,16 +5120,6 @@ HRESULT WINAPI VarMod(LPVARIANT left, LP case VT_UNKNOWN: V_VT(result) = VT_EMPTY; return DISP_E_TYPEMISMATCH; - case VT_DECIMAL: - if(V_VT(left) == VT_ERROR) - { - V_VT(result) = VT_EMPTY; - return DISP_E_TYPEMISMATCH; - } else - { - V_VT(result) = VT_EMPTY; - return E_INVALIDARG; - } case VT_ERROR: return DISP_E_TYPEMISMATCH; case VT_RECORD:

1 0

Hans Leidekker : usp10: Reduce multiple assignments to a single memset in ScriptItemize.
by Alexandre Julliard 26 Dec '06

26 Dec '06

Module: wine Branch: master Commit: d2f213013ec382da2bae32ee6dc324c4177e7786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2f213013ec382da2bae32ee6… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Dec 24 12:37:36 2006 +0100 usp10: Reduce multiple assignments to a single memset in ScriptItemize. --- dlls/usp10/usp10.c | 76 ++++++++------------------------------------------- 1 files changed, 12 insertions(+), 64 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 99b057e..a630622 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -412,6 +412,9 @@ HRESULT WINAPI ScriptItemize(const WCHAR if (!pwcInChars || !cInChars || !pItems || cMaxItems < 2) return E_INVALIDARG; + pItems[index].iCharPos = 0; + memset(&pItems[index].a, 0, sizeof(SCRIPT_ANALYSIS)); + if (pwcInChars[cnt] >= Numeric_start && pwcInChars[cnt] <= Numeric_stop) pItems[index].a.eScript = Script_Numeric; else @@ -420,31 +423,10 @@ HRESULT WINAPI ScriptItemize(const WCHAR else if (pwcInChars[cnt] >= Latin_start && pwcInChars[cnt] <= Latin_stop) pItems[index].a.eScript = Script_Latin; - else - pItems[index].a.eScript = SCRIPT_UNDEFINED; - pItems[index].iCharPos = 0; - /* Set the SCRIPT_ANALYSIS */ - pItems[index].a.fRTL = 0; - pItems[index].a.fLayoutRTL = 0; - pItems[index].a.fLinkBefore = 0; - pItems[index].a.fLinkAfter = 0; - pItems[index].a.fLogicalOrder = 0; - pItems[index].a.fNoGlyphIndex = 0; - /* set the SCRIPT_STATE */ + if (pItems[index].a.eScript == Script_Arabic) pItems[index].a.s.uBidiLevel = 1; - else - pItems[index].a.s.uBidiLevel = 0; - pItems[index].a.s.fOverrideDirection = 0; - pItems[index].a.s.fInhibitSymSwap = FALSE; - pItems[index].a.s.fCharShape = 0; - pItems[index].a.s.fDigitSubstitute = 0; - pItems[index].a.s.fInhibitLigate = 0; - pItems[index].a.s.fDisplayZWG = 0; - pItems[index].a.s.fArabicNumContext = 0; - pItems[index].a.s.fGcpClusters = 0; - pItems[index].a.s.fReserved = 0; - pItems[index].a.s.fEngineReserved = 0; + TRACE("New_Script=%d, eScript=%d index=%d cnt=%d iCharPos=%d\n", New_Script, pItems[index].a.eScript, index, cnt, pItems[index].iCharPos = cnt); @@ -470,34 +452,17 @@ HRESULT WINAPI ScriptItemize(const WCHAR index++; if (index+1 > cMaxItems) return E_OUTOFMEMORY; + pItems[index].iCharPos = cnt; + memset(&pItems[index].a, 0, sizeof(SCRIPT_ANALYSIS)); + if (New_Script == Script_Arabic) pItems[index].a.s.uBidiLevel = 1; - /* Set SCRIPT_ITEM */ - pItems[index].iCharPos = cnt; - /* Set the SCRIPT_ANALYSIS */ + pItems[index].a.eScript = New_Script; - pItems[index].a.fRTL = 0; - pItems[index].a.fLayoutRTL = 0; - pItems[index].a.fLinkBefore = 0; - pItems[index].a.fLinkAfter = 0; - pItems[index].a.fLogicalOrder = 0; - pItems[index].a.fNoGlyphIndex = 0; - /* set the SCRIPT_STATE */ if (New_Script == Script_Arabic) pItems[index].a.s.uBidiLevel = 1; - else - pItems[index].a.s.uBidiLevel = 0; - pItems[index].a.s.fOverrideDirection = 0; - pItems[index].a.s.fInhibitSymSwap = FALSE; - pItems[index].a.s.fCharShape = 0; - pItems[index].a.s.fDigitSubstitute = 0; - pItems[index].a.s.fInhibitLigate = 0; - pItems[index].a.s.fDisplayZWG = 0; - pItems[index].a.s.fArabicNumContext = 0; - pItems[index].a.s.fGcpClusters = 0; - pItems[index].a.s.fReserved = 0; - pItems[index].a.s.fEngineReserved = 0; + TRACE("index=%d cnt=%d iCharPos=%d\n", index, cnt, pItems[index].iCharPos = cnt); } } @@ -505,25 +470,8 @@ HRESULT WINAPI ScriptItemize(const WCHAR /* While not strictly necessary according to the spec, make sure the n+1 * item is set up to prevent random behaviour if the caller erroneously * checks the n+1 structure */ - pItems[index+1].a.eScript = 0; - pItems[index+1].a.fRTL = 0; - pItems[index+1].a.fLayoutRTL = 0; - pItems[index+1].a.fLinkBefore = 0; - pItems[index+1].a.fLinkAfter = 0; - pItems[index+1].a.fLogicalOrder = 0; - pItems[index+1].a.fNoGlyphIndex = 0; - /* set the SCRIPT_STATE */ - pItems[index+1].a.s.uBidiLevel = 0; - pItems[index+1].a.s.fOverrideDirection = 0; - pItems[index+1].a.s.fInhibitSymSwap = FALSE; - pItems[index+1].a.s.fCharShape = 0; - pItems[index+1].a.s.fDigitSubstitute = 0; - pItems[index+1].a.s.fInhibitLigate = 0; - pItems[index+1].a.s.fDisplayZWG = 0; - pItems[index+1].a.s.fArabicNumContext = 0; - pItems[index+1].a.s.fGcpClusters = 0; - pItems[index+1].a.s.fReserved = 0; - pItems[index+1].a.s.fEngineReserved = 0; + memset(&pItems[index+1].a, 0, sizeof(SCRIPT_ANALYSIS)); + TRACE("index=%d cnt=%d iCharPos=%d\n", index+1, cnt, pItems[index+1].iCharPos = cnt); /* Set one SCRIPT_STATE item being returned */

1 0

Hans Leidekker : usp10: Fix all failing tests on Windows and Wine.
by Alexandre Julliard 26 Dec '06

26 Dec '06

Module: wine Branch: master Commit: 55f385c8d7955cbd504b203afbf41b0c3cc45dfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f385c8d7955cbd504b203af… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Dec 24 12:39:27 2006 +0100 usp10: Fix all failing tests on Windows and Wine. --- dlls/usp10/tests/usp10.c | 62 +++++++-------------------------------------- dlls/usp10/usp10.c | 11 +++---- 2 files changed, 15 insertions(+), 58 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index ae28be8..7a949dc 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -313,21 +313,12 @@ static void test_ScriptGetCMap(HDC hdc, } -static void test_ScriptGetFontProperties(void) +static void test_ScriptGetFontProperties(HDC hdc) { HRESULT hr; - HDC hdc; - HWND hwnd; SCRIPT_CACHE psc,old_psc; SCRIPT_FONTPROPERTIES sfp; - /* Only do the bare minumum to get a valid hdc */ - hwnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100,0, 0, 0, NULL); - assert(hwnd != 0); - - hdc = GetDC(hwnd); - ok( hdc != NULL, "HDC failed to be created %p\n", hdc); - /* Some sanity checks for ScriptGetFontProperties */ hr = ScriptGetFontProperties(NULL,NULL,NULL); @@ -383,17 +374,11 @@ static void test_ScriptGetFontProperties ok( psc == old_psc, "Expected psc not to be changed, was %p is now %p\n", old_psc, psc); ScriptFreeCache(&psc); ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); - - /* Cleanup */ - ReleaseDC(hwnd, hdc); - DestroyWindow(hwnd); } -static void test_ScriptTextOut(void) +static void test_ScriptTextOut(HDC hdc) { HRESULT hr; - HWND hwnd; - HDC hdc; int cInChars; int cMaxItems; @@ -418,17 +403,6 @@ static void test_ScriptTextOut(void) SCRIPT_LOGATTR *psla; SCRIPT_LOGATTR sla[256]; - /* We need a valid HDC to drive a lot of Script functions which requires the following * - * to set up for the tests. */ - hwnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100, - 0, 0, 0, NULL); - assert(hwnd != 0); - ShowWindow(hwnd, SW_SHOW); - UpdateWindow(hwnd); - - hdc = GetDC(hwnd); /* We now have a hdc */ - ok( hdc != NULL, "HDC failed to be created %p\n", hdc); - /* This is a valid test that will cause parsing to take place */ cInChars = 5; cMaxItems = 255; @@ -519,8 +493,6 @@ static void test_ScriptTextOut(void) ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); } } - ReleaseDC(hwnd, hdc); - DestroyWindow(hwnd); } static void test_ScriptXtoX(void) @@ -632,20 +604,18 @@ static void test_ScriptXtoX(void) } -static void test_ScriptString(void) +static void test_ScriptString(HDC hdc) { /******************************************************************************************* * * This set of tests are for the string functions of uniscribe. The ScriptStringAnalyse - * function allocates memory pointed to by the SCRIPT_STRING_ANALYSIS ssa pointer. This - * memory if freed by ScriptStringFree. There needs to be a valid hdc for this this as - * ScriptStrinAnalyse calls ScriptSItemize, ScriptShape and ScriptPlace which require it. + * function allocates memory pointed to by the SCRIPT_STRING_ANALYSIS ssa pointer. This + * memory if freed by ScriptStringFree. There needs to be a valid hdc for this as + * ScriptStringAnalyse calls ScriptSItemize, ScriptShape and ScriptPlace which require it. * */ HRESULT hr; - HWND hwnd; - HDC hdc = 0; WCHAR teststr[] = {'T','e','s','t','1',' ','a','2','b','3', '\0'}; int String = (sizeof(teststr)/sizeof(WCHAR))-1; int Glyphs = String * 2 + 16; @@ -668,16 +638,6 @@ static void test_ScriptString(void) BOOL Disabled = FALSE; LOGFONTA lf; - HFONT zfont; - - /* We need a valid HDC to drive a lot of Script functions which requires the following * - * to set up for the tests. */ - hwnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100, - 0, 0, 0, NULL); - assert(hwnd != 0); - - hdc = GetDC(hwnd); /* We now have a hdc */ - ok( hdc != NULL, "HDC failed to be created %p\n", hdc); lstrcpyA(lf.lfFaceName, "Symbol"); lf.lfHeight = 10; @@ -689,10 +649,8 @@ static void test_ScriptString(void) lf.lfWeight = 300; lf.lfWidth = 10; - zfont = (HFONT) SelectObject(hdc, CreateFontIndirectA(&lf)); - Charset = -1; /* this flag indicates unicode input */ - /* Test without hdc to get E_INVALIDARG */ + /* Test without hdc to get E_PENDING */ hr = ScriptStringAnalyse( NULL, teststr, String, Glyphs, Charset, Flags, ReqWidth, &Control, &State, Dx, &Tabdef, &InClass, &ssa); @@ -1298,10 +1256,10 @@ START_TEST(usp10) test_ScriptCacheGetHeight(hdc); test_ScriptGetGlyphABCWidth(hdc); - test_ScriptGetFontProperties(); - test_ScriptTextOut(); + test_ScriptGetFontProperties(hdc); + test_ScriptTextOut(hdc); test_ScriptXtoX(); - test_ScriptString(); + test_ScriptString(hdc); test_ScriptStringXtoCP_CPtoX(hdc); test_ScriptLayout(); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a630622..360d24e 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -511,12 +511,11 @@ HRESULT WINAPI ScriptStringAnalyse(HDC h hdc, pString, cString, cGlyphs, iCharset, dwFlags, iReqWidth, psControl, psState, piDx, pTabdef, pbInClass, pssa); - if (1 > cString || NULL == pString) { - return E_INVALIDARG; - } - if ((dwFlags & SSA_GLYPHS) && NULL == hdc) { - return E_PENDING; - } + if (cString < 1 || !pString) + return E_INVALIDARG; + + if ((dwFlags & SSA_GLYPHS) && !hdc) + return E_PENDING; analysis = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(StringAnalysis));

1 0

Clinton Stimpson : usp10: Implement ScriptStringGetLogicalWidths.
by Alexandre Julliard 26 Dec '06

26 Dec '06

Module: wine Branch: master Commit: 46bb89e7daeec84a9c0007f696668a0d52adc252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46bb89e7daeec84a9c0007f69… Author: Clinton Stimpson <cjstimpson(a)utwire.net> Date: Sun Dec 24 12:47:15 2006 +0100 usp10: Implement ScriptStringGetLogicalWidths. --- dlls/usp10/usp10.c | 33 +++++++++++++++++++++++++++++++++ dlls/usp10/usp10.spec | 2 +- 2 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 360d24e..b9a8b62 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1426,6 +1426,39 @@ HRESULT WINAPI ScriptLayout(int runs, co } /*********************************************************************** + * ScriptStringGetLogicalWidths (USP10.@) + * + * Returns logical widths from a string analysis. + * + * PARAMS + * ssa [I] string analysis. + * piDx [O] logical widths returned. + * + * RETURNS + * Success: S_OK + * Failure: a non-zero HRESULT. + */ +HRESULT WINAPI ScriptStringGetLogicalWidths(SCRIPT_STRING_ANALYSIS ssa, int *piDx) +{ + int i, j, next = 0; + StringAnalysis *analysis = ssa; + + TRACE("%p, %p\n", ssa, piDx); + + if (!analysis) return S_FALSE; + + for (i = 0; i < analysis->numItems; i++) + { + for (j = 0; j < analysis->glyphs[i].numGlyphs; j++) + { + piDx[next] = analysis->glyphs[i].piAdvance[j]; + next++; + } + } + return S_OK; +} + +/*********************************************************************** * ScriptStringValidate (USP10.@) * * Validate a string analysis. diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index 83e97ba..8051da2 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -20,7 +20,7 @@ @ stdcall ScriptStringAnalyse(ptr ptr long long long long long ptr ptr ptr ptr ptr ptr) @ stdcall ScriptStringCPtoX(ptr long long ptr) @ stdcall ScriptStringFree(ptr) -@ stub ScriptStringGetLogicalWidths +@ stdcall ScriptStringGetLogicalWidths(ptr ptr) @ stub ScriptStringGetOrder @ stdcall ScriptStringOut(ptr long long long ptr long long long) @ stdcall ScriptStringValidate(ptr)

1 0

Vijay Kiran Kamuju : comctl32: MonthCalendar - Fix highlighting of current date.
by Alexandre Julliard 26 Dec '06

26 Dec '06

Module: wine Branch: master Commit: c5b8df481f2bb0362b57188a8c7df423030ba8b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5b8df481f2bb0362b57188a8… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Dec 24 13:31:56 2006 +0530 comctl32: MonthCalendar - Fix highlighting of current date. --- dlls/comctl32/monthcal.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 71e0777..5baf788 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1891,6 +1891,10 @@ MONTHCAL_Create(HWND hwnd, WPARAM wParam infoPtr->bk = GetSysColor(COLOR_WINDOW); infoPtr->txt = GetSysColor(COLOR_WINDOWTEXT); + /* set the current day for highlighing */ + infoPtr->minSel.wDay = infoPtr->todaysDate.wDay; + infoPtr->maxSel.wDay = infoPtr->todaysDate.wDay; + /* call MONTHCAL_UpdateSize to set all of the dimensions */ /* of the control */ MONTHCAL_UpdateSize(infoPtr);

1 0

Chris Robinson : d3d: GetStreamSource on a stream with NULL data isn' t an error.
by Alexandre Julliard 26 Dec '06

26 Dec '06

Module: wine Branch: master Commit: b7b9d4e3c719c81c124660f59be6a383a624516c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7b9d4e3c719c81c124660f59… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sun Dec 24 01:00:05 2006 -0800 d3d: GetStreamSource on a stream with NULL data isn't an error. --- dlls/d3d8/device.c | 4 +++- dlls/d3d8/tests/device.c | 9 +++++++++ dlls/d3d9/device.c | 4 +++- dlls/d3d9/tests/device.c | 10 ++++++++++ dlls/wined3d/device.c | 13 ++++++------- 5 files changed, 31 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 3faf807..b21eb6c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1498,7 +1498,9 @@ static HRESULT WINAPI IDirect3DDevice8Im IWineD3DVertexBuffer_GetParent(retStream, (IUnknown **)pStream); IWineD3DVertexBuffer_Release(retStream); }else{ - FIXME("Call to GetStreamSource failed %p\n", pStride); + if (rc != D3D_OK){ + FIXME("Call to GetStreamSource failed %p\n", pStride); + } *pStream = NULL; } diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a7f8d0c..0214117 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -407,13 +407,22 @@ static void test_refcount(void) CHECK_CALL( hr, "CreateVertexBuffer", pDevice, ++refcount ); if(pVertexBuffer) { + IDirect3DVertexBuffer8 *pVBuf = (void*)~0; + UINT stride = ~0; + tmp = get_refcount( (IUnknown *)pVertexBuffer ); hr = IDirect3DDevice8_SetStreamSource(pDevice, 0, pVertexBuffer, 3 * sizeof(float)); CHECK_CALL( hr, "SetStreamSource", pVertexBuffer, tmp); hr = IDirect3DDevice8_SetStreamSource(pDevice, 0, NULL, 0); CHECK_CALL( hr, "SetStreamSource", pVertexBuffer, tmp); + + hr = IDirect3DDevice8_GetStreamSource(pDevice, 0, &pVBuf, &stride); + ok(SUCCEEDED(hr), "GetStreamSource did not succeed with NULL stream!\n"); + ok(pVBuf==NULL, "pVBuf not NULL (%p)!\n", pVBuf); + ok(stride==3*sizeof(float), "stride not %u (got %u)!\n", 3*sizeof(float), stride); } + /* Shaders */ hr = IDirect3DDevice8_CreateVertexShader( pDevice, decl, simple_vs, &dVertexShader, 0 ); CHECK_CALL( hr, "CreateVertexShader", pDevice, refcount ); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 06534e7..0b49d2f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -800,7 +800,9 @@ HRESULT WINAPI IDirect3DDevice9Impl_Ge IWineD3DVertexBuffer_GetParent(retStream, (IUnknown **)pStream); IWineD3DVertexBuffer_Release(retStream); }else{ - FIXME("Call to GetStreamSource failed %p %p\n", OffsetInBytes, pStride); + if (rc != D3D_OK){ + FIXME("Call to GetStreamSource failed %p %p\n", OffsetInBytes, pStride); + } *pStream = NULL; } return rc; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 7198155..c82f65b 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -455,12 +455,22 @@ static void test_refcount(void) CHECK_CALL( hr, "CreateVertexBuffer", pDevice, ++refcount ); if(pVertexBuffer) { + IDirect3DVertexBuffer9 *pVBuf = (void*)~0; + UINT offset = ~0; + UINT stride = ~0; + tmp = get_refcount( (IUnknown *)pVertexBuffer ); hr = IDirect3DDevice9_SetStreamSource(pDevice, 0, pVertexBuffer, 0, 3 * sizeof(float)); CHECK_CALL( hr, "SetStreamSource", pVertexBuffer, tmp); hr = IDirect3DDevice9_SetStreamSource(pDevice, 0, NULL, 0, 0); CHECK_CALL( hr, "SetStreamSource", pVertexBuffer, tmp); + + hr = IDirect3DDevice9_GetStreamSource(pDevice, 0, &pVBuf, &offset, &stride); + ok(SUCCEEDED(hr), "GetStreamSource did not succeed with NULL stream!\n"); + ok(pVBuf==NULL, "pVBuf not NULL (%p)!\n", pVBuf); + ok(stride==3*sizeof(float), "stride not %u (got %u)!\n", 3*sizeof(float), stride); + ok(offset==0, "offset not 0 (got %u)!\n", offset); } /* Shaders */ hr = IDirect3DDevice9_CreateVertexDeclaration( pDevice, decl, &pVertexDeclaration ); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0ad4512..a858ba1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2421,9 +2421,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl This->updateStateBlock->changed.streamSource[StreamNumber] = TRUE; This->updateStateBlock->set.streamSource[StreamNumber] = TRUE; - This->updateStateBlock->streamStride[StreamNumber] = Stride; This->updateStateBlock->streamSource[StreamNumber] = pStreamData; - This->updateStateBlock->streamOffset[StreamNumber] = OffsetInBytes; + if (pStreamData) { + This->updateStateBlock->streamStride[StreamNumber] = Stride; + This->updateStateBlock->streamOffset[StreamNumber] = OffsetInBytes; + } This->updateStateBlock->streamFlags[StreamNumber] = streamFlags; /* Handle recording of state blocks */ @@ -2487,12 +2489,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl *pOffset = This->stateBlock->streamOffset[StreamNumber]; } - if (*pStream == NULL) { - FIXME("Attempting to get an empty stream %d, returning WINED3DERR_INVALIDCALL\n", StreamNumber); - return WINED3DERR_INVALIDCALL; + if (*pStream != NULL) { + IWineD3DVertexBuffer_AddRef(*pStream); /* We have created a new reference to the VB */ } - - IWineD3DVertexBuffer_AddRef(*pStream); /* We have created a new reference to the VB */ return WINED3D_OK; }

1 0

H. Verbeet : wined3d: Skip NULL textures rather than non-NULL ones, assign -1 to skipped stages.
by Alexandre Julliard 26 Dec '06

26 Dec '06

Module: wine Branch: master Commit: 957474f223d28751c65eb87515bf9b7da2767624 URL: http://source.winehq.org/git/wine.git/?a=commit;h=957474f223d28751c65eb8751… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Dec 25 23:02:41 2006 +0100 wined3d: Skip NULL textures rather than non-NULL ones, assign -1 to skipped stages. Downgrade a FIXME to a WARN. --- dlls/wined3d/device.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4966d0c..0ad4512 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3735,15 +3735,26 @@ static void IWineD3DDeviceImpl_FindTexUn /* Now work out the mapping */ tex = 0; This->oneToOneTexUnitMap = FALSE; - FIXME("Non 1:1 mapping UNTESTED!\n"); + WARN("Non 1:1 mapping UNTESTED!\n"); for(i = 0; i < This->stateBlock->lowest_disabled_stage; i++) { - if(This->stateBlock->textures[i] == NULL) tex++; + /* Skip NULL textures */ + if (!This->stateBlock->textures[i]) { + /* Map to -1, so the check below doesn't fail if a non-NULL + * texture is set on this stage */ + TRACE("Mapping texture stage %d to -1\n", i); + This->texUnitMap[i] = -1; + + continue; + } + TRACE("Mapping texture stage %d to unit %d\n", i, tex); if(This->texUnitMap[i] != tex) { This->texUnitMap[i] = tex; IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(i)); markTextureStagesDirty(This, i); } + + ++tex; } } }

1 0

Jacek Caban : wininet: Use proc instead of enum in FTPRENAMEFILEW request.
by Alexandre Julliard 26 Dec '06

26 Dec '06

Module: wine Branch: master Commit: 3a08f1f65659ed4a48886898da1648af763c5e09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a08f1f65659ed4a48886898d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 25 21:36:30 2006 +0100 wininet: Use proc instead of enum in FTPRENAMEFILEW request. --- dlls/wininet/ftp.c | 17 +++++++++++++++-- dlls/wininet/internet.c | 13 ------------- dlls/wininet/internet.h | 1 - 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 24e3084..66b196d 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1654,6 +1654,18 @@ BOOL WINAPI FtpRenameFileA(HINTERNET hFt * FALSE on failure * */ +static void AsyncFtpRenameFileProc(WORKREQUEST *workRequest) +{ + struct WORKREQ_FTPRENAMEFILEW const *req = &workRequest->u.FtpRenameFileW; + LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest->hdr; + + TRACE("%p\n", lpwfs); + + FTP_FtpRenameFileW(lpwfs, req->lpszSrcFile, req->lpszDestFile); + HeapFree(GetProcessHeap(), 0, req->lpszSrcFile); + HeapFree(GetProcessHeap(), 0, req->lpszDestFile); +} + BOOL WINAPI FtpRenameFileW(HINTERNET hFtpSession, LPCWSTR lpszSrc, LPCWSTR lpszDest) { LPWININETFTPSESSIONW lpwfs; @@ -1673,8 +1685,9 @@ BOOL WINAPI FtpRenameFileW(HINTERNET hFt WORKREQUEST workRequest; struct WORKREQ_FTPRENAMEFILEW *req; - workRequest.asyncall = FTPRENAMEFILEW; - workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); + workRequest.asyncall = CALLASYNCPROC; + workRequest.asyncproc = AsyncFtpRenameFileProc; + workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); req = &workRequest.u.FtpRenameFileW; req->lpszSrcFile = WININET_strdupW(lpszSrc); req->lpszDestFile = WININET_strdupW(lpszDest); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index fd5513a..5e7ebf0 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3243,19 +3243,6 @@ static VOID INTERNET_ExecuteWork(void) workRequest.asyncproc(&workRequest); break; - case FTPRENAMEFILEW: - { - struct WORKREQ_FTPRENAMEFILEW *req = &workRequest.u.FtpRenameFileW; - LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest.hdr; - - TRACE("FTPRENAMEFILEW %p\n", lpwfs); - - FTP_FtpRenameFileW(lpwfs, req->lpszSrcFile, req->lpszDestFile); - HeapFree(GetProcessHeap(), 0, req->lpszSrcFile); - HeapFree(GetProcessHeap(), 0, req->lpszDestFile); - } - break; - case FTPFINDNEXTW: { struct WORKREQ_FTPFINDNEXTW *req; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index b9f7161..4a95d72 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -250,7 +250,6 @@ typedef struct typedef enum { CALLASYNCPROC, - FTPRENAMEFILEW, FTPFINDNEXTW, } ASYNC_FUNC;

1 0