January 2006 - Wine-Commits

appdb/. testResults.php appsubmit.php
by WineHQ Jan. 17, 2006

Jan. 17, 2006

ChangeSet ID: 22336 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/01/16 20:33:14 Modified files: . : testResults.php appsubmit.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Only create new distributions if the user didn't pick one from the dropdown menu. Previous behavior would create a new distribution if any text was present in the 'distribution' textbox, even if a distribution is picked from the dropdown menu. Patch: http://cvs.winehq.org/patch.py?id=22336 Old revision New revision Changes Path 1.1 1.2 +17 -14 appdb/testResults.php 1.35 1.36 +9 -7 appdb/appsubmit.php Index: appdb/testResults.php diff -u -p appdb/testResults.php:1.1 appdb/testResults.php:1.2 --- appdb/testResults.php:1.1 17 Jan 2006 2:33:14 -0000 +++ appdb/testResults.php 17 Jan 2006 2:33:14 -0000 @@ -27,22 +27,25 @@ if ($_REQUEST['sub']) $oTest->GetOutputEditorValues(); // retrieve the values from the current $_REQUEST if(empty($errors)) { - $sDistribution = trim($_REQUEST['sDistribution']); - if(!empty($sDistribution)) + if(!$_REQUEST['iDistributionId']) { - $oDistribution = new distribution(); - $oDistribution->sName = $sDistribution; - $oDistribution->create(); - $oTest->iDistributionId = $oDistribution->iDistributionId; + $sDistribution = trim($_REQUEST['sDistribution']); + if(!empty($sDistribution)) + { + $oDistribution = new distribution(); + $oDistribution->sName = $sDistribution; + $oDistribution->create(); + $oTest->iDistributionId = $oDistribution->iDistributionId; + } + } + if($_REQUEST['sub'] == 'Submit') + { + $oTest->create(); + } else if($_REQUEST['sub'] == 'Resubmit') + { + $oTest->update(true); + $oTest->ReQueue(); } - if($_REQUEST['sub'] == 'Submit') - { - $oTest->create(); - } else if($_REQUEST['sub'] == 'Resubmit') - { - $oTest->update(true); - $oTest->ReQueue(); - } redirect($_SERVER['PHP_SELF']); } else { Index: appdb/appsubmit.php diff -u -p appdb/appsubmit.php:1.35 appdb/appsubmit.php:1.36 --- appdb/appsubmit.php:1.35 17 Jan 2006 2:33:14 -0000 +++ appdb/appsubmit.php 17 Jan 2006 2:33:14 -0000 @@ -181,14 +181,16 @@ if ($_REQUEST['sub']) { $oVersion->create(); } - - $sDistribution = trim($_REQUEST['sDistribution']); - if(!empty($sDistribution)) + if(!$_REQUEST['iDistributionId']) { - $oDistribution = new distribution(); - $oDistribution->sName = $sDistribution; - $oDistribution->create(); - $oTest->iDistributionId = $oDistribution->iDistributionId; + $sDistribution = trim($_REQUEST['sDistribution']); + if(!empty($sDistribution)) + { + $oDistribution = new distribution(); + $oDistribution->sName = $sDistribution; + $oDistribution->create(); + $oTest->iDistributionId = $oDistribution->iDistributionId; + } } $oTest->iVersionId = $oVersion->iVersionId; if(is_numeric($oTest->iTestingId))

1 0

Michael Stefaniuc : oleaut32: Tests for the VarCmp reimplementation.
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: 2f9c9b31ae1d734266726271342da0778414eda2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2f9c9b31ae1d73426672627… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 16 21:34:59 2006 +0100 oleaut32: Tests for the VarCmp reimplementation. --- dlls/oleaut32/tests/vartest.c | 240 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 240 insertions(+), 0 deletions(-)

1 0

Michael Stefaniuc : oleaut32: Reimplement VarCmp().
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: f73b68b0169bc8b53993329364798f884f2c2b4e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f73b68b0169bc8b53993329… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 16 21:34:50 2006 +0100 oleaut32: Reimplement VarCmp(). - Supports now all WinXP allowed combinations of input variants. - VT_RESERVED on input variants is handled now. - Removed complicated VT_DATE comparision; that's not how Windows does it. - Improved documentation. --- dlls/oleaut32/variant.c | 368 ++++++++++++++++++++++++++--------------------- 1 files changed, 200 insertions(+), 168 deletions(-)

