April 2010 - Wine-Commits - list.winehq.org

Piotr Caban : msvcrt/tests: Added sscanf_s tests.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: ca3cb9e2f5c6e6a8134b88f400ba6ae0f43767d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca3cb9e2f5c6e6a8134b88f40… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 22 17:56:24 2010 +0200 msvcrt/tests: Added sscanf_s tests. --- dlls/msvcrt/tests/scanf.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 0ec89ff..e9cb987 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -198,7 +198,49 @@ static void test_sscanf( void ) ok(number_so_far == 4, "%%n yielded wrong result: %d\n", number_so_far); } +static void test_sscanf_s(void) +{ + int (__cdecl *psscanf_s)(const char*,const char*,...); + HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + int i, ret; + char buf[100]; + + psscanf_s = (void*)GetProcAddress(hmod, "sscanf_s"); + if(!psscanf_s) { + win_skip("sscanf_s not available\n"); + return; + } + + ret = psscanf_s("123", "%d", &i); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(i == 123, "i = %d\n", i); + + ret = psscanf_s("123", "%s", buf, 100); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(!strcmp("123", buf), "buf = %s\n", buf); + + ret = psscanf_s("123", "%s", buf, 3); + ok(ret == 0, "Wrong number of arguments read: %d\n", ret); + ok(buf[0]=='\0', "buf = %s\n", buf); + + buf[0] = 'a'; + ret = psscanf_s("123", "%3c", buf, 2); + ok(ret == 0, "Wrong number of arguments read: %d\n", ret); + ok(buf[0]=='\0', "buf = %s\n", buf); + + i = 1; + ret = psscanf_s("123 123", "%s %d", buf, 2, &i); + ok(ret == 0, "Wrong number of arguments read: %d\n", ret); + ok(i==1, "i = %d\n", i); + + i = 1; + ret = psscanf_s("123 123", "%d %s", &i, buf, 2); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(i==123, "i = %d\n", i); +} + START_TEST(scanf) { test_sscanf(); + test_sscanf_s(); }

1 0

Alexandre Julliard : winex11: Flush the gdi display after processing the last event.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: 5e60175c7a83e157eda60b03e4358e7ebc42638b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e60175c7a83e157eda60b03e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 22 16:33:35 2010 +0200 winex11: Flush the gdi display after processing the last event. --- dlls/winex11.drv/event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 63fb5c1..7d84b63 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -379,8 +379,8 @@ static int process_events( Display *display, Bool (*filter)(Display*, XEvent*,XP break; } } - XFlush( gdi_display ); if (prev_event.type) call_event_handler( display, &prev_event ); + XFlush( gdi_display ); wine_tsx11_unlock(); if (count) TRACE( "processed %d events\n", count ); return count;

1 0

Hans Leidekker : winhttp: Add tests for basic authentication.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: cd79874cee3bed886d6e17635819e6e3cf402c66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd79874cee3bed886d6e17635… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 22 16:35:28 2010 +0200 winhttp: Add tests for basic authentication. --- dlls/winhttp/tests/Makefile.in | 2 +- dlls/winhttp/tests/winhttp.c | 268 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 267 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd79874cee3bed886d6e1…

1 0

