wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Vincent Povirk : windowscodecs: Implement IWICStream_InitializeFromFilename .
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: 2f41a3ad21ff5689e12e78031d102c8cdf10373a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f41a3ad21ff5689e12e78031… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 27 10:20:42 2010 -0500 windowscodecs: Implement IWICStream_InitializeFromFilename. --- dlls/windowscodecs/Makefile.in | 2 +- dlls/windowscodecs/stream.c | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 7ff3ae2..0516161 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = windowscodecs.dll IMPORTLIB = windowscodecs -IMPORTS = uuid ole32 advapi32 kernel32 +IMPORTS = uuid ole32 shlwapi advapi32 kernel32 EXTRAINCL = @PNGINCL@ C_SRCS = \ diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c index bd5592b..bee27db 100644 --- a/dlls/windowscodecs/stream.c +++ b/dlls/windowscodecs/stream.c @@ -23,6 +23,7 @@ #include "winbase.h" #include "winreg.h" #include "objbase.h" +#include "shlwapi.h" #include "wincodec.h" #include "wincodecs_private.h" @@ -434,8 +435,35 @@ static HRESULT WINAPI IWICStreamImpl_InitializeFromIStream(IWICStream *iface, static HRESULT WINAPI IWICStreamImpl_InitializeFromFilename(IWICStream *iface, LPCWSTR wzFileName, DWORD dwDesiredAccess) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + IWICStreamImpl *This = (IWICStreamImpl*)iface; + HRESULT hr; + DWORD dwMode; + IStream *stream; + + TRACE("(%p, %s, %u)\n", iface, debugstr_w(wzFileName), dwDesiredAccess); + + if (This->pStream) return WINCODEC_ERR_WRONGSTATE; + + if(dwDesiredAccess & GENERIC_WRITE) + dwMode = STGM_SHARE_DENY_WRITE | STGM_WRITE | STGM_CREATE; + else if(dwDesiredAccess & GENERIC_READ) + dwMode = STGM_SHARE_DENY_WRITE | STGM_READ | STGM_FAILIFTHERE; + else + return E_INVALIDARG; + + hr = SHCreateStreamOnFileW(wzFileName, dwMode, &stream); + + if (SUCCEEDED(hr)) + { + if (InterlockedCompareExchangePointer((void**)&This->pStream, stream, NULL)) + { + /* Some other thread set the stream first. */ + IStream_Release(stream); + hr = WINCODEC_ERR_WRONGSTATE; + } + } + + return hr; } /******************************************

1 0

