wine-commits April 2007

wine-commits@winehq.org

4 participants
687 discussions

Chris Robinson : quartz: Implement IAMFilterData interface for IFilterMapper.
by Alexandre Julliard 11 Apr '07

11 Apr '07

Module: wine Branch: master Commit: 2faaa3b8dee030c874d02b065eb40a482447719c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2faaa3b8dee030c874d02b065… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Apr 10 08:15:09 2007 -0700 quartz: Implement IAMFilterData interface for IFilterMapper. --- dlls/quartz/filtermapper.c | 253 ++++++++++++++++++++++++++++++++++---------- 1 files changed, 198 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2faaa3b8dee030c874d02…

1 0

Francois Gouget : oleaut32/tests: Fix compilation on systems that don' t support nameless structs or unions.
by Alexandre Julliard 11 Apr '07

11 Apr '07

Module: wine Branch: master Commit: 1f692cdcaafaaaec2227c932f261aae380ed58d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f692cdcaafaaaec2227c932f… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 11 11:21:10 2007 +0200 oleaut32/tests: Fix compilation on systems that don't support nameless structs or unions. --- dlls/oleaut32/tests/vartest.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 7de21bd..07ab320 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1392,10 +1392,10 @@ static const char *szFailOk = "Call failed, hres = %08x\n"; ok(V_CY(&vOut).int64 == (LONG64)(val * CY_MULTIPLIER), "Expected r8 = 0x%x%08x, got 0x%x%08x\n", \ (DWORD)((LONG64)val >> 23), (DWORD)(LONG64)val, (DWORD)(V_CY(&vOut).int64 >>32), (DWORD)V_CY(&vOut).int64); } #define EXPECT_DECIMAL(valHi, valMid, valLo) EXPECT_OK { EXPECT_TYPE(VT_DECIMAL); \ - ok((V_DECIMAL(&vOut).Hi32 == valHi) && (V_DECIMAL(&vOut).Mid32 == valMid) && \ - (V_DECIMAL(&vOut).Lo32 == valLo), \ + ok((V_DECIMAL(&vOut).Hi32 == valHi) && (S1(U1(V_DECIMAL(&vOut))).Mid32 == valMid) && \ + (S1(U1(V_DECIMAL(&vOut))).Lo32 == valLo), \ "Expected decimal = %x/0x%x%08x, got %x/0x%x%08x\n", valHi, valMid, valLo, \ - V_DECIMAL(&vOut).Hi32, V_DECIMAL(&vOut).Mid32, V_DECIMAL(&vOut).Lo32); } + V_DECIMAL(&vOut).Hi32, S1(U1(V_DECIMAL(&vOut))).Mid32, S1(U1(V_DECIMAL(&vOut))).Lo32); } static void test_VarNumFromParseNum(void) {

1 0

Aric Stewart : shell32: Use _ILSimpleGetTextW instead of using _ILGetTextPointer
by Alexandre Julliard 11 Apr '07

11 Apr '07

Module: wine Branch: master Commit: c465e11a6d61ccb6054839913d2f99ca4ccd565e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c465e11a6d61ccb6054839913… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 10 19:40:00 2007 +0900 shell32: Use _ILSimpleGetTextW instead of using _ILGetTextPointer to be able to make use of FileStructW and avoid W->A->W roundtrips if possible. --- dlls/shell32/shlfolder.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 6ab4908..b243412 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -222,13 +222,10 @@ static HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot, } if (pidlChild) { - LPCSTR pszChild = _ILGetTextPointer(pidlChild); int len = lstrlenW(ppfti.szTargetParsingName); - if (pszChild) - MultiByteToWideChar (CP_ACP, 0, pszChild, -1, ppfti.szTargetParsingName + len, MAX_PATH - len); - else - hr = E_INVALIDARG; + if (!_ILSimpleGetTextW(pidlChild, ppfti.szTargetParsingName + len, MAX_PATH - len)) + hr = E_INVALIDARG; } IPersistFolder3_InitializeEx (ppf, NULL, pidlAbsolute, &ppfti); @@ -290,7 +287,9 @@ HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, lstrcpynW(wszFolderPath, pathRoot, MAX_PATH); pwszPathTail = PathAddBackslashW(wszFolderPath); } - MultiByteToWideChar(CP_ACP, 0, _ILGetTextPointer(pidlChild), -1, pwszPathTail, MAX_PATH - (int)(pwszPathTail - wszFolderPath)); + + _ILSimpleGetTextW(pidlChild,pwszPathTail,MAX_PATH - (int)(pwszPathTail - wszFolderPath)); + if (SHELL32_GetCustomFolderAttributeFromPath (wszFolderPath, wszDotShellClassInfo, wszCLSID, wszCLSIDValue, CHARS_IN_GUID)) CLSIDFromString (wszCLSIDValue, &clsidFolder);