Nikolay Sivov : comctl32/listview: Add callback subitem on column insertion .
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: dd3fc178844d744d59ee85264e8c117468e305a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd3fc178844d744d59ee85264… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 22 12:06:28 2010 +0400 comctl32/listview: Add callback subitem on column insertion. --- dlls/comctl32/listview.c | 26 ++++++++++++----- dlls/comctl32/tests/listview.c | 59 +++++++++++++++++++++++++++++----------- 2 files changed, 61 insertions(+), 24 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 3ea8e0f..68ad0a9 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4276,12 +4276,11 @@ static BOOL set_sub_item(const LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, *bChanged = TRUE; } - if (lpLVItem->mask & LVIF_IMAGE) - if (lpSubItem->hdr.iImage != lpLVItem->iImage) - { - lpSubItem->hdr.iImage = lpLVItem->iImage; - *bChanged = TRUE; - } + if ((lpLVItem->mask & LVIF_IMAGE) && (lpSubItem->hdr.iImage != lpLVItem->iImage)) + { + lpSubItem->hdr.iImage = lpLVItem->iImage; + *bChanged = TRUE; + } if ((lpLVItem->mask & LVIF_TEXT) && textcmpWT(lpSubItem->hdr.pszText, lpLVItem->pszText, isW)) { @@ -6434,7 +6433,7 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, if (isubitem) { - SUBITEM_INFO *lpSubItem = LISTVIEW_GetSubItemPtr(hdpaSubItems, isubitem); + SUBITEM_INFO *lpSubItem = LISTVIEW_GetSubItemPtr(hdpaSubItems, isubitem); pItemHdr = lpSubItem ? &lpSubItem->hdr : &callbackHdr; if (!lpSubItem) { @@ -7883,7 +7882,14 @@ static INT LISTVIEW_InsertColumnT(LISTVIEW_INFO *infoPtr, INT nColumn, SUBITEM_INFO *lpSubItem; HDPA hdpaSubItems; INT nItem, i; - + LVITEMW item; + BOOL changed; + + item.iSubItem = nNewColumn; + item.mask = LVIF_TEXT | LVIF_IMAGE; + item.iImage = I_IMAGECALLBACK; + item.pszText = LPSTR_TEXTCALLBACKW; + for (nItem = 0; nItem < infoPtr->nItemCount; nItem++) { hdpaSubItems = DPA_GetPtr(infoPtr->hdpaItems, nItem); @@ -7893,6 +7899,10 @@ static INT LISTVIEW_InsertColumnT(LISTVIEW_INFO *infoPtr, INT nColumn, if (lpSubItem->iSubItem >= nNewColumn) lpSubItem->iSubItem++; } + + /* add new subitem for each item */ + item.iItem = nItem; + set_sub_item(infoPtr, &item, isW, &changed); } } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 13fda83..4bf877a 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -45,7 +45,7 @@ static const WCHAR testparentclassW[] = {'L','i','s','t','v','i','e','w',' ','t','e','s','t',' ','p','a','r','e','n','t','W', 0}; -HWND hwndparent, hwndparentW; +static HWND hwndparent, hwndparentW; /* prevents edit box creation, LVN_BEGINLABELEDIT return value */ static BOOL blockEdit; /* return nonzero on NM_HOVER */ @@ -54,9 +54,11 @@ static BOOL g_block_hover; static BOOL g_dump_itemchanged; /* format reported to control: -1 falls to defproc, anything else returned */ -INT notifyFormat; +static INT notifyFormat; /* indicates we're running < 5.80 version */ -BOOL g_is_below_5; +static BOOL g_is_below_5; +/* item data passed to LVN_GETDISPINFOA */ +static LVITEMA g_itema; static HWND subclass_editbox(HWND hwndListview); @@ -366,6 +368,12 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP nmlv->iItem, nmlv->uNewState, nmlv->uOldState, nmlv->uChanged); } break; + case LVN_GETDISPINFOA: + { + NMLVDISPINFOA *dispinfo = (NMLVDISPINFOA*)lParam; + g_itema = dispinfo->item; + } + break; case NM_HOVER: if (g_block_hover) return 1; break; @@ -1187,24 +1195,25 @@ static void test_items(void) static void test_columns(void) { HWND hwnd, hwndheader; - LVCOLUMN column; - DWORD rc; + LVCOLUMNA column; + LVITEMA item; INT order[2]; + CHAR buff[5]; + DWORD rc; - hwnd = CreateWindowEx(0, "SysListView32", "foo", LVS_REPORT, + hwnd = CreateWindowExA(0, "SysListView32", "foo", LVS_REPORT, 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); ok(hwnd != NULL, "failed to create listview window\n"); /* Add a column with no mask */ memset(&column, 0xcc, sizeof(column)); column.mask = 0; - rc = ListView_InsertColumn(hwnd, 0, &column); - ok(rc==0, "Inserting column with no mask failed with %d\n", rc); + rc = SendMessageA(hwnd, LVM_INSERTCOLUMNA, 0, (LPARAM)&column); + ok(rc == 0, "Inserting column with no mask failed with %d\n", rc); /* Check its width */ - rc = ListView_GetColumnWidth(hwnd, 0); - ok(rc==10 || - broken(rc==0), /* win9x */ + rc = SendMessageA(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); + ok(rc == 10 || broken(rc == 0) /* win9x */, "Inserting column with no mask failed to set width to 10 with %d\n", rc); DestroyWindow(hwnd); @@ -1216,24 +1225,43 @@ static void test_columns(void) memset(&column, 0, sizeof(column)); column.mask = LVCF_WIDTH; column.cx = 100; - rc = ListView_InsertColumn(hwnd, 0, &column); + rc = SendMessageA(hwnd, LVM_INSERTCOLUMNA, 0, (LPARAM)&column); ok(rc == 0, "Inserting column failed with %d\n", rc); column.cx = 200; - rc = ListView_InsertColumn(hwnd, 1, &column); + rc = SendMessageA(hwnd, LVM_INSERTCOLUMNA, 1, (LPARAM)&column); ok(rc == 1, "Inserting column failed with %d\n", rc); flush_sequences(sequences, NUM_MSG_SEQUENCES); - rc = SendMessage(hwnd, LVM_GETCOLUMNORDERARRAY, 2, (LPARAM)&order); - ok(rc != 0, "Expected LVM_GETCOLUMNORDERARRAY to succeed\n"); + rc = SendMessageA(hwnd, LVM_GETCOLUMNORDERARRAY, 2, (LPARAM)&order); + ok(rc == 1, "Expected LVM_GETCOLUMNORDERARRAY to succeed\n"); ok(order[0] == 0, "Expected order 0, got %d\n", order[0]); ok(order[1] == 1, "Expected order 1, got %d\n", order[1]); ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_getorderarray_seq, "get order array", FALSE); + /* after column added subitem is considered as present */ + insert_item(hwnd, 0); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + item.pszText = buff; + item.cchTextMax = sizeof(buff); + item.iItem = 0; + item.iSubItem = 1; + item.mask = LVIF_TEXT; + memset(&g_itema, 0, sizeof(g_itema)); + rc = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + ok(rc == 1, "got %d\n", rc); + ok(g_itema.iSubItem == 1, "got %d\n", g_itema.iSubItem); + + ok_sequence(sequences, PARENT_SEQ_INDEX, single_getdispinfo_parent_seq, + "get subitem text after column added", FALSE); + DestroyWindow(hwnd); } + /* test setting imagelist between WM_NCCREATE and WM_CREATE */ static WNDPROC listviewWndProc; static HIMAGELIST test_create_imagelist; @@ -3389,7 +3417,6 @@ static void test_getitemrect(void) expect(2 + 16, rect.left); expect(34, rect.right); - DestroyWindow(hwnd); }

1 0

Hans Leidekker : winhttp: Support setting and querying credentials on request handles.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: 24e1fcc7a0bc34ce45231b34b310369e4cddb197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24e1fcc7a0bc34ce45231b34b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 22 16:34:48 2010 +0200 winhttp: Support setting and querying credentials on request handles. --- dlls/winhttp/session.c | 78 ++++++++++++++++++++++++++- dlls/winhttp/tests/winhttp.c | 123 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 199 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24e1fcc7a0bc34ce45231…

1 0

Alexandre Julliard : winex11: Add missing X11 locking when setting the cursor.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: 860329d61d781b5e7fbfd07b624cc9f4942fbed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=860329d61d781b5e7fbfd07b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 22 16:33:57 2010 +0200 winex11: Add missing X11 locking when setting the cursor. --- dlls/winex11.drv/mouse.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index b776383..e0e6bb1 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -301,12 +301,15 @@ static void queue_raw_mouse_message( UINT message, HWND hwnd, DWORD x, DWORD y, if (hwnd) { + Cursor xcursor; struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); if (data && cursor != data->cursor) { - Cursor xcursor = get_x11_cursor( cursor ); - if (xcursor) XDefineCursor( gdi_display, data->whole_window, xcursor ); + wine_tsx11_lock(); + if ((xcursor = get_x11_cursor( cursor ))) + XDefineCursor( gdi_display, data->whole_window, xcursor ); data->cursor = cursor; + wine_tsx11_unlock(); } } }