1 0

Michael Stefaniuc : oleaut32: Define missing but useful VTBIT_* macros.
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: e47b813fc6d517ed341ed7b6f75925d1cec5add0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e47b813fc6d517ed341ed7b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 16 21:32:24 2006 +0100 oleaut32: Define missing but useful VTBIT_* macros. --- dlls/oleaut32/varformat.c | 2 +- dlls/oleaut32/variant.c | 6 +++--- dlls/oleaut32/variant.h | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 13458a2..29bf3a7 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -1983,7 +1983,7 @@ VARIANT_FormatString_Exit: #define NUMBER_VTBITS (VTBIT_I1|VTBIT_UI1|VTBIT_I2|VTBIT_UI2| \ VTBIT_I4|VTBIT_UI4|VTBIT_I8|VTBIT_UI8| \ VTBIT_R4|VTBIT_R8|VTBIT_CY|VTBIT_DECIMAL| \ - (1<<VT_BOOL)|(1<<VT_INT)|(1<<VT_UINT)) + VTBIT_BOOL|VTBIT_INT|VTBIT_UINT) /********************************************************************** * VarFormatFromTokens [OLEAUT32.139] diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 953595b..55b61fa 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -3184,7 +3184,7 @@ HRESULT WINAPI VarDiv(LPVARIANT left, LP found = TRUE; resvt = VT_DECIMAL; } - if (!found && (((1<<lvt) | (1<<rvt)) & (VTBIT_I1|VTBIT_I2|VTBIT_UI1|VTBIT_UI2|VTBIT_I4|VTBIT_UI4|(1<<VT_INT)|(1<<VT_UINT)))) { + if (!found && (((1<<lvt) | (1<<rvt)) & (VTBIT_I1|VTBIT_I2|VTBIT_UI1|VTBIT_UI2|VTBIT_I4|VTBIT_UI4|VTBIT_INT|VTBIT_UINT))) { found = TRUE; resvt = VT_I4; } @@ -3253,7 +3253,7 @@ HRESULT WINAPI VarSub(LPVARIANT left, LP lvt = V_VT(left)&VT_TYPEMASK; rvt = V_VT(right)&VT_TYPEMASK; found = FALSE;resvt = VT_VOID; - if (((1<<lvt) | (1<<rvt)) & ((1<<VT_DATE)|(1<<VT_R4)|(1<<VT_R8))) { + if (((1<<lvt) | (1<<rvt)) & (VTBIT_DATE|VTBIT_R4|VTBIT_R8)) { found = TRUE; resvt = VT_R8; } @@ -3261,7 +3261,7 @@ HRESULT WINAPI VarSub(LPVARIANT left, LP found = TRUE; resvt = VT_DECIMAL; } - if (!found && (((1<<lvt) | (1<<rvt)) & (VTBIT_I1|VTBIT_I2|VTBIT_UI1|VTBIT_UI2|VTBIT_I4|VTBIT_UI4|(1<<VT_INT)|(1<<VT_UINT)))) { + if (!found && (((1<<lvt) | (1<<rvt)) & (VTBIT_I1|VTBIT_I2|VTBIT_UI1|VTBIT_UI2|VTBIT_I4|VTBIT_UI4|VTBIT_INT|VTBIT_UINT))) { found = TRUE; resvt = VT_I4; } diff --git a/dlls/oleaut32/variant.h b/dlls/oleaut32/variant.h index 0c2acde..42c5e76 100644 --- a/dlls/oleaut32/variant.h +++ b/dlls/oleaut32/variant.h @@ -34,6 +34,20 @@ /* Get the extra flags from a variant pointer */ #define V_EXTRA_TYPE(v) (V_VT((v)) & VT_EXTRA_TYPE) +/* Missing in Windows but usefull VTBIT_* defines */ +#define VTBIT_BOOL (1 << VT_BSTR) +#define VTBIT_BSTR (1 << VT_BSTR) +#define VTBIT_DATE (1 << VT_DATE) +#define VTBIT_DISPATCH (1 << VT_DISPATCH) +#define VTBIT_EMPTY (1 << VT_EMPTY) +#define VTBIT_ERROR (1 << VT_ERROR) +#define VTBIT_INT (1 << VT_INT) +#define VTBIT_NULL (1 << VT_NULL) +#define VTBIT_UINT (1 << VT_UINT) +#define VTBIT_UNKNOWN (1 << VT_UNKNOWN) +#define VTBIT_VARIANT (1 << VT_VARIANT) +#define VTBIT_15 (1 << 15) /* no variant type with this number */ + extern const char* wine_vtypes[]; #define debugstr_vt(v) (((v)&VT_TYPEMASK) <= VT_CLSID ? wine_vtypes[((v)&VT_TYPEMASK)] : \ ((v)&VT_TYPEMASK) == VT_BSTR_BLOB ? "VT_BSTR_BLOB": "Invalid")