Nikolay Sivov : comctl32/listview: Rework item selection with letter keys, fix some glitches.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: d57247ce396c4a71918fb9bc41b99a350063fdb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d57247ce396c4a71918fb9bc4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 24 19:19:40 2010 +0400 comctl32/listview: Rework item selection with letter keys, fix some glitches. --- dlls/comctl32/listview.c | 144 ++++++++++++++++++++++++--------------------- 1 files changed, 77 insertions(+), 67 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 09c731a..4c24a67 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1751,14 +1751,15 @@ static inline INT LISTVIEW_GetCountPerColumn(const LISTVIEW_INFO *infoPtr) */ static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, LPARAM keyData) { - INT nItem; - INT endidx,idx; - LVITEMW item; WCHAR buffer[MAX_PATH]; - DWORD lastKeyPressTimestamp = infoPtr->lastKeyPressTimestamp; + INT endidx, startidx; + DWORD prevTime; + LVITEMW item; + INT nItem; + INT diff; /* simple parameter checking */ - if (!charCode || !keyData) return 0; + if (!charCode || !keyData || infoPtr->nItemCount == 0) return 0; /* only allow the valid WM_CHARs through */ if (!isalnumW(charCode) && @@ -1773,86 +1774,95 @@ static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, L charCode != '<' && charCode != ',' && charCode != '~') return 0; - /* if there's one item or less, there is no where to go */ - if (infoPtr->nItemCount <= 1) return 0; - /* update the search parameters */ + prevTime = infoPtr->lastKeyPressTimestamp; infoPtr->lastKeyPressTimestamp = GetTickCount(); - if (infoPtr->lastKeyPressTimestamp - lastKeyPressTimestamp < KEY_DELAY) { - if (infoPtr->nSearchParamLength < MAX_PATH-1) - infoPtr->szSearchParam[infoPtr->nSearchParamLength++]=charCode; + diff = infoPtr->lastKeyPressTimestamp - prevTime; + + if (diff >= 0 && diff < KEY_DELAY) + { + if (infoPtr->nSearchParamLength < MAX_PATH - 1) + infoPtr->szSearchParam[infoPtr->nSearchParamLength++] = charCode; + if (infoPtr->charCode != charCode) infoPtr->charCode = charCode = 0; - } else { - infoPtr->charCode=charCode; - infoPtr->szSearchParam[0]=charCode; - infoPtr->nSearchParamLength=1; - /* Redundant with the 1 char string */ - charCode=0; + } + else + { + infoPtr->charCode = charCode; + infoPtr->szSearchParam[0] = charCode; + infoPtr->nSearchParamLength = 1; + /* redundant with the 1 char string */ + charCode = 0; } /* and search from the current position */ - nItem=-1; - if (infoPtr->nFocusedItem >= 0) { - endidx=infoPtr->nFocusedItem; - idx=endidx; - /* if looking for single character match, - * then we must always move forward - */ - if (infoPtr->nSearchParamLength == 1) - idx++; - } else { - endidx=infoPtr->nItemCount; - idx=0; - } + nItem = -1; + endidx = infoPtr->nItemCount; + + /* should start from next after focused item, so next item that matches + will be selected, if there isn't any and focused matches it will be selected + on second search stage from beginning of the list */ + if (infoPtr->nFocusedItem >= 0 && infoPtr->nItemCount > 1) + startidx = infoPtr->nFocusedItem + 1; + else + startidx = 0; - /* Let application handle this for virtual listview */ + /* let application handle this for virtual listview */ if (infoPtr->dwStyle & LVS_OWNERDATA) { NMLVFINDITEMW nmlv; - LVFINDINFOW lvfi; - ZeroMemory(&lvfi, sizeof(lvfi)); - lvfi.flags = (LVFI_WRAP | LVFI_PARTIAL); - infoPtr->szSearchParam[infoPtr->nSearchParamLength] = '\0'; - lvfi.psz = infoPtr->szSearchParam; - nmlv.iStart = idx; - nmlv.lvfi = lvfi; + memset(&nmlv.lvfi, 0, sizeof(nmlv.lvfi)); + nmlv.lvfi.flags = (LVFI_WRAP | LVFI_PARTIAL); + nmlv.lvfi.psz = infoPtr->szSearchParam; + nmlv.iStart = startidx; + + infoPtr->szSearchParam[infoPtr->nSearchParamLength] = 0; nItem = notify_hdr(infoPtr, LVN_ODFINDITEMW, (LPNMHDR)&nmlv.hdr); + } + else + { + INT i = startidx; - if (nItem != -1) - LISTVIEW_KeySelection(infoPtr, nItem, FALSE); + /* first search in [startidx, endidx), on failure continue in [0, startidx) */ + while (1) + { + /* start from first item if not found with >= startidx */ + if (i == infoPtr->nItemCount && startidx > 0) + { + endidx = startidx; + startidx = 0; + } - return 0; - } + for (i = startidx; i < endidx; i++) + { + /* retrieve text */ + item.mask = LVIF_TEXT; + item.iItem = i; + item.iSubItem = 0; + item.pszText = buffer; + item.cchTextMax = MAX_PATH; + if (!LISTVIEW_GetItemW(infoPtr, &item)) return 0; + + if (lstrncmpiW(item.pszText, infoPtr->szSearchParam, infoPtr->nSearchParamLength) == 0) + { + nItem = i; + break; + } + else if (nItem == -1 && lstrncmpiW(item.pszText, infoPtr->szSearchParam, 1) == 0) + { + /* this would work but we must keep looking for a longer match */ + nItem = i; + } + } - do { - if (idx == infoPtr->nItemCount) { - if (endidx == infoPtr->nItemCount || endidx == 0) + /* found something or second search completed with any result */ + if (nItem != -1 || endidx != infoPtr->nItemCount) break; - idx=0; - } - - /* get item */ - item.mask = LVIF_TEXT; - item.iItem = idx; - item.iSubItem = 0; - item.pszText = buffer; - item.cchTextMax = MAX_PATH; - if (!LISTVIEW_GetItemW(infoPtr, &item)) return 0; - - /* check for a match */ - if (lstrncmpiW(item.pszText,infoPtr->szSearchParam,infoPtr->nSearchParamLength) == 0) { - nItem=idx; - break; - } else if ( (charCode != 0) && (nItem == -1) && (nItem != infoPtr->nFocusedItem) && - (lstrncmpiW(item.pszText,infoPtr->szSearchParam,1) == 0) ) { - /* This would work but we must keep looking for a longer match */ - nItem=idx; - } - idx++; - } while (idx != endidx); + }; + } if (nItem != -1) LISTVIEW_KeySelection(infoPtr, nItem, FALSE);

1 0

Nikolay Sivov : shell32/shlview: Remove redundant message sent on every iteration, fix a helper interface leak.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: fc59d0b2f89f656c409332ef03bee622f6d359bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc59d0b2f89f656c409332ef0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 27 01:17:47 2010 +0400 shell32/shlview: Remove redundant message sent on every iteration, fix a helper interface leak. --- dlls/shell32/shlview.c | 136 +++++++++++++++++++++++------------------------- 1 files changed, 65 insertions(+), 71 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index d3322e4..01fee47 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1517,98 +1517,92 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn case LVN_KEYDOWN: { - /* MSG msg; - msg.hwnd = This->hWnd; - msg.message = WM_KEYDOWN; - msg.wParam = plvKeyDown->wVKey; - msg.lParam = 0; - msg.time = 0; - msg.pt = 0;*/ - LPNMLVKEYDOWN plvKeyDown = (LPNMLVKEYDOWN) lpnmh; /* initiate a rename of the selected file or directory */ - if(plvKeyDown->wVKey == VK_F2) + switch (plvKeyDown->wVKey) { - /* see how many files are selected */ - int i = SendMessageW(This->hWndList, LVM_GETSELECTEDCOUNT, 0, 0); - - /* get selected item */ - if(i == 1) + case VK_F2: { - /* get selected item */ - i = SendMessageW(This->hWndList, LVM_GETNEXTITEM, -1, MAKELPARAM (LVNI_SELECTED, 0)); + INT i = SendMessageW(This->hWndList, LVM_GETSELECTEDCOUNT, 0, 0); - SendMessageW(This->hWndList, LVM_ENSUREVISIBLE, i, 0); - SendMessageW(This->hWndList, LVM_EDITLABELW, i, 0); + if (i == 1) + { + /* get selected item */ + i = SendMessageW(This->hWndList, LVM_GETNEXTITEM, -1, MAKELPARAM (LVNI_SELECTED, 0)); + + SendMessageW(This->hWndList, LVM_ENSUREVISIBLE, i, 0); + SendMessageW(This->hWndList, LVM_EDITLABELW, i, 0); + } } - } -#if 0 - TranslateAccelerator(This->hWnd, This->hAccel, &msg) -#endif - else if(plvKeyDown->wVKey == VK_DELETE) - { - UINT i; - int item_index; - LVITEMA item; - LPITEMIDLIST* pItems; - ISFHelper *psfhlp; + break; + case VK_DELETE: + { + UINT i, count; + int item_index; + LVITEMW item; + LPITEMIDLIST* pItems; + ISFHelper *psfhlp; + HRESULT hr; - IShellFolder_QueryInterface(This->pSFParent, &IID_ISFHelper, - (LPVOID*)&psfhlp); + hr = IShellFolder_QueryInterface(This->pSFParent, &IID_ISFHelper, (void**)&psfhlp); + if (hr != S_OK) return 0; - if (psfhlp == NULL) - break; + if(!(count = SendMessageW(This->hWndList, LVM_GETSELECTEDCOUNT, 0, 0))) + { + ISFHelper_Release(psfhlp); + return 0; + } - if(!(i = SendMessageW(This->hWndList, LVM_GETSELECTEDCOUNT, 0, 0))) - break; + /* allocate memory for the pidl array */ + pItems = HeapAlloc(GetProcessHeap(), 0, sizeof(LPITEMIDLIST) * count); - /* allocate memory for the pidl array */ - pItems = HeapAlloc(GetProcessHeap(), 0, - sizeof(LPITEMIDLIST) * i); + /* retrieve all selected items */ + i = 0; + item_index = -1; - /* retrieve all selected items */ - i = 0; - item_index = -1; - while(SendMessageW(This->hWndList, LVM_GETSELECTEDCOUNT, 0, 0) > i) - { - /* get selected item */ - item_index = SendMessageW(This->hWndList, LVM_GETNEXTITEM, item_index, - MAKELPARAM (LVNI_SELECTED, 0)); - item.iItem = item_index; - item.mask = LVIF_PARAM; - SendMessageW(This->hWndList, LVM_GETITEMW, 0, (LPARAM) &item); + while (count > i) + { + /* get selected item */ + item_index = SendMessageW(This->hWndList, LVM_GETNEXTITEM, item_index, + MAKELPARAM (LVNI_SELECTED, 0)); + item.iItem = item_index; + item.mask = LVIF_PARAM; + SendMessageW(This->hWndList, LVM_GETITEMW, 0, (LPARAM)&item); - /* get item pidl */ - pItems[i] = (LPITEMIDLIST)item.lParam; + /* get item pidl */ + pItems[i] = (LPITEMIDLIST)item.lParam; - i++; - } + i++; + } - /* perform the item deletion */ - ISFHelper_DeleteItems(psfhlp, i, (LPCITEMIDLIST*)pItems); + /* perform the item deletion */ + ISFHelper_DeleteItems(psfhlp, i, (LPCITEMIDLIST*)pItems); + ISFHelper_Release(psfhlp); - /* free pidl array memory */ - HeapFree(GetProcessHeap(), 0, pItems); - } + /* free pidl array memory */ + HeapFree(GetProcessHeap(), 0, pItems); + } + break; - /* Initiate a refresh */ - else if(plvKeyDown->wVKey == VK_F5) - { + case VK_F5: + /* Initiate a refresh */ IShellView_Refresh((IShellView*)This); - } + break; - else if(plvKeyDown->wVKey == VK_BACK) - { - LPSHELLBROWSER lpSb; - if((lpSb = (LPSHELLBROWSER)SendMessageW(This->hWndParent, CWM_GETISHELLBROWSER, 0, 0))) + case VK_BACK: { - IShellBrowser_BrowseObject(lpSb, NULL, SBSP_PARENT); - } - } + LPSHELLBROWSER lpSb; + if((lpSb = (LPSHELLBROWSER)SendMessageW(This->hWndParent, CWM_GETISHELLBROWSER, 0, 0))) + { + IShellBrowser_BrowseObject(lpSb, NULL, SBSP_PARENT); + } + } + break; - else - FIXME("LVN_KEYDOWN key=0x%08x\n",plvKeyDown->wVKey); + default: + FIXME("LVN_KEYDOWN key=0x%08x\n", plvKeyDown->wVKey); + } } break;

1 0

Nikolay Sivov : shell32/shlview: Try to use IShellDetails to respond on notifications if IShellFolder2 isn' t available.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: 7ea711964ba9619c24425f384c8e11ef33a599f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ea711964ba9619c24425f384… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 27 00:38:48 2010 +0400 shell32/shlview: Try to use IShellDetails to respond on notifications if IShellFolder2 isn't available. --- dlls/shell32/shlview.c | 51 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 36 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index b3d300a..d3322e4 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1387,28 +1387,49 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn if(lpdi->item.mask & LVIF_TEXT) /* text requested */ { + static WCHAR emptyW[] = { 0 }; + SHELLDETAILS sd; + HRESULT hr; + if (This->pSF2Parent) { - SHELLDETAILS sd; - IShellFolder2_GetDetailsOf(This->pSF2Parent, pidl, lpdi->item.iSubItem, &sd); - if (lpnmh->code == LVN_GETDISPINFOA) - { - /* shouldn't happen */ - NMLVDISPINFOA *lpdiA = (NMLVDISPINFOA *)lpnmh; - StrRetToStrNA( lpdiA->item.pszText, lpdiA->item.cchTextMax, &sd.str, NULL); - TRACE("-- text=%s\n",lpdiA->item.pszText); - } - else /* LVN_GETDISPINFOW */ - { - StrRetToStrNW( lpdi->item.pszText, lpdi->item.cchTextMax, &sd.str, NULL); - TRACE("-- text=%s\n",debugstr_w(lpdi->item.pszText)); - } + hr = IShellFolder2_GetDetailsOf(This->pSF2Parent, pidl, lpdi->item.iSubItem, &sd); } else { - FIXME("no SF2\n"); + IShellDetails *details; + + hr = IShellFolder_QueryInterface(This->pSFParent, &IID_IShellDetails, (void**)&details); + if (hr == S_OK) + { + hr = IShellDetails_GetDetailsOf(details, pidl, lpdi->item.iSubItem, &sd); + IShellDetails_Release(details); + } + else + WARN("IShellFolder2/IShellDetails not supported\n"); + } + + if (hr != S_OK) + { + /* set to empty on failure */ + sd.str.uType = STRRET_WSTR; + sd.str.u.pOleStr = emptyW; } + + if (lpnmh->code == LVN_GETDISPINFOW) + { + StrRetToStrNW( lpdi->item.pszText, lpdi->item.cchTextMax, &sd.str, NULL); + TRACE("-- text=%s\n", debugstr_w(lpdi->item.pszText)); + } + else + { + /* LVN_GETDISPINFOA - shouldn't happen */ + NMLVDISPINFOA *lpdiA = (NMLVDISPINFOA *)lpnmh; + StrRetToStrNA( lpdiA->item.pszText, lpdiA->item.cchTextMax, &sd.str, NULL); + TRACE("-- text=%s\n", lpdiA->item.pszText); + } } + if(lpdi->item.mask & LVIF_IMAGE) /* image requested */ { lpdi->item.iImage = SHMapPIDLToSystemImageListIndex(This->pSFParent, pidl, 0);

1 0

Hans Leidekker : kernel32/tests: Fix test failures on certain versions of Windows.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: 9b33b479d61e0f39f856ad717d105914e2c5f3e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b33b479d61e0f39f856ad717… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 27 13:30:52 2010 +0200 kernel32/tests: Fix test failures on certain versions of Windows. --- dlls/kernel32/tests/version.c | 92 +++++++++++++++++++++++++--------------- 1 files changed, 57 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b33b479d61e0f39f856a…

1 0

Jeff Latimer : usp10/tests: Remove some redundant tests and fully test bidi flag setting.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: a7fc0c65c1dcf4a1d40476f99713524e1bbb00c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7fc0c65c1dcf4a1d40476f99… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Apr 27 22:43:43 2010 +1000 usp10/tests: Remove some redundant tests and fully test bidi flag setting. --- dlls/usp10/tests/usp10.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 5ba4315..002748a 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -806,8 +806,6 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 "Start pos [2] not = 11 (%d) or end [3] pos not = 14 (%d), cInChars = %d\n", pItem[2].iCharPos, pItem[3].iCharPos, cInChars); } - hr = ScriptFreeCache( &psc); - ok (!psc, "psc is not null after ScriptFreeCache\n"); } /* This is a valid test that will cause parsing to take place and create 5 script_items */ @@ -823,21 +821,27 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 ok (pItem[0].iCharPos == 0 && pItem[1].iCharPos == 6, "Start pos [0] not = 0 (%d) or end pos [1] not = %d\n", pItem[0].iCharPos, pItem[1].iCharPos); + ok (pItem[0].a.s.uBidiLevel == 0, "Should have been bidi=0 not %d\n", + pItem[0].a.s.uBidiLevel); ok (pItem[1].iCharPos == 6 && pItem[2].iCharPos == 11, "Start pos [1] not = 6 (%d) or end pos [2] not = 11 (%d)\n", pItem[1].iCharPos, pItem[2].iCharPos); + ok (pItem[1].a.s.uBidiLevel == 1, "Should have been bidi=1 not %d\n", + pItem[1].a.s.uBidiLevel); ok (pItem[2].iCharPos == 11 && pItem[3].iCharPos == 12, "Start pos [2] not = 11 (%d) or end [3] pos not = 12 (%d)\n", pItem[2].iCharPos, pItem[3].iCharPos); + ok (pItem[2].a.s.uBidiLevel == 0, "Should have been bidi=0 not %d\n", + pItem[2].a.s.uBidiLevel); ok (pItem[3].iCharPos == 12 && pItem[4].iCharPos == 13, "Start pos [3] not = 12 (%d) or end [4] pos not = 13 (%d)\n", pItem[3].iCharPos, pItem[4].iCharPos); + ok (pItem[3].a.s.uBidiLevel == 0, "Should have been bidi=0 not %d\n", + pItem[3].a.s.uBidiLevel); ok (pItem[4].iCharPos == 13 && pItem[5].iCharPos == cInChars, "Start pos [4] not = 13 (%d) or end [5] pos not = 16 (%d), cInChars = %d\n", pItem[4].iCharPos, pItem[5].iCharPos, cInChars); } - hr = ScriptFreeCache( &psc); - ok (!psc, "psc is not null after ScriptFreeCache\n"); } /*

1 0

Jeff Latimer : usp10: Check that there are sufficient script_items before setting the last pointer .
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: b367e902c9cafb1dfa5f35e52bf89377dd608ac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b367e902c9cafb1dfa5f35e52… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Apr 27 22:43:34 2010 +1000 usp10: Check that there are sufficient script_items before setting the last pointer. --- dlls/usp10/tests/usp10.c | 10 ++++++++++ dlls/usp10/usp10.c | 11 ++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 124526b..5ba4315 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -673,6 +673,7 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 WCHAR TestItem3[] = {'T', 'e', 's', 't', 'c',' ','1','2','3',' ',' ','e','n','d',0}; WCHAR TestItem4[] = {'T', 'e', 's', 't', 'd',' ',0x0684,0x0694,0x06a4,' ',' ','\r','\n','e','n','d',0}; WCHAR TestItem5[] = {0x0684,'T','e','s','t','e',' ',0x0684,0x0694,0x06a4,' ',' ','e','n','d',0}; + WCHAR TestItem6[] = {'T', 'e', 's', 't', 'f',' ',' ',' ','\r','\n','e','n','d',0}; SCRIPT_CACHE psc; int cChars; @@ -848,6 +849,15 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256 ok (pcItems == 4, "There should have been 4 items, found %d\n", pcItems); ok (pItem[0].a.s.uBidiLevel == 1, "The first character should have been bidi=1 not %d\n", pItem[0].a.s.uBidiLevel); + + /* This test checks to make sure that the test to see if there are sufficient buffers to store * + * the pointer to the last char works. Note that windows often needs a greater number of * + * SCRIPT_ITEMS to process a string than is returned in pcItems. */ + cInChars = (sizeof(TestItem6)/2)-1; + cMaxItems = 4; + hr = ScriptItemize(TestItem6, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); + ok (hr == E_OUTOFMEMORY, "ScriptItemize should return E_OUTOFMEMORY, returned %08x\n", hr); + } static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 201a74a..eebc8ab 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -669,16 +669,17 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem /* While not strictly necessary according to the spec, make sure the n+1 * item is set up to prevent random behaviour if the caller erroneously * checks the n+1 structure */ - memset(&pItems[index+1].a, 0, sizeof(SCRIPT_ANALYSIS)); + index++; + memset(&pItems[index].a, 0, sizeof(SCRIPT_ANALYSIS)); - TRACE("index=%d cnt=%d iCharPos=%d\n", index+1, cnt, pItems[index+1].iCharPos); + TRACE("index=%d cnt=%d iCharPos=%d\n", index, cnt, pItems[index].iCharPos); /* Set one SCRIPT_STATE item being returned */ - if (pcItems) *pcItems = index + 1; + if (index + 1 > cMaxItems) return E_OUTOFMEMORY; + if (pcItems) *pcItems = index; /* Set SCRIPT_ITEM */ - pItems[index+1].iCharPos = cnt; /* the last + 1 item - contains the ptr to the lastchar */ + pItems[index].iCharPos = cnt; /* the last item contains the ptr to the lastchar */ heap_free(levels); return S_OK; }

