wine-commits August 2013

wine-commits@winehq.org

2 participants
461 discussions

Frédéric Delanoy : winedev: Update 'kernel' paths .
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: docs Branch: master Commit: 19d2f08fbeb77a2dcc864fe2ec00ec6094966a83 URL: http://source.winehq.org/git/docs.git/?a=commit;h=19d2f08fbeb77a2dcc864fe2e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 15 21:48:35 2013 +0200 winedev: Update 'kernel' paths. --- en/winedev-coding.sgml | 4 ++-- en/winedev-kernel.sgml | 4 ++-- en/winedev-testing.sgml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/en/winedev-coding.sgml b/en/winedev-coding.sgml index a2d5daf..5cd7290 100644 --- a/en/winedev-coding.sgml +++ b/en/winedev-coding.sgml @@ -489,8 +489,8 @@ AC_CHECK_HEADER(foo.h, AC_DEFINE(HAVE_FOO_H)) </para> <para> - When adding a new language, also make sure the parameters - defined in <filename>./dlls/kernel/nls/*.nls</filename> + When adding a new language, also make sure the parameters + defined in <filename>dlls/kernel32/nls/*.nls</filename> fit your local habits and language. </para> </sect1> diff --git a/en/winedev-kernel.sgml b/en/winedev-kernel.sgml index cab6883..c787ff6 100644 --- a/en/winedev-kernel.sgml +++ b/en/winedev-kernel.sgml @@ -2178,7 +2178,7 @@ if (res != ERROR_SUCCESS) return res; <function>WriteConsole()</function> which is called, hence using the default console's code page. There are some other spots affected, but you can look in - <filename>dlls/kernel</filename> to find them all. All of this is + <filename>dlls/kernel32</filename> to find them all. All of this is implemented in Wine. </para> <para> @@ -2394,7 +2394,7 @@ if (res != ERROR_SUCCESS) return res; <para> When entering a syslevel, the code (in - <filename>dlls/kernel/syslevel.c</filename>) will check that a + <filename>dlls/krnl386.exe16/syslevel.c</filename>) will check that a higher syslevel is not already held and produce an error if so. This is because it's not legal to enter level 2 while holding level 3 - first, you must leave level 3. diff --git a/en/winedev-testing.sgml b/en/winedev-testing.sgml index 9f2d785..7581ef6 100644 --- a/en/winedev-testing.sgml +++ b/en/winedev-testing.sgml @@ -140,7 +140,7 @@ <para> The tests for a specific Wine library are located in a 'tests' subdirectory of the library directory. Each test is contained in a - file (e.g. <filename>dlls/kernel/tests/thread.c</filename>). Each + file (e.g. <filename>dlls/kernel32/tests/thread.c</filename>). Each file itself contains many checks concerning one or more related APIs. </para> <para> @@ -151,7 +151,7 @@ run the tests contained in the <filename>thread.c</filename> file of the kernel library, you would do: <screen> -<prompt>$ </prompt>cd dlls/kernel/tests +<prompt>$ </prompt>cd dlls/kernel32/tests <prompt>$ </prompt>make thread.ok </screen> </para>

1 0