1 0

Piotr Caban : msvcrt: Added _cscanf_s(_l) implementation.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: 177d545592de1a9b5943d5de9d1f2e7886661170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=177d545592de1a9b5943d5de9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 22 13:53:28 2010 +0200 msvcrt: Added _cscanf_s(_l) implementation. --- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/scanf.c | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 38 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index e21da6c..938f610 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -342,8 +342,8 @@ @ stub _crt_debugger_hook @ varargs _cscanf(str) msvcrt._cscanf @ varargs _cscanf_l(str ptr) msvcrt._cscanf_l -@ stub _cscanf_s -@ stub _cscanf_s_l +@ varargs _cscanf_s(str) msvcrt._cscanf_s +@ varargs _cscanf_s_l(str ptr) msvcrt._cscanf_s_l @ cdecl _ctime32(ptr) msvcrt._ctime32 @ stub _ctime32_s @ cdecl _ctime64(ptr) msvcrt._ctime64 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ad85378..3f9de55 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -334,8 +334,8 @@ @ stub _crt_debugger_hook @ varargs _cscanf(str) msvcrt._cscanf @ varargs _cscanf_l(str ptr) msvcrt._cscanf_l -@ stub _cscanf_s -@ stub _cscanf_s_l +@ varargs _cscanf_s(str) msvcrt._cscanf_s +@ varargs _cscanf_s_l(str ptr) msvcrt._cscanf_s_l @ cdecl _ctime32(ptr) msvcrt._ctime32 @ stub _ctime32_s @ cdecl _ctime64(ptr) msvcrt._ctime64 diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 9b66898..e9b898a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -315,8 +315,8 @@ # stub _crtDbgFlag @ varargs _cscanf(str) @ varargs _cscanf_l(str ptr) -# stub _cscanf_s -# stub _cscanf_s_l +@ varargs _cscanf_s(str) +@ varargs _cscanf_s_l(str ptr) @ cdecl _ctime32(ptr) MSVCRT__ctime32 # stub _ctime32_s @ cdecl _ctime64(ptr) MSVCRT__ctime64 diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index cfb4aa0..298d4c9 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -109,6 +109,10 @@ static int wchar2digit(MSVCRT_wchar_t c, int base) { #undef SECURE #include "scanf.h" +/* vcscanf_s_l */ +#define SECURE 1 +#include "scanf.h" + /********************************************************************* * fscanf (MSVCRT.@) @@ -483,3 +487,31 @@ int CDECL _cscanf_l(const char *format, MSVCRT__locale_t locale, ...) __ms_va_end(valist); return res; } + +/********************************************************************* + * _cscanf_s (MSVCRT.@) + */ +int CDECL _cscanf_s(const char *format, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, format); + res = MSVCRT_vcscanf_s_l(format, NULL, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* + * _cscanf_s_l (MSVCRT.@) + */ +int CDECL _cscanf_s_l(const char *format, MSVCRT__locale_t locale, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, locale); + res = MSVCRT_vcscanf_s_l(format, locale, valist); + __ms_va_end(valist); + return res; +}

