February 2011 - Wine-Commits

Austin English : user32/tests: Make sure return values are used (LLVM/Clang ).
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: f956a472c0ee3b425be05488009c2f637c4c802d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f956a472c0ee3b425be054880… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 14:51:43 2011 -0800 user32/tests: Make sure return values are used (LLVM/Clang). --- dlls/user32/tests/menu.c | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 6a831a8..0502672 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -425,7 +425,7 @@ static void test_menu_ownerdraw(void) MOD_maxid = k-1; assert( k <= sizeof(MOD_rc)/sizeof(RECT)); /* display the menu */ - ret = TrackPopupMenu( hmenu, TPM_RETURNCMD, 100,100, 0, hwnd, NULL); + TrackPopupMenu( hmenu, TPM_RETURNCMD, 100,100, 0, hwnd, NULL); /* columns have a 4 pixel gap between them */ ok( MOD_rc[0].right + 4 == MOD_rc[2].left, @@ -449,7 +449,7 @@ static void test_menu_ownerdraw(void) leftcol= MOD_rc[0].left; ModifyMenu( hmenu, 0, MF_BYCOMMAND| MF_OWNERDRAW| MF_SEPARATOR, 0, 0); /* display the menu */ - ret = TrackPopupMenu( hmenu, TPM_RETURNCMD, 100,100, 0, hwnd, NULL); + TrackPopupMenu( hmenu, TPM_RETURNCMD, 100,100, 0, hwnd, NULL); /* left should be 4 pixels less now */ ok( leftcol == MOD_rc[0].left + 4, "columns should be 4 pixels to the left (actual %d).\n", @@ -562,13 +562,15 @@ static void test_mbs_help( int ispop, int hassub, int mnuopt, ReleaseDC( hwnd, hdc); } if(ispop) - ret = TrackPopupMenu( hmenu, TPM_RETURNCMD, 100,100, 0, hwnd, NULL); + TrackPopupMenu( hmenu, TPM_RETURNCMD, 100,100, 0, hwnd, NULL); else { ret = SetMenu( hwnd, hmenu); ok(ret, "SetMenu failed with error %d\n", GetLastError()); DrawMenuBar( hwnd); } ret = GetMenuItemRect( hwnd, hmenu, 0, &rc); + ok(ret, "GetMenuItemRect failed with error %d\n", GetLastError()); + if (0) /* comment out menu size checks, behavior is different in almost every Windows version */ /* the tests should however succeed on win2000, XP and Wine (at least up to 1.1.15) */ /* with a variety of dpis and desktop font sizes */ @@ -2889,7 +2891,8 @@ static void test_menu_trackpopupmenu(void) } /* display the menu */ /* start with an invalid menu handle */ - gle = 0xdeadbeef; + SetLastError(0xdeadbeef); + gflag_initmenupopup = gflag_entermenuloop = gflag_initmenu = 0; ret = MyTrackPopupMenu( Ex, NULL, TPM_RETURNCMD, 100,100, hwnd, NULL); gle = GetLastError(); @@ -2905,7 +2908,7 @@ static void test_menu_trackpopupmenu(void) gflag_entermenuloop ? "WM_INITMENULOOP ": "", gflag_initmenu ? "WM_INITMENU": ""); /* another one but not NULL */ - gle = 0xdeadbeef; + SetLastError(0xdeadbeef); gflag_initmenupopup = gflag_entermenuloop = gflag_initmenu = 0; ret = MyTrackPopupMenu( Ex, (HMENU)hwnd, TPM_RETURNCMD, 100,100, hwnd, NULL); gle = GetLastError(); @@ -2921,7 +2924,7 @@ static void test_menu_trackpopupmenu(void) gflag_entermenuloop ? "WM_INITMENULOOP ": "", gflag_initmenu ? "WM_INITMENU": ""); /* now a somewhat successful call */ - gle = 0xdeadbeef; + SetLastError(0xdeadbeef); gflag_initmenupopup = gflag_entermenuloop = gflag_initmenu = 0; ret = MyTrackPopupMenu( Ex, hmenu, TPM_RETURNCMD, 100,100, hwnd, NULL); gle = GetLastError(); @@ -2939,7 +2942,7 @@ static void test_menu_trackpopupmenu(void) /* and another */ ret = AppendMenuA( hmenu, MF_STRING, 1, "winetest"); ok( ret, "AppendMenA has failed!\n"); - gle = 0xdeadbeef; + SetLastError(0xdeadbeef); gflag_initmenupopup = gflag_entermenuloop = gflag_initmenu = 0; ret = MyTrackPopupMenu( Ex, hmenu, TPM_RETURNCMD, 100,100, hwnd, NULL); gle = GetLastError(); @@ -3067,14 +3070,14 @@ static void test_menu_cancelmode(void) */ /* menu owner is top level window */ g_hwndtosend = hwnd; - ret = TrackPopupMenu( menu, TPM_RETURNCMD, 100,100, 0, hwnd, NULL); + TrackPopupMenu( menu, TPM_RETURNCMD, 100,100, 0, hwnd, NULL); todo_wine { ok( g_got_enteridle == 0, "received %d WM_ENTERIDLE messages, none expected\n", g_got_enteridle); } ok( g_got_enteridle < 2, "received %d WM_ENTERIDLE messages, should be less than 2\n", g_got_enteridle); /* menu owner is child window */ g_hwndtosend = hwndchild; - ret = TrackPopupMenu( menu, TPM_RETURNCMD, 100,100, 0, hwndchild, NULL); + TrackPopupMenu( menu, TPM_RETURNCMD, 100,100, 0, hwndchild, NULL); todo_wine { ok(g_got_enteridle == 0, "received %d WM_ENTERIDLE messages, none expected\n", g_got_enteridle); } @@ -3082,7 +3085,7 @@ static void test_menu_cancelmode(void) /* now send the WM_CANCELMODE messages to the WRONG window */ /* those should fail ( to have any effect) */ g_hwndtosend = hwnd; - ret = TrackPopupMenu( menu, TPM_RETURNCMD, 100,100, 0, hwndchild, NULL); + TrackPopupMenu( menu, TPM_RETURNCMD, 100,100, 0, hwndchild, NULL); ok( g_got_enteridle == 2, "received %d WM_ENTERIDLE messages, should be 2\n", g_got_enteridle); /* cleanup */ DestroyMenu( menu); @@ -3182,6 +3185,7 @@ static void test_menualign(void) if( pGetMenuInfo) { mi.fMask = MIM_STYLE; ret = pGetMenuInfo( menu, &mi); + ok( ret, "GetMenuInfo failed: %d\n", GetLastError()); ok( menu != NULL, "GetMenuInfo() failed\n"); ok( 0 == mi.dwStyle, "menuinfo style is %x\n", mi.dwStyle); }

1 0

Ken Thomases : iphlpapi: Enable non-privileged ICMP (ping) on Mac OS X.
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: d52f95cec83eb9da252df431fd93c4682ff4ec0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d52f95cec83eb9da252df431f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Feb 11 16:02:02 2011 -0600 iphlpapi: Enable non-privileged ICMP (ping) on Mac OS X. --- dlls/iphlpapi/icmp.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index d8ee101..2b76041 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -153,6 +153,11 @@ HANDLE WINAPI IcmpCreateFile(VOID) icmp_t* icp; int sid=socket(AF_INET,SOCK_RAW,IPPROTO_ICMP); + if (sid < 0) + { + /* Mac OS X supports non-privileged ICMP via SOCK_DGRAM type. */ + sid=socket(AF_INET,SOCK_DGRAM,IPPROTO_ICMP); + } if (sid < 0) { ERR_(winediag)("Failed to use ICMP (network ping), this requires special permissions.\n"); SetLastError(ERROR_ACCESS_DENIED);

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: 1bb6395b0d25b8944a36f68333eb5a3ecf63a25a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bb6395b0d25b8944a36f6833… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Feb 11 21:02:25 2011 +0900 po: Update Japanese translation. --- po/ja.po | 799 ++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 385 insertions(+), 414 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1bb6395b0d25b8944a36f…

1 0

Jacek Caban : urlmon: Fixed Valgrind warnings.
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: 9896d41ced9fd2b1904cfa244300a7e3302f307a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9896d41ced9fd2b1904cfa244… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Feb 12 18:58:09 2011 +0100 urlmon: Fixed Valgrind warnings. --- dlls/urlmon/tests/sec_mgr.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 72b6e8a..b88b37a 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -792,6 +792,10 @@ static void test_InternetGetSecurityUrl(void) CHECK_CALLED(ParseUrl_SECURITY_URL_input2); CHECK_CALLED(ParseUrl_SECURITY_URL_expected); CHECK_CALLED(ParseUrl_SECURITY_DOMAIN_expected); + + ok(!lstrcmpW(security_expectedW, sec), "Expected %s but got %s\n", + wine_dbgstr_w(security_expectedW), wine_dbgstr_w(sec)); + CoTaskMemFree(sec); } static HRESULT WINAPI InternetProtocolInfo_QueryInterface(IInternetProtocolInfo *iface, @@ -872,7 +876,7 @@ static HRESULT WINAPI InternetProtocolInfo_ParseUrl(IInternetProtocolInfo *iface *pcchResult = lstrlenW(ret)+1; if(*pcchResult > cchResult) return S_FALSE; - memcpy(pwzResult, ret, (*pcchResult+1)*sizeof(WCHAR)); + memcpy(pwzResult, ret, (*pcchResult)*sizeof(WCHAR)); return S_OK; }

1 0

Austin English : gdi32: Add a stub for GdiDrawStream.
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: e36370f04b036b6e0a4a5e5f6b60d3ca6cc0ad45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e36370f04b036b6e0a4a5e5f6… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Feb 12 15:13:14 2011 -0800 gdi32: Add a stub for GdiDrawStream. --- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/painting.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 4901e13..79c6f3c 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -171,7 +171,7 @@ # @ stub GdiDeleteSpoolFileHandle # @ stub GdiDescribePixelFormat @ stub GdiDllInitialize -# @ stub GdiDrawStream +@ stdcall GdiDrawStream(long long ptr) # @ stub GdiEndDocEMF # @ stub GdiEndPageEMF @ stdcall GdiEntry13() diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 1bcdc23..991c326 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -1383,3 +1383,13 @@ BOOL WINAPI GdiGradientFill( HDC hdc, TRIVERTEX *vert_array, ULONG nvert, return TRUE; } + +/****************************************************************************** + * GdiDrawStream (GDI32.@) + * + */ +BOOL WINAPI GdiDrawStream( HDC hdc, ULONG in, void * pvin ) +{ + FIXME("stub: %p, %d, %p\n", hdc, in, pvin); + return FALSE; +}

1 0

Gerald Pfeifer : wpp: Fix the output type for the "unsigned OP signed" cases in BIN_OP_INT and friends.
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: 7f6d6b835dc361eab32e939c2745bd37930de888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f6d6b835dc361eab32e939c2… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Feb 13 00:54:05 2011 +0100 wpp: Fix the output type for the "unsigned OP signed" cases in BIN_OP_INT and friends. --- libs/wpp/ppy.y | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/wpp/ppy.y b/libs/wpp/ppy.y index 5a63494..5f1566e 100644 --- a/libs/wpp/ppy.y +++ b/libs/wpp/ppy.y @@ -61,7 +61,7 @@ else if(cv_signed(v1) && !cv_signed(v2)) \ r.val.si = v1.val.si OP v2.val.ui; \ else if(!cv_signed(v1) && cv_signed(v2)) \ - r.val.ui = v1.val.ui OP v2.val.si; \ + r.val.si = v1.val.ui OP v2.val.si; \ else \ r.val.ui = v1.val.ui OP v2.val.ui; @@ -72,7 +72,7 @@ else if(cv_signed(v1) && !cv_signed(v2)) \ r.val.sl = v1.val.sl OP v2.val.ul; \ else if(!cv_signed(v1) && cv_signed(v2)) \ - r.val.ul = v1.val.ul OP v2.val.sl; \ + r.val.sl = v1.val.ul OP v2.val.sl; \ else \ r.val.ul = v1.val.ul OP v2.val.ul; @@ -83,7 +83,7 @@ else if(cv_signed(v1) && !cv_signed(v2)) \ r.val.sll = v1.val.sll OP v2.val.ull; \ else if(!cv_signed(v1) && cv_signed(v2)) \ - r.val.ull = v1.val.ull OP v2.val.sll; \ + r.val.sll = v1.val.ull OP v2.val.sll; \ else \ r.val.ull = v1.val.ull OP v2.val.ull;

1 0

Gerald Pfeifer : wined3d: Remove an old hack around Mesa choking on protected memory from flush_to_framebuffer_drawpixels .
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: 54d98ba791e0b020f13e2fabd1c83ce7fcd850e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54d98ba791e0b020f13e2fabd… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Feb 13 00:46:19 2011 +0100 wined3d: Remove an old hack around Mesa choking on protected memory from flush_to_framebuffer_drawpixels. --- dlls/wined3d/surface.c | 17 ----------------- 1 files changed, 0 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4377f10..b7f4b1c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1960,23 +1960,6 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, glRasterPos3i(rect.left, rect.top, 1); checkGLcall("glRasterPos3i"); - /* Some drivers(radeon dri, others?) don't like exceptions during - * glDrawPixels. If the surface is a DIB section, it might be in GDIMode - * after ReleaseDC. Reading it will cause an exception, which x11drv will - * catch to put the dib section in InSync mode, which leads to a crash - * and a blocked x server on my radeon card. - * - * The following lines read the dib section so it is put in InSync mode - * before glDrawPixels is called and the crash is prevented. There won't - * be any interfering gdi accesses, because UnlockRect is called from - * ReleaseDC, and the app won't use the dc any more afterwards. - */ - if ((This->flags & SFLAG_DIBSECTION) && !(This->flags & SFLAG_PBO)) - { - volatile BYTE read; - read = This->resource.allocatedMemory[0]; - } - /* If not fullscreen, we need to skip a number of bytes to find the next row of data */ glPixelStorei(GL_UNPACK_ROW_LENGTH, This->currentDesc.Width);

1 0

Akihiro Sagawa : wmc: Update PO message match algorithm.
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: 0ea27c6ad8972d4f425e785ff79353d4fd737fc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ea27c6ad8972d4f425e785ff… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Feb 11 21:02:29 2011 +0900 wmc: Update PO message match algorithm. --- tools/wmc/po.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wmc/po.c b/tools/wmc/po.c index 414e4a6..06b5bc7 100644 --- a/tools/wmc/po.c +++ b/tools/wmc/po.c @@ -355,7 +355,7 @@ static po_message_t find_message( po_file_t po, const char *msgid, const char *m { if (strcmp( po_message_msgid( msg ), msgid )) continue; if (!msgctxt) break; - if (!(context = po_message_msgctxt( msg ))) break; + if (!(context = po_message_msgctxt( msg ))) continue; if (!strcmp( context, msgctxt )) break; } return msg;

1 0

Austin English : shell32: Trace APPBARDATA struct members based on message type (Valgrind).
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: 99d9e0f6b297ea19839997211cc466b906709d7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=99d9e0f6b297ea19839997211… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 11 18:38:38 2011 -0800 shell32: Trace APPBARDATA struct members based on message type (Valgrind). --- dlls/shell32/appbar.c | 33 ++++++++++++++++++++++++++++++--- 1 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/appbar.c b/dlls/shell32/appbar.c index 212ee37..c5bd3d4 100644 --- a/dlls/shell32/appbar.c +++ b/dlls/shell32/appbar.c @@ -74,9 +74,36 @@ UINT_PTR WINAPI SHAppBarMessage(DWORD msg, PAPPBARDATA data) UINT_PTR ret = 0; - TRACE("msg=%d, data={cb=%d, hwnd=%p, callback=%x, edge=%d, rc=%s, lparam=%lx}\n", - msg, data->cbSize, data->hWnd, data->uCallbackMessage, data->uEdge, - wine_dbgstr_rect(&data->rc), data->lParam); + TRACE("msg=%d, data={cb=%d, hwnd=%p}\n", msg, data->cbSize, data->hWnd); + + /* These members are message dependent */ + switch(msg) + { + case ABM_NEW: + TRACE("callback: %x\n", data->uCallbackMessage); + break; + + case ABM_GETAUTOHIDEBAR: + TRACE("edge: %d\n", data->uEdge); + break; + + case ABM_QUERYPOS: + case ABM_SETPOS: + TRACE("edge: %d, rc: %s\n", data->uEdge, wine_dbgstr_rect(&data->rc)); + break; + + case ABM_GETTASKBARPOS: + TRACE("rc: %s\n", wine_dbgstr_rect(&data->rc)); + break; + + case ABM_SETAUTOHIDEBAR: + TRACE("edge: %d, lParam: %lx\n", data->uEdge, data->lParam); + break; + + default: + FIXME("unknown msg: %d\n", msg); + break; + } if (data->cbSize < sizeof(APPBARDATA)) {

1 0

Ken Thomases : user32: Remove wrong parameter name from comment.
by Alexandre Julliard Feb. 14, 2011

Feb. 14, 2011

Module: wine Branch: master Commit: e814147b12c11f2cfc4b72c557d598dccc17a22d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e814147b12c11f2cfc4b72c55… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Feb 11 11:37:14 2011 -0600 user32: Remove wrong parameter name from comment. Spotted by Peter Oberndorfer. --- dlls/user32/input.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 48430e9..4fd00ba 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -686,7 +686,7 @@ UINT WINAPI GetKBCodePage(void) * * - device handle for keyboard layout defaulted to * the language id. This is the way Windows default works. - * - the thread identifier (dwLayout) is also ignored. + * - the thread identifier is also ignored. */ HKL WINAPI GetKeyboardLayout(DWORD thread_id) {

1 0