Frédéric Delanoy : winedev: Correct windows device name -> unix device name mappings table.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: docs Branch: master Commit: 1ec9ffb700e6b77366138df7df78e0e298b78976 URL: http://source.winehq.org/git/docs.git/?a=commit;h=1ec9ffb700e6b77366138df7d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 15 21:48:34 2013 +0200 winedev: Correct windows device name -> unix device name mappings table. --- en/winedev-kernel.sgml | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/en/winedev-kernel.sgml b/en/winedev-kernel.sgml index bb277bf..cab6883 100644 --- a/en/winedev-kernel.sgml +++ b/en/winedev-kernel.sgml @@ -1794,23 +1794,23 @@ if (res != ERROR_SUCCESS) return res; <entry>Treated as an alias to <filename>LPT1</filename></entry> </row> <row> - <entry><filename><any_path>COM1</filename></entry> - <entry><filename>\Global??\COM1</filename></entry> + <entry><filename><any_path>COM<N></filename></entry> + <entry><filename>\Global??\COM<N></filename></entry> <entry> - <filename>$(WINEPREFIX)/dosdevices/com1</filename> + <filename>$(WINEPREFIX)/dosdevices/com<N></filename> (if the symbol link exists) or the Nth serial line in the system (on Linux, - <filename>/dev/ttyS0</filename>). + <filename>/dev/ttyS<N-1></filename>). </entry> </row> <row> - <entry><filename><any_path>LPT1</filename></entry> - <entry><filename>\Global??\LPT1</filename></entry> + <entry><filename><any_path>LPT<N></filename></entry> + <entry><filename>\Global??\LPT<N></filename></entry> <entry> - <filename>$(WINEPREFIX)/dosdevices/lpt1</filename> + <filename>$(WINEPREFIX)/dosdevices/lpt<N></filename> (if the symbol link exists) or the Nth printer in the system (on Linux, - <filename>/dev/lp0</filename>). + <filename>/dev/lp<N-1></filename>). </entry> </row> <row>

1 0

Frédéric Delanoy : winedev: Fix winedbg 'break' command documentation.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: docs Branch: master Commit: ae339680bf3e4b8cfc186dbb669167741a6a1854 URL: http://source.winehq.org/git/docs.git/?a=commit;h=ae339680bf3e4b8cfc186dbb6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 15 21:48:33 2013 +0200 winedev: Fix winedbg 'break' command documentation. --- en/winedev-debugger.sgml | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/en/winedev-debugger.sgml b/en/winedev-debugger.sgml index 9f0344a..270ba7c 100644 --- a/en/winedev-debugger.sgml +++ b/en/winedev-debugger.sgml @@ -1680,8 +1680,7 @@ set $BreakAllThreadsStartup = 1 <row> <entry><command>break <id> N</command></entry> <entry> - adds a breakpoint at the address of symbol - <id> (N ?) + adds a breakpoint at line N inside symbol <id> </entry> </row> <row>

1 0

Frédéric Delanoy : winedev: GSM 06. 10 audio codec is supported in msacm.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: docs Branch: master Commit: e096a6283f1698e1717d964db067368080c893c0 URL: http://source.winehq.org/git/docs.git/?a=commit;h=e096a6283f1698e1717d964db… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 15 21:48:32 2013 +0200 winedev: GSM 06.10 audio codec is supported in msacm. --- en/winedev-multimedia.sgml | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/en/winedev-multimedia.sgml b/en/winedev-multimedia.sgml index 7bc17c7..5d0954b 100644 --- a/en/winedev-multimedia.sgml +++ b/en/winedev-multimedia.sgml @@ -535,6 +535,10 @@ Kernel space | Client applications <entry>msg711</entry> <entry>Microsoft G.711 (A-Law and μ-Law)</entry> </row> + <row> + <entry>msgsm32</entry> + <entry>Microsoft GSM 06.10</entry> + </row> <row> <entry>winemp3</entry> <entry>

1 0