1 0

Alexandre Julliard : shell32: Have _ILCreateFromFindDataW also create a FileStructW type of pidl.
by Alexandre Julliard 11 Apr '07

11 Apr '07

Module: wine Branch: master Commit: a1b764e65f2cf3973bf9ac19803081942fd0fcbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1b764e65f2cf3973bf9ac198… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 11 12:25:53 2007 +0200 shell32: Have _ILCreateFromFindDataW also create a FileStructW type of pidl. Based on a patch by Aric Stewart. Also get rid of _ILCreateFromFindDataA and _ILCreateFromPatA. --- dlls/shell32/pidl.c | 103 +++++++++++++++------------------------------------ dlls/shell32/pidl.h | 4 +- 2 files changed, 31 insertions(+), 76 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index bc8fdfc..b88c422 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1484,95 +1484,52 @@ LPITEMIDLIST _ILCreateGuidFromStrW(LPCWSTR szGUID) return _ILCreateGuid(PT_GUID, &iid); } -LPITEMIDLIST _ILCreateFromFindDataW( WIN32_FIND_DATAW *wfd ) -{ - /* FIXME: should make unicode PIDLs */ - WIN32_FIND_DATAA fda; - - memset( &fda, 0, sizeof fda ); - fda.dwFileAttributes = wfd->dwFileAttributes; - fda.ftCreationTime = wfd->ftCreationTime; - fda.ftLastAccessTime = wfd->ftLastAccessTime; - fda.ftLastWriteTime = wfd->ftLastWriteTime; - fda.nFileSizeHigh = wfd->nFileSizeHigh; - fda.nFileSizeLow = wfd->nFileSizeLow; - fda.dwReserved0 = wfd->dwReserved0; - fda.dwReserved1 = wfd->dwReserved1; - WideCharToMultiByte( CP_ACP, 0, wfd->cFileName, -1, - fda.cFileName, MAX_PATH, NULL, NULL ); - return _ILCreateFromFindDataA( &fda ); -} - -LPITEMIDLIST _ILCreateFromFindDataA(WIN32_FIND_DATAA * stffile ) +LPITEMIDLIST _ILCreateFromFindDataW( const WIN32_FIND_DATAW *wfd ) { char buff[MAX_PATH + 14 +1]; /* see WIN32_FIND_DATA */ - char * pbuff = buff; - size_t len, len1; + DWORD len, len1, wlen, alen; LPITEMIDLIST pidl; PIDLTYPE type; - if (!stffile) + if (!wfd) return NULL; - TRACE("(%s, %s)\n",stffile->cAlternateFileName, stffile->cFileName); + TRACE("(%s, %s)\n",debugstr_w(wfd->cAlternateFileName), debugstr_w(wfd->cFileName)); /* prepare buffer with both names */ - len = strlen (stffile->cFileName) + 1; - memcpy (pbuff, stffile->cFileName, len); - pbuff += len; + len = WideCharToMultiByte(CP_ACP,0,wfd->cFileName,-1,buff,MAX_PATH,NULL,NULL); + len1 = WideCharToMultiByte(CP_ACP,0,wfd->cAlternateFileName,-1, buff+len, sizeof(buff)-len, NULL, NULL); + alen = len + len1; - len1 = strlen (stffile->cAlternateFileName)+1; - memcpy (pbuff, stffile->cAlternateFileName, len1); + type = (wfd->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? PT_FOLDER : PT_VALUE; - type = (stffile->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? PT_FOLDER : PT_VALUE; - - /* - * FileStruct already has one byte for the first name, so use len - 1 in - * size calculation - */ - pidl = _ILAlloc(type, sizeof(FileStruct) + (len - 1) + len1); + wlen = lstrlenW(wfd->cFileName) + 1; + pidl = _ILAlloc(type, FIELD_OFFSET(FileStruct, szNames[alen + (alen & 1)]) + + FIELD_OFFSET(FileStructW, wszName[wlen]) + sizeof(WORD)); if (pidl) { - LPPIDLDATA pData; - LPSTR pszDest; - - /* set attributes */ - pData = _ILGetDataPointer(pidl); - if (pData) - { - pData->type = type; - FileTimeToDosDateTime( &(stffile->ftLastWriteTime), - &pData->u.file.uFileDate, &pData->u.file.uFileTime); - pData->u.file.dwFileSize = stffile->nFileSizeLow; - pData->u.file.uFileAttribs = (WORD)stffile->dwFileAttributes; - } - pszDest = _ILGetTextPointer(pidl); - if (pszDest) - { - memcpy(pszDest, buff, len + len1); - TRACE("-- create Value: %s\n",debugstr_a(pszDest)); - } + LPPIDLDATA pData = _ILGetDataPointer(pidl); + FileStruct *fs = &pData->u.file; + FileStructW *fsw; + WORD *pOffsetW; + + FileTimeToDosDateTime( &wfd->ftLastWriteTime, &fs->uFileDate, &fs->uFileTime); + fs->dwFileSize = wfd->nFileSizeLow; + fs->uFileAttribs = wfd->dwFileAttributes; + memcpy(fs->szNames, buff, alen); + + fsw = (FileStructW*)(pData->u.file.szNames + alen + (alen & 0x1)); + fsw->cbLen = FIELD_OFFSET(FileStructW, wszName[wlen]) + sizeof(WORD); + FileTimeToDosDateTime( &wfd->ftCreationTime, &fsw->uCreationDate, &fsw->uCreationTime); + FileTimeToDosDateTime( &wfd->ftLastAccessTime, &fsw->uLastAccessDate, &fsw->uLastAccessTime); + memcpy(fsw->wszName, wfd->cFileName, wlen * sizeof(WCHAR)); + + pOffsetW = (WORD*)((LPBYTE)pidl + pidl->mkid.cb - sizeof(WORD)); + *pOffsetW = (LPBYTE)fsw - (LPBYTE)pidl; + TRACE("-- Set Value: %s\n",debugstr_w(fsw->wszName)); } return pidl; -} - -HRESULT _ILCreateFromPathA(LPCSTR szPath, LPITEMIDLIST* ppidl) -{ - HANDLE hFile; - WIN32_FIND_DATAA stffile; - - if (!ppidl) - return E_INVALIDARG; - hFile = FindFirstFileA(szPath, &stffile); - if (hFile == INVALID_HANDLE_VALUE) - return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); - - FindClose(hFile); - - *ppidl = _ILCreateFromFindDataA(&stffile); - - return *ppidl ? S_OK : E_OUTOFMEMORY; } HRESULT _ILCreateFromPathW(LPCWSTR szPath, LPITEMIDLIST* ppidl) diff --git a/dlls/shell32/pidl.h b/dlls/shell32/pidl.h index c2b5cd9..06372fa 100644 --- a/dlls/shell32/pidl.h +++ b/dlls/shell32/pidl.h @@ -242,9 +242,7 @@ LPITEMIDLIST _ILCreateGuidFromStrW(LPCWSTR szGUID); /* Commonly used PIDLs representing file system objects. */ LPITEMIDLIST _ILCreateDesktop (void); -LPITEMIDLIST _ILCreateFromFindDataA(WIN32_FIND_DATAA *stffile); -LPITEMIDLIST _ILCreateFromFindDataW(WIN32_FIND_DATAW *stffile); -HRESULT _ILCreateFromPathA (LPCSTR szPath, LPITEMIDLIST* ppidl); +LPITEMIDLIST _ILCreateFromFindDataW(const WIN32_FIND_DATAW *stffile); HRESULT _ILCreateFromPathW (LPCWSTR szPath, LPITEMIDLIST* ppidl); /* Other helpers */

1 0

Aric Stewart : shell32: Update the debug functions to handle Unicode value pidl.
by Alexandre Julliard 11 Apr '07

11 Apr '07

Module: wine Branch: master Commit: c0db9e573eaba6a119aefe39068a1e3d988c4778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0db9e573eaba6a119aefe390… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Apr 9 20:52:21 2007 +0900 shell32: Update the debug functions to handle Unicode value pidl. Add _ILIsUnicode as a simple pidl test. --- dlls/shell32/debughlp.c | 129 +++++++++++++++++++++++++++++++++++++++++----- dlls/shell32/pidl.c | 10 ++++ dlls/shell32/pidl.h | 1 + 3 files changed, 126 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/debughlp.c b/dlls/shell32/debughlp.c index 16f79f2..b1e9238 100644 --- a/dlls/shell32/debughlp.c +++ b/dlls/shell32/debughlp.c @@ -104,6 +104,51 @@ LPSTR _dbg_ILGetTextPointer(LPCITEMIDLIST pidl) } static +LPWSTR _dbg_ILGetTextPointerW(LPCITEMIDLIST pidl) +{ + LPPIDLDATA pdata =_dbg_ILGetDataPointer(pidl); + + if (pdata) + { + switch (pdata->type) + { + case PT_GUID: + case PT_SHELLEXT: + case PT_YAGUID: + return NULL; + + case PT_DRIVE: + case PT_DRIVE1: + case PT_DRIVE2: + case PT_DRIVE3: + /* return (LPSTR)&(pdata->u.drive.szDriveName);*/ + return NULL; + + case PT_FOLDER: + case PT_FOLDER1: + case PT_VALUE: + case PT_IESPECIAL1: + case PT_IESPECIAL2: + /* return (LPSTR)&(pdata->u.file.szNames); */ + return NULL; + + case PT_WORKGRP: + case PT_COMP: + case PT_NETWORK: + case PT_NETPROVIDER: + case PT_SHARE: + /* return (LPSTR)&(pdata->u.network.szNames); */ + return NULL; + + case PT_VALUEW: + return (LPWSTR)&(pdata->u.file.szNames); + } + } + return NULL; +} + + +static LPSTR _dbg_ILGetSTextPointer(LPCITEMIDLIST pidl) { LPPIDLDATA pdata =_dbg_ILGetDataPointer(pidl); @@ -126,6 +171,34 @@ LPSTR _dbg_ILGetSTextPointer(LPCITEMIDLIST pidl) } static +LPWSTR _dbg_ILGetSTextPointerW(LPCITEMIDLIST pidl) +{ + LPPIDLDATA pdata =_dbg_ILGetDataPointer(pidl); + + if (pdata) + { + switch (pdata->type) + { + case PT_FOLDER: + case PT_VALUE: + case PT_IESPECIAL1: + case PT_IESPECIAL2: + /*return (LPSTR)(pdata->u.file.szNames + strlen (pdata->u.file.szNames) + 1); */ + return NULL; + + case PT_WORKGRP: + /* return (LPSTR)(pdata->u.network.szNames + strlen (pdata->u.network.szNames) + 1); */ + return NULL; + + case PT_VALUEW: + return (LPWSTR)(pdata->u.file.szNames + lstrlenW ((LPWSTR)pdata->u.file.szNames) + 1); + } + } + return NULL; +} + + +static IID* _dbg_ILGetGUIDPointer(LPCITEMIDLIST pidl) { LPPIDLDATA pdata =_ILGetDataPointer(pidl); @@ -147,6 +220,7 @@ static void _dbg_ILSimpleGetText (LPCITEMIDLIST pidl, LPSTR szOut, UINT uOutSize) { LPSTR szSrc; + LPWSTR szSrcW; GUID const * riid; if (!pidl) return; @@ -164,6 +238,13 @@ void _dbg_ILSimpleGetText (LPCITEMIDLIST pidl, LPSTR szOut, UINT uOutSize) /* filesystem */ if (szOut) lstrcpynA(szOut, szSrc, uOutSize); } + else if (( szSrcW = _dbg_ILGetTextPointerW(pidl) )) + { + CHAR tmp[MAX_PATH]; + /* unicode filesystem */ + WideCharToMultiByte(CP_ACP,0,szSrcW, -1, tmp, MAX_PATH, NULL, NULL); + if (szOut) lstrcpynA(szOut, tmp, uOutSize); + } else if (( riid = _dbg_ILGetGUIDPointer(pidl) )) { if (szOut) @@ -194,20 +275,40 @@ void pdump (LPCITEMIDLIST pidl) { do { - DWORD dwAttrib = 0; - LPPIDLDATA pData = _dbg_ILGetDataPointer(pidltemp); - DWORD type = pData ? pData->type : 0; - LPSTR szLongName = _dbg_ILGetTextPointer(pidltemp); - LPSTR szShortName = _dbg_ILGetSTextPointer(pidltemp); - char szName[MAX_PATH]; - - _dbg_ILSimpleGetText(pidltemp, szName, MAX_PATH); - if ( pData && (PT_FOLDER == type || PT_VALUE == type) ) - dwAttrib = pData->u.file.uFileAttribs; - - MESSAGE ("[%p] size=%04u type=%x attr=0x%08x name=%s (%s,%s)\n", - pidltemp, pidltemp->mkid.cb, type, dwAttrib, - debugstr_a(szName), debugstr_a(szLongName), debugstr_a(szShortName)); + if (_ILIsUnicode(pidltemp)) + { + DWORD dwAttrib = 0; + LPPIDLDATA pData = _dbg_ILGetDataPointer(pidltemp); + DWORD type = pData ? pData->type : 0; + LPWSTR szLongName = _dbg_ILGetTextPointerW(pidltemp); + LPWSTR szShortName = _dbg_ILGetSTextPointerW(pidltemp); + char szName[MAX_PATH]; + + _dbg_ILSimpleGetText(pidltemp, szName, MAX_PATH); + if ( pData && (PT_FOLDER == type || PT_VALUE == type) ) + dwAttrib = pData->u.file.uFileAttribs; + + MESSAGE ("[%p] size=%04u type=%x attr=0x%08x name=%s (%s,%s)\n", + pidltemp, pidltemp->mkid.cb, type, dwAttrib, + debugstr_a(szName), debugstr_w(szLongName), debugstr_w(szShortName)); + } + else + { + DWORD dwAttrib = 0; + LPPIDLDATA pData = _dbg_ILGetDataPointer(pidltemp); + DWORD type = pData ? pData->type : 0; + LPSTR szLongName = _dbg_ILGetTextPointer(pidltemp); + LPSTR szShortName = _dbg_ILGetSTextPointer(pidltemp); + char szName[MAX_PATH]; + + _dbg_ILSimpleGetText(pidltemp, szName, MAX_PATH); + if ( pData && (PT_FOLDER == type || PT_VALUE == type) ) + dwAttrib = pData->u.file.uFileAttribs; + + MESSAGE ("[%p] size=%04u type=%x attr=0x%08x name=%s (%s,%s)\n", + pidltemp, pidltemp->mkid.cb, type, dwAttrib, + debugstr_a(szName), debugstr_a(szLongName), debugstr_a(szShortName)); + } pidltemp = _dbg_ILGetNext(pidltemp); diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index e1d19f2..bc8fdfc 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1642,6 +1642,7 @@ DWORD _ILGetDrive(LPCITEMIDLIST pidl,LPSTR pOut, UINT uSize) * ### 2. section testing pidls ### * ************************************************************************** + * _ILIsUnicode() * _ILIsDesktop() * _ILIsMyComputer() * _ILIsSpecialFolder() @@ -1650,6 +1651,15 @@ DWORD _ILGetDrive(LPCITEMIDLIST pidl,LPSTR pOut, UINT uSize) * _ILIsValue() * _ILIsPidlSimple() */ +BOOL _ILIsUnicode(LPCITEMIDLIST pidl) +{ + LPPIDLDATA lpPData = _ILGetDataPointer(pidl); + + TRACE("(%p)\n",pidl); + + return (pidl && lpPData && PT_VALUEW == lpPData->type); +} + BOOL _ILIsDesktop(LPCITEMIDLIST pidl) { TRACE("(%p)\n",pidl); diff --git a/dlls/shell32/pidl.h b/dlls/shell32/pidl.h index 34112fe..c2b5cd9 100644 --- a/dlls/shell32/pidl.h +++ b/dlls/shell32/pidl.h @@ -201,6 +201,7 @@ DWORD _ILGetDrive (LPCITEMIDLIST, LPSTR, UINT); /* * testing simple pidls */ +BOOL _ILIsUnicode (LPCITEMIDLIST pidl); BOOL _ILIsDesktop (LPCITEMIDLIST pidl); BOOL _ILIsMyComputer (LPCITEMIDLIST pidl); BOOL _ILIsDrive (LPCITEMIDLIST pidl);

1 0

Aric Stewart : shell32: Avoid unneeded A-> W conversions in _ILSimpleGetTextW.
by Alexandre Julliard 11 Apr '07

11 Apr '07

Module: wine Branch: master Commit: 3533be811cc28a7bee392005f852944b50d29198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3533be811cc28a7bee392005f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Apr 9 20:12:00 2007 +0900 shell32: Avoid unneeded A->W conversions in _ILSimpleGetTextW. Implement _ILGetTextPointerW, though it does little now. Handle the LPWSTR from _ILGetTextPointerW in _ILSimpleGetText and _ILSimpleGetTextW. --- dlls/shell32/pidl.c | 118 +++++++++++++++++++++++++++++++++++++++++++++++++- dlls/shell32/pidl.h | 1 + 2 files changed, 116 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index c5a79e0..e1d19f2 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1754,6 +1754,7 @@ DWORD _ILSimpleGetText (LPCITEMIDLIST pidl, LPSTR szOut, UINT uOutSize) { DWORD dwReturn=0; LPSTR szSrc; + LPWSTR szSrcW; GUID const * riid; char szTemp[MAX_PATH]; @@ -1784,6 +1785,16 @@ DWORD _ILSimpleGetText (LPCITEMIDLIST pidl, LPSTR szOut, UINT uOutSize) dwReturn = strlen(szSrc); } + else if (( szSrcW = _ILGetTextPointerW(pidl) )) + { + /* unicode filesystem */ + WideCharToMultiByte(CP_ACP,0,szSrcW, -1, szTemp, MAX_PATH, NULL, NULL); + + if (szOut) + lstrcpynA(szOut, szTemp, uOutSize); + + dwReturn = strlen (szTemp); + } else if (( riid = _ILGetGUIDPointer(pidl) )) { /* special folder */ @@ -1814,7 +1825,6 @@ DWORD _ILSimpleGetText (LPCITEMIDLIST pidl, LPSTR szOut, UINT uOutSize) DWORD _ILSimpleGetTextW (LPCITEMIDLIST pidl, LPWSTR szOut, UINT uOutSize) { DWORD dwReturn; - char szTemp[MAX_PATH]; FileStructW *pFileStructW = _ILGetFileStructW(pidl); TRACE("(%p %p %x)\n",pidl,szOut,uOutSize); @@ -1823,10 +1833,62 @@ DWORD _ILSimpleGetTextW (LPCITEMIDLIST pidl, LPWSTR szOut, UINT uOutSize) lstrcpynW(szOut, pFileStructW->wszName, uOutSize); dwReturn = lstrlenW(pFileStructW->wszName); } else { - dwReturn = _ILSimpleGetText(pidl, szTemp, MAX_PATH); + GUID const * riid; + WCHAR szTemp[MAX_PATH]; + LPSTR szSrc; + LPWSTR szSrcW; + dwReturn=0; - if (!MultiByteToWideChar(CP_ACP, 0, szTemp, -1, szOut, uOutSize)) + if (!pidl) + return 0; + + if (szOut) *szOut = 0; + + if (_ILIsDesktop(pidl)) + { + /* desktop */ + if (HCR_GetClassNameW(&CLSID_ShellDesktop, szTemp, MAX_PATH)) + { + if (szOut) + lstrcpynW(szOut, szTemp, uOutSize); + + dwReturn = lstrlenW (szTemp); + } + } + else if (( szSrcW = _ILGetTextPointerW(pidl) )) + { + /* unicode filesystem */ + if (szOut) + lstrcpynW(szOut, szSrcW, uOutSize); + + dwReturn = lstrlenW(szSrcW); + } + else if (( szSrc = _ILGetTextPointer(pidl) )) + { + /* filesystem */ + MultiByteToWideChar(CP_ACP, 0, szSrc, -1, szTemp, MAX_PATH); + + if (szOut) + lstrcpynW(szOut, szTemp, uOutSize); + + dwReturn = lstrlenW (szTemp); + } + else if (( riid = _ILGetGUIDPointer(pidl) )) + { + /* special folder */ + if ( HCR_GetClassNameW(riid, szTemp, MAX_PATH) ) + { + if (szOut) + lstrcpynW(szOut, szTemp, uOutSize); + + dwReturn = lstrlenW (szTemp); + } + } + else + { + ERR("-- no text\n"); + } } TRACE("-- (%p=%s 0x%08x)\n",szOut,debugstr_w(szOut),dwReturn); @@ -1848,6 +1910,56 @@ LPPIDLDATA _ILGetDataPointer(LPCITEMIDLIST pidl) } /************************************************************************** + * _ILGetTextPointerW() + * gets a pointer to the unicode long filename string stored in the pidl + */ +LPWSTR _ILGetTextPointerW(LPCITEMIDLIST pidl) +{ + /* TRACE(pidl,"(pidl%p)\n", pidl);*/ + + LPPIDLDATA pdata = _ILGetDataPointer(pidl); + + if (!pdata) + return NULL; + + switch (pdata->type) + { + case PT_GUID: + case PT_SHELLEXT: + case PT_YAGUID: + return NULL; + + case PT_DRIVE: + case PT_DRIVE1: + case PT_DRIVE2: + case PT_DRIVE3: + /*return (LPSTR)&(pdata->u.drive.szDriveName);*/ + return NULL; + + case PT_FOLDER: + case PT_FOLDER1: + case PT_VALUE: + case PT_IESPECIAL1: + case PT_IESPECIAL2: + /*return (LPSTR)&(pdata->u.file.szNames);*/ + return NULL; + + case PT_WORKGRP: + case PT_COMP: + case PT_NETWORK: + case PT_NETPROVIDER: + case PT_SHARE: + /*return (LPSTR)&(pdata->u.network.szNames);*/ + return NULL; + + case PT_VALUEW: + return (LPWSTR)&(pdata->u.file.szNames); + } + return NULL; +} + + +/************************************************************************** * _ILGetTextPointer() * gets a pointer to the long filename string stored in the pidl */ diff --git a/dlls/shell32/pidl.h b/dlls/shell32/pidl.h index 0bdae80..34112fe 100644 --- a/dlls/shell32/pidl.h +++ b/dlls/shell32/pidl.h @@ -261,6 +261,7 @@ LPITEMIDLIST _ILCreateDrive (LPCWSTR); */ LPPIDLDATA _ILGetDataPointer (LPCITEMIDLIST); LPSTR _ILGetTextPointer (LPCITEMIDLIST); +LPWSTR _ILGetTextPointerW (LPCITEMIDLIST); LPSTR _ILGetSTextPointer (LPCITEMIDLIST); IID *_ILGetGUIDPointer (LPCITEMIDLIST pidl); FileStructW *_ILGetFileStructW (LPCITEMIDLIST pidl);

1 0

Aric Stewart : msi: Register fonts with full target paths as applications can and will install fonts to places other than the windows /fonts directory.
by Alexandre Julliard 11 Apr '07

11 Apr '07

Module: wine Branch: master Commit: d54900b8bc856e0fbe2d0ef99b1433de0c0112dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d54900b8bc856e0fbe2d0ef99… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 11 16:10:32 2007 +0900 msi: Register fonts with full target paths as applications can and will install fonts to places other than the windows/fonts directory. --- dlls/msi/font.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/font.c b/dlls/msi/font.c index 2b08a0f..b0c43f3 100644 --- a/dlls/msi/font.c +++ b/dlls/msi/font.c @@ -216,8 +216,8 @@ static UINT ITERATE_RegisterFonts(MSIRECORD *row, LPVOID param) if (name) { - msi_reg_set_val_str( hkey1, name, file->FileName ); - msi_reg_set_val_str( hkey2, name, file->FileName ); + msi_reg_set_val_str( hkey1, name, file->TargetPath); + msi_reg_set_val_str( hkey2, name, file->TargetPath); } msi_free(name);

1 0

Paul Vriens : advapi32/tests: Use skip when OpenSCManagerA is not implemented.
by Alexandre Julliard 11 Apr '07

11 Apr '07

Module: wine Branch: master Commit: 7dd647b633c9cd733128978a069a816ccf09a9fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dd647b633c9cd733128978a0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Apr 11 08:39:34 2007 +0200 advapi32/tests: Use skip when OpenSCManagerA is not implemented. --- dlls/advapi32/tests/registry.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 0b6a25a..9d2a544 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -754,8 +754,8 @@ static void test_regconnectregistry( void) LONG retl; HKEY hkey; SC_HANDLE schnd; - DWORD GLE; + SetLastError(0xdeadbeef); ret = GetComputerNameA(compName, &len); ok( ret, "GetComputerName failed err = %d\n", GetLastError()); if( !ret) return; @@ -771,16 +771,20 @@ static void test_regconnectregistry( void) ok( !retl || retl == ERROR_DLL_INIT_FAILED, "RegConnectRegistryA failed err = %d\n", retl); if( !retl) RegCloseKey( hkey); + SetLastError(0xdeadbeef); schnd = OpenSCManagerA( compName, NULL, GENERIC_READ); - GLE = GetLastError(); - ok( schnd != NULL || GLE==ERROR_CALL_NOT_IMPLEMENTED, - "OpenSCManagerA failed err = %d\n", GLE); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("OpenSCManagerA is not implemented\n"); + return; + } + + ok( schnd != NULL, "OpenSCManagerA failed err = %d\n", GetLastError()); CloseServiceHandle( schnd); + SetLastError(0xdeadbeef); schnd = OpenSCManagerA( netwName, NULL, GENERIC_READ); - GLE = GetLastError(); - ok( schnd != NULL || GLE==ERROR_CALL_NOT_IMPLEMENTED, - "OpenSCManagerA failed err = %d\n", GLE); + ok( schnd != NULL, "OpenSCManagerA failed err = %d\n", GetLastError()); CloseServiceHandle( schnd); }

1 0

Michael Stefaniuc : ws2_32/tests: Remove redundant NULL check before HeapFree().
by Alexandre Julliard 11 Apr '07

11 Apr '07

Module: wine Branch: master Commit: 57d200235127b6cdf58a272cecf04d8c2cf2fac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d200235127b6cdf58a272ce… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 11 00:15:22 2007 +0200 ws2_32/tests: Remove redundant NULL check before HeapFree(). --- dlls/ws2_32/tests/sock.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6ae9180..17268b7 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1725,8 +1725,7 @@ end: closesocket(dst); if (hThread != NULL) CloseHandle(hThread); - if (buffer != NULL) - HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, buffer); } static void test_write_events(void)