1 0

Piotr Caban : msvcrt: Added wcstombs_s implementation.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: 6c0e61cd65c5a9bacb46608c116d99e81bd12131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c0e61cd65c5a9bacb46608c1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 27 08:42:46 2010 +0200 msvcrt: Added wcstombs_s implementation. --- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/msvcrt.spec | 4 +- dlls/msvcrt/wcs.c | 76 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 82 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 6ead0a7..3866dc6 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1110,7 +1110,7 @@ @ cdecl _wcstoi64_l(wstr ptr long ptr) msvcrt._wcstoi64_l @ stub _wcstol_l @ stub _wcstombs_l -@ stub _wcstombs_s_l +@ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcrt._wcstombs_s_l @ cdecl _wcstoui64(wstr ptr long) msvcrt._wcstoui64 @ cdecl _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l @ stub _wcstoul_l @@ -1456,7 +1456,7 @@ @ stub wcstok_s @ cdecl wcstol(wstr ptr long) msvcrt.wcstol @ cdecl wcstombs(ptr ptr long) msvcrt.wcstombs -@ stub wcstombs_s +@ cdecl wcstombs_s(ptr ptr long wstr long) msvcrt.wcstombs_s @ cdecl wcstoul(wstr ptr long) msvcrt.wcstoul @ stub wcsxfrm @ stub wctob diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 72dff79..ea3e534 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1097,7 +1097,7 @@ @ cdecl _wcstoi64_l(wstr ptr long ptr) msvcrt._wcstoi64_l @ stub _wcstol_l @ stub _wcstombs_l -@ stub _wcstombs_s_l +@ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcrt._wcstombs_s_l @ cdecl _wcstoui64(wstr ptr long) msvcrt._wcstoui64 @ cdecl _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l @ stub _wcstoul_l @@ -1440,7 +1440,7 @@ @ stub wcstok_s @ cdecl wcstol(wstr ptr long) msvcrt.wcstol @ cdecl wcstombs(ptr ptr long) msvcrt.wcstombs -@ stub wcstombs_s +@ cdecl wcstombs_s(ptr ptr long wstr long) msvcrt.wcstombs_s @ cdecl wcstoul(wstr ptr long) msvcrt.wcstoul @ stub wcsxfrm @ stub wctob diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5f82cf1..1e7b9e2 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1039,7 +1039,7 @@ @ cdecl _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l # stub _wcstol_l # stub _wcstombs_l -# stub _wcstombs_s_l +@ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) MSVCRT__wcstombs_s_l @ cdecl _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 @ cdecl _wcstoui64_l(wstr ptr long ptr) MSVCRT__wcstoui64_l # stub _wcstoul_l @@ -1396,7 +1396,7 @@ # stub wcstok_s @ cdecl wcstol(wstr ptr long) ntdll.wcstol @ cdecl wcstombs(ptr ptr long) ntdll.wcstombs -# stub wcstombs_s +@ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) ntdll.wcstoul @ stub wcsxfrm #(ptr wstr long) MSVCRT_wcsxfrm # stub wctob diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 04d90de..ddeb999 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -227,6 +227,82 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, } /********************************************************************* + * _wcstombs_s_l (MSVCRT.@) + */ +int CDECL MSVCRT__wcstombs_s_l(MSVCRT_size_t *ret, char *mbstr, + MSVCRT_size_t size, const MSVCRT_wchar_t *wcstr, + MSVCRT_size_t count, MSVCRT__locale_t locale) +{ + char default_char = '\0', *p; + int hlp, len; + + if(!size) + return 0; + + if(!mbstr || !wcstr) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if(mbstr) + *mbstr = '\0'; + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + if(!locale) + locale = get_locale(); + + if(size<=count) + len = size; + else if(count==_TRUNCATE) + len = size-1; + else + len = count; + + p = mbstr; + *ret = 0; + while(1) { + if(!len) + break; + + if(*wcstr == '\0') { + *p = '\0'; + break; + } + + hlp = WideCharToMultiByte(locale->locinfo->lc_codepage, + WC_NO_BEST_FIT_CHARS, wcstr, 1, p, len, &default_char, NULL); + if(!hlp || *p=='\0') + break; + + p += hlp; + len -= hlp; + + wcstr++; + *ret += 1; + } + + if(!len && size<=count) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + *mbstr = '\0'; + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; + } + + if(*wcstr == '\0') + *ret += 1; + *p = '\0'; + return 0; +} + +/********************************************************************* + * wcstombs_s (MSVCRT.@) + */ +int CDECL MSVCRT_wcstombs_s(MSVCRT_size_t *ret, char *mbstr, + MSVCRT_size_t size, const MSVCRT_wchar_t *wcstr, MSVCRT_size_t count) +{ + return MSVCRT__wcstombs_s_l(ret, mbstr, size, wcstr, count, NULL); +} + +/********************************************************************* * wcstod (MSVCRT.@) */ double CDECL MSVCRT_wcstod(const MSVCRT_wchar_t* lpszStr, MSVCRT_wchar_t** end)