1 0

Piotr Caban : msvcrt: Added _swscanf_s(_l) implementation.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: a51292e4dcb6eeae7c3dd6aa9c518a7f5057510c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a51292e4dcb6eeae7c3dd6aa9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 22 13:53:10 2010 +0200 msvcrt: Added _swscanf_s(_l) implementation. --- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/scanf.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 65506fb..e21da6c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -976,7 +976,7 @@ @ stub _swprintf_p_l @ stub _swprintf_s_l @ varargs _swscanf_l(wstr wstr ptr) msvcrt._swscanf_l -@ stub _swscanf_s_l +@ varargs _swscanf_s_l(wstr wstr ptr) msvcrt._swscanf_s_l @ extern _sys_errlist msvcrt._sys_errlist @ extern _sys_nerr msvcrt._sys_nerr @ cdecl _tell(long) msvcrt._tell @@ -1402,7 +1402,7 @@ @ cdecl strxfrm(ptr str long) msvcrt.strxfrm @ varargs swprintf_s(ptr long wstr) msvcrt.swprintf_s @ varargs swscanf(wstr wstr) msvcrt.swscanf -@ stub swscanf_s +@ varargs swscanf_s(wstr wstr) msvcrt.swscanf_s @ cdecl system(str) msvcrt.system @ cdecl tan(double) msvcrt.tan @ cdecl tanh(double) msvcrt.tanh diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 0e6c62e..ad85378 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -963,7 +963,7 @@ @ stub _swprintf_p_l @ stub _swprintf_s_l @ varargs _swscanf_l(wstr wstr ptr) msvcrt._swscanf_l -@ stub _swscanf_s_l +@ varargs _swscanf_s_l(wstr wstr ptr) msvcrt._swscanf_s_l @ extern _sys_errlist msvcrt._sys_errlist @ extern _sys_nerr msvcrt._sys_nerr @ cdecl _tell(long) msvcrt._tell @@ -1386,7 +1386,7 @@ @ cdecl strxfrm(ptr str long) msvcrt.strxfrm @ varargs swprintf_s(ptr long wstr) msvcrt.swprintf_s @ varargs swscanf(wstr wstr) msvcrt.swscanf -@ stub swscanf_s +@ varargs swscanf_s(wstr wstr) msvcrt.swscanf_s @ cdecl system(str) msvcrt.system @ cdecl tan(double) msvcrt.tan @ cdecl tanh(double) msvcrt.tanh diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a5705ac..9b66898 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -911,7 +911,7 @@ # stub _swprintf_p_l # stub _swprintf_s_l @ varargs _swscanf_l(wstr wstr ptr) MSVCRT__swscanf_l -# stub _swscanf_s_l +@ varargs _swscanf_s_l(wstr wstr ptr) MSVCRT__swscanf_s_l @ extern _sys_errlist MSVCRT__sys_errlist @ extern _sys_nerr MSVCRT__sys_nerr @ cdecl _tell(long) MSVCRT__tell @@ -1338,7 +1338,7 @@ @ varargs swprintf(ptr wstr) MSVCRT_swprintf @ varargs swprintf_s(ptr long wstr) MSVCRT_swprintf_s @ varargs swscanf(wstr wstr) MSVCRT_swscanf -# stub swscanf_s +@ varargs swscanf_s(wstr wstr) MSVCRT_swscanf_s @ cdecl system(str) MSVCRT_system @ cdecl tan(double) MSVCRT_tan @ cdecl tanh(double) MSVCRT_tanh diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index c9d5c56..cfb4aa0 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -98,6 +98,10 @@ static int wchar2digit(MSVCRT_wchar_t c, int base) { #undef SECURE #include "scanf.h" +/* vswscanf_s_l */ +#define SECURE 1 +#include "scanf.h" + /* vcscanf_l */ #undef WIDE_SCANF #define CONSOLE 1 @@ -424,6 +428,35 @@ int CDECL MSVCRT__swscanf_l(const MSVCRT_wchar_t *str, const MSVCRT_wchar_t *for } /********************************************************************* + * swscanf_s (MSVCRT.@) + */ +int CDECL MSVCRT_swscanf_s(const MSVCRT_wchar_t *str, const MSVCRT_wchar_t *format, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, format); + res = MSVCRT_vswscanf_s_l(str, format, NULL, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* + * _swscanf_s_l (MSVCRT.@) + */ +int CDECL MSVCRT__swscanf_s_l(const MSVCRT_wchar_t *str, const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, locale); + res = MSVCRT_vswscanf_s_l(str, format, locale, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* * _cscanf (MSVCRT.@) */ int CDECL _cscanf(const char *format, ...)

