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

Magnus Lundborg : x11drv: Declared two functions as static to avoid compiler warnings.
by Alexandre Julliard 07 Jun '06

07 Jun '06

Module: wine Branch: refs/heads/master Commit: 2b5b86fb9cba90c9d5bf411d5eb93b184d412532 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2b5b86fb9cba90c9d5bf411… Author: Magnus Lundborg <magnus.lundborg.6955(a)student.uu.se> Date: Tue Jun 6 00:31:58 2006 +0200 x11drv: Declared two functions as static to avoid compiler warnings. --- dlls/x11drv/xvidmode.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/x11drv/xvidmode.c b/dlls/x11drv/xvidmode.c index 208f952..46c7e68 100644 --- a/dlls/x11drv/xvidmode.c +++ b/dlls/x11drv/xvidmode.c @@ -89,7 +89,7 @@ static int XVidModeErrorHandler(Display return 1; } -int X11DRV_XF86VM_GetCurrentMode(void) +static int X11DRV_XF86VM_GetCurrentMode(void) { XF86VidModeModeLine line; int dotclock; @@ -112,7 +112,7 @@ int X11DRV_XF86VM_GetCurrentMode(void) return 0; } -void X11DRV_XF86VM_SetCurrentMode(int mode) +static void X11DRV_XF86VM_SetCurrentMode(int mode) { DWORD dwBpp = screen_depth; if (dwBpp == 24) dwBpp = 32;

1 0

appdb/include version.php
by WineHQ 06 Jun '06

06 Jun '06

ChangeSet ID: 25437 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/06 13:58:30 Modified files: include : version.php Log message: "EA Durbin" <ead1234(a)hotmail.com> Fix typo Patch: http://cvs.winehq.org/patch.py?id=25437 Old revision New revision Changes Path 1.51 1.52 +1 -1 appdb/include/version.php Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.51 appdb/include/version.php:1.52 --- appdb/include/version.php:1.51 6 Jun 2006 18:58:30 -0000 +++ appdb/include/version.php 6 Jun 2006 18:58:30 -0000 @@ -710,7 +710,7 @@ class Version { if($_SESSION['current']->isSuperMaintainer($oApp->iAppId)) { echo '<form method="post" name="message" action="maintainerdelete.php">'; - echo '<input type="submit" value="Remove yourself as a supermaintainer" class="button">'; + echo '<input type="submit" value="Remove yourself as a super maintainer" class="button">'; echo '<input type="hidden" name="superMaintainer" value="1">'; echo "<input type=hidden name=\"appId\" value=\"".$oApp->iAppId."\">"; echo "<input type=hidden name=\"versionId\" value=\"".$this->iVersionId."\">";

1 0

appdb/. preferences.php
by WineHQ 06 Jun '06

06 Jun '06

ChangeSet ID: 25436 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/06 13:56:48 Modified files: . : preferences.php Log message: "EA Durbin" <ead1234(a)hotmail.com> Fix typos Patch: http://cvs.winehq.org/patch.py?id=25436 Old revision New revision Changes Path 1.18 1.19 +1 -1 appdb/preferences.php Index: appdb/preferences.php diff -u -p appdb/preferences.php:1.18 appdb/preferences.php:1.19 --- appdb/preferences.php:1.18 6 Jun 2006 18:56:48 -0000 +++ appdb/preferences.php 6 Jun 2006 18:56:48 -0000 @@ -110,7 +110,7 @@ if($_POST) } else { - addmsg("There was a problem updating your userinfo", "red"); + addmsg("There was a problem updating your user info", "red"); } }

1 0

appdb/. maintainerdelete.php
by WineHQ 06 Jun '06

06 Jun '06

ChangeSet ID: 25435 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/06 13:56:14 Modified files: . : maintainerdelete.php Log message: "EA Durbin" <ead1234(a)hotmail.com> Fix typos Patch: http://cvs.winehq.org/patch.py?id=25435 Old revision New revision Changes Path 1.15 1.16 +3 -3 appdb/maintainerdelete.php Index: appdb/maintainerdelete.php diff -u -p appdb/maintainerdelete.php:1.15 appdb/maintainerdelete.php:1.16 --- appdb/maintainerdelete.php:1.15 6 Jun 2006 18:56:14 -0000 +++ appdb/maintainerdelete.php 6 Jun 2006 18:56:14 -0000 @@ -27,7 +27,7 @@ if($confirmed) $oApp = new Application($appId); if($superMaintainer) { - apidb_header("You have resigned as supermaintainer of ".$oApp->sName); + apidb_header("You have resigned as super maintainer of ".$oApp->sName); $result = $_SESSION['current']->deleteMaintainer($oApp->iAppId, null); } else { @@ -40,14 +40,14 @@ if($confirmed) if($result) { if($superMaintainer) - echo "You were removed as a supermaintainer of ".$oApp->sName; + echo "You were removed as a super maintainer of ".$oApp->sName; else echo "You were removed as a maintainer of ".$oApp->sName." ".$oVersion->sName; } } else { if($superMaintainer) - apidb_header("Confirm supermaintainer resignation of ".$oApp->sName); + apidb_header("Confirm super maintainer resignation of ".$oApp->sName); else apidb_header("Confirm maintainer resignation of ".$oApp->sName." ".$oVersion->sName);

1 0

appdb/. screenshots.php
by WineHQ 06 Jun '06

06 Jun '06

ChangeSet ID: 25434 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/06 13:55:05 Modified files: . : screenshots.php Log message: "EA Durbin" <ead1234(a)hotmail.com> Fix grammatical error Patch: http://cvs.winehq.org/patch.py?id=25434 Old revision New revision Changes Path 1.31 1.32 +1 -1 appdb/screenshots.php Index: appdb/screenshots.php diff -u -p appdb/screenshots.php:1.31 appdb/screenshots.php:1.32 --- appdb/screenshots.php:1.31 6 Jun 2006 18:55: 5 -0000 +++ appdb/screenshots.php 6 Jun 2006 18:55: 5 -0000 @@ -95,7 +95,7 @@ if($hResult && mysql_num_rows($hResult)) echo html_frame_end("Click thumbnail to view image in new window."); } else { - echo "<p align=\"center\">There are currently no screenshot for the selected version of this application."; + echo "<p align=\"center\">There are currently no screenshots for the selected version of this application."; echo "<br />Please consider submitting a screenshot for the selected version yourself.</p>"; }

1 0

appdb/. maintainersubmit.php
by WineHQ 06 Jun '06

06 Jun '06

ChangeSet ID: 25433 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/06 13:54:12 Modified files: . : maintainersubmit.php Log message: "EA Durbin" <ead1234(a)hotmail.com> Fix typos Patch: http://cvs.winehq.org/patch.py?id=25433 Old revision New revision Changes Path 1.21 1.22 +2 -2 appdb/maintainersubmit.php Index: appdb/maintainersubmit.php diff -u -p appdb/maintainersubmit.php:1.21 appdb/maintainersubmit.php:1.22 --- appdb/maintainersubmit.php:1.21 6 Jun 2006 18:54:12 -0000 +++ appdb/maintainersubmit.php 6 Jun 2006 18:54:12 -0000 @@ -87,7 +87,7 @@ if($_REQUEST['maintainReason']) if (query_appdb($query)) { - echo "<p>Your maintainer request has been submitted for Review. You should hear back\n"; + echo "<p>Your maintainer request has been submitted for review. You should hear back\n"; echo "soon about the status of your submission</p>\n"; } } else @@ -151,7 +151,7 @@ if($_REQUEST['maintainReason']) echo "<input type=hidden name='superMaintainer' value=$superMaintainer>"; if($superMaintainer) - echo '<tr valign=top><td class=color0><b>Why you want to and should be an application supermaintainer</b></td><td><textarea name="maintainReason" rows=15 cols=70></textarea></td></tr>',"\n"; + echo '<tr valign=top><td class=color0><b>Why you want to and should be an application super maintainer</b></td><td><textarea name="maintainReason" rows=15 cols=70></textarea></td></tr>',"\n"; else echo '<tr valign=top><td class=color0><b>Why you want to and should be an application maintainer</b></td><td><textarea name="maintainReason" rows=15 cols=70></textarea></td></tr>',"\n";

1 0

appdb/. testResults.php
by WineHQ 06 Jun '06

06 Jun '06

ChangeSet ID: 25432 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/06 13:53:00 Modified files: . : testResults.php Log message: "EA Durbin" <ead1234(a)hotmail.com> Fix typo Patch: http://cvs.winehq.org/patch.py?id=25432 Old revision New revision Changes Path 1.4 1.5 +1 -1 appdb/testResults.php Index: appdb/testResults.php diff -u -p appdb/testResults.php:1.4 appdb/testResults.php:1.5 --- appdb/testResults.php:1.4 6 Jun 2006 18:53: 0 -0000 +++ appdb/testResults.php 6 Jun 2006 18:53: 0 -0000 @@ -111,7 +111,7 @@ if ($_REQUEST['sub']) //help - echo "<p>This is the Screen for imputting testing information so that others looking at the database will know \n"; + echo "<p>This is the Screen for inputting testing information so that others looking at the database will know \n"; echo "what was working or a particular release of Wine.</p>\n"; echo "<p>Please be as detailed as you can.</p>\n"; echo "<p>If you can not find your distribution on the list of existing Distributions please add it add it in the \n";

1 0

Stefan Leichter : wine.inf: Added default values for .htm and . html file extension.
by Alexandre Julliard 06 Jun '06

06 Jun '06

Module: wine Branch: refs/heads/master Commit: 0013b3498f8d11f28de0420605f81ea87dda572d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0013b3498f8d11f28de0420… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Fri Jun 2 22:52:39 2006 +0200 wine.inf: Added default values for .htm and .html file extension. --- tools/wine.inf | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 9752357..96ba9e9 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -85,7 +85,9 @@ HKCR,.avi,"Content Type",,"video/avi" HKCR,.dll,"Content Type",,"application/x-msdownload" HKCR,.exe,,,"exefile" HKCR,.exe,"Content Type",,"application/x-msdownload" +HKCR,.htm,,,"htmlfile" HKCR,.htm,"Content Type",,"text/html" +HKCR,.html,,,"htmlfile" HKCR,.html,"Content Type",,"text/html" HKCR,.jfif,"Content Type",,"image/jpeg" HKCR,.lnk,,,"lnkfile"

1 0

qingdoa daoo : oleaut32: safearray: Convert dimension index at the API boundary.
by Alexandre Julliard 06 Jun '06

06 Jun '06

Module: wine Branch: refs/heads/master Commit: 06fcfda9fff76f7f3d92352c2050181d63613645 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=06fcfda9fff76f7f3d92352… Author: qingdoa daoo <qingdao33122(a)yahoo.com> Date: Sun Jun 4 19:43:13 2006 +0800 oleaut32: safearray: Convert dimension index at the API boundary. --- dlls/oleaut32/safearray.c | 42 +++++++++++---------------------------- dlls/oleaut32/tests/safearray.c | 16 +++++++++++++++ 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index ad4ce19..cfebfbb 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -169,25 +169,6 @@ static ULONG SAFEARRAY_GetCellCount(cons return ulNumCells; } -/* Get the 0 based index of an index into a dimension */ -static inline ULONG SAFEARRAY_GetDimensionIndex(SAFEARRAYBOUND *psab, ULONG ulIndex) -{ - return ulIndex - psab->lLbound; -} - -/* Get the size of a dimension in cells */ -static inline ULONG SAFEARRAY_GetDimensionCells(SAFEARRAY *psa, ULONG ulDim) -{ - ULONG size = psa->rgsabound[0].cElements; - - while (ulDim) - { - size *= psa->rgsabound[ulDim].cElements; - ulDim--; - } - return size; -} - /* Allocate a descriptor for an array */ static HRESULT SAFEARRAY_AllocDescriptor(ULONG ulSize, SAFEARRAY **ppsaOut) { @@ -226,6 +207,7 @@ static void SAFEARRAY_SetFeatures(VARTYP static SAFEARRAY* SAFEARRAY_Create(VARTYPE vt, UINT cDims, SAFEARRAYBOUND *rgsabound, ULONG ulSize) { SAFEARRAY *psa = NULL; + int i; if (!rgsabound) return NULL; @@ -240,7 +222,8 @@ static SAFEARRAY* SAFEARRAY_Create(VARTY case VT_VARIANT: psa->fFeatures |= FADF_VARIANT; break; } - memcpy(psa->rgsabound, rgsabound, cDims * sizeof(SAFEARRAYBOUND)); + for (i = 0; i < cDims; i++) + memcpy(psa->rgsabound + i, rgsabound + cDims - 1 - i, sizeof(SAFEARRAYBOUND)); if (ulSize) psa->cbElements = ulSize; @@ -1027,8 +1010,8 @@ HRESULT WINAPI SafeArrayGetUBound(SAFEAR if(!nDim || nDim > psa->cDims) return DISP_E_BADINDEX; - *plUbound = psa->rgsabound[nDim - 1].lLbound + - psa->rgsabound[nDim - 1].cElements - 1; + *plUbound = psa->rgsabound[psa->cDims - nDim].lLbound + + psa->rgsabound[psa->cDims - nDim].cElements - 1; return S_OK; } @@ -1060,7 +1043,7 @@ HRESULT WINAPI SafeArrayGetLBound(SAFEAR if(!nDim || nDim > psa->cDims) return DISP_E_BADINDEX; - *plLbound = psa->rgsabound[nDim - 1].lLbound; + *plLbound = psa->rgsabound[psa->cDims - nDim].lLbound; return S_OK; } @@ -1199,7 +1182,7 @@ HRESULT WINAPI SafeArrayPtrOfIndex(SAFEA if (!psa || !rgIndices || !ppvData) return E_INVALIDARG; - psab = psa->rgsabound; + psab = psa->rgsabound + psa->cDims - 1; c1 = *rgIndices++; if (c1 < psab->lLbound || c1 >= psab->lLbound + (LONG)psab->cElements) @@ -1209,7 +1192,7 @@ HRESULT WINAPI SafeArrayPtrOfIndex(SAFEA { dimensionSize *= psab->cElements; - psab++; + psab--; if (!psab->cElements || *rgIndices < psab->lLbound || @@ -1220,7 +1203,7 @@ HRESULT WINAPI SafeArrayPtrOfIndex(SAFEA rgIndices++; } - cell += (c1 - psa->rgsabound[0].lLbound); + cell += (c1 - psa->rgsabound[psa->cDims - 1].lLbound); *ppvData = (char*)psa->pvData + cell * psa->cbElements; return S_OK; @@ -1452,7 +1435,7 @@ HRESULT WINAPI SafeArrayRedim(SAFEARRAY if (FAILED(SafeArrayLock(psa))) return E_UNEXPECTED; - oldBounds = &psa->rgsabound[psa->cDims - 1]; + oldBounds = psa->rgsabound; oldBounds->lLbound = psabound->lLbound; if (psabound->cElements != oldBounds->cElements) @@ -1460,9 +1443,8 @@ HRESULT WINAPI SafeArrayRedim(SAFEARRAY if (psabound->cElements < oldBounds->cElements) { /* Shorten the final dimension. */ - ULONG ulStartCell = psa->cDims == 1 ? 0 : SAFEARRAY_GetDimensionCells(psa, psa->cDims - 1); - - ulStartCell += psabound->cElements; + ULONG ulStartCell = psabound->cElements * + (SAFEARRAY_GetCellCount(psa) / oldBounds->cElements); SAFEARRAY_DestroyData(psa, ulStartCell); } else diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index e1f761c..c719c69 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -321,6 +321,22 @@ static void test_safearray(void) hres = SafeArrayDestroy(a); ok(hres == S_OK,"SAD of 0 dim array faild with hres %lx\n", hres); + SafeArrayAllocDescriptor(2, &a); + a->rgsabound[0].cElements = 2; + a->rgsabound[0].lLbound = 1; + a->rgsabound[1].cElements = 4; + a->rgsabound[1].lLbound = 1; + a->cbElements = 2; + SafeArrayAllocData(a); + + indices[0] = 4; + indices[1] = 2; + hres = SafeArrayPtrOfIndex(a, indices, (void **)&ptr1); + ok(hres == S_OK, "SAPOI failed with hres %lx\n", hres); + SafeArrayAccessData(a, (void **)&ptr2); + ok(ptr1 - ptr2 == 14, "SAPOI got wrong ptr\n"); + SafeArrayUnaccessData(a); + bounds[0].cElements = 0; bounds[0].lLbound = 1; bounds[1].cElements = 2; bounds[1].lLbound = 23; a = SafeArrayCreate(VT_I4,2,bounds);

1 0

Ivan Gyurdiev : wined3d: Remove constant type field in stateblock.
by Alexandre Julliard 06 Jun '06

06 Jun '06

Module: wine Branch: refs/heads/master Commit: 5f5969b3c5bd237277b8f2f1eaa4ddacce5fb63b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5f5969b3c5bd237277b8f2f… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Tue Jun 6 02:46:59 2006 -0400 wined3d: Remove constant type field in stateblock. It is wrong to maintain a mapping from a constant index to a type field, because different constant types do not share an index - boolean constant 0 is supposed to co-exist with floating point constant 0, not replace it. Drawprim and other code using the type array to decide whether to look up a constant in bools, floats, or ints is wrong - you can't make that decision based on the index. --- dlls/wined3d/device.c | 397 +++++++++++++++++++------------------- dlls/wined3d/drawprim.c | 15 + dlls/wined3d/stateblock.c | 106 ++++++---- dlls/wined3d/wined3d_private.h | 17 +- include/wine/wined3d_interface.h | 12 - 5 files changed, 274 insertions(+), 273 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5f5969b3c5bd237277b…

1 0