August 2013 - Wine-Commits - list.winehq.org

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

Aug. 16, 2013

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

Frédéric Delanoy : Don' t insert emacs file variables in documents.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: docs Branch: master Commit: 683d9265ff32fdb69af0d98c9623d2cfb63d8630 URL: http://source.winehq.org/git/docs.git/?a=commit;h=683d9265ff32fdb69af0d98c9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Aug 16 02:12:08 2013 +0200 Don't insert emacs file variables in documents. --- en/winedev-architecture.sgml | 8 -------- en/winedev-coding.sgml | 7 ------- en/winedev-ddraw.sgml | 7 ------- en/winedev-debugger.sgml | 7 ------- en/winedev-debugging.sgml | 7 ------- en/winedev-documentation.sgml | 7 ------- en/winedev-kernel.sgml | 7 ------- en/winedev-multimedia.sgml | 7 ------- en/winedev-ole.sgml | 7 ------- en/winedev-opengl.sgml | 7 ------- en/winedev-otherdebug.sgml | 7 ------- en/winedev-testing.sgml | 7 ------- en/winedev-windowing.sgml | 7 ------- en/winelib-bindlls.sgml | 7 ------- en/winelib-intro.sgml | 7 ------- en/winelib-mfc.sgml | 7 ------- en/winelib-porting.sgml | 7 ------- en/winelib-toolkit.sgml | 7 ------- en/wineusr-bugs.sgml | 7 ------- en/wineusr-configuring.sgml | 7 ------- en/wineusr-getting.sgml | 7 ------- en/wineusr-introduction.sgml | 7 ------- en/wineusr-running.sgml | 7 ------- 23 files changed, 0 insertions(+), 162 deletions(-) diff --git a/en/winedev-architecture.sgml b/en/winedev-architecture.sgml index 71007be..84082ee 100644 --- a/en/winedev-architecture.sgml +++ b/en/winedev-architecture.sgml @@ -933,11 +933,3 @@ </sect2> </sect1> </chapter> - - - diff --git a/en/winedev-coding.sgml b/en/winedev-coding.sgml index 5cd7290..83998bd 100644 --- a/en/winedev-coding.sgml +++ b/en/winedev-coding.sgml @@ -495,10 +495,3 @@ AC_CHECK_HEADER(foo.h, AC_DEFINE(HAVE_FOO_H)) </para> </sect1> </chapter> - - diff --git a/en/winedev-ddraw.sgml b/en/winedev-ddraw.sgml index b435b73..816ec4e 100644 --- a/en/winedev-ddraw.sgml +++ b/en/winedev-ddraw.sgml @@ -164,10 +164,3 @@ </para> </sect1> </chapter> - - diff --git a/en/winedev-debugger.sgml b/en/winedev-debugger.sgml index 270ba7c..22b3051 100644 --- a/en/winedev-debugger.sgml +++ b/en/winedev-debugger.sgml @@ -2634,10 +2634,3 @@ $ gdb wine </sect1> </chapter> - - diff --git a/en/winedev-debugging.sgml b/en/winedev-debugging.sgml index 7da3916..01b270e 100644 --- a/en/winedev-debugging.sgml +++ b/en/winedev-debugging.sgml @@ -464,10 +464,3 @@ TRACE("flags = %s\n", dbgstr_flags(flags)); </sect1> </chapter> - - diff --git a/en/winedev-documentation.sgml b/en/winedev-documentation.sgml index da2347c..26f4b57 100644 --- a/en/winedev-documentation.sgml +++ b/en/winedev-documentation.sgml @@ -1669,10 +1669,3 @@ </sect1> </chapter> - - diff --git a/en/winedev-kernel.sgml b/en/winedev-kernel.sgml index c787ff6..20222c5 100644 --- a/en/winedev-kernel.sgml +++ b/en/winedev-kernel.sgml @@ -2476,10 +2476,3 @@ if (res != ERROR_SUCCESS) return res; </sect1> </chapter> - - diff --git a/en/winedev-multimedia.sgml b/en/winedev-multimedia.sgml index 5d0954b..a38d7a2 100644 --- a/en/winedev-multimedia.sgml +++ b/en/winedev-multimedia.sgml @@ -928,10 +928,3 @@ HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\MediaProperties\PrivatePrope </sect1> </chapter> - - diff --git a/en/winedev-ole.sgml b/en/winedev-ole.sgml index f1b2a27..528c718 100644 --- a/en/winedev-ole.sgml +++ b/en/winedev-ole.sgml @@ -1147,10 +1147,3 @@ static ICOM_VTABLE(IDirect3D) d3dvt = { </sect2> </sect1> </chapter> - - diff --git a/en/winedev-opengl.sgml b/en/winedev-opengl.sgml index c347984..a4bb913 100644 --- a/en/winedev-opengl.sgml +++ b/en/winedev-opengl.sgml @@ -309,10 +309,3 @@ gcc dummy.c -L/usr/local/lib -L/usr/local/lib/wine -lwine -lopengl32 </sect2> </sect1> </chapter> - - diff --git a/en/winedev-otherdebug.sgml b/en/winedev-otherdebug.sgml index ee7cab0..e8dba3c 100644 --- a/en/winedev-otherdebug.sgml +++ b/en/winedev-otherdebug.sgml @@ -342,10 +342,3 @@ less registry.c.gcov </sect1> </chapter> - - diff --git a/en/winedev-testing.sgml b/en/winedev-testing.sgml index 7581ef6..9095166 100644 --- a/en/winedev-testing.sgml +++ b/en/winedev-testing.sgml @@ -615,10 +615,3 @@ ok ( GetLastError() == WIN9X_ERROR || GetLastError() == NT_ERROR, ...); file handling... --> </chapter> - - diff --git a/en/winedev-windowing.sgml b/en/winedev-windowing.sgml index 4175f0d..c977eff 100644 --- a/en/winedev-windowing.sgml +++ b/en/winedev-windowing.sgml @@ -663,10 +663,3 @@ WINEDEBUG=+key,+keyboard wine > key.log 2>&1 </sect2> </sect1> </chapter> - - diff --git a/en/winelib-bindlls.sgml b/en/winelib-bindlls.sgml index 9978bd5..3ca663c 100644 --- a/en/winelib-bindlls.sgml +++ b/en/winelib-bindlls.sgml @@ -283,10 +283,3 @@ signed short WINAPI MyProxyWinFunc (unsigned short a, void *b, void *c, </para> </sect1> </chapter> - - diff --git a/en/winelib-intro.sgml b/en/winelib-intro.sgml index c84987c..3d95746 100644 --- a/en/winelib-intro.sgml +++ b/en/winelib-intro.sgml @@ -418,10 +418,3 @@ </sect2> </sect1> </chapter> - - diff --git a/en/winelib-mfc.sgml b/en/winelib-mfc.sgml index 5a3dcab..c625b47 100644 --- a/en/winelib-mfc.sgml +++ b/en/winelib-mfc.sgml @@ -211,10 +211,3 @@ </sect1> </chapter> - - diff --git a/en/winelib-porting.sgml b/en/winelib-porting.sgml index 0e8e5cd..43f1a7d 100644 --- a/en/winelib-porting.sgml +++ b/en/winelib-porting.sgml @@ -148,10 +148,3 @@ </sect1> </chapter> - - diff --git a/en/winelib-toolkit.sgml b/en/winelib-toolkit.sgml index c1ee8ee..040f243 100644 --- a/en/winelib-toolkit.sgml +++ b/en/winelib-toolkit.sgml @@ -748,10 +748,3 @@ ORDINAL extern EXPORTNAME SYMBOLNAME  </sect1> </chapter> - - diff --git a/en/wineusr-bugs.sgml b/en/wineusr-bugs.sgml index 19ebd4d..7040d23 100644 --- a/en/wineusr-bugs.sgml +++ b/en/wineusr-bugs.sgml @@ -309,10 +309,3 @@ </sect2> </sect1> </chapter> - - diff --git a/en/wineusr-configuring.sgml b/en/wineusr-configuring.sgml index 0db8eed..bb5307a 100644 --- a/en/wineusr-configuring.sgml +++ b/en/wineusr-configuring.sgml @@ -798,10 +798,3 @@ </sect1> </chapter> - - diff --git a/en/wineusr-getting.sgml b/en/wineusr-getting.sgml index c3536a6..ef8a13d 100644 --- a/en/wineusr-getting.sgml +++ b/en/wineusr-getting.sgml @@ -191,10 +191,3 @@ </sect1> </chapter> - - diff --git a/en/wineusr-introduction.sgml b/en/wineusr-introduction.sgml index 070bb00..94051e5 100644 --- a/en/wineusr-introduction.sgml +++ b/en/wineusr-introduction.sgml @@ -399,10 +399,3 @@ </sect2> </sect1> </chapter> - - diff --git a/en/wineusr-running.sgml b/en/wineusr-running.sgml index 95416a6..51fcd4b 100644 --- a/en/wineusr-running.sgml +++ b/en/wineusr-running.sgml @@ -737,10 +737,3 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\" </sect2> </sect1> </chapter> - -

1 0

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

Aug. 16, 2013

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: Correct windows device name -> unix device name mappings table.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

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

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

Aug. 15, 2013

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 Aug. 15, 2013

Aug. 15, 2013

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 Aug. 15, 2013

Aug. 15, 2013

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

Dmitry Timoshkov : kernel32/tests: Add interactive WaitCommEvent tests.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

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 ClearCommError very first test since it depends on device queue being empty .
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: wine Branch: master Commit: b288f0a8790dbcb79332de4e2af9f6674c5d3484 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b288f0a8790dbcb79332de4e2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 15 16:38:15 2013 +0900 kernel32/tests: Make ClearCommError very first test since it depends on device queue being empty. --- dlls/kernel32/tests/comm.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index e9a8690..38a8bbc 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -1671,6 +1671,7 @@ START_TEST(comm) hcom = test_OpenComm(FALSE); if (hcom != INVALID_HANDLE_VALUE) { + test_ClearCommErrors(hcom); /* keep it the very first test */ test_GetModemStatus(hcom); test_ReadTimeOut(hcom); test_waittxempty(hcom); @@ -1679,13 +1680,6 @@ START_TEST(comm) hcom = test_OpenComm(FALSE); if (hcom != INVALID_HANDLE_VALUE) { - Sleep(200); /* Give the laster character of test_waittxempty to drop into the receiver */ - test_ClearCommErrors(hcom); - CloseHandle(hcom); - } - hcom = test_OpenComm(FALSE); - if (hcom != INVALID_HANDLE_VALUE) - { test_non_pending_errors(hcom); CloseHandle(hcom); }

1 0

Vincent Povirk : gdiplus: Copy custom dashes in GdipClonePen.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: wine Branch: master Commit: 2c3142f0ee4a5fa3aff658b9b46a9f91aea030d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c3142f0ee4a5fa3aff658b9b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 14 16:35:11 2013 -0500 gdiplus: Copy custom dashes in GdipClonePen. --- dlls/gdiplus/pen.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 80ede40..9b63db9 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -102,6 +102,7 @@ GpStatus WINGDIPAPI GdipClonePen(GpPen *pen, GpPen **clonepen) (*clonepen)->customstart = NULL; (*clonepen)->customend = NULL; (*clonepen)->brush = NULL; + (*clonepen)->dashes = NULL; stat = GdipCloneBrush(pen->brush, &(*clonepen)->brush); @@ -111,6 +112,15 @@ GpStatus WINGDIPAPI GdipClonePen(GpPen *pen, GpPen **clonepen) if (stat == Ok && pen->customend) stat = GdipCloneCustomLineCap(pen->customend, &(*clonepen)->customend); + if (stat == Ok && pen->dashes) + { + (*clonepen)->dashes = GdipAlloc(pen->numdashes * sizeof(REAL)); + if ((*clonepen)->dashes) + memcpy((*clonepen)->dashes, pen->dashes, pen->numdashes * sizeof(REAL)); + else + stat = OutOfMemory; + } + if (stat != Ok) { GdipDeletePen(*clonepen);

1 0