1 0

Piotr Caban : msvcrt: Added _wcstoi64 and _wcstoui64 implementation.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: 0ec1635172b70fd42ece6d05edb6383437514b1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ec1635172b70fd42ece6d05e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 27 08:42:32 2010 +0200 msvcrt: Added _wcstoi64 and _wcstoui64 implementation. --- dlls/msvcr80/msvcr80.spec | 8 +- dlls/msvcr90/msvcr90.spec | 8 +- dlls/msvcrt/msvcrt.spec | 8 +- dlls/msvcrt/string.c | 6 +- dlls/msvcrt/wcs.c | 158 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 173 insertions(+), 15 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 3cc641e..6ead0a7 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1106,13 +1106,13 @@ @ cdecl _wcsset(wstr long) msvcrt._wcsset @ stub _wcsset_s @ cdecl _wcstod_l(wstr ptr) msvcrt._wcstod_l -@ stub _wcstoi64 -@ stub _wcstoi64_l +@ cdecl _wcstoi64(wstr ptr long) msvcrt._wcstoi64 +@ cdecl _wcstoi64_l(wstr ptr long ptr) msvcrt._wcstoi64_l @ stub _wcstol_l @ stub _wcstombs_l @ stub _wcstombs_s_l -@ stub _wcstoui64 -@ stub _wcstoui64_l +@ cdecl _wcstoui64(wstr ptr long) msvcrt._wcstoui64 +@ cdecl _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l @ stub _wcstoul_l @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ stub _wcsupr_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 59a71ba..72dff79 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1093,13 +1093,13 @@ @ cdecl _wcsset(wstr long) msvcrt._wcsset @ stub _wcsset_s @ cdecl _wcstod_l(wstr ptr) msvcrt._wcstod_l -@ stub _wcstoi64 -@ stub _wcstoi64_l +@ cdecl _wcstoi64(wstr ptr long) msvcrt._wcstoi64 +@ cdecl _wcstoi64_l(wstr ptr long ptr) msvcrt._wcstoi64_l @ stub _wcstol_l @ stub _wcstombs_l @ stub _wcstombs_s_l -@ stub _wcstoui64 -@ stub _wcstoui64_l +@ cdecl _wcstoui64(wstr ptr long) msvcrt._wcstoui64 +@ cdecl _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l @ stub _wcstoul_l @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ stub _wcsupr_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e5bbaf4..5f82cf1 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1035,13 +1035,13 @@ @ cdecl _wcsrev(wstr) @ cdecl _wcsset(wstr long) # stub _wcsset_s -# stub _wcstoi64 -# stub _wcstoi64_l +@ cdecl _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 +@ cdecl _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l # stub _wcstol_l # stub _wcstombs_l # stub _wcstombs_s_l -# stub _wcstoui64 -# stub _wcstoui64_l +@ cdecl _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 +@ cdecl _wcstoui64_l(wstr ptr long ptr) MSVCRT__wcstoui64_l # stub _wcstoul_l @ cdecl _wcsupr(wstr) ntdll._wcsupr # stub _wcsupr_l diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 459d1a1..7d578a3 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -529,10 +529,10 @@ __int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, MSVCR if(!negative && (ret>MSVCRT_I64_MAX/base || ret*base>MSVCRT_I64_MAX-v)) { ret = MSVCRT_I64_MAX; - *MSVCRT__errno() = ERANGE; + *MSVCRT__errno() = MSVCRT_ERANGE; } else if(negative && (ret<MSVCRT_I64_MIN/base || ret*base<MSVCRT_I64_MIN-v)) { ret = MSVCRT_I64_MIN; - *MSVCRT__errno() = ERANGE; + *MSVCRT__errno() = MSVCRT_ERANGE; } else ret = ret*base + v; } @@ -606,7 +606,7 @@ unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int b if(ret>MSVCRT_UI64_MAX/base || ret*base>MSVCRT_UI64_MAX-v) { ret = MSVCRT_UI64_MAX; - *MSVCRT__errno() = ERANGE; + *MSVCRT__errno() = MSVCRT_ERANGE; } else ret = ret*base + v; } diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 44a3b4d..04d90de 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1408,3 +1408,161 @@ INT CDECL MSVCRT_wcscat_s(MSVCRT_wchar_t* dst, MSVCRT_size_t elem, const MSVCRT_ dst[0] = '\0'; return MSVCRT_ERANGE; } + +/********************************************************************* + * _wctoi64_l (MSVCR90.@) + * + * FIXME: locale parameter is ignored + */ +__int64 CDECL MSVCRT__wcstoi64_l(const MSVCRT_wchar_t *nptr, + MSVCRT_wchar_t **endptr, int base, MSVCRT__locale_t locale) +{ + BOOL negative = FALSE; + __int64 ret = 0; + + TRACE("(%s %p %d %p)\n", debugstr_w(nptr), endptr, base, locale); + + if(!nptr || base<0 || base>36 || base==1) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + return 0; + } + + while(isspaceW(*nptr)) nptr++; + + if(*nptr == '-') { + negative = TRUE; + nptr++; + } else if(*nptr == '+') + nptr++; + + if((base==0 || base==16) && *nptr=='0' && tolowerW(*(nptr+1))=='x') { + base = 16; + nptr += 2; + } + + if(base == 0) { + if(*nptr=='0') + base = 8; + else + base = 10; + } + + while(*nptr) { + char cur = tolowerW(*nptr); + int v; + + if(isdigitW(cur)) { + if(cur >= '0'+base) + break; + v = cur-'0'; + } else { + if(cur<'a' || cur>='a'+base-10) + break; + v = cur-'a'+10; + } + + if(negative) + v = -v; + + nptr++; + + if(!negative && (ret>MSVCRT_I64_MAX/base || ret*base>MSVCRT_I64_MAX-v)) { + ret = MSVCRT_I64_MAX; + *MSVCRT__errno() = MSVCRT_ERANGE; + } else if(negative && (ret<MSVCRT_I64_MIN/base || ret*base<MSVCRT_I64_MIN-v)) { + ret = MSVCRT_I64_MIN; + *MSVCRT__errno() = MSVCRT_ERANGE; + } else + ret = ret*base + v; + } + + if(endptr) + *endptr = (MSVCRT_wchar_t*)nptr; + + return ret; +} + +/********************************************************************* + * _wcstoi64 (MSVCR90.@) + */ +__int64 CDECL MSVCRT__wcstoi64(const MSVCRT_wchar_t *nptr, + MSVCRT_wchar_t **endptr, int base) +{ + return MSVCRT__wcstoi64_l(nptr, endptr, base, NULL); +} + +/********************************************************************* + * _wcstoui64_l (MSVCR90.@) + * + * FIXME: locale parameter is ignored + */ +unsigned __int64 CDECL MSVCRT__wcstoui64_l(const MSVCRT_wchar_t *nptr, + MSVCRT_wchar_t **endptr, int base, MSVCRT__locale_t locale) +{ + BOOL negative = FALSE; + unsigned __int64 ret = 0; + + TRACE("(%s %p %d %p)\n", debugstr_w(nptr), endptr, base, locale); + + if(!nptr || base<0 || base>36 || base==1) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + return 0; + } + + while(isspaceW(*nptr)) nptr++; + + if(*nptr == '-') { + negative = TRUE; + nptr++; + } else if(*nptr == '+') + nptr++; + + if((base==0 || base==16) && *nptr=='0' && tolowerW(*(nptr+1))=='x') { + base = 16; + nptr += 2; + } + + if(base == 0) { + if(*nptr=='0') + base = 8; + else + base = 10; + } + + while(*nptr) { + char cur = tolowerW(*nptr); + int v; + + if(isdigit(cur)) { + if(cur >= '0'+base) + break; + v = *nptr-'0'; + } else { + if(cur<'a' || cur>='a'+base-10) + break; + v = cur-'a'+10; + } + + nptr++; + + if(ret>MSVCRT_UI64_MAX/base || ret*base>MSVCRT_UI64_MAX-v) { + ret = MSVCRT_UI64_MAX; + *MSVCRT__errno() = MSVCRT_ERANGE; + } else + ret = ret*base + v; + } + + if(endptr) + *endptr = (MSVCRT_wchar_t*)nptr; + + return negative ? -ret : ret; +} + +/********************************************************************* + * _wcstoui64 (MSVCR90.@) + */ +unsigned __int64 CDECL MSVCRT__wcstoui64(const MSVCRT_wchar_t *nptr, + MSVCRT_wchar_t **endptr, int base) +{ + return MSVCRT__wcstoui64_l(nptr, endptr, base, NULL); +}

