January 2008 - Wine-commits

Rob Shearman : riched20: The wParam parameter to WM_GETTEXT contains the number of characters, not the number of bytes.
by Alexandre Julliard 21 Jan '08

21 Jan '08

Module: wine Branch: master Commit: 374f6ec616567772d87c13f066cd06f03bf893bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=374f6ec616567772d87c13f06… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 18 13:23:37 2008 +0000 riched20: The wParam parameter to WM_GETTEXT contains the number of characters, not the number of bytes. Fix up some places in the WM_GETTEXT handler where it was assumed that it was a byte count. --- dlls/riched20/editor.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 4e7c820..a954500 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2077,7 +2077,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, else bufferA = heap_alloc(wParam + 2); - ex.cb = wParam + (unicode ? 2*sizeof(WCHAR) : 2); + ex.cb = (wParam + 2) * (unicode ? sizeof(WCHAR) : sizeof(CHAR)); ex.flags = GT_USECRLF; ex.codepage = unicode ? 1200 : CP_ACP; ex.lpDefaultChar = NULL; @@ -2086,8 +2086,8 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, if (unicode) { - memcpy((LPWSTR)lParam, bufferW, wParam); - if (lstrlenW(bufferW) >= wParam / sizeof(WCHAR)) rc = 0; + memcpy((LPWSTR)lParam, bufferW, wParam * sizeof(WCHAR)); + if (lstrlenW(bufferW) >= wParam) rc = 0; } else {

1 0

Alexander Nicolaysen Sørnes : riched20: Don't clear CFM_UNDERLINE flag when applying styles where it is set.
by Alexandre Julliard 21 Jan '08

21 Jan '08

Module: wine Branch: master Commit: 9f41a53c2aa89655054888a69dfc72de993fc1f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f41a53c2aa89655054888a69… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jan 20 17:50:52 2008 +0100 riched20: Don't clear CFM_UNDERLINE flag when applying styles where it is set. --- dlls/riched20/style.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 06d76cf..8d67de3 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -218,7 +218,6 @@ ME_Style *ME_ApplyStyle(ME_Style *sSrc, CHARFORMAT2W *style) if (style->dwMask & CFM_UNDERLINE) { s->fmt.dwMask |= CFM_UNDERLINETYPE; - s->fmt.dwMask &= ~CFM_UNDERLINE; s->fmt.bUnderlineType = (style->dwEffects & CFM_UNDERLINE) ? CFU_CF1UNDERLINE : CFU_UNDERLINENONE; }

1 0

Marcus Meissner : gdi32: Fix possible NULL ptr in TRACE.
by Alexandre Julliard 21 Jan '08

21 Jan '08

Module: wine Branch: master Commit: a63664f1ecc54db63fb19eafdcfe390583490485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a63664f1ecc54db63fb19eafd… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jan 20 20:59:16 2008 +0100 gdi32: Fix possible NULL ptr in TRACE. --- dlls/gdi32/font.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 2789df5..5cec471 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -848,8 +848,9 @@ static INT FONT_EnumFontFamiliesEx( HDC hDC, LPLOGFONTW plf, if (!dc) return 0; - TRACE("lfFaceName = %s lfCharset = %d\n", debugstr_w(plf->lfFaceName), - plf->lfCharSet); + if (plf) + TRACE("lfFaceName = %s lfCharset = %d\n", debugstr_w(plf->lfFaceName), + plf->lfCharSet); fe32.lpLogFontParam = plf; fe32.lpEnumFunc = efproc; fe32.lpData = lParam;

1 0

Marcus Meissner : msi: Replaced msi_free() by LocalAlloc() since ConvertSidToStringSidW uses LocalAlloc().
by Alexandre Julliard 21 Jan '08

21 Jan '08

Module: wine Branch: master Commit: 943ac9795bfa2128d1b83294a646ef0a04e4a3db URL: http://source.winehq.org/git/wine.git/?a=commit;h=943ac9795bfa2128d1b83294a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jan 20 21:11:19 2008 +0100 msi: Replaced msi_free() by LocalAlloc() since ConvertSidToStringSidW uses LocalAlloc(). Spotted by Christoph von Wittich <Christoph(a)ApiViewer.de>. --- dlls/msi/registry.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index bf06d9d..ac89186 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -662,7 +662,7 @@ UINT MSIREG_OpenUserDataFeaturesKey(LPCWSTR szProduct, HKEY *key, BOOL create) else rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); - msi_free(usersid); + LocalFree(usersid); return rc; } @@ -739,7 +739,7 @@ UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, HKEY *key, BOOL create else rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); - msi_free(usersid); + LocalFree(usersid); return rc; } @@ -764,7 +764,7 @@ UINT MSIREG_DeleteUserDataComponentKey(LPCWSTR szComponent) sprintfW(keypath, szUserDataComp_fmt, usersid, comp); - msi_free(usersid); + LocalFree(usersid); return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); } @@ -794,7 +794,7 @@ UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, HKEY *key, BOOL create) else rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); - msi_free(usersid); + LocalFree(usersid); return rc; } @@ -824,7 +824,7 @@ UINT MSIREG_OpenInstallPropertiesKey(LPCWSTR szProduct, HKEY *key, BOOL create) else rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); - msi_free(usersid); + LocalFree(usersid); return rc; } @@ -849,7 +849,7 @@ UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct) sprintfW(keypath, szUserDataProd_fmt, usersid, squished_pc); - msi_free(usersid); + LocalFree(usersid); return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); } @@ -1039,7 +1039,7 @@ UINT MSIREG_OpenLocalManagedProductKey(LPCWSTR szProductCode, HKEY *key, BOOL cr } sprintfW(keypath, szInstaller_LocalManagedProd_fmt, usersid, squished_pc); - msi_free(usersid); + LocalFree(usersid); if (create) return RegCreateKeyW(HKEY_LOCAL_MACHINE, keypath, key);

1 0

Hans Leidekker : msvcr71: Add an implementation that forwards to msvcrt.
by Alexandre Julliard 21 Jan '08

21 Jan '08

Module: wine Branch: master Commit: 67815c6b9e663a18f624b73271e35331a7b35833 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67815c6b9e663a18f624b7327… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Jan 20 19:34:01 2008 +0100 msvcr71: Add an implementation that forwards to msvcrt. --- .gitignore | 1 + Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 5 + dlls/msvcr71/Makefile.in | 14 + dlls/msvcr71/msvcr71.c | 42 +++ dlls/msvcr71/msvcr71.spec | 837 +++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 905 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67815c6b9e663a18f624b…

1 0

Hans Leidekker : msvcrt: _ftol returns a 64-bit value.
by Alexandre Julliard 21 Jan '08

21 Jan '08

Module: wine Branch: master Commit: b284dfd7abad56228ae66173df4fb9ad1eca7263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b284dfd7abad56228ae66173d… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Jan 20 19:34:44 2008 +0100 msvcrt: _ftol returns a 64-bit value. --- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index c09fda9..339cb1c 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -596,7 +596,7 @@ @ cdecl _fsopen(str str long) msvcrt._fsopen @ cdecl _fstat(long ptr) msvcrt._fstat @ cdecl _ftime(ptr) msvcrt._ftime -@ cdecl _ftol() msvcrt._ftol +@ cdecl -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime(long ptr) msvcrt._futime @ cdecl _gcvt( double long str) msvcrt._gcvt diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index d44a767..e46b157 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -653,7 +653,7 @@ @ cdecl _fstat(long ptr) msvcrt._fstat @ cdecl _fstati64(long ptr) msvcrt._fstati64 @ cdecl _ftime(ptr) msvcrt._ftime -@ cdecl _ftol() msvcrt._ftol +@ cdecl -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime(long ptr) msvcrt._futime @ cdecl _gcvt( double long str) msvcrt._gcvt

1 0

Hans Leidekker : msvcrt: Fix _execv spec entries for the forwarding variants too.
by Alexandre Julliard 21 Jan '08

21 Jan '08

Module: wine Branch: master Commit: 93661611e524bf354157a8cb6ec256a7ae405b3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=93661611e524bf354157a8cb6… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Jan 20 19:34:29 2008 +0100 msvcrt: Fix _execv spec entries for the forwarding variants too. --- dlls/msvcrt20/msvcrt20.spec | 8 ++++---- dlls/msvcrt40/msvcrt40.spec | 8 ++++---- dlls/msvcrtd/msvcrtd.spec | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 8282130..c09fda9 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -566,10 +566,10 @@ @ varargs _execle(str str) msvcrt._execle @ varargs _execlp(str str) msvcrt._execlp @ varargs _execlpe(str str) msvcrt._execlpe -@ cdecl _execv(str str) msvcrt._execv -@ cdecl _execve(str str str) msvcrt._execve -@ cdecl _execvp(str str) msvcrt._execvp -@ cdecl _execvpe(str str str) msvcrt._execvpe +@ cdecl _execv(str ptr) msvcrt._execv +@ cdecl _execve(str ptr ptr) msvcrt._execve +@ cdecl _execvp(str ptr) msvcrt._execvp +@ cdecl _execvpe(str ptr ptr) msvcrt._execvpe @ cdecl _exit(long) msvcrt._exit @ cdecl _expand(ptr long) msvcrt._expand @ cdecl _fcloseall() msvcrt._fcloseall diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 4657ccf..d44a767 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -619,10 +619,10 @@ @ varargs _execle(str str) msvcrt._execle @ varargs _execlp(str str) msvcrt._execlp @ varargs _execlpe(str str) msvcrt._execlpe -@ cdecl _execv(str str) msvcrt._execv -@ cdecl _execve(str str str) msvcrt._execve -@ cdecl _execvp(str str) msvcrt._execvp -@ cdecl _execvpe(str str str) msvcrt._execvpe +@ cdecl _execv(str ptr) msvcrt._execv +@ cdecl _execve(str ptr ptr) msvcrt._execve +@ cdecl _execvp(str ptr) msvcrt._execvp +@ cdecl _execvpe(str ptr ptr) msvcrt._execvpe @ cdecl _exit(long) msvcrt._exit @ cdecl _expand(ptr long) msvcrt._expand @ cdecl _fcloseall() msvcrt._fcloseall diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 9e94364..ec1a4b7 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -235,10 +235,10 @@ @ varargs _execle(str str) msvcrt._execle @ varargs _execlp(str str) msvcrt._execlp @ varargs _execlpe(str str) msvcrt._execlpe -@ cdecl _execv(str str) msvcrt._execv -@ cdecl _execve(str str str) msvcrt._execve -@ cdecl _execvp(str str) msvcrt._execvp -@ cdecl _execvpe(str str str) msvcrt._execvpe +@ cdecl _execv(str ptr) msvcrt._execv +@ cdecl _execve(str ptr ptr) msvcrt._execve +@ cdecl _execvp(str ptr) msvcrt._execvp +@ cdecl _execvpe(str ptr ptr) msvcrt._execvpe @ cdecl _exit(long) msvcrt._exit @ cdecl _expand(ptr long) msvcrt._expand @ cdecl _expand_dbg(ptr long) msvcrt._expand

1 0

Andrew Talbot : shell32: Remove unneeded casts.
by Alexandre Julliard 21 Jan '08

21 Jan '08

Module: wine Branch: master Commit: 2f2575567465863f005e0dcfb5d073cc49c6ad68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f2575567465863f005e0dcfb… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 19 16:54:28 2008 +0000 shell32: Remove unneeded casts. --- dlls/shell32/recyclebin.c | 12 ++++++------ dlls/shell32/shell.c | 2 +- dlls/shell32/shell32_main.c | 6 +++--- dlls/shell32/shelllink.c | 4 ++-- dlls/shell32/shfldr_fs.c | 2 +- dlls/shell32/shfldr_mycomp.c | 2 +- dlls/shell32/shfldr_unixfs.c | 6 +++--- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index ddf2fc3..6c26e3d 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -206,9 +206,9 @@ static HRESULT WINAPI RecycleBin_EnumObjects(IShellFolder2 *iface, HWND hwnd, SH HRESULT ret; int pidls_count; int i=0; - - TRACE("(%p, %p, %x, %p)\n", This, hwnd, (unsigned int)grfFlags, ppenumIDList); - + + TRACE("(%p, %p, %x, %p)\n", This, hwnd, grfFlags, ppenumIDList); + if (grfFlags & SHCONTF_NONFOLDERS) { *ppenumIDList = NULL; @@ -293,7 +293,7 @@ static HRESULT WINAPI RecycleBin_CreateViewObject(IShellFolder2 *iface, HWND hwn static HRESULT WINAPI RecycleBin_GetAttributesOf(IShellFolder2 *This, UINT cidl, LPCITEMIDLIST *apidl, SFGAOF *rgfInOut) { - TRACE("(%p, %d, {%p, ...}, {%x})\n", This, cidl, apidl[0], (unsigned int)*rgfInOut); + TRACE("(%p, %d, {%p, ...}, {%x})\n", This, cidl, apidl[0], *rgfInOut); *rgfInOut &= SFGAO_CANMOVE|SFGAO_CANDELETE|SFGAO_HASPROPSHEET|SFGAO_FILESYSTEM; return S_OK; } @@ -310,7 +310,7 @@ static HRESULT WINAPI RecycleBin_GetDisplayNameOf(IShellFolder2 *This, LPCITEMID { WIN32_FIND_DATAW data; - TRACE("(%p, %p, %x, %p)\n", This, pidl, (unsigned int)uFlags, pName); + TRACE("(%p, %p, %x, %p)\n", This, pidl, uFlags, pName); TRASH_UnpackItemID(&pidl->mkid, NULL, &data); pName->uType = STRRET_WSTR; pName->u.pOleStr = StrDupW(PathFindFileNameW(data.cFileName)); @@ -371,7 +371,7 @@ static HRESULT WINAPI RecycleBin_EnumSearches(IShellFolder2 *iface, IEnumExtraSe static HRESULT WINAPI RecycleBin_GetDefaultColumn(IShellFolder2 *iface, DWORD dwReserved, ULONG *pSort, ULONG *pDisplay) { RecycleBin *This = (RecycleBin *)iface; - TRACE("(%p, %x, %p, %p)\n", This, (unsigned int)dwReserved, pSort, pDisplay); + TRACE("(%p, %x, %p, %p)\n", This, dwReserved, pSort, pDisplay); *pSort = 0; *pDisplay = 0; return S_OK; diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c index 0078f57..981e28c 100644 --- a/dlls/shell32/shell.c +++ b/dlls/shell32/shell.c @@ -133,7 +133,7 @@ end: void WINAPI DragFinish16(HDROP16 h) { TRACE("\n"); - GlobalFree16((HGLOBAL16)h); + GlobalFree16(h); } diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 0b7a8f3..37694ba 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -526,7 +526,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, static const WCHAR p1W[] = {'%','1',0}; WCHAR sTemp [MAX_PATH]; - szExt = (LPWSTR) PathFindExtensionW(szFullPath); + szExt = PathFindExtensionW(szFullPath); TRACE("szExt=%s\n", debugstr_w(szExt)); if ( szExt && HCR_MapTypeToValueW(szExt, sTemp, MAX_PATH, TRUE) && @@ -584,7 +584,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, static const WCHAR p1W[] = {'%','1',0}; psfi->iIcon = 0; - szExt = (LPWSTR) PathFindExtensionW(sTemp); + szExt = PathFindExtensionW(sTemp); if ( szExt && HCR_MapTypeToValueW(szExt, sTemp, MAX_PATH, TRUE) && HCR_GetDefaultIconW(sTemp, sTemp, MAX_PATH, &icon_idx)) @@ -1090,7 +1090,7 @@ BOOL WINAPI ShellAboutW( HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff, if(!(hRes = FindResourceW(shell32_hInstance, wszSHELL_ABOUT_MSGBOX, (LPWSTR)RT_DIALOG))) return FALSE; - if(!(template = (LPVOID)LoadResource(shell32_hInstance, hRes))) + if(!(template = LoadResource(shell32_hInstance, hRes))) return FALSE; info.szApp = szApp; info.szOtherStuff = szOtherStuff; diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index c42242c..6e9ac70 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -1539,7 +1539,7 @@ static HRESULT SHELL_PidlGeticonLocationA(IShellFolder* psf, LPCITEMIDLIST pidl, if (SUCCEEDED(hr)) { IExtractIconA* pei; - hr = IShellFolder_GetUIObjectOf(psf, 0, 1, (LPCITEMIDLIST*)&pidlLast, &IID_IExtractIconA, NULL, (LPVOID*)&pei); + hr = IShellFolder_GetUIObjectOf(psf, 0, 1, &pidlLast, &IID_IExtractIconA, NULL, (LPVOID*)&pei); if (SUCCEEDED(hr)) { hr = IExtractIconA_GetIconLocation(pei, 0, pszIconPath, MAX_PATH, piIcon, NULL); @@ -1918,7 +1918,7 @@ static HRESULT SHELL_PidlGeticonLocationW(IShellFolder* psf, LPCITEMIDLIST pidl, if (SUCCEEDED(hr)) { IExtractIconW* pei; - hr = IShellFolder_GetUIObjectOf(psf, 0, 1, (LPCITEMIDLIST*)&pidlLast, &IID_IExtractIconW, NULL, (LPVOID*)&pei); + hr = IShellFolder_GetUIObjectOf(psf, 0, 1, &pidlLast, &IID_IExtractIconW, NULL, (LPVOID*)&pei); if (SUCCEEDED(hr)) { hr = IExtractIconW_GetIconLocation(pei, 0, pszIconPath, MAX_PATH, piIcon, NULL); diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 2b0e407..830013b 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -588,7 +588,7 @@ IShellFolder_fnGetAttributesOf (IShellFolder2 * iface, UINT cidl, IShellFolder *psfParent = NULL; LPCITEMIDLIST rpidl = NULL; - hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder, (LPVOID*)&psfParent, (LPCITEMIDLIST*)&rpidl); + hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder, (LPVOID*)&psfParent, &rpidl); if(SUCCEEDED(hr)) { SHELL32_GetItemAttributes (psfParent, rpidl, rgfInOut); IShellFolder_Release(psfParent); diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 87530a5..af9958e 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -447,7 +447,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetAttributesOf (IShellFolder2 * iface, IShellFolder *psfParent = NULL; LPCITEMIDLIST rpidl = NULL; - hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder, (LPVOID*)&psfParent, (LPCITEMIDLIST*)&rpidl); + hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder, (LPVOID*)&psfParent, &rpidl); if(SUCCEEDED(hr)) { SHELL32_GetItemAttributes (psfParent, rpidl, rgfInOut); IShellFolder_Release(psfParent); diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 6ec8d11..ab1f78a 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -947,11 +947,11 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_BindToObject(IShellFolder2* iface } else { clsidChild = This->m_pCLSID; } - + hr = CreateUnixFolder(NULL, &IID_IPersistFolder3, (void**)&persistFolder, clsidChild); if (!SUCCEEDED(hr)) return hr; - hr = IPersistFolder_QueryInterface(persistFolder, riid, (void**)ppvOut); - + hr = IPersistFolder_QueryInterface(persistFolder, riid, ppvOut); + if (SUCCEEDED(hr)) { UnixFolder *subfolder = ADJUST_THIS(UnixFolder, IPersistFolder3, persistFolder); subfolder->m_pidlLocation = ILCombine(This->m_pidlLocation, pidl);

1 0

Andrew Talbot : shell32: Remove unneeded casts.
by Alexandre Julliard 21 Jan '08

21 Jan '08

Module: wine Branch: master Commit: 6994071269184c5db7b9ede376e3519cb0e518b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6994071269184c5db7b9ede37… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 19 16:54:31 2008 +0000 shell32: Remove unneeded casts. --- dlls/shell32/shlfolder.c | 2 +- dlls/shell32/shv_item_cmenu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 11aeab5..cff924f 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -135,7 +135,7 @@ LPCWSTR GetNextElementW (LPCWSTR pszNext, LPWSTR pszOut, DWORD dwOut) while (*pszTail && (*pszTail != (WCHAR) '\\')) pszTail++; - dwCopy = (const WCHAR *) pszTail - (const WCHAR *) pszNext + 1; + dwCopy = pszTail - pszNext + 1; lstrcpynW (pszOut, pszNext, (dwOut < dwCopy) ? dwOut : dwCopy); if (*pszTail) diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index b0ec250..6beb08f 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -472,7 +472,7 @@ static HRESULT WINAPI ISvItemCm_fnGetCommandString( switch(idCommand) { case FCIDM_SHVIEW_RENAME: - strcpy((LPSTR)lpszName, "rename"); + strcpy(lpszName, "rename"); hr = NOERROR; break; }

1 0

Rob Shearman : widl: Write out code for initialising out-only client context handles.
by Alexandre Julliard 21 Jan '08

21 Jan '08

Module: wine Branch: master Commit: 5af6012fbadf5948dfef4502e91fc3e91c476089 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af6012fbadf5948dfef4502e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 20 10:56:15 2008 +0000 widl: Write out code for initialising out-only client context handles. --- tools/widl/typegen.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 4fdc84f..0e8a096 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2724,6 +2724,8 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func, { if (pass == PASS_OUT) { + if (!in_attr) + print_file(file, indent, "*%s = 0;\n", var->name); print_file(file, indent, "NdrClientContextUnmarshall(\n"); print_file(file, indent + 1, "&_StubMsg,\n"); print_file(file, indent + 1, "(NDR_CCONTEXT *)%s,\n", var->name);

1 0