January 2006 - Wine-commits

Michael Jung : unixfs: Fix SetNameOf.
by Alexandre Julliard 16 Jan '06

16 Jan '06

Module: wine Branch: refs/heads/master Commit: f87efbd14eedb076f7f4cb2887ee7c2bcf279afd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f87efbd14eedb076f7f4cb2… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Mon Jan 16 20:37:51 2006 +0100 unixfs: Fix SetNameOf. Ensure that pidls passed to SHNotify are absolute SetNameOf should fail on absolute path names. Some tests to show this. --- dlls/shell32/shfldr_unixfs.c | 92 ++++++++++++++++++++-------------------- dlls/shell32/tests/shlfolder.c | 29 +++++++++++++ 2 files changed, 74 insertions(+), 47 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 7ffdb9a..c898e67 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1216,50 +1216,54 @@ static HRESULT WINAPI UnixFolder_IShellF } static HRESULT WINAPI UnixFolder_IShellFolder2_SetNameOf(IShellFolder2* iface, HWND hwnd, - LPCITEMIDLIST pidl, LPCOLESTR lpszName, SHGDNF uFlags, LPITEMIDLIST* ppidlOut) + LPCITEMIDLIST pidl, LPCOLESTR lpcwszName, SHGDNF uFlags, LPITEMIDLIST* ppidlOut) { UnixFolder *This = ADJUST_THIS(UnixFolder, IShellFolder2, iface); + static const WCHAR awcInvalidChars[] = { '\\', '/', ':', '*', '?', '"', '<', '>', '|' }; char szSrc[FILENAME_MAX], szDest[FILENAME_MAX]; - WCHAR *pwszDosDest; - int cBasePathLen = lstrlenA(This->m_pszPath); + WCHAR wszSrcRelative[MAX_PATH]; + int cBasePathLen = lstrlenA(This->m_pszPath), i; struct stat statDest; - LPITEMIDLIST pidlSrc, pidlDest; + LPITEMIDLIST pidlSrc, pidlDest, pidlRelativeDest; + LPOLESTR lpwszName; + HRESULT hr; - TRACE("(iface=%p, hwnd=%p, pidl=%p, lpszName=%s, uFlags=0x%08lx, ppidlOut=%p)\n", - iface, hwnd, pidl, debugstr_w(lpszName), uFlags, ppidlOut); + TRACE("(iface=%p, hwnd=%p, pidl=%p, lpcwszName=%s, uFlags=0x%08lx, ppidlOut=%p)\n", + iface, hwnd, pidl, debugstr_w(lpcwszName), uFlags, ppidlOut); - /* pidl has to contain a single non-empty SHITEMID */ - if (_ILIsDesktop(pidl) || !_ILIsPidlSimple(pidl) || !_ILGetTextPointer(pidl)) - return E_INVALIDARG; - + /* prepare to fail */ if (ppidlOut) *ppidlOut = NULL; + /* pidl has to contain a single non-empty SHITEMID */ + if (_ILIsDesktop(pidl) || !_ILIsPidlSimple(pidl) || !_ILGetTextPointer(pidl)) + return E_INVALIDARG; + + /* check for invalid characters in lpcwszName. */ + for (i=0; i < sizeof(awcInvalidChars)/sizeof(*awcInvalidChars); i++) + if (StrChrW(lpcwszName, awcInvalidChars[i])) + return HRESULT_FROM_WIN32(ERROR_CANCELLED); + /* build source path */ memcpy(szSrc, This->m_pszPath, cBasePathLen); UNIXFS_filename_from_shitemid(pidl, szSrc + cBasePathLen); /* build destination path */ - if (uFlags & SHGDN_FORPARSING) { /* absolute path in lpszName */ - WideCharToMultiByte(CP_UNIXCP, 0, lpszName, -1, szDest, FILENAME_MAX, NULL, NULL); - } else { - WCHAR wszSrcRelative[MAX_PATH]; - memcpy(szDest, This->m_pszPath, cBasePathLen); - WideCharToMultiByte(CP_UNIXCP, 0, lpszName, -1, szDest+cBasePathLen, - FILENAME_MAX-cBasePathLen, NULL, NULL); - - /* uFlags is SHGDN_FOREDITING of SHGDN_FORADDRESSBAR. If the filename's - * extension is hidden to the user, we have to append it. */ - if (_ILSimpleGetTextW(pidl, wszSrcRelative, MAX_PATH) && - SHELL_FS_HideExtension(wszSrcRelative)) - { - WCHAR *pwszExt = PathFindExtensionW(wszSrcRelative); - int cLenDest = strlen(szDest); - WideCharToMultiByte(CP_UNIXCP, 0, pwszExt, -1, szDest + cLenDest, - FILENAME_MAX - cLenDest, NULL, NULL); - } - } + memcpy(szDest, This->m_pszPath, cBasePathLen); + WideCharToMultiByte(CP_UNIXCP, 0, lpcwszName, -1, szDest+cBasePathLen, + FILENAME_MAX-cBasePathLen, NULL, NULL); + + /* If the filename's extension is hidden to the user, we have to append it. */ + if (!(uFlags & SHGDN_FORPARSING) && + _ILSimpleGetTextW(pidl, wszSrcRelative, MAX_PATH) && + SHELL_FS_HideExtension(wszSrcRelative)) + { + WCHAR *pwszExt = PathFindExtensionW(wszSrcRelative); + int cLenDest = strlen(szDest); + WideCharToMultiByte(CP_UNIXCP, 0, pwszExt, -1, szDest + cLenDest, + FILENAME_MAX - cLenDest, NULL, NULL); + } TRACE("src=%s dest=%s\n", szSrc, szDest); @@ -1272,36 +1276,30 @@ static HRESULT WINAPI UnixFolder_IShellF return E_FAIL; /* Build a pidl for the path of the renamed file */ - if (This->m_dwPathMode == PATHMODE_DOS) - { - pwszDosDest = wine_get_dos_file_name(szDest); - } - else - { - int len = MultiByteToWideChar(CP_UNIXCP, 0, szDest, -1, NULL, 0); - - pwszDosDest = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_UNIXCP, 0, szDest, -1, pwszDosDest, len); - } - if (!pwszDosDest || !UNIXFS_path_to_pidl(This, pwszDosDest, &pidlDest)) { - HeapFree(GetProcessHeap(), 0, pwszDosDest); + lpwszName = SHAlloc((lstrlenW(lpcwszName)+1)*sizeof(WCHAR)); /* due to const correctness. */ + lstrcpyW(lpwszName, lpcwszName); + hr = IShellFolder2_ParseDisplayName(iface, NULL, NULL, lpwszName, NULL, &pidlRelativeDest, NULL); + SHFree(lpwszName); + if (FAILED(hr)) { rename(szDest, szSrc); /* Undo the renaming */ return E_FAIL; } + pidlDest = ILCombine(This->m_pidlLocation, pidlRelativeDest); + ILFree(pidlRelativeDest); + pidlSrc = ILCombine(This->m_pidlLocation, pidl); /* Inform the shell */ - pidlSrc = ILCombine(This->m_pidlLocation, pidl); if (_ILIsFolder(ILFindLastID(pidlDest))) SHChangeNotify(SHCNE_RENAMEFOLDER, SHCNF_IDLIST, pidlSrc, pidlDest); else SHChangeNotify(SHCNE_RENAMEITEM, SHCNF_IDLIST, pidlSrc, pidlDest); - ILFree(pidlSrc); - ILFree(pidlDest); if (ppidlOut) - _ILCreateFromPathW(pwszDosDest, ppidlOut); + *ppidlOut = ILClone(ILFindLastID(pidlDest)); + + ILFree(pidlSrc); + ILFree(pidlDest); - HeapFree(GetProcessHeap(), 0, pwszDosDest); return S_OK; } diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 7abeae1..6ab6044 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -383,6 +383,35 @@ static void test_GetDisplayName(void) if (SUCCEEDED(hr)) { IShellFolder_Release(psfFile); } + + /* Some tests for IShellFolder::SetNameOf */ + hr = pSHBindToParent(pidlTestFile, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast); + ok(SUCCEEDED(hr), "SHBindToParent failed! hr = %08lx\n", hr); + if (SUCCEEDED(hr)) { + /* It's ok to use this fixed path. Call will fail anyway. */ + WCHAR wszAbsoluteFilename[] = { 'C',':','\\','w','i','n','e','t','e','s','t', 0 }; + LPITEMIDLIST pidlNew; + + /* The pidl returned through the last parameter of SetNameOf is a simple one. */ + hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlLast, wszDirName, SHGDN_NORMAL, &pidlNew); + ok (SUCCEEDED(hr), "SetNameOf failed! hr = %08lx\n", hr); + ok (((LPITEMIDLIST)((LPBYTE)pidlNew+pidlNew->mkid.cb))->mkid.cb == 0, + "pidl returned from SetNameOf should be simple!\n"); + + /* Passing an absolute path to SetNameOf fails. The HRESULT code indicates that SetNameOf + * is implemented on top of SHFileOperation in WinXP. */ + hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszAbsoluteFilename, + SHGDN_FORPARSING, NULL); + ok (hr == HRESULT_FROM_WIN32(ERROR_CANCELLED), "SetNameOf succeeded! hr = %08lx\n", hr); + + /* Rename the file back to it's original name. SetNameOf ignores the fact, that the + * SHGDN flags specify an absolute path. */ + hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszFileName, SHGDN_FORPARSING, NULL); + ok (SUCCEEDED(hr), "SetNameOf failed! hr = %08lx\n", hr); + + ILFree(pidlNew); + IShellFolder_Release(psfPersonal); + } /* Deleting the file and the directory */ DeleteFileA(szTestFile);