1 0

Piotr Caban : msvcrt: Added _mkgmtime implementation.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: c4d6877894e67c001b3a67518570e1f2dacc5f4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4d6877894e67c001b3a67518… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 27 08:42:13 2010 +0200 msvcrt: Added _mkgmtime implementation. --- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/msvcrt.spec | 6 ++-- dlls/msvcrt/tests/time.c | 81 +++++++++++++++++++++++++++++++++++++------- dlls/msvcrt/time.c | 58 ++++++++++++++++++++++++++++++++ 5 files changed, 133 insertions(+), 20 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 60e66ba..3cc641e 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -800,8 +800,8 @@ @ cdecl _memicmp(str str long) msvcrt._memicmp @ stub _memicmp_l @ cdecl _mkdir(str) msvcrt._mkdir -@ stub _mkgmtime32 -@ stub _mkgmtime64 +@ cdecl _mkgmtime32(ptr) msvcrt._mkgmtime32 +@ cdecl _mkgmtime64(ptr) msvcrt._mkgmtime64 @ cdecl _mktemp(str) msvcrt._mktemp @ stub _mktemp_s @ cdecl _mktime32(ptr) msvcrt._mktime32 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 16a1bc2..59a71ba 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -788,8 +788,8 @@ @ cdecl _memicmp(str str long) msvcrt._memicmp @ stub _memicmp_l @ cdecl _mkdir(str) msvcrt._mkdir -@ stub _mkgmtime32 -@ stub _mkgmtime64 +@ cdecl _mkgmtime32(ptr) msvcrt._mkgmtime32 +@ cdecl _mkgmtime64(ptr) msvcrt._mkgmtime64 @ cdecl _mktemp(str) msvcrt._mktemp @ stub _mktemp_s @ cdecl _mktime32(ptr) msvcrt._mktime32 diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6807de2..e5bbaf4 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -745,9 +745,9 @@ @ cdecl _memicmp(str str long) ntdll._memicmp # stub _memicmp_l @ cdecl _mkdir(str) MSVCRT__mkdir -# stub _mkgmtime -# stub _mkgmtime32 -# stub _mkgmtime64 +@ cdecl _mkgmtime(ptr) MSVCRT__mkgmtime +@ cdecl _mkgmtime32(ptr) MSVCRT__mkgmtime32 +@ cdecl _mkgmtime64(ptr) MSVCRT__mkgmtime64 @ cdecl _mktemp(str) # stub _mktemp_s @ cdecl _mktime32(ptr) MSVCRT__mktime32 diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index ac782ca..7f0a80b 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -54,20 +54,75 @@ static void test_ctime(void) } static void test_gmtime(void) { - time_t gmt = 0; - struct tm* gmt_tm = gmtime(&gmt); - if(gmt_tm == 0) - { - ok(0,"gmtime() error\n"); - return; - } + static __time32_t (__cdecl *p_mkgmtime32)(struct tm*); + static struct tm* (__cdecl *p_gmtime32)(__time32_t*); + + HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + __time32_t valid, gmt; + struct tm* gmt_tm; + + p_gmtime32 = (void*)GetProcAddress(hmod, "_gmtime32"); + if(!p_gmtime32) { + win_skip("Skipping _gmtime32 tests\n"); + return; + } + + gmt = valid = 0; + gmt_tm = p_gmtime32(&gmt); + if(!gmt_tm) { + ok(0, "_gmtime32() failed\n"); + return; + } + ok(((gmt_tm->tm_year == 70) && (gmt_tm->tm_mon == 0) && (gmt_tm->tm_yday == 0) && - (gmt_tm->tm_mday == 1) && (gmt_tm->tm_wday == 4) && (gmt_tm->tm_hour == 0) && - (gmt_tm->tm_min == 0) && (gmt_tm->tm_sec == 0) && (gmt_tm->tm_isdst == 0)), - "Wrong date:Year %4d mon %2d yday %3d mday %2d wday %1d hour%2d min %2d sec %2d dst %2d\n", - gmt_tm->tm_year, gmt_tm->tm_mon, gmt_tm->tm_yday, gmt_tm->tm_mday, gmt_tm->tm_wday, - gmt_tm->tm_hour, gmt_tm->tm_min, gmt_tm->tm_sec, gmt_tm->tm_isdst); - + (gmt_tm->tm_mday == 1) && (gmt_tm->tm_wday == 4) && (gmt_tm->tm_hour == 0) && + (gmt_tm->tm_min == 0) && (gmt_tm->tm_sec == 0) && (gmt_tm->tm_isdst == 0)), + "Wrong date:Year %4d mon %2d yday %3d mday %2d wday %1d hour%2d min %2d sec %2d dst %2d\n", + gmt_tm->tm_year, gmt_tm->tm_mon, gmt_tm->tm_yday, gmt_tm->tm_mday, gmt_tm->tm_wday, + gmt_tm->tm_hour, gmt_tm->tm_min, gmt_tm->tm_sec, gmt_tm->tm_isdst); + + p_mkgmtime32 = (void*)GetProcAddress(hmod, "_mkgmtime32"); + if(!p_mkgmtime32) { + win_skip("Skipping _mkgmtime32 tests\n"); + return; + } + + gmt_tm->tm_wday = gmt_tm->tm_yday = 0; + gmt = p_mkgmtime32(gmt_tm); + ok(gmt == valid, "gmt = %u\n", gmt); + ok(gmt_tm->tm_wday == 4, "gmt_tm->tm_wday = %d\n", gmt_tm->tm_wday); + ok(gmt_tm->tm_yday == 0, "gmt_tm->tm_yday = %d\n", gmt_tm->tm_yday); + + gmt_tm->tm_wday = gmt_tm->tm_yday = 0; + gmt_tm->tm_isdst = -1; + gmt = p_mkgmtime32(gmt_tm); + ok(gmt == valid, "gmt = %u\n", gmt); + ok(gmt_tm->tm_wday == 4, "gmt_tm->tm_wday = %d\n", gmt_tm->tm_wday); + ok(gmt_tm->tm_yday == 0, "gmt_tm->tm_yday = %d\n", gmt_tm->tm_yday); + + gmt_tm->tm_wday = gmt_tm->tm_yday = 0; + gmt_tm->tm_isdst = 1; + gmt = p_mkgmtime32(gmt_tm); + ok(gmt == valid, "gmt = %u\n", gmt); + ok(gmt_tm->tm_wday == 4, "gmt_tm->tm_wday = %d\n", gmt_tm->tm_wday); + ok(gmt_tm->tm_yday == 0, "gmt_tm->tm_yday = %d\n", gmt_tm->tm_yday); + + gmt = valid = 173921; + gmt_tm = p_gmtime32(&gmt); + if(!gmt_tm) { + ok(0, "_gmtime32() failed\n"); + return; + } + + gmt_tm->tm_isdst = -1; + gmt = p_mkgmtime32(gmt_tm); + ok(gmt == valid, "gmt = %u\n", gmt); + ok(gmt_tm->tm_wday == 6, "gmt_tm->tm_wday = %d\n", gmt_tm->tm_wday); + ok(gmt_tm->tm_yday == 2, "gmt_tm->tm_yday = %d\n", gmt_tm->tm_yday); + + gmt_tm->tm_isdst = 1; + gmt = p_mkgmtime32(gmt_tm); + ok(gmt == valid, "gmt = %u\n", gmt); } static void test_mktime(void) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index d5b0227..2e8828c 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -123,6 +123,64 @@ MSVCRT___time32_t CDECL MSVCRT_mktime(struct MSVCRT_tm *mstm) } #endif +/********************************************************************** + * _mkgmtime64 (MSVCRT.@) + * + * time->tm_isdst value is ignored + */ +MSVCRT___time64_t CDECL MSVCRT__mkgmtime64(struct MSVCRT_tm *time) +{ + SYSTEMTIME st; + FILETIME ft; + MSVCRT___time64_t ret; + int i; + + st.wMilliseconds = 0; + st.wSecond = time->tm_sec; + st.wMinute = time->tm_min; + st.wHour = time->tm_hour; + st.wDay = time->tm_mday; + st.wMonth = time->tm_mon+1; + st.wYear = time->tm_year+1900; + + if(!SystemTimeToFileTime(&st, &ft)) + return -1; + + FileTimeToSystemTime(&ft, &st); + time->tm_wday = st.wDayOfWeek; + + for(i=time->tm_yday=0; i<st.wMonth-1; i++) + time->tm_yday += MonthLengths[IsLeapYear(st.wYear)][i]; + time->tm_yday += st.wDay-1; + + ret = ((MSVCRT___time64_t)ft.dwHighDateTime<<32)+ft.dwLowDateTime; + ret = (ret-TICKS_1601_TO_1970)/TICKSPERSEC; + return ret; +} + +/********************************************************************** + * _mkgmtime32 (MSVCRT.@) + */ +MSVCRT___time32_t CDECL MSVCRT__mkgmtime32(struct MSVCRT_tm *time) +{ + return MSVCRT__mkgmtime64(time); +} + +/********************************************************************** + * _mkgmtime (MSVCRT.@) + */ +#ifdef _WIN64 +MSVCRT___time64_t CDECL MSVCRT__mkgmtime(struct MSVCRT_tm *time) +{ + return MSVCRT__mkgmtime64(time); +} +#else +MSVCRT___time32_t CDECL MSVCRT__mkgmtime(struct MSVCRT_tm *time) +{ + return MSVCRT__mkgmtime32(time); +} +#endif + /********************************************************************* * _localtime64 (MSVCRT.@) */

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
90
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 2010