1 0

Robert Shearman : shell: GetDetailsOf fix.
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: d9d9d7e897245083fad749c395a21ea4343aa86e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d9d9d7e897245083fad749c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jan 16 21:32:06 2006 +0100 shell: GetDetailsOf fix. Initialise hr and psd->str.uType before the call to IShellFolder_GetDisplayNameOf so that whatever it returns is preserved. --- dlls/shell32/shfldr_fs.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 394c254..506236f 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -965,6 +965,8 @@ IShellFolder_fnGetDetailsOf (IShellFolde psd->str.u.cStr, MAX_PATH); return S_OK; } else { + hr = S_OK; + psd->str.uType = STRRET_CSTR; /* the data from the pidl */ switch (iColumn) { case 0: /* name */ @@ -984,8 +986,6 @@ IShellFolder_fnGetDetailsOf (IShellFolde _ILGetFileAttributes (pidl, psd->str.u.cStr, MAX_PATH); break; } - hr = S_OK; - psd->str.uType = STRRET_CSTR; } return hr;

1 0

Robert Shearman : shell: Convert the filesystem shell folder to Unicode.
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: f8782733f3b8b19f39fb90e24140e08e5cfd0098 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f8782733f3b8b19f39fb90e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jan 16 21:31:48 2006 +0100 shell: Convert the filesystem shell folder to Unicode. --- dlls/shell32/shfldr.h | 2 - dlls/shell32/shfldr_desktop.c | 18 ++++-- dlls/shell32/shfldr_fs.c | 115 +++++++++++++++++++++++------------------ 3 files changed, 75 insertions(+), 60 deletions(-)

1 0

Robert Shearman : shell: Convert SHELL32_GetDisplayNameOfChild to unicode.
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: 50c1e46d18089118c522fe13da34fc85559b1ad5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=50c1e46d18089118c522fe1… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jan 16 21:31:10 2006 +0100 shell: Convert SHELL32_GetDisplayNameOfChild to unicode. --- dlls/shell32/cpanelfolder.c | 13 ++++++++----- dlls/shell32/shfldr.h | 2 +- dlls/shell32/shfldr_desktop.c | 18 ++++++++++++++++-- dlls/shell32/shfldr_fs.c | 8 +++++++- dlls/shell32/shfldr_mycomp.c | 18 ++++++++++++++++-- dlls/shell32/shlfolder.c | 6 +++--- 6 files changed, 51 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index cbac65a..878e6d8 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -652,7 +652,8 @@ static HRESULT WINAPI ISF_ControlPanel_f { ICPanelImpl *This = (ICPanelImpl *)iface; - CHAR szPath[MAX_PATH*2]; + CHAR szPath[MAX_PATH]; + WCHAR wszPath[MAX_PATH+1]; /* +1 for potential backslash */ PIDLCPanelStruct* pcpanel; *szPath = '\0'; @@ -676,7 +677,7 @@ static HRESULT WINAPI ISF_ControlPanel_f BOOL bSimplePidl = _ILIsPidlSimple(pidl); if (bSimplePidl) { - _ILSimpleGetText(pidl, szPath, MAX_PATH); /* append my own path */ + _ILSimpleGetTextW(pidl, wszPath, MAX_PATH); /* append my own path */ } else { FIXME("special pidl\n"); } @@ -684,12 +685,14 @@ static HRESULT WINAPI ISF_ControlPanel_f if ((dwFlags & SHGDN_FORPARSING) && !bSimplePidl) { /* go deeper if needed */ int len = 0; - PathAddBackslashA(szPath); /*FIXME*/ - len = lstrlenA(szPath); + PathAddBackslashW(wszPath); + len = lstrlenW(wszPath); if (!SUCCEEDED - (SHELL32_GetDisplayNameOfChild(iface, pidl, dwFlags | SHGDN_INFOLDER, szPath + len, MAX_PATH - len))) + (SHELL32_GetDisplayNameOfChild(iface, pidl, dwFlags | SHGDN_INFOLDER, wszPath + len, MAX_PATH + 1 - len))) return E_OUTOFMEMORY; + if (!WideCharToMultiByte(CP_ACP, 0, wszPath, -1, szPath, MAX_PATH, NULL, NULL)) + wszPath[0] = '\0'; } } diff --git a/dlls/shell32/shfldr.h b/dlls/shell32/shfldr.h index e626255..ed474b2 100644 --- a/dlls/shell32/shfldr.h +++ b/dlls/shell32/shfldr.h @@ -39,7 +39,7 @@ LPCWSTR GetNextElementW (LPCWSTR pszNext HRESULT SHELL32_ParseNextElement (IShellFolder2 * psf, HWND hwndOwner, LPBC pbc, LPITEMIDLIST * pidlInOut, LPOLESTR szNext, DWORD * pEaten, DWORD * pdwAttributes); HRESULT SHELL32_GetItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes); -HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf, LPCITEMIDLIST pidl, DWORD dwFlags, LPSTR szOut, +HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf, LPCITEMIDLIST pidl, DWORD dwFlags, LPWSTR szOut, DWORD dwOutLen); HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 09d6270..3dd637d 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -562,6 +562,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetD { IGenericSFImpl *This = (IGenericSFImpl *)iface; HRESULT hr = S_OK; + WCHAR wszPath[MAX_PATH]; TRACE ("(%p)->(pidl=%p,0x%08lx,%p)\n", This, pidl, dwFlags, strRet); pdump (pidl); @@ -645,13 +646,20 @@ static HRESULT WINAPI ISF_Desktop_fnGetD if ((GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL) && bWantsForParsing) { + WCHAR wszPath[MAX_PATH]; /* * we need the filesystem path to the destination folder. * Only the folder itself can know it */ hr = SHELL32_GetDisplayNameOfChild (iface, pidl, dwFlags, - strRet->u.cStr, + wszPath, MAX_PATH); + if (SUCCEEDED(hr)) + { + if (!WideCharToMultiByte(CP_ACP, 0, wszPath, -1, strRet->u.cStr, MAX_PATH, + NULL, NULL)) + wszPath[0] = '\0'; + } } else { @@ -690,7 +698,13 @@ static HRESULT WINAPI ISF_Desktop_fnGetD { /* a complex pidl, let the subfolder do the work */ hr = SHELL32_GetDisplayNameOfChild (iface, pidl, dwFlags, - strRet->u.cStr, MAX_PATH); + wszPath, MAX_PATH); + if (SUCCEEDED(hr)) + { + if (!WideCharToMultiByte(CP_ACP, 0, wszPath, -1, strRet->u.cStr, MAX_PATH, + NULL, NULL)) + wszPath[0] = '\0'; + } } TRACE ("-- (%p)->(%s,0x%08lx)\n", This, diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 53d8231..fb89688 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -816,7 +816,13 @@ IShellFolder_fnGetDisplayNameOf (IShellF _ILSimpleGetText(pidl, strRet->u.cStr + len, MAX_PATH - len); if (!_ILIsFolder(pidl)) SHELL_FS_ProcessDisplayFilename(strRet->u.cStr, dwFlags); } else { - hr = SHELL32_GetDisplayNameOfChild(iface, pidl, dwFlags, strRet->u.cStr, MAX_PATH); + WCHAR wszPath[MAX_PATH]; + hr = SHELL32_GetDisplayNameOfChild(iface, pidl, dwFlags, wszPath, MAX_PATH); + if (SUCCEEDED(hr)) { + if (!WideCharToMultiByte(CP_ACP, 0, wszPath, -1, strRet->u.cStr, MAX_PATH, + NULL, NULL)) + wszPath[0] = '\0'; + } } TRACE ("-- (%p)->(%s)\n", This, strRet->u.cStr); diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index b9b51b7..176b8ae 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -617,12 +617,19 @@ static HRESULT WINAPI ISF_MyComputer_fnG if ((GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL) && bWantsForParsing) { + WCHAR wszPath[MAX_PATH]; /* * We need the filesystem path to the destination folder * Only the folder itself can know it */ hr = SHELL32_GetDisplayNameOfChild (iface, pidl, - dwFlags, szPath, MAX_PATH); + dwFlags, wszPath, MAX_PATH); + if (SUCCEEDED(hr)) + { + if (!WideCharToMultiByte(CP_ACP, 0, wszPath, -1, szPath, MAX_PATH, + NULL, NULL)) + wszPath[0] = '\0'; + } } else { @@ -677,9 +684,16 @@ static HRESULT WINAPI ISF_MyComputer_fnG } else { + WCHAR wszPath[MAX_PATH]; /* Complex pidl. Let the child folder do the work */ strRet->uType = STRRET_CSTR; - hr = SHELL32_GetDisplayNameOfChild(iface, pidl, dwFlags, szPath, MAX_PATH); + hr = SHELL32_GetDisplayNameOfChild(iface, pidl, dwFlags, wszPath, MAX_PATH); + if (SUCCEEDED(hr)) + { + if (!WideCharToMultiByte(CP_ACP, 0, wszPath, -1, szPath, MAX_PATH, + NULL, NULL)) + wszPath[0] = '\0'; + } } if (SUCCEEDED (hr)) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index d033b2a..09e46f1 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -331,7 +331,7 @@ HRESULT SHELL32_BindToChild (LPCITEMIDLI * virtual folders with the registry key WantsFORPARSING set. */ HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf, - LPCITEMIDLIST pidl, DWORD dwFlags, LPSTR szOut, DWORD dwOutLen) + LPCITEMIDLIST pidl, DWORD dwFlags, LPWSTR szOut, DWORD dwOutLen) { LPITEMIDLIST pidlFirst; HRESULT hr = E_INVALIDARG; @@ -350,7 +350,7 @@ HRESULT SHELL32_GetDisplayNameOfChild (I hr = IShellFolder_GetDisplayNameOf (psfChild, pidlNext, dwFlags, &strTemp); if (SUCCEEDED (hr)) { - hr = StrRetToStrNA (szOut, dwOutLen, &strTemp, pidlNext); + hr = StrRetToStrNW (szOut, dwOutLen, &strTemp, pidlNext); } IShellFolder_Release (psfChild); } @@ -358,7 +358,7 @@ HRESULT SHELL32_GetDisplayNameOfChild (I } else hr = E_OUTOFMEMORY; - TRACE ("-- ret=0x%08lx %s\n", hr, szOut); + TRACE ("-- ret=0x%08lx %s\n", hr, debugstr_w(szOut)); return hr; }