1 0

Lionel Ulmer : ddraw: Better simulate what 'GetVerticalBlankStatus' does on real hardware.
by Alexandre Julliard 16 Jan '06

16 Jan '06

Module: wine Branch: refs/heads/master Commit: 00577aa605ce2ab742b594f10d4b1ba42d7be74a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=00577aa605ce2ab742b594f… Author: Lionel Ulmer <lionel.ulmer(a)free.fr> Date: Mon Jan 16 20:38:08 2006 +0100 ddraw: Better simulate what 'GetVerticalBlankStatus' does on real hardware. --- dlls/ddraw/ddraw_main.c | 3 ++- dlls/ddraw/ddraw_private.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw_main.c b/dlls/ddraw/ddraw_main.c index 9fbd4f7..009db04 100644 --- a/dlls/ddraw/ddraw_main.c +++ b/dlls/ddraw/ddraw_main.c @@ -1067,7 +1067,8 @@ Main_DirectDraw_GetVerticalBlankStatus(L { IDirectDrawImpl *This = (IDirectDrawImpl *)iface; TRACE("(%p)->(%p)\n",This,status); - *status = TRUE; + *status = This->fake_vblank; + This->fake_vblank = !This->fake_vblank; return DD_OK; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index aa9ee9c..e22acf8 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -114,6 +114,8 @@ struct IDirectDrawImpl DDPIXELFORMAT pixelformat; DWORD cur_scanline; + BOOL fake_vblank; + /* Should each of these go into some structure? */ DWORD orig_width, orig_height; LONG orig_pitch;

1 0

Robert Shearman : oleaut: Add const attribute to iterators in get functions.
by Alexandre Julliard 14 Jan '06

14 Jan '06

Module: wine Branch: refs/heads/master Commit: 1616f81d00cae414ab559b812c49c8e89a92fe77 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1616f81d00cae414ab559b8… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Jan 14 17:48:12 2006 +0100 oleaut: Add const attribute to iterators in get functions. --- dlls/oleaut32/typelib.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 3fa66c2..983eda3 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4628,8 +4628,8 @@ static HRESULT WINAPI ITypeInfo_fnGetNam BSTR *rgBstrNames, UINT cMaxNames, UINT *pcNames) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - TLBFuncDesc * pFDesc; - TLBVarDesc * pVDesc; + const TLBFuncDesc *pFDesc; + const TLBVarDesc *pVDesc; int i; TRACE("(%p) memid=0x%08lx Maxname=%d\n", This, memid, cMaxNames); for(pFDesc=This->funclist; pFDesc && pFDesc->funcdesc.memid != memid; pFDesc=pFDesc->next); @@ -4698,7 +4698,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRef ITypeInfoImpl *This = (ITypeInfoImpl *)iface; int i; HRESULT hr = S_OK; - TLBImplType *pImpl = This->impltypelist; + const TLBImplType *pImpl = This->impltypelist; TRACE("(%p) index %d\n", This, index); if (TRACE_ON(ole)) dump_TypeInfo(This); @@ -4777,8 +4777,8 @@ static HRESULT WINAPI ITypeInfo_fnGetIDs LPOLESTR *rgszNames, UINT cNames, MEMBERID *pMemId) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - TLBFuncDesc * pFDesc; - TLBVarDesc * pVDesc; + const TLBFuncDesc *pFDesc; + const TLBVarDesc *pVDesc; HRESULT ret=S_OK; int i; @@ -5446,8 +5446,8 @@ static HRESULT WINAPI ITypeInfo_fnGetDoc DWORD *pdwHelpContext, BSTR *pBstrHelpFile) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - TLBFuncDesc * pFDesc; - TLBVarDesc * pVDesc; + const TLBFuncDesc *pFDesc; + const TLBVarDesc *pVDesc; TRACE("(%p) memid %ld Name(%p) DocString(%p)" " HelpContext(%p) HelpFile(%p)\n", This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); @@ -5497,7 +5497,7 @@ static HRESULT WINAPI ITypeInfo_fnGetDll WORD *pwOrdinal) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - TLBFuncDesc *pFDesc; + const TLBFuncDesc *pFDesc; TRACE("(%p)->(memid %lx, %d, %p, %p, %p)\n", This, memid, invKind, pBstrDllName, pBstrName, pwOrdinal); @@ -5831,7 +5831,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetFu MEMBERID memid, INVOKEKIND invKind, UINT *pFuncIndex) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - TLBFuncDesc *pFuncInfo; + const TLBFuncDesc *pFuncInfo; int i; HRESULT result; @@ -6055,8 +6055,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetDo BSTR *pbstrHelpStringDll) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - TLBFuncDesc * pFDesc; - TLBVarDesc * pVDesc; + const TLBFuncDesc *pFDesc; + const TLBVarDesc *pVDesc; TRACE("(%p) memid %ld lcid(0x%lx) HelpString(%p) " "HelpStringContext(%p) HelpStringDll(%p)\n", This, memid, lcid, pbstrHelpString, pdwHelpStringContext, @@ -6429,8 +6429,8 @@ static HRESULT WINAPI ITypeComp_fnBind( BINDPTR * pBindPtr) { ITypeInfoImpl *This = info_impl_from_ITypeComp(iface); - TLBFuncDesc * pFDesc; - TLBVarDesc * pVDesc; + const TLBFuncDesc *pFDesc; + const TLBVarDesc *pVDesc; TRACE("(%s, %lx, 0x%x, %p, %p, %p)\n", debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr);

1 0

Robert Shearman : oleaut: Support VT_CY in the typelib marshaller.
by Alexandre Julliard 14 Jan '06

14 Jan '06

Module: wine Branch: refs/heads/master Commit: 878af6661eda616a0826b9bb5559d002941494ec URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=878af6661eda616a0826b9b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Jan 14 17:47:25 2006 +0100 oleaut: Support VT_CY in the typelib marshaller. --- dlls/oleaut32/tmarshal.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 50a9135..273a598 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -508,6 +508,7 @@ serialize_param( return S_OK; case VT_I8: case VT_UI8: + case VT_CY: hres = S_OK; if (debugout) TRACE_(olerelay)("%lx%lx",arg[0],arg[1]); if (writeit) @@ -825,6 +826,7 @@ deserialize_param( } case VT_I8: case VT_UI8: + case VT_CY: if (readit) { hres = xbuf_get(buf,(LPBYTE)arg,8); if (hres) ERR("Failed to read integer 8 byte\n");

1 0

Robert Shearman : oleaut: Initialise more fields in CreateDispTypeInfo.
by Alexandre Julliard 14 Jan '06

14 Jan '06

Module: wine Branch: refs/heads/master Commit: 0b2c0d8365b7dee927e4ec5e39a84a77ae464308 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0b2c0d8365b7dee927e4ec5… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Jan 14 17:47:36 2006 +0100 oleaut: Initialise more fields in CreateDispTypeInfo. Don't leave some of the fields of the TLBFuncDesc structure uninitialised in CreateDispTypeInfo. --- dlls/oleaut32/typelib.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 31f5bad..3fa66c2 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6385,6 +6385,12 @@ HRESULT WINAPI CreateDispTypeInfo( (*ppFuncDesc)->funcdesc.lprgelemdescParam[param].tdesc.vt = md->ppdata[param].vt; (*ppFuncDesc)->pParamDesc[param].Name = SysAllocString(md->ppdata[param].szName); } + (*ppFuncDesc)->helpcontext = 0; + (*ppFuncDesc)->HelpStringContext = 0; + (*ppFuncDesc)->HelpString = NULL; + (*ppFuncDesc)->Entry = NULL; + (*ppFuncDesc)->ctCustData = 0; + (*ppFuncDesc)->pCustData = NULL; ppFuncDesc = &(*ppFuncDesc)->next; } *pptinfo = (ITypeInfo*)pTIImpl;

1 0

Robert Shearman : ole: Optimisation for COM Calls.
by Alexandre Julliard 14 Jan '06

14 Jan '06

Module: wine Branch: refs/heads/master Commit: b3041ba6ad646af8bd463a9a29196ff4bc2c2fd5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b3041ba6ad646af8bd463a9… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Jan 14 17:45:49 2006 +0100 ole: Optimisation for COM Calls. Add an optimisation to yield and try to allow the RPC to run before waiting for messages and RPCs to arrive. --- dlls/ole32/rpc.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 58a3272..06c24d3 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -290,7 +290,10 @@ static HRESULT WINAPI RpcChannelBuffer_S if (apt) apartment_release(apt); if (hr == S_OK) - hr = CoWaitForMultipleHandles(0, INFINITE, 1, &params->handle, &index); + { + if (WaitForSingleObject(params->handle, 0)) + hr = CoWaitForMultipleHandles(0, INFINITE, 1, &params->handle, &index); + } CloseHandle(params->handle); if (hr == S_OK) hr = params->hr;

1 0

Alexandre Julliard : msvcrt: Forward functions to ntdll instead of libc where possible.
by Alexandre Julliard 14 Jan '06

14 Jan '06

Module: wine Branch: refs/heads/master Commit: 30a90e1842337b8fc303b8ca5e82d708e3fe45fa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=30a90e1842337b8fc303b8c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 14 17:42:12 2006 +0100 msvcrt: Forward functions to ntdll instead of libc where possible. --- dlls/msvcrt/msvcrt.spec | 66 ++++++++++++++++++++++++----------------------- 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 66610ad..e582e1a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -387,7 +387,7 @@ @ cdecl _mbstok(str str) @ cdecl _mbstrlen(str) @ cdecl _mbsupr(str) -@ cdecl _memccpy(ptr ptr long long) memccpy +@ cdecl _memccpy(ptr ptr long long) ntdll._memccpy @ cdecl _memicmp(str str long) ntdll._memicmp @ cdecl _mkdir(str) @ cdecl _mktemp(str) @@ -448,15 +448,15 @@ @ cdecl _stat(str ptr) MSVCRT__stat @ cdecl _stati64(str ptr) MSVCRT__stati64 @ cdecl _statusfp() -@ cdecl _strcmpi(str str) strcasecmp +@ cdecl _strcmpi(str str) ntdll._strcmpi @ cdecl _strdate(ptr) @ cdecl _strdup(str) @ cdecl _strerror(long) -@ cdecl _stricmp(str str) strcasecmp +@ cdecl _stricmp(str str) ntdll._stricmp @ cdecl _stricoll(str str) MSVCRT__stricoll @ cdecl _strlwr(str) ntdll._strlwr @ stub _strncoll #(str str long) -@ cdecl _strnicmp(str str long) strncasecmp +@ cdecl _strnicmp(str str long) ntdll._strnicmp @ stub _strnicoll #(str str long) @ cdecl _strnset(str long long) @ cdecl _strrev(str) @@ -568,7 +568,7 @@ @ cdecl _y1(double) @ cdecl _yn(long double ) @ cdecl abort() MSVCRT_abort -@ cdecl abs(long) +@ cdecl abs(long) ntdll.abs @ cdecl acos(double) MSVCRT_acos @ cdecl asctime(ptr) MSVCRT_asctime @ cdecl asin(double) MSVCRT_asin @@ -576,9 +576,9 @@ @ cdecl atan2(double double) MSVCRT_atan2 @ cdecl atexit(ptr) MSVCRT_atexit @ cdecl atof(str) MSVCRT_atof -@ cdecl atoi(str) -@ cdecl atol(str) -@ cdecl bsearch(ptr ptr long long ptr) +@ cdecl atoi(str) ntdll.atoi +@ cdecl atol(str) ntdll.atol +@ cdecl bsearch(ptr ptr long long ptr) ntdll.bsearch @ cdecl calloc(long long) MSVCRT_calloc @ cdecl ceil(double) MSVCRT_ceil @ cdecl clearerr(ptr) MSVCRT_clearerr @@ -652,7 +652,7 @@ @ cdecl iswupper(long) MSVCRT_iswupper @ cdecl iswxdigit(long) MSVCRT_iswxdigit @ cdecl isxdigit(long) MSVCRT_isxdigit -@ cdecl labs(long) +@ cdecl labs(long) ntdll.labs @ cdecl ldexp( double long) MSVCRT_ldexp @ cdecl ldiv(long long) MSVCRT_ldiv @ cdecl localeconv() MSVCRT_localeconv @@ -664,11 +664,11 @@ @ cdecl mblen(ptr long) MSVCRT_mblen @ cdecl mbstowcs(ptr str long) ntdll.mbstowcs @ cdecl mbtowc(wstr str long) MSVCRT_mbtowc -@ cdecl memchr(ptr long long) -@ cdecl memcmp(ptr ptr long) -@ cdecl memcpy(ptr ptr long) memmove -@ cdecl memmove(ptr ptr long) -@ cdecl memset(ptr long long) +@ cdecl memchr(ptr long long) ntdll.memchr +@ cdecl memcmp(ptr ptr long) ntdll.memcmp +@ cdecl memcpy(ptr ptr long) ntdll.memmove #sic +@ cdecl memmove(ptr ptr long) ntdll.memmove +@ cdecl memset(ptr long long) ntdll.memset @ cdecl mktime(ptr) MSVCRT_mktime @ cdecl modf(double ptr) MSVCRT_modf @ cdecl perror(str) MSVCRT_perror @@ -679,7 +679,7 @@ @ cdecl puts(str) MSVCRT_puts @ cdecl putwc(long ptr) MSVCRT_fputwc @ cdecl putwchar(long) _fputwchar -@ cdecl qsort(ptr long long ptr) +@ cdecl qsort(ptr long long ptr) ntdll.qsort @ stub raise #(long) @ cdecl rand() MSVCRT_rand @ cdecl realloc(ptr long) MSVCRT_realloc @@ -697,26 +697,26 @@ @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf -@ cdecl strcat(str str) -@ cdecl strchr(str long) -@ cdecl strcmp(str str) +@ cdecl strcat(str str) ntdll.strcat +@ cdecl strchr(str long) ntdll.strchr +@ cdecl strcmp(str str) ntdll.strcmp @ cdecl strcoll(str str) MSVCRT_strcoll -@ cdecl strcpy(ptr str) -@ cdecl strcspn(str str) +@ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strftime(str long str ptr) MSVCRT_strftime -@ cdecl strlen(str) -@ cdecl strncat(str str long) -@ cdecl strncmp(str str long) -@ cdecl strncpy(ptr str long) -@ cdecl strpbrk(str str) -@ cdecl strrchr(str long) -@ cdecl strspn(str str) -@ cdecl strstr(str str) +@ cdecl strlen(str) ntdll.strlen +@ cdecl strncat(str str long) ntdll.strncat +@ cdecl strncmp(str str long) ntdll.strncmp +@ cdecl strncpy(ptr str long) ntdll.strncpy +@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strrchr(str long) ntdll.strrchr +@ cdecl strspn(str str) ntdll.strspn +@ cdecl strstr(str str) ntdll.strstr @ cdecl strtod(str ptr) MSVCRT_strtod @ cdecl strtok(str str) MSVCRT_strtok -@ cdecl strtol(str ptr long) -@ cdecl strtoul(str ptr long) +@ cdecl strtol(str ptr long) ntdll.strtol +@ cdecl strtoul(str ptr long) ntdll.strtoul @ cdecl strxfrm(ptr str long) MSVCRT_strxfrm @ varargs swprintf(wstr wstr) MSVCRT_swprintf @ varargs swscanf(wstr wstr) MSVCRT_swscanf @@ -726,8 +726,8 @@ @ cdecl time(ptr) MSVCRT_time @ cdecl tmpfile() MSVCRT_tmpfile @ cdecl tmpnam(ptr) MSVCRT_tmpnam -@ cdecl tolower(long) -@ cdecl toupper(long) +@ cdecl tolower(long) ntdll.tolower +@ cdecl toupper(long) ntdll.toupper @ cdecl towlower(long) ntdll.towlower @ cdecl towupper(long) ntdll.towupper @ cdecl ungetc(long ptr) MSVCRT_ungetc @@ -735,7 +735,7 @@ @ cdecl vfprintf(ptr str long) MSVCRT_vfprintf @ cdecl vfwprintf(ptr wstr long) MSVCRT_vfwprintf @ cdecl vprintf(str long) MSVCRT_vprintf -@ cdecl vsprintf(ptr str ptr) +@ cdecl vsprintf(ptr str ptr) ntdll.vsprintf @ cdecl vswprintf(ptr wstr long) MSVCRT_vswprintf @ cdecl vwprintf(wstr long) MSVCRT_vwprintf @ cdecl wcscat(wstr wstr) ntdll.wcscat

1 0

Alexandre Julliard : msvcrt: Set errno in the standard math functions too, not only in the
by Alexandre Julliard 14 Jan '06

14 Jan '06

Module: wine Branch: refs/heads/master Commit: 78412005e121472490160e5a6b32322ed1275a32 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=78412005e121472490160e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 14 17:36:23 2006 +0100 msvcrt: Set errno in the standard math functions too, not only in the _CI* variants. --- dlls/msvcrt/math.c | 202 ++++++++++++++++++++++++++++++++++++++--------- dlls/msvcrt/msvcrt.spec | 32 ++++--- 2 files changed, 181 insertions(+), 53 deletions(-)

1 0

Alexandre Julliard : msvcrt: Make snprintf and snwprintf use the msvcrt version of printf.
by Alexandre Julliard 14 Jan '06

14 Jan '06

Module: wine Branch: refs/heads/master Commit: ee603ce6ddf54b40d35f7c8c7f53376410041af4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ee603ce6ddf54b40d35f7c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 14 17:30:02 2006 +0100 msvcrt: Make snprintf and snwprintf use the msvcrt version of printf. Remove todos from tests that succeed now. --- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/tests/printf.c | 22 ++++++++-------------- dlls/msvcrt/wcs.c | 30 +++++++++++++++++++++++++++--- 3 files changed, 37 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a24f11b..e9e4298 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -433,8 +433,8 @@ @ cdecl _setmode(long long) @ stub _setsystime #(ptr long) @ cdecl _sleep(long) -@ varargs _snprintf(str long str) snprintf -@ varargs _snwprintf(wstr long wstr) ntdll._snwprintf +@ varargs _snprintf(str long str) MSVCRT__snprintf +@ varargs _snwprintf(wstr long wstr) MSVCRT__snwprintf @ varargs _sopen(str long long) MSVCRT__sopen @ varargs _spawnl(long str str) @ varargs _spawnle(long str str) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index f13ac2d..64b5d5a 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -496,16 +496,12 @@ static void test_snprintf (void) struct snprintf_test { const char *format; int expected; - struct { - int retval; - int render; - } todo; }; /* Pre-2.1 libc behaviour, not C99 compliant. */ - const struct snprintf_test tests[] = {{"short", 5, {0, 0}}, - {"justfit", 7, {0, 0}}, - {"justfits", 8, {0, 1}}, - {"muchlonger", -1, {1, 1}}}; + const struct snprintf_test tests[] = {{"short", 5}, + {"justfit", 7}, + {"justfits", 8}, + {"muchlonger", -1}}; char buffer[8]; const int bufsiz = sizeof buffer; unsigned int i; @@ -516,12 +512,10 @@ static void test_snprintf (void) const int n = _snprintf (buffer, bufsiz, fmt); const int valid = n < 0 ? bufsiz : (n == bufsiz ? n : n+1); - todo (tests[i].todo.retval ? "wine" : "none") - ok (n == expect, "\"%s\": expected %d, returned %d\n", - fmt, expect, n); - todo (tests[i].todo.render ? "wine" : "none") - ok (!memcmp (fmt, buffer, valid), - "\"%s\": rendered \"%.*s\"\n", fmt, valid, buffer); + ok (n == expect, "\"%s\": expected %d, returned %d\n", + fmt, expect, n); + ok (!memcmp (fmt, buffer, valid), + "\"%s\": rendered \"%.*s\"\n", fmt, valid, buffer); }; } diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 2a48003..992185d 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -712,9 +712,7 @@ static int pf_vsnprintf( pf_output *out, /* check we reached the end, and null terminate the string */ assert( *p == 0 ); - r = pf_output_stringW( out, p, 1 ); - if( r<0 ) - return r; + pf_output_stringW( out, p, 1 ); return out->used - 1; } @@ -750,6 +748,19 @@ int MSVCRT_vsnprintf( char *str, unsigne } /********************************************************************* + * _snprintf (MSVCRT.@) + */ +int MSVCRT__snprintf(char *str, unsigned int len, const char *format, ...) +{ + int retval; + va_list valist; + va_start(valist, format); + retval = MSVCRT_vsnprintf(str, len, format, valist); + va_end(valist); + return retval; +} + +/********************************************************************* * _vsnwsprintf (MSVCRT.@) */ int MSVCRT_vsnwprintf( MSVCRT_wchar_t *str, unsigned int len, @@ -766,6 +777,19 @@ int MSVCRT_vsnwprintf( MSVCRT_wchar_t *s } /********************************************************************* + * _snwprintf (MSVCRT.@) + */ +int MSVCRT__snwprintf( MSVCRT_wchar_t *str, unsigned int len, const MSVCRT_wchar_t *format, ...) +{ + int retval; + va_list valist; + va_start(valist, format); + retval = MSVCRT_vsnwprintf(str, len, format, valist); + va_end(valist); + return retval; +} + +/********************************************************************* * sprintf (MSVCRT.@) */ int MSVCRT_sprintf( char *str, const char *format, ... )

1 0

Alexandre Julliard : msvcrt: Added wrappers for a few functions instead of linking them
by Alexandre Julliard 14 Jan '06

14 Jan '06

Module: wine Branch: refs/heads/master Commit: b34ac466b1bb7085484b39e0fc5b12a2876466e9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b34ac466b1bb7085484b39e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 14 17:40:29 2006 +0100 msvcrt: Added wrappers for a few functions instead of linking them directly to libc. --- dlls/msvcrt/math.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/mbcs.c | 26 ++++++++++++++++ dlls/msvcrt/msvcrt.spec | 32 ++++++++++---------- dlls/msvcrt/string.c | 36 ++++++++++++++++++++++ 4 files changed, 154 insertions(+), 16 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index f5277b0..66a3ec0 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -490,6 +490,55 @@ double _scalb(double num, long power) } /********************************************************************* + * _hypot (MSVCRT.@) + */ +double _hypot(double x, double y) +{ + /* FIXME: errno handling */ + return hypot( x, y ); +} + +/********************************************************************* + * ceil (MSVCRT.@) + */ +double MSVCRT_ceil( double x ) +{ + return ceil(x); +} + +/********************************************************************* + * floor (MSVCRT.@) + */ +double MSVCRT_floor( double x ) +{ + return floor(x); +} + +/********************************************************************* + * fabs (MSVCRT.@) + */ +double MSVCRT_fabs( double x ) +{ + return fabs(x); +} + +/********************************************************************* + * frexp (MSVCRT.@) + */ +double MSVCRT_frexp( double x, int *exp ) +{ + return frexp( x, exp ); +} + +/********************************************************************* + * modf (MSVCRT.@) + */ +double MSVCRT_modf( double x, double *iptr ) +{ + return modf( x, iptr ); +} + +/********************************************************************* * _matherr (MSVCRT.@) */ int MSVCRT__matherr(struct MSVCRT__exception *e) @@ -715,6 +764,33 @@ INT _isnan(double num) } /********************************************************************* + * _j0 (MSVCRT.@) + */ +double _j0(double num) +{ + /* FIXME: errno handling */ + return j0(num); +} + +/********************************************************************* + * _j1 (MSVCRT.@) + */ +double _j1(double num) +{ + /* FIXME: errno handling */ + return j1(num); +} + +/********************************************************************* + * jn (MSVCRT.@) + */ +double _jn(int n, double num) +{ + /* FIXME: errno handling */ + return jn(n, num); +} + +/********************************************************************* * _y0 (MSVCRT.@) */ double _y0(double num) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 939c314..59bb182 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -606,6 +606,32 @@ int _mbsnbicmp(const unsigned char* str, } /********************************************************************* + * _mbscat (MSVCRT.@) + */ +unsigned char *_mbscat( unsigned char *dst, const unsigned char *src ) +{ + strcat( (char *)dst, (const char *)src ); + return dst; +} + +/********************************************************************* + * _mbscpy (MSVCRT.@) + */ +unsigned char* _mbscpy( unsigned char *dst, const unsigned char *src ) +{ + strcpy( (char *)dst, (const char *)src ); + return dst; +} + +/********************************************************************* + * _mbsstr (MSVCRT.@) + */ +unsigned char *_mbsstr(const unsigned char *haystack, const unsigned char *needle) +{ + return (unsigned char *)strstr( (const char *)haystack, (const char *)needle ); +} + +/********************************************************************* * _mbschr(MSVCRT.@) * * Find a multibyte character in a multibyte string. diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 9a6da3a..66610ad 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -270,7 +270,7 @@ @ cdecl _heapset(long) @ stub _heapused #(ptr ptr) @ cdecl _heapwalk(ptr) -@ cdecl _hypot(double double) hypot +@ cdecl _hypot(double double) @ cdecl _i64toa(long long ptr long) ntdll._i64toa @ cdecl _i64tow(long long ptr long) ntdll._i64tow @ cdecl _initterm(ptr ptr) @@ -312,9 +312,9 @@ @ cdecl _isnan( double ) @ cdecl _itoa(long ptr long) ntdll._itoa @ cdecl _itow(long ptr long) ntdll._itow -@ cdecl _j0(double) j0 -@ cdecl _j1(double) j1 -@ cdecl _jn(long double) jn +@ cdecl _j0(double) +@ cdecl _j1(double) +@ cdecl _jn(long double) @ cdecl _kbhit() @ cdecl _lfind(ptr ptr ptr long ptr) @ cdecl _loaddll(str) @@ -346,11 +346,11 @@ @ cdecl _mbctoupper(long) @ extern _mbctype MSVCRT_mbctype @ stub _mbsbtype #(str long) -@ cdecl _mbscat(str str) strcat +@ cdecl _mbscat(str str) @ cdecl _mbschr(str long) @ cdecl _mbscmp(str str) @ cdecl _mbscoll(str str) -@ cdecl _mbscpy(ptr str) strcpy +@ cdecl _mbscpy(ptr str) @ cdecl _mbscspn (str str) @ cdecl _mbsdec(ptr ptr) @ cdecl _mbsdup(str) _strdup @@ -383,7 +383,7 @@ @ cdecl _mbsset(str long) @ cdecl _mbsspn(str str) @ stub _mbsspnp #(str str) -@ cdecl _mbsstr(str str) strstr +@ cdecl _mbsstr(str str) @ cdecl _mbstok(str str) @ cdecl _mbstrlen(str) @ cdecl _mbsupr(str) @@ -575,12 +575,12 @@ @ cdecl atan(double) MSVCRT_atan @ cdecl atan2(double double) MSVCRT_atan2 @ cdecl atexit(ptr) MSVCRT_atexit -@ cdecl atof(str) +@ cdecl atof(str) MSVCRT_atof @ cdecl atoi(str) @ cdecl atol(str) @ cdecl bsearch(ptr ptr long long ptr) @ cdecl calloc(long long) MSVCRT_calloc -@ cdecl ceil(double) +@ cdecl ceil(double) MSVCRT_ceil @ cdecl clearerr(ptr) MSVCRT_clearerr @ cdecl clock() MSVCRT_clock @ cdecl cos(double) MSVCRT_cos @@ -590,7 +590,7 @@ @ cdecl div(long long) MSVCRT_div @ cdecl exit(long) MSVCRT_exit @ cdecl exp(double) MSVCRT_exp -@ cdecl fabs(double) +@ cdecl fabs(double) MSVCRT_fabs @ cdecl fclose(ptr) MSVCRT_fclose @ cdecl feof(ptr) MSVCRT_feof @ cdecl ferror(ptr) MSVCRT_ferror @@ -600,7 +600,7 @@ @ cdecl fgets(ptr long ptr) MSVCRT_fgets @ cdecl fgetwc(ptr) MSVCRT_fgetwc @ cdecl fgetws(ptr long ptr) MSVCRT_fgetws -@ cdecl floor(double) +@ cdecl floor(double) MSVCRT_floor @ cdecl fmod(double double) MSVCRT_fmod @ cdecl fopen(str str) MSVCRT_fopen @ varargs fprintf(ptr str) MSVCRT_fprintf @@ -611,7 +611,7 @@ @ cdecl fread(ptr long long ptr) MSVCRT_fread @ cdecl free(ptr) MSVCRT_free @ cdecl freopen(str str ptr) MSVCRT_freopen -@ cdecl frexp(double ptr) +@ cdecl frexp(double ptr) MSVCRT_frexp @ varargs fscanf(ptr str) MSVCRT_fscanf @ cdecl fseek(ptr long long) MSVCRT_fseek @ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos @@ -670,7 +670,7 @@ @ cdecl memmove(ptr ptr long) @ cdecl memset(ptr long long) @ cdecl mktime(ptr) MSVCRT_mktime -@ cdecl modf(double ptr) +@ cdecl modf(double ptr) MSVCRT_modf @ cdecl perror(str) MSVCRT_perror @ cdecl pow(double double) MSVCRT_pow @ varargs printf(str) MSVCRT_printf @@ -700,7 +700,7 @@ @ cdecl strcat(str str) @ cdecl strchr(str long) @ cdecl strcmp(str str) -@ cdecl strcoll(str str) +@ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) @ cdecl strcspn(str str) @ cdecl strerror(long) MSVCRT_strerror @@ -713,11 +713,11 @@ @ cdecl strrchr(str long) @ cdecl strspn(str str) @ cdecl strstr(str str) -@ cdecl strtod(str ptr) +@ cdecl strtod(str ptr) MSVCRT_strtod @ cdecl strtok(str str) MSVCRT_strtok @ cdecl strtol(str ptr long) @ cdecl strtoul(str ptr long) -@ cdecl strxfrm(ptr str long) +@ cdecl strxfrm(ptr str long) MSVCRT_strxfrm @ varargs swprintf(wstr wstr) MSVCRT_swprintf @ varargs swscanf(wstr wstr) MSVCRT_swscanf @ cdecl system(str) MSVCRT_system diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 057dbf8..579c9bd 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -21,6 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <stdlib.h> #include "msvcrt.h" #include "wine/debug.h" @@ -135,6 +136,41 @@ void MSVCRT__swab(char* src, char* dst, } } } + +/********************************************************************* + * atof (MSVCRT.@) + */ +double MSVCRT_atof( const char *str ) +{ + return atof( str ); +} + +/********************************************************************* + * strtod (MSVCRT.@) + */ +double MSVCRT_strtod( const char *str, char **end ) +{ + return strtod( str, end ); +} + +/********************************************************************* + * strcoll (MSVCRT.@) + */ +int MSVCRT_strcoll( const char* str1, const char* str2 ) +{ + /* FIXME: handle Windows locale */ + return strcoll( str1, str2 ); +} + +/********************************************************************* + * strxfrm (MSVCRT.@) + */ +MSVCRT_size_t MSVCRT_strxfrm( char *dest, const char *src, MSVCRT_size_t len ) +{ + /* FIXME: handle Windows locale */ + return strxfrm( dest, src, len ); +} + /********************************************************************* * _stricoll (MSVCRT.@) */

1 0