1 0

Piotr Caban : msvcrt: Added _sscanf_s(_l) implementation.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: 8386e95afca747eb8349088b1a576dc069ca2785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8386e95afca747eb8349088b1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 22 13:52:55 2010 +0200 msvcrt: Added _sscanf_s(_l) implementation. --- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/scanf.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index a6bb276..65506fb 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -922,7 +922,7 @@ @ stub _sprintf_p_l @ stub _sprintf_s_l @ varargs _sscanf_l(str str ptr) msvcrt._sscanf_l -@ stub _sscanf_s_l +@ varargs _sscanf_s_l(str str ptr) msvcrt._sscanf_s_l @ stub _stat32 @ stub _stat32i64 @ cdecl _stat64(str ptr) msvcrt._stat64 @@ -1371,7 +1371,7 @@ @ cdecl sqrt(double) msvcrt.sqrt @ cdecl srand(long) msvcrt.srand @ varargs sscanf(str str) msvcrt.sscanf -@ stub sscanf_s +@ varargs sscanf_s(str str) msvcrt.sscanf_s @ cdecl strcat(str str) msvcrt.strcat @ cdecl strcat_s(str long str) msvcrt.strcat_s @ cdecl strchr(str long) msvcrt.strchr diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 311d646..0e6c62e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -908,7 +908,7 @@ @ stub _sprintf_p_l @ stub _sprintf_s_l @ varargs _sscanf_l(str str ptr) msvcrt._sscanf_l -@ stub _sscanf_s_l +@ varargs _sscanf_s_l(str str ptr) msvcrt._sscanf_s_l @ stub _stat32 @ stub _stat32i64 @ cdecl _stat64(str ptr) msvcrt._stat64 @@ -1355,7 +1355,7 @@ @ cdecl sqrt(double) msvcrt.sqrt @ cdecl srand(long) msvcrt.srand @ varargs sscanf(str str) msvcrt.sscanf -@ stub sscanf_s +@ varargs sscanf_s(str str) msvcrt.sscanf_s @ cdecl strcat(str str) msvcrt.strcat @ cdecl strcat_s(str long str) msvcrt.strcat_s @ cdecl strchr(str long) msvcrt.strchr diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a5f47a9..a5705ac 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -858,7 +858,7 @@ # stub _sprintf_p_l # stub _sprintf_s_l @ varargs _sscanf_l(str str ptr) MSVCRT__sscanf_l -# stub _sscanf_s_l +@ varargs _sscanf_s_l(str str ptr) MSVCRT__sscanf_s_l @ cdecl _stat(str ptr) MSVCRT_stat @ cdecl _stat64(str ptr) MSVCRT_stat64 @ cdecl _stati64(str ptr) MSVCRT_stati64 @@ -1306,7 +1306,7 @@ @ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf -# stub sscanf_s +@ varargs sscanf_s(str str) MSVCRT_sscanf_s @ cdecl strcat(str str) ntdll.strcat @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) ntdll.strchr diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index a47a3e4..c9d5c56 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -87,6 +87,10 @@ static int wchar2digit(MSVCRT_wchar_t c, int base) { #undef SECURE #include "scanf.h" +/* vsscanf_s_l */ +#define SECURE 1 +#include "scanf.h" + /* vswscanf_l */ #define WIDE_SCANF 1 #undef CONSOLE @@ -362,6 +366,35 @@ int CDECL MSVCRT__sscanf_l(const char *str, const char *format, } /********************************************************************* + * sscanf_s (MSVCRT.@) + */ +int CDECL MSVCRT_sscanf_s(const char *str, const char *format, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, format); + res = MSVCRT_vsscanf_s_l(str, format, NULL, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* + * _sscanf_s_l (MSVCRT.@) + */ +int CDECL MSVCRT__sscanf_s_l(const char *str, const char *format, + MSVCRT__locale_t locale, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, locale); + res = MSVCRT_vsscanf_s_l(str, format, locale, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* * swscanf (MSVCRT.@) */ int CDECL MSVCRT_swscanf(const MSVCRT_wchar_t *str, const MSVCRT_wchar_t *format, ...)