1 0

Alex Villacís Lasso : msacm: Fix incorrect linked list traversing leading to memory/driver
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: 8cfa507f31923a717a00bbe8f7c882d6f63c756a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8cfa507f31923a717a00bbe… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Jan 16 21:30:52 2006 +0100 msacm: Fix incorrect linked list traversing leading to memory/driver instance leak. --- dlls/msacm/driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msacm/driver.c b/dlls/msacm/driver.c index bfcc533..eef7875 100644 --- a/dlls/msacm/driver.c +++ b/dlls/msacm/driver.c @@ -123,7 +123,7 @@ MMRESULT WINAPI acmDriverClose(HACMDRIVE padid = pad->obj.pACMDriverID; /* remove driver from list */ - for (tpad = &(padid->pACMDriverList); *tpad; *tpad = (*tpad)->pNextACMDriver) { + for (tpad = &(padid->pACMDriverList); *tpad; tpad = &((*tpad)->pNextACMDriver)) { if (*tpad == pad) { *tpad = (*tpad)->pNextACMDriver; break;

1 0

Uwe Bonnes : regsvr32 understands '-' and '/' for arguments.
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: 6906cbc1bffb52ca3f04059e0a102a3d01a36210 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6906cbc1bffb52ca3f04059… Author: Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> Date: Mon Jan 16 21:30:38 2006 +0100 regsvr32 understands '-' and '/' for arguments. --- programs/regsvr32/regsvr32.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 7fd9c93..184e00a 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -190,11 +190,11 @@ int main(int argc, char* argv[]) */ for(i = 1; i < argc; i++) { - if (!strcasecmp(argv[i], "/u")) + if ((!strcasecmp(argv[i], "/u")) ||(!strcasecmp(argv[i], "-u"))) Unregister = TRUE; - else if (!strcasecmp(argv[i], "/s")) + else if ((!strcasecmp(argv[i], "/s"))||(!strcasecmp(argv[i], "-s"))) Silent = 1; - else if (!strncasecmp(argv[i], "/i", strlen("/i"))) + else if ((!strncasecmp(argv[i], "/i", strlen("/i")))||(!strncasecmp(argv[i], "-i", strlen("-i")))) { CHAR* command_line = argv[i] + strlen("/i"); @@ -236,7 +236,7 @@ int main(int argc, char* argv[]) wsCommandLine = EmptyLine; } } - else if(!strcasecmp(argv[i], "/n")) + else if((!strcasecmp(argv[i], "/n"))||(!strcasecmp(argv[i], "-n"))) CallRegister = FALSE; else if (argv[i][0] == '/' && (!argv[i][2] || argv[i][2] == ':')) printf("Unrecognized switch %s\n", argv[i]);

1 0

Mike McCormack : kernel32: Move FileCDR16 in with the other 16bit file functions.
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: 13ea51556d3bf11201c635f258ba8c1dc470ea0c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=13ea51556d3bf11201c635f… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jan 16 20:51:28 2006 +0100 kernel32: Move FileCDR16 in with the other 16bit file functions. --- dlls/kernel/change.c | 10 ---------- dlls/kernel/file16.c | 9 +++++++++ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/kernel/change.c b/dlls/kernel/change.c index 601c18f..177c616 100644 --- a/dlls/kernel/change.c +++ b/dlls/kernel/change.c @@ -31,7 +31,6 @@ #include "winerror.h" #include "winternl.h" #include "kernel_private.h" -#include "wine/windef16.h" #include "wine/server.h" #include "wine/debug.h" @@ -126,15 +125,6 @@ BOOL WINAPI FindCloseChangeNotification( return CloseHandle( handle ); } -/*********************************************************************** -* FileCDR (KERNEL.130) -*/ -FARPROC16 WINAPI FileCDR16(FARPROC16 x) -{ - FIXME("(%p): stub\n", x); - return (FARPROC16)TRUE; -} - BOOL WINAPI ReadDirectoryChangesW( HANDLE handle, LPVOID buffer, DWORD len, BOOL subtree, DWORD filter, LPDWORD returned, LPOVERLAPPED overlapped, LPOVERLAPPED_COMPLETION_ROUTINE completion ) diff --git a/dlls/kernel/file16.c b/dlls/kernel/file16.c index 0ac6fad..503c614 100644 --- a/dlls/kernel/file16.c +++ b/dlls/kernel/file16.c @@ -733,3 +733,12 @@ BOOL16 WINAPI GetDiskFreeSpace16( LPCSTR return GetDiskFreeSpaceA( root, cluster_sectors, sector_bytes, free_clusters, total_clusters ); } + +/*********************************************************************** + * FileCDR (KERNEL.130) + */ +FARPROC16 WINAPI FileCDR16(FARPROC16 x) +{ + FIXME("(%p): stub\n", x); + return (FARPROC16)TRUE; +}

1 0