1 0

Andrew Talbot : msvcrt: Remove superfluous semicolons.
by Alexandre Julliard 11 Apr '07

11 Apr '07

Module: wine Branch: master Commit: 0edfb58d2aeee54cde84ba65007c5fdf40ab9e4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0edfb58d2aeee54cde84ba650… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Apr 10 23:13:10 2007 +0100 msvcrt: Remove superfluous semicolons. --- dlls/msvcrt/cpp.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 3592f9d..69ace0a 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -637,17 +637,17 @@ void * __stdcall MSVCRT_type_info_vector_dtor(type_info * _this, unsigned int fl funcs "\n\t.text"); #define __ASM_EXCEPTION_VTABLE(name) \ - __ASM_VTABLE(name, "\t.long " THISCALL_NAME(MSVCRT_what_exception) ); + __ASM_VTABLE(name, "\t.long " THISCALL_NAME(MSVCRT_what_exception) ) #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif -__ASM_VTABLE(type_info,""); -__ASM_EXCEPTION_VTABLE(exception); -__ASM_EXCEPTION_VTABLE(bad_typeid); -__ASM_EXCEPTION_VTABLE(bad_cast); -__ASM_EXCEPTION_VTABLE(__non_rtti_object); +__ASM_VTABLE(type_info,"") +__ASM_EXCEPTION_VTABLE(exception) +__ASM_EXCEPTION_VTABLE(bad_typeid) +__ASM_EXCEPTION_VTABLE(bad_cast) +__ASM_EXCEPTION_VTABLE(__non_rtti_object) #ifndef __GNUC__ }

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
69
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2007