1 0

Piotr Caban : msvcrt: Added _cwscanf* implementation.
by Alexandre Julliard April 22, 2010

April 22, 2010

Module: wine Branch: master Commit: f36671c57f5db8a08a1e97d3196a7d76ee480f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f36671c57f5db8a08a1e97d31… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 22 13:54:03 2010 +0200 msvcrt: Added _cwscanf* implementation. --- dlls/msvcr80/msvcr80.spec | 8 +++--- dlls/msvcr90/msvcr90.spec | 8 +++--- dlls/msvcrt/msvcrt.spec | 8 +++--- dlls/msvcrt/scanf.c | 67 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/scanf.h | 8 +++++ 5 files changed, 87 insertions(+), 12 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 938f610..53cef75 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -355,10 +355,10 @@ @ stub _cwprintf_p_l @ stub _cwprintf_s @ stub _cwprintf_s_l -@ stub _cwscanf -@ stub _cwscanf_l -@ stub _cwscanf_s -@ stub _cwscanf_s_l +@ varargs _cwscanf(wstr) msvcrt._cwscanf +@ varargs _cwscanf_l(wstr ptr) msvcrt._cwscanf_l +@ varargs _cwscanf_s(wstr) msvcrt._cwscanf_s +@ varargs _cwscanf_s_l(wstr ptr) msvcrt._cwscanf_s_l @ extern _daylight msvcrt._daylight @ cdecl _decode_pointer(ptr) msvcr90._decode_pointer @ cdecl _difftime32(long long) msvcrt._difftime32 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 3f9de55..d8f8e04 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -347,10 +347,10 @@ @ stub _cwprintf_p_l @ stub _cwprintf_s @ stub _cwprintf_s_l -@ stub _cwscanf -@ stub _cwscanf_l -@ stub _cwscanf_s -@ stub _cwscanf_s_l +@ varargs _cwscanf(wstr) msvcrt._cwscanf +@ varargs _cwscanf_l(wstr ptr) msvcrt._cwscanf_l +@ varargs _cwscanf_s(wstr) msvcrt._cwscanf_s +@ varargs _cwscanf_s_l(wstr ptr) msvcrt._cwscanf_s_l @ extern _daylight msvcrt._daylight @ cdecl _decode_pointer(ptr) MSVCR90_decode_pointer @ cdecl _difftime32(long long) msvcrt._difftime32 diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e9b898a..0909cd0 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -329,10 +329,10 @@ # stub _cwprintf_p_l # stub _cwprintf_s # stub _cwprintf_s_l -# stub _cwscanf -# stub _cwscanf_l -# stub _cwscanf_s -# stub _cwscanf_s_l +@ varargs _cwscanf(wstr) +@ varargs _cwscanf_l(wstr ptr) +@ varargs _cwscanf_s(wstr) +@ varargs _cwscanf_s_l(wstr ptr) @ extern _daylight MSVCRT___daylight @ cdecl _difftime32(long long) MSVCRT__difftime32 @ cdecl _difftime64(long long) MSVCRT__difftime64 diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 298d4c9..c795e15 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -113,6 +113,17 @@ static int wchar2digit(MSVCRT_wchar_t c, int base) { #define SECURE 1 #include "scanf.h" +/* vcwscanf_l */ +#define WIDE_SCANF 1 +#define CONSOLE 1 +#undef STRING +#undef SECURE +#include "scanf.h" + +/* vcwscanf_s_l */ +#define SECURE 1 +#include "scanf.h" + /********************************************************************* * fscanf (MSVCRT.@) @@ -515,3 +526,59 @@ int CDECL _cscanf_s_l(const char *format, MSVCRT__locale_t locale, ...) __ms_va_end(valist); return res; } + +/********************************************************************* + * _cwscanf (MSVCRT.@) + */ +int CDECL _cwscanf(const char *format, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, format); + res = MSVCRT_vcwscanf_l(format, NULL, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* + * _cwscanf_l (MSVCRT.@) + */ +int CDECL _cwscanf_l(const char *format, MSVCRT__locale_t locale, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, locale); + res = MSVCRT_vcwscanf_l(format, locale, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* + * _cwscanf_s (MSVCRT.@) + */ +int CDECL _cwscanf_s(const char *format, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, format); + res = MSVCRT_vcwscanf_s_l(format, NULL, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* + * _cwscanf_s_l (MSVCRT.@) + */ +int CDECL _cwscanf_s_l(const char *format, MSVCRT__locale_t locale, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, locale); + res = MSVCRT_vcwscanf_s_l(format, locale, valist); + __ms_va_end(valist); + return res; +} diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index a5202fe..6366a77 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -48,11 +48,19 @@ #ifdef CONSOLE #define _GETC_(file) (consumed++, _getch()) #define _UNGETC_(nch, file) do { _ungetch(nch); consumed--; } while(0) +#ifdef WIDE_SCANF +#ifdef SECURE +#define _FUNCTION_ static int MSVCRT_vcwscanf_s_l(const char *format, MSVCRT__locale_t locale, __ms_va_list ap) +#else /* SECURE */ +#define _FUNCTION_ static int MSVCRT_vcwscanf_l(const char *format, MSVCRT__locale_t locale, __ms_va_list ap) +#endif /* SECURE */ +#else /* WIDE_SCANF */ #ifdef SECURE #define _FUNCTION_ static int MSVCRT_vcscanf_s_l(const char *format, MSVCRT__locale_t locale, __ms_va_list ap) #else /* SECURE */ #define _FUNCTION_ static int MSVCRT_vcscanf_l(const char *format, MSVCRT__locale_t locale, __ms_va_list ap) #endif /* SECURE */ +#endif /* WIDE_SCANF */ #else #ifdef STRING #undef _EOF_

1 0