Daniel Jelinski : shell32/tests: Test context menu contents.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 1825bddbff5db772cc82613bf854e25154bafbaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1825bddbff5db772cc82613bf… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Aug 10 12:42:46 2013 +0200 shell32/tests: Test context menu contents. --- dlls/shell32/tests/shlfolder.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index ef8aae9..169426e 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3917,11 +3917,12 @@ static void test_GetUIObject(void) ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { + const int baseItem = 0x40; HMENU hmenu = CreatePopupMenu(); INT max_id, max_id_check; UINT count, i; const int id_upper_limit = 32767; - hr = IContextMenu_QueryContextMenu(pcm, hmenu, 0, 0, id_upper_limit, CMF_NORMAL); + hr = IContextMenu_QueryContextMenu(pcm, hmenu, 0, baseItem, id_upper_limit, CMF_NORMAL); ok(SUCCEEDED(hr), "Got 0x%08x\n", hr); max_id = HRESULT_CODE(hr) - 1; /* returns max_id + 1 */ ok(max_id <= id_upper_limit, "Got %d\n", max_id); @@ -3933,9 +3934,12 @@ static void test_GetUIObject(void) { MENUITEMINFOA mii; INT res; + char buf[255], buf2[255]; ZeroMemory(&mii, sizeof(MENUITEMINFOA)); mii.cbSize = sizeof(MENUITEMINFOA); - mii.fMask = MIIM_ID | MIIM_FTYPE; + mii.fMask = MIIM_ID | MIIM_FTYPE | MIIM_STRING; + mii.dwTypeData = buf2; + mii.cch = sizeof(buf2); SetLastError(0); res = GetMenuItemInfoA(hmenu, i, TRUE, &mii); @@ -3944,8 +3948,17 @@ static void test_GetUIObject(void) ok( (mii.wID <= id_upper_limit) || (mii.fType & MFT_SEPARATOR), "Got non-separator ID out of range: %d (type: %x)\n", mii.wID, mii.fType); if(!(mii.fType & MFT_SEPARATOR)) + { max_id_check = (mii.wID>max_id_check)?mii.wID:max_id_check; + hr = IContextMenu_GetCommandString(pcm, mii.wID - baseItem, GCS_VERBA, 0, buf, sizeof(buf)); + ok(SUCCEEDED(hr) || hr == E_NOTIMPL, "for id 0x%x got 0x%08x (menustr: %s)\n", mii.wID - baseItem, hr, mii.dwTypeData); + if (SUCCEEDED(hr)) + trace("for id 0x%x got string %s (menu string: %s)\n", mii.wID - baseItem, buf, mii.dwTypeData); + else if (hr == E_NOTIMPL) + trace("for id 0x%x got E_NOTIMPL (menu string: %s)\n", mii.wID - baseItem, mii.dwTypeData); + } } + max_id_check -= baseItem; ok((max_id_check == max_id) || (max_id_check == max_id-1 /* Win 7 */), "Not equal (or near equal), got %d and %d\n", max_id_check, max_id);

1 0

Daniel Jelinski : shell32: Return command strings for a few more commands.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: e6acc695c6b2ee312a31f2cdac00d493f52df6f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6acc695c6b2ee312a31f2cda… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Aug 10 19:23:53 2013 +0200 shell32: Return command strings for a few more commands. --- dlls/shell32/shlview_cmenu.c | 56 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index b7dc994..6004afc 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -505,6 +505,34 @@ static HRESULT WINAPI ItemMenu_GetCommandString( case GCS_VERBA: switch(idCommand) { + case FCIDM_SHVIEW_OPEN: + strcpy(lpszName, "open"); + hr = S_OK; + break; + case FCIDM_SHVIEW_EXPLORE: + strcpy(lpszName, "explore"); + hr = S_OK; + break; + case FCIDM_SHVIEW_CUT: + strcpy(lpszName, "cut"); + hr = S_OK; + break; + case FCIDM_SHVIEW_COPY: + strcpy(lpszName, "copy"); + hr = S_OK; + break; + case FCIDM_SHVIEW_CREATELINK: + strcpy(lpszName, "link"); + hr = S_OK; + break; + case FCIDM_SHVIEW_DELETE: + strcpy(lpszName, "delete"); + hr = S_OK; + break; + case FCIDM_SHVIEW_PROPERTIES: + strcpy(lpszName, "properties"); + hr = S_OK; + break; case FCIDM_SHVIEW_RENAME: strcpy(lpszName, "rename"); hr = S_OK; @@ -517,6 +545,34 @@ static HRESULT WINAPI ItemMenu_GetCommandString( case GCS_VERBW: switch(idCommand) { + case FCIDM_SHVIEW_OPEN: + MultiByteToWideChar(CP_ACP, 0, "open", -1, (LPWSTR)lpszName, uMaxNameLen); + hr = S_OK; + break; + case FCIDM_SHVIEW_EXPLORE: + MultiByteToWideChar(CP_ACP, 0, "explore", -1, (LPWSTR)lpszName, uMaxNameLen); + hr = S_OK; + break; + case FCIDM_SHVIEW_CUT: + MultiByteToWideChar(CP_ACP, 0, "cut", -1, (LPWSTR)lpszName, uMaxNameLen); + hr = S_OK; + break; + case FCIDM_SHVIEW_COPY: + MultiByteToWideChar(CP_ACP, 0, "copy", -1, (LPWSTR)lpszName, uMaxNameLen); + hr = S_OK; + break; + case FCIDM_SHVIEW_CREATELINK: + MultiByteToWideChar(CP_ACP, 0, "link", -1, (LPWSTR)lpszName, uMaxNameLen); + hr = S_OK; + break; + case FCIDM_SHVIEW_DELETE: + MultiByteToWideChar(CP_ACP, 0, "delete", -1, (LPWSTR)lpszName, uMaxNameLen); + hr = S_OK; + break; + case FCIDM_SHVIEW_PROPERTIES: + MultiByteToWideChar(CP_ACP, 0, "properties", -1, (LPWSTR)lpszName, uMaxNameLen); + hr = S_OK; + break; case FCIDM_SHVIEW_RENAME: MultiByteToWideChar( CP_ACP, 0, "rename", -1, (LPWSTR)lpszName, uMaxNameLen ); hr = S_OK;

1 0

Daniel Jelinski : shell32: Context menu offset is handled by client.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 6509499fc91d8aa453f9f81299c47699f8afabe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6509499fc91d8aa453f9f8129… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Aug 10 19:06:33 2013 +0200 shell32: Context menu offset is handled by client. --- dlls/shell32/shlview_cmenu.c | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 07c33d0..b7dc994 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -49,7 +49,6 @@ typedef struct LONG ref; IShellFolder* parent; - UINT verb_offset; /* item menu data */ LPITEMIDLIST pidl; /* root pidl */ @@ -138,8 +137,6 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( TRACE("(%p)->(%p %d 0x%x 0x%x 0x%x )\n", This, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); - This->verb_offset = idCmdFirst; - if(!(CMF_DEFAULTONLY & uFlags) && This->cidl > 0) { HMENU hmenures = LoadMenuW(shell32_hInstance, MAKEINTRESOURCEW(MENU_SHV_FILE)); @@ -419,7 +416,7 @@ static HRESULT WINAPI ItemMenu_InvokeCommand( if (HIWORD(lpcmi->lpVerb) == 0) { - switch(LOWORD(lpcmi->lpVerb - This->verb_offset)) + switch(LOWORD(lpcmi->lpVerb)) { case FCIDM_SHVIEW_EXPLORE: TRACE("Verb FCIDM_SHVIEW_EXPLORE\n"); @@ -466,7 +463,7 @@ static HRESULT WINAPI ItemMenu_InvokeCommand( DoOpenProperties(This, lpcmi->hwnd); break; default: - FIXME("Unhandled Verb %xl\n",LOWORD(lpcmi->lpVerb)-This->verb_offset); + FIXME("Unhandled Verb %xl\n",LOWORD(lpcmi->lpVerb)); return E_INVALIDARG; } } @@ -506,7 +503,7 @@ static HRESULT WINAPI ItemMenu_GetCommandString( break; case GCS_VERBA: - switch(idCommand-This->verb_offset) + switch(idCommand) { case FCIDM_SHVIEW_RENAME: strcpy(lpszName, "rename"); @@ -518,7 +515,7 @@ static HRESULT WINAPI ItemMenu_GetCommandString( /* NT 4.0 with IE 3.0x or no IE will always call This with GCS_VERBW. In This case, you need to do the lstrcpyW to the pointer passed.*/ case GCS_VERBW: - switch(idCommand-This->verb_offset) + switch(idCommand) { case FCIDM_SHVIEW_RENAME: MultiByteToWideChar( CP_ACP, 0, "rename", -1, (LPWSTR)lpszName, uMaxNameLen ); @@ -581,7 +578,6 @@ HRESULT ItemMenu_Constructor(IShellFolder *parent, LPCITEMIDLIST pidl, const LPC This->IContextMenu3_iface.lpVtbl = &ItemContextMenuVtbl; This->ref = 1; - This->verb_offset = 0; This->parent = parent; if (parent) IShellFolder_AddRef(parent); @@ -618,8 +614,6 @@ static HRESULT WINAPI BackgroundMenu_QueryContextMenu( TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n", This, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); - This->verb_offset = idCmdFirst; - hMyMenu = LoadMenuA(shell32_hInstance, "MENU_002"); if (uFlags & CMF_DEFAULTONLY) { @@ -804,7 +798,7 @@ static HRESULT WINAPI BackgroundMenu_InvokeCommand( } else { - switch (LOWORD(lpcmi->lpVerb) - This->verb_offset) + switch (LOWORD(lpcmi->lpVerb)) { case FCIDM_SHVIEW_REFRESH: if (view) IShellView_Refresh(view); @@ -893,7 +887,6 @@ HRESULT BackgroundMenu_Constructor(IShellFolder *parent, BOOL desktop, REFIID ri This->IContextMenu3_iface.lpVtbl = &BackgroundContextMenuVtbl; This->ref = 1; This->parent = parent; - This->verb_offset = 0; This->pidl = NULL; This->apidl = NULL;

1 0

Daniel Jelinski : shell32: Fix context menu creation.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: c687b4adf4d6c0232270f8845c5314bcca538b29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c687b4adf4d6c0232270f8845… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Aug 10 18:53:29 2013 +0200 shell32: Fix context menu creation. --- dlls/shell32/shlview_cmenu.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 92f671a..07c33d0 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -160,10 +160,10 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( mi.dwTypeData = str; mi.cch = 255; GetMenuItemInfoW(hmenu, FCIDM_SHVIEW_EXPLORE, MF_BYCOMMAND, &mi); - RemoveMenu(hmenu, FCIDM_SHVIEW_EXPLORE, MF_BYCOMMAND); + RemoveMenu(hmenu, FCIDM_SHVIEW_EXPLORE + idCmdFirst, MF_BYCOMMAND); mi.cbSize = sizeof(mi); - mi.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE; + mi.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_STRING; mi.dwTypeData = str; mi.fState = MFS_ENABLED; mi.wID = FCIDM_SHVIEW_EXPLORE;

1 0

Dmitry Timoshkov : kernel32/tests: Add interactive WaitCommEvent tests.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: fc2309b84bee9e2f895f6ae60b72a28c9c18e0f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc2309b84bee9e2f895f6ae60… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 15 16:41:13 2013 +0900 kernel32/tests: Add interactive WaitCommEvent tests. --- dlls/kernel32/tests/comm.c | 62 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index b393db4..12a808d 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -1818,6 +1818,60 @@ static void test_stdio(void) "got error %u\n", GetLastError() ); } +static void test_WaitCommEvent(void) +{ + HANDLE hcom; + DWORD evtmask, ret, bytes, before, after, last_event_time; + OVERLAPPED ovl_wait; + + hcom = test_OpenComm(TRUE); + if (hcom == INVALID_HANDLE_VALUE) return; + + test_GetModemStatus(hcom); + + ret = SetCommMask(hcom, 0x1fff); + ok(ret, "SetCommMask error %d\n", GetLastError()); + + S(U(ovl_wait)).Offset = 0; + S(U(ovl_wait)).OffsetHigh = 0; + ovl_wait.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + + trace("waiting 10 secs for com port events (turn on/off the device)...\n"); + last_event_time = 0; + before = GetTickCount(); + do + { + evtmask = 0; + SetLastError(0xdeadbeef); + ret = WaitCommEvent(hcom, &evtmask, &ovl_wait); + ok(!ret && GetLastError() == ERROR_IO_PENDING, "WaitCommEvent returned %d, error %d\n", ret, GetLastError()); + if (GetLastError() != ERROR_IO_PENDING) goto done; /* no point in further testing */ + for (;;) + { + ret = WaitForSingleObject(ovl_wait.hEvent, 500); + after = GetTickCount(); + if (ret == WAIT_OBJECT_0) + { + last_event_time = after; + ret = GetOverlappedResult(hcom, &ovl_wait, &bytes, FALSE); + ok(ret, "GetOverlappedResult reported error %d\n", GetLastError()); + ok(bytes == sizeof(evtmask), "expected %u, written %u\n", (UINT)sizeof(evtmask), bytes); + trace("WaitCommEvent: got events %#x\n", evtmask); + test_GetModemStatus(hcom); + break; + } + else + { + if (last_event_time || after - before >= 10000) goto done; + } + } + } while (after - before < 10000); + +done: + CloseHandle(ovl_wait.hEvent); + CloseHandle(hcom); +} + START_TEST(comm) { test_ClearCommError(); /* keep it the very first test */ @@ -1838,4 +1892,12 @@ START_TEST(comm) test_WaitDcd(); test_WaitBreak(); test_stdio(); + + if (!winetest_interactive) + { + skip("interactive tests (set WINETEST_INTERACTIVE=1)\n"); + return; + } + + test_WaitCommEvent(); }

1 0

Dmitry Timoshkov : kernel32/tests: Make test_waittxempty() use overlapped IO to avoid waiting forever when a kernel driver doesn' t support TIOCGICOUNT/TIOCSERGETLSR ioctl.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 507449ee783ceb670ae12ec54b8f7e542a3034d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=507449ee783ceb670ae12ec54… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 15 16:40:29 2013 +0900 kernel32/tests: Make test_waittxempty() use overlapped IO to avoid waiting forever when a kernel driver doesn't support TIOCGICOUNT/TIOCSERGETLSR ioctl. Most of Linux USB-serial drivers don't support these ioctls. --- dlls/kernel32/tests/comm.c | 102 ++++++++++++++++++++++++++++++------------- 1 files changed, 71 insertions(+), 31 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 81953cb..b393db4 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -780,59 +780,99 @@ static void test_waittxempty(void) DCB dcb; COMMTIMEOUTS timeouts; char tbuf[]="test_waittxempty"; - DWORD before, after, written, timediff, evtmask = 0; - BOOL res_write, res; + DWORD before, after, bytes, timediff, evtmask; + BOOL res; DWORD baud = SLOWBAUD; + OVERLAPPED ovl_write, ovl_wait; - hcom = test_OpenComm(FALSE); + hcom = test_OpenComm(TRUE); if (hcom == INVALID_HANDLE_VALUE) return; /* set a low baud rate to have ample time*/ - ok(GetCommState(hcom, &dcb), "GetCommState failed\n"); + res = GetCommState(hcom, &dcb); + ok(res, "GetCommState error %d\n", GetLastError()); dcb.BaudRate = baud; dcb.ByteSize = 8; dcb.Parity = NOPARITY; dcb.fRtsControl=RTS_CONTROL_ENABLE; dcb.fDtrControl=DTR_CONTROL_ENABLE; dcb.StopBits = ONESTOPBIT; - ok(SetCommState(hcom, &dcb), "SetCommState failed\n"); + res = SetCommState(hcom, &dcb); + ok(res, "SetCommState error %d\n", GetLastError()); ZeroMemory( &timeouts, sizeof(timeouts)); timeouts.ReadTotalTimeoutConstant = TIMEOUT; - ok(SetCommTimeouts(hcom, &timeouts),"SetCommTimeouts failed\n"); + res = SetCommTimeouts(hcom, &timeouts); + ok(res,"SetCommTimeouts error %d\n", GetLastError()); - ok(SetupComm(hcom,1024,1024),"SetUpComm failed\n"); - ok(SetCommMask(hcom, EV_TXEMPTY), "SetCommMask failed\n"); + res = SetupComm(hcom, 1024, 1024); + ok(res, "SetUpComm error %d\n", GetLastError()); + + /* calling SetCommMask after WriteFile leads to WaitCommEvent failures + * due to timeout (no events) under testbot VMs and VirtualBox + */ + res = SetCommMask(hcom, EV_TXEMPTY); + ok(res, "SetCommMask error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + res = WriteFile(hcom, tbuf, sizeof(tbuf), &bytes, NULL); +todo_wine + ok(!res, "WriteFile on an overlapped handle without ovl structure should fail\n"); +todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + S(U(ovl_write)).Offset = 0; + S(U(ovl_write)).OffsetHigh = 0; + ovl_write.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); before = GetTickCount(); - res_write=WriteFile(hcom, tbuf, sizeof(tbuf), &written, NULL); + SetLastError(0xdeadbeef); + res = WriteFile(hcom, tbuf, sizeof(tbuf), &bytes, &ovl_write); after = GetTickCount(); - ok(res_write == TRUE, "WriteFile failed\n"); - ok(written == sizeof(tbuf), - "WriteFile: Unexpected write_size %d\n", written); - - trace("WriteFile succeeded, took %d ms to write %d Bytes at %d Baud\n", - after - before, written, baud); - +todo_wine + ok(!res && GetLastError() == ERROR_IO_PENDING, "WriteFile returned %d, error %d\n", res, GetLastError()); +todo_wine + ok(!bytes, "expected 0, got %u\n", bytes); + ok(after - before == 0, "WriteFile took %d ms to write %d Bytes at %d Baud\n", + after - before, bytes, baud); + /* don't wait for WriteFile completion */ + + S(U(ovl_wait)).Offset = 0; + S(U(ovl_wait)).OffsetHigh = 0; + ovl_wait.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + evtmask = 0; before = GetTickCount(); - res = WaitCommEvent(hcom, &evtmask, NULL); + SetLastError(0xdeadbeef); + res = WaitCommEvent(hcom, &evtmask, &ovl_wait); + ok(!res && GetLastError() == ERROR_IO_PENDING, "WaitCommEvent error %d\n", GetLastError()); + res = WaitForSingleObject(ovl_wait.hEvent, TIMEOUT); +todo_wine + ok(res == WAIT_OBJECT_0, "WaitCommEvent failed with a timeout\n"); + if (res == WAIT_OBJECT_0) + { + res = GetOverlappedResult(hcom, &ovl_wait, &bytes, FALSE); + ok(res, "GetOverlappedResult reported error %d\n", GetLastError()); + ok(bytes == sizeof(evtmask), "expected %u, written %u\n", (UINT)sizeof(evtmask), bytes); + res = TRUE; + } + else res = FALSE; after = GetTickCount(); - - ok(res == TRUE, "WaitCommEvent failed\n"); - ok((evtmask & EV_TXEMPTY), - "WaitCommEvent: Unexpected EvtMask 0x%08x, expected 0x%08x\n", - evtmask, EV_TXEMPTY); +todo_wine + ok(res, "WaitCommEvent error %d\n", GetLastError()); +todo_wine + ok(evtmask & EV_TXEMPTY, "WaitCommEvent: expected EV_TXEMPTY, got %#x\n", evtmask); + CloseHandle(ovl_wait.hEvent); timediff = after - before; - - trace("WaitCommEvent for EV_TXEMPTY took %d ms\n", timediff); - /* 050604: This shows a difference between XP (tested with mingw compiled crosstest): - XP returns Writefile only after everything went out of the Serial port, - while wine returns immediately. - Thus on XP, WaintCommEvent after setting the CommMask for EV_TXEMPTY - nearly return immediate, - while on wine the most time is spent here - */ + trace("WaitCommEvent for EV_TXEMPTY took %d ms (timeout %d)\n", timediff, TIMEOUT); +todo_wine + ok(timediff < 900, "WaitCommEvent used %d ms for waiting\n", timediff); + + res = WaitForSingleObject(ovl_write.hEvent, 0); + ok(res == WAIT_OBJECT_0, "WriteFile failed with a timeout\n"); + res = GetOverlappedResult(hcom, &ovl_write, &bytes, FALSE); + ok(res, "GetOverlappedResult reported error %d\n", GetLastError()); + ok(bytes == sizeof(tbuf), "expected %u, written %u\n", (UINT)sizeof(tbuf), bytes); + CloseHandle(ovl_write.hEvent); CloseHandle(hcom); }

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
47
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 August 2013