February 2011 - Wine-commits

Austin English : ntdll/tests: Make sure return values are used (LLVM/Clang) .
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: fe9544abd20b1bf5f297473760ccea612cb4ac04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe9544abd20b1bf5f29747376… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 10 15:15:44 2011 -0800 ntdll/tests: Make sure return values are used (LLVM/Clang). --- dlls/ntdll/tests/rtlbitmap.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/rtlbitmap.c b/dlls/ntdll/tests/rtlbitmap.c index d24f0af..4c1559b 100644 --- a/dlls/ntdll/tests/rtlbitmap.c +++ b/dlls/ntdll/tests/rtlbitmap.c @@ -497,6 +497,7 @@ static void test_RtlFindSetRuns(void) /* Get first 2 */ ulCount = pRtlFindSetRuns(&bm, runs, 2, FALSE); + ok(ulCount == 2, "RtlFindClearRuns returned %d, expected 2\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 101,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 101,"bad find\n"); ok (runs[0].NumberOfBits + runs[1].NumberOfBits == 19 + 3,"bad size\n"); @@ -506,6 +507,7 @@ static void test_RtlFindSetRuns(void) /* Get longest 3 */ memset(runs, 0, sizeof(runs)); ulCount = pRtlFindSetRuns(&bm, runs, 2, TRUE); + ok(ulCount == 2, "RtlFindClearRuns returned %d, expected 2\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 1877,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 1877,"bad find\n"); ok (runs[0].NumberOfBits + runs[1].NumberOfBits == 33 + 19,"bad size\n"); @@ -515,6 +517,7 @@ static void test_RtlFindSetRuns(void) /* Get all 3 */ memset(runs, 0, sizeof(runs)); ulCount = pRtlFindSetRuns(&bm, runs, 3, TRUE); + ok(ulCount == 3, "RtlFindClearRuns returned %d, expected 3\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 101 || runs[0].StartingIndex == 1877,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 101 || @@ -571,6 +574,7 @@ static void test_RtlFindClearRuns(void) /* Get first 2 */ ulCount = pRtlFindClearRuns(&bm, runs, 2, FALSE); + ok(ulCount == 2, "RtlFindClearRuns returned %d, expected 2\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 101,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 101,"bad find\n"); ok (runs[0].NumberOfBits + runs[1].NumberOfBits == 19 + 3,"bad size\n"); @@ -580,6 +584,7 @@ static void test_RtlFindClearRuns(void) /* Get longest 3 */ memset(runs, 0, sizeof(runs)); ulCount = pRtlFindClearRuns(&bm, runs, 2, TRUE); + ok(ulCount == 2, "RtlFindClearRuns returned %d, expected 2\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 1877,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 1877,"bad find\n"); ok (runs[0].NumberOfBits + runs[1].NumberOfBits == 33 + 19,"bad size\n"); @@ -589,6 +594,7 @@ static void test_RtlFindClearRuns(void) /* Get all 3 */ memset(runs, 0, sizeof(runs)); ulCount = pRtlFindClearRuns(&bm, runs, 3, TRUE); + ok(ulCount == 3, "RtlFindClearRuns returned %d, expected 3\n", ulCount); ok (runs[0].StartingIndex == 7 || runs[0].StartingIndex == 101 || runs[0].StartingIndex == 1877,"bad find\n"); ok (runs[1].StartingIndex == 7 || runs[1].StartingIndex == 101 ||

1 0

Akihiro Sagawa : wmc: Update PO message match algorithm.
by Alexandre Julliard 14 Feb '11

14 Feb '11

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

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 14 Feb '11

14 Feb '11

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

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

14 Feb '11

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

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

14 Feb '11

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

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

14 Feb '11

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

Jacek Caban : urlmon: Fixed Valgrind warnings.
by Alexandre Julliard 14 Feb '11

14 Feb '11

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 14 Feb '11

14 Feb '11

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 : comctl32/tests: Avoid uninitialized variable warning in GetWidthBytes().
by Alexandre Julliard 14 Feb '11

14 Feb '11

Module: wine Branch: master Commit: 8c9abc1dd8db3c1621276c0cfeabc5107d2c4c90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c9abc1dd8db3c1621276c0cf… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Feb 13 00:43:30 2011 +0100 comctl32/tests: Avoid uninitialized variable warning in GetWidthBytes(). --- dlls/comctl32/tests/imagelist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 28b21a4..cc98a17 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -753,7 +753,7 @@ static INT DIB_GetWidthBytes( int width, int bpp ) default: trace("Unknown depth %d, please report.\n", bpp ); assert(0); - break; + return -1; } return 4 * words; }

1 0

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

14 Feb '11

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