January 2009 - Wine-commits

Rob Shearman : configure.ac: Fix test for libresolv on Mac OS 10.4.x.
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: ba349210345accf4026c8db65d9fe9ed0341cee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba349210345accf4026c8db65… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Jan 2 12:12:06 2009 +0000 configure.ac: Fix test for libresolv on Mac OS 10.4.x. The resolv.h header file won't compile without netinet/in.h being included first. --- configure | 3 +++ configure.ac | 5 ++++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 98115be..6fd413f 100755 --- a/configure +++ b/configure @@ -14285,6 +14285,9 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif #include <resolv.h> int main () diff --git a/configure.ac b/configure.ac index 784107e..8d45409 100644 --- a/configure.ac +++ b/configure.ac @@ -1011,7 +1011,10 @@ if test "$ac_cv_header_resolv_h" = "yes" then ac_save_LIBS="$LIBS" LIBS="$LIBS -lresolv" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <resolv.h>]],[[res_init();]])], + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#include <resolv.h>]],[[res_init();]])], [AC_DEFINE(HAVE_RESOLV, 1, [Define if you have the resolver library and header]) RESOLVLIBS="-lresolv"]) LIBS="$ac_save_LIBS"

1 0

Rob Shearman : widl: Use is_string_type instead of is_attr(..., ATTR_STRING ) for detecting strings.
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: 10a422ae1455574fd21f92135a2b5c2a9a287664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10a422ae1455574fd21f92135… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Jan 2 12:14:50 2009 +0000 widl: Use is_string_type instead of is_attr(..., ATTR_STRING) for detecting strings. Detecting strings is a bit harder than just looking for the string attribute, so make sure to use the function which has the purpose of doing just that. Fixes compilation of generated server/proxy code when a parameter has both the [out] and [string] attributes. --- tools/widl/typegen.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 8852ca0..7810f80 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2025,7 +2025,7 @@ static size_t write_struct_tfs(FILE *file, type_t *type, array = find_array_or_string_in_struct(type); if (array && !processed(array->type)) array_offset - = is_attr(array->attrs, ATTR_STRING) + = is_string_type(array->attrs, array->type) ? write_string_tfs(file, array->attrs, array->type, array->name, tfsoff) : write_array_tfs(file, array->attrs, array->type, array->name, tfsoff); @@ -3291,7 +3291,7 @@ void declare_stub_args( FILE *file, int indent, const func_t *func ) LIST_FOR_EACH_ENTRY( var, func->args, const var_t, entry ) { - int is_string = is_attr(var->attrs, ATTR_STRING); + int is_string = is_string_type(var->attrs, var->type); in_attr = is_attr(var->attrs, ATTR_IN); out_attr = is_attr(var->attrs, ATTR_OUT); @@ -3338,7 +3338,7 @@ void assign_stub_out_args( FILE *file, int indent, const func_t *func, const cha LIST_FOR_EACH_ENTRY( var, func->args, const var_t, entry ) { - int is_string = is_attr(var->attrs, ATTR_STRING); + int is_string = is_string_type(var->attrs, var->type); in_attr = is_attr(var->attrs, ATTR_IN); out_attr = is_attr(var->attrs, ATTR_OUT); if (!out_attr && !in_attr)

1 0

Gerald Pfeifer : comctl32: Simplify fifteen functions by removing unused parameters.
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: 6bdcdc423266c6a40995eb11758efa6d8148234e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bdcdc423266c6a40995eb117… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Jan 1 10:01:18 2009 +0100 comctl32: Simplify fifteen functions by removing unused parameters. --- dlls/comctl32/toolbar.c | 70 +++++++++++++++++++++++----------------------- 1 files changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 7972605..2437d97 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -495,7 +495,7 @@ TOOLBAR_DrawFlatSeparator (const RECT *lpRect, HDC hdc, const TOOLBAR_INFO *info * FIXME: It is possible that the height of each line is really SM_CYBORDER. */ static void -TOOLBAR_DrawDDFlatSeparator (const RECT *lpRect, HDC hdc, const TBUTTON_INFO *btnPtr, +TOOLBAR_DrawDDFlatSeparator (const RECT *lpRect, HDC hdc, const TOOLBAR_INFO *infoPtr) { RECT myrect; @@ -848,7 +848,7 @@ TOOLBAR_DrawButton (HWND hwnd, TBUTTON_INFO *btnPtr, HDC hdc, DWORD dwBaseCustDr /* when drawing the vertical bar... */ if ((dwStyle & TBSTYLE_FLAT) /* && (btnPtr->iBitmap == 0) */) { if (btnPtr->fsStyle & BTNS_DROPDOWN) - TOOLBAR_DrawDDFlatSeparator (&rc, hdc, btnPtr, infoPtr); + TOOLBAR_DrawDDFlatSeparator (&rc, hdc, infoPtr); else TOOLBAR_DrawFlatSeparator (&rc, hdc, infoPtr); } @@ -3060,7 +3060,7 @@ TOOLBAR_AutoSize (HWND hwnd) static LRESULT -TOOLBAR_ButtonCount (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_ButtonCount (HWND hwnd) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); @@ -3069,7 +3069,7 @@ TOOLBAR_ButtonCount (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_ButtonStructSize (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_ButtonStructSize (HWND hwnd, WPARAM wParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); @@ -3151,7 +3151,7 @@ TOOLBAR_CheckButton (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_CommandToIndex (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_CommandToIndex (HWND hwnd, WPARAM wParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); @@ -3197,7 +3197,7 @@ TOOLBAR_Customize (HWND hwnd) static LRESULT -TOOLBAR_DeleteButton (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_DeleteButton (HWND hwnd, WPARAM wParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); INT nIndex = (INT)wParam; @@ -3296,7 +3296,7 @@ TOOLBAR_GetAnchorHighlight (HWND hwnd) static LRESULT -TOOLBAR_GetBitmap (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_GetBitmap (HWND hwnd, WPARAM wParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); INT nIndex; @@ -3310,7 +3310,7 @@ TOOLBAR_GetBitmap (HWND hwnd, WPARAM wParam, LPARAM lParam) static inline LRESULT -TOOLBAR_GetBitmapFlags (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_GetBitmapFlags (HWND hwnd) { return (GetDeviceCaps (0, LOGPIXELSX) >= 120) ? TBBF_LARGE : 0; } @@ -3512,7 +3512,7 @@ TOOLBAR_GetDefImageList (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_GetInsertMark (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_GetInsertMark (HWND hwnd, LPARAM lParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); TBINSERTMARK *lptbim = (TBINSERTMARK*)lParam; @@ -3526,7 +3526,7 @@ TOOLBAR_GetInsertMark (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_GetInsertMarkColor (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_GetInsertMarkColor (HWND hwnd) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); @@ -3564,7 +3564,7 @@ TOOLBAR_GetItemRect (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_GetMaxSize (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_GetMaxSize (HWND hwnd, LPARAM lParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); LPSIZE lpSize = (LPSIZE)lParam; @@ -3623,7 +3623,7 @@ TOOLBAR_GetRect (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_GetRows (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_GetRows (HWND hwnd) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); @@ -3632,7 +3632,7 @@ TOOLBAR_GetRows (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_GetState (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_GetState (HWND hwnd, WPARAM wParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); INT nIndex; @@ -3646,14 +3646,14 @@ TOOLBAR_GetState (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_GetStyle (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_GetStyle (HWND hwnd) { return GetWindowLongW(hwnd, GWL_STYLE); } static LRESULT -TOOLBAR_GetTextRows (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_GetTextRows (HWND hwnd) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); @@ -3662,7 +3662,7 @@ TOOLBAR_GetTextRows (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_GetToolTips (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_GetToolTips (HWND hwnd) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); @@ -3673,7 +3673,7 @@ TOOLBAR_GetToolTips (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_GetUnicodeFormat (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_GetUnicodeFormat (HWND hwnd) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); @@ -4287,7 +4287,7 @@ TOOLBAR_Restore(TOOLBAR_INFO *infoPtr, const TBSAVEPARAMSW *lpSave) * delete */ for (i = infoPtr->nNumButtons - 1; i >= 0; i--) if (infoPtr->buttons[i].iBitmap == -1) - TOOLBAR_DeleteButton(infoPtr->hwndSelf, i, 0); + TOOLBAR_DeleteButton(infoPtr->hwndSelf, i); /* only indicate success if at least one button survived */ if (infoPtr->nNumButtons > 0) ret = TRUE; @@ -5826,7 +5826,7 @@ TOOLBAR_LButtonUp (HWND hwnd, WPARAM wParam, LPARAM lParam) if (pt.x < (btnPtr->rect.left + (btnPtr->rect.right - btnPtr->rect.left)/2)) { if ((nButton > 0) && (infoPtr->buttons[nButton-1].fsStyle & BTNS_SEP)) - TOOLBAR_DeleteButton(hwnd, nButton - 1, 0); + TOOLBAR_DeleteButton(hwnd, nButton - 1); } else /* else insert a separator before the dragged button */ { @@ -5853,7 +5853,7 @@ TOOLBAR_LButtonUp (HWND hwnd, WPARAM wParam, LPARAM lParam) else { TRACE("button %d dragged out of toolbar\n", infoPtr->nButtonDrag); - TOOLBAR_DeleteButton(hwnd, (WPARAM)infoPtr->nButtonDrag, 0); + TOOLBAR_DeleteButton(hwnd, (WPARAM)infoPtr->nButtonDrag); } /* button under cursor changed so need to re-set hot item */ @@ -6676,10 +6676,10 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_AutoSize (hwnd); case TB_BUTTONCOUNT: - return TOOLBAR_ButtonCount (hwnd, wParam, lParam); + return TOOLBAR_ButtonCount (hwnd); case TB_BUTTONSTRUCTSIZE: - return TOOLBAR_ButtonStructSize (hwnd, wParam, lParam); + return TOOLBAR_ButtonStructSize (hwnd, wParam); case TB_CHANGEBITMAP: return TOOLBAR_ChangeBitmap (hwnd, wParam, lParam); @@ -6688,13 +6688,13 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_CheckButton (hwnd, wParam, lParam); case TB_COMMANDTOINDEX: - return TOOLBAR_CommandToIndex (hwnd, wParam, lParam); + return TOOLBAR_CommandToIndex (hwnd, wParam); case TB_CUSTOMIZE: return TOOLBAR_Customize (hwnd); case TB_DELETEBUTTON: - return TOOLBAR_DeleteButton (hwnd, wParam, lParam); + return TOOLBAR_DeleteButton (hwnd, wParam); case TB_ENABLEBUTTON: return TOOLBAR_EnableButton (hwnd, wParam, lParam); @@ -6703,10 +6703,10 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_GetAnchorHighlight (hwnd); case TB_GETBITMAP: - return TOOLBAR_GetBitmap (hwnd, wParam, lParam); + return TOOLBAR_GetBitmap (hwnd, wParam); case TB_GETBITMAPFLAGS: - return TOOLBAR_GetBitmapFlags (hwnd, wParam, lParam); + return TOOLBAR_GetBitmapFlags (hwnd); case TB_GETBUTTON: return TOOLBAR_GetButton (hwnd, wParam, lParam); @@ -6742,16 +6742,16 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_GetDefImageList (hwnd, wParam, lParam); case TB_GETINSERTMARK: - return TOOLBAR_GetInsertMark (hwnd, wParam, lParam); + return TOOLBAR_GetInsertMark (hwnd, lParam); case TB_GETINSERTMARKCOLOR: - return TOOLBAR_GetInsertMarkColor (hwnd, wParam, lParam); + return TOOLBAR_GetInsertMarkColor (hwnd); case TB_GETITEMRECT: return TOOLBAR_GetItemRect (hwnd, wParam, lParam); case TB_GETMAXSIZE: - return TOOLBAR_GetMaxSize (hwnd, wParam, lParam); + return TOOLBAR_GetMaxSize (hwnd, lParam); /* case TB_GETOBJECT: */ /* 4.71 */ @@ -6762,10 +6762,10 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_GetRect (hwnd, wParam, lParam); case TB_GETROWS: - return TOOLBAR_GetRows (hwnd, wParam, lParam); + return TOOLBAR_GetRows (hwnd); case TB_GETSTATE: - return TOOLBAR_GetState (hwnd, wParam, lParam); + return TOOLBAR_GetState (hwnd, wParam); case TB_GETSTRINGA: return TOOLBAR_GetStringA (hwnd, wParam, lParam); @@ -6774,16 +6774,16 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_GetStringW (hwnd, wParam, lParam); case TB_GETSTYLE: - return TOOLBAR_GetStyle (hwnd, wParam, lParam); + return TOOLBAR_GetStyle (hwnd); case TB_GETTEXTROWS: - return TOOLBAR_GetTextRows (hwnd, wParam, lParam); + return TOOLBAR_GetTextRows (hwnd); case TB_GETTOOLTIPS: - return TOOLBAR_GetToolTips (hwnd, wParam, lParam); + return TOOLBAR_GetToolTips (hwnd); case TB_GETUNICODEFORMAT: - return TOOLBAR_GetUnicodeFormat (hwnd, wParam, lParam); + return TOOLBAR_GetUnicodeFormat (hwnd); case TB_HIDEBUTTON: return TOOLBAR_HideButton (hwnd, wParam, lParam);

1 0

Andrew Riedi : winex11: Factor out the 'alpha_zero' test and use it for legacy cursor support.
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: 73393fab16c4e978caecf18ba5288329b8b7c164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73393fab16c4e978caecf18ba… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Tue Dec 30 17:41:17 2008 -0800 winex11: Factor out the 'alpha_zero' test and use it for legacy cursor support. --- dlls/winex11.drv/mouse.c | 80 +++++++++++++++++++++++++++------------------- 1 files changed, 47 insertions(+), 33 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 728a8cd..5282412 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -399,6 +399,47 @@ void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y, } +/*********************************************************************** + * check_alpha_zero + * + * Generally 32 bit bitmaps have an alpha channel which is used in favor of the + * AND mask. However, if all pixels have alpha = 0x00, the bitmap is treated + * like one without alpha and the masks are used. As soon as one pixel has + * alpha != 0x00, and the mask ignored as described in the docs. + * + * This is most likely for applications which create the bitmaps with + * CreateDIBitmap, which creates a device dependent bitmap, so the format that + * arrives when loading depends on the screen's bpp. Apps that were written at + * 8 / 16 bpp times do not know about the 32 bit alpha, so they would get a + * completely transparent cursor on 32 bit displays. + * + * Non-32 bit bitmaps always use the AND mask. + */ +static BOOL check_alpha_zero(CURSORICONINFO *ptr, unsigned char *xor_bits) +{ + int x, y; + unsigned char *xor_ptr; + + if (ptr->bBitsPerPixel == 32) + { + for (y = 0; y < ptr->nHeight; ++y) + { + xor_ptr = xor_bits + (y * ptr->nWidthBytes); + for (x = 0; x < ptr->nWidth; ++x) + { + if (xor_ptr[3] != 0x00) + { + return FALSE; + } + xor_ptr+=4; + } + } + } + + return TRUE; +} + + #ifdef SONAME_LIBXCURSOR /*********************************************************************** @@ -434,7 +475,7 @@ static XcursorImage *create_cursor_image( CURSORICONINFO *ptr ) XcursorPixel *pixel_ptr; XcursorImage *image; unsigned char tmp; - BOOL alpha_zero = TRUE; + BOOL alpha_zero; and_width_bytes = 2 * ((ptr->nWidth+15) / 16); xor_width_bytes = ptr->nWidthBytes; @@ -447,36 +488,7 @@ static XcursorImage *create_cursor_image( CURSORICONINFO *ptr ) image = pXcursorImageCreate( ptr->nWidth, ptr->nHeight ); pixel_ptr = image->pixels; - /* Generally 32 bit bitmaps have an alpha channel which is used in favor - * of the AND mask. However, if all pixels have alpha = 0x00, the bitmap - * is treated like one without alpha and the masks are used. As soon as - * one pixel has alpha != 0x00, and the mask ignored as described in the - * docs. - * - * This is most likely for applications which create the bitmaps with - * CreateDIBitmap, which creates a device dependent bitmap, so the format - * that arrives when loading depends on the screen's bpp. Apps that were - * written at 8 / 16 bpp times do not know about the 32 bit alpha, so - * they would get a completely transparent cursor on 32 bit displays. - * - * Non-32 bit bitmaps always use the AND mask - */ - if(ptr->bBitsPerPixel == 32) - { - for (y = 0; alpha_zero && y < ptr->nHeight; ++y) - { - xor_ptr = xor_bits + (y * xor_width_bytes); - for (x = 0; x < ptr->nWidth; ++x) - { - if (xor_ptr[3] != 0x00) - { - alpha_zero = FALSE; - break; - } - xor_ptr+=4; - } - } - } + alpha_zero = check_alpha_zero(ptr, xor_bits); /* On windows, to calculate the color for a pixel, first an AND is done * with the background and the "and" bitmap, then an XOR with the "xor" @@ -618,6 +630,7 @@ static Cursor create_cursor( Display *display, CURSORICONINFO *ptr ) Cursor cursor = None; POINT hotspot; char *bitMask32 = NULL; + BOOL alpha_zero = TRUE; #ifdef SONAME_LIBXCURSOR if (pXcursorImageLoadCursor) return create_xcursor_cursor( display, ptr ); @@ -733,6 +746,7 @@ static Cursor create_cursor( Display *display, CURSORICONINFO *ptr ) ptr->nWidth, ptr->nHeight); } ymax = (ptr->nHeight > 32) ? 32 : ptr->nHeight; + alpha_zero = check_alpha_zero(ptr, theImage); memset(pXorBits, 0, 128); for (y=0; y<ymax; y++) @@ -841,7 +855,7 @@ static Cursor create_cursor( Display *display, CURSORICONINFO *ptr ) /* Now create the 2 pixmaps for bits and mask */ pixmapBits = XCreatePixmap( display, root_window, ptr->nWidth, ptr->nHeight, 1 ); - if (ptr->bBitsPerPixel != 32) + if (alpha_zero) { pixmapMaskInv = XCreatePixmap( display, root_window, ptr->nWidth, ptr->nHeight, 1 ); pixmapMask = XCreatePixmap( display, root_window, ptr->nWidth, ptr->nHeight, 1 ); @@ -901,7 +915,6 @@ static Cursor create_cursor( Display *display, CURSORICONINFO *ptr ) pixmapMask = XCreateBitmapFromData( display, root_window, bitMask32, ptr->nWidth, ptr->nHeight ); - HeapFree( GetProcessHeap(), 0, bitMask32 ); } /* Make sure hotspot is valid */ @@ -924,6 +937,7 @@ static Cursor create_cursor( Display *display, CURSORICONINFO *ptr ) if (pixmapBits) XFreePixmap( display, pixmapBits ); if (pixmapMask) XFreePixmap( display, pixmapMask ); if (pixmapMaskInv) XFreePixmap( display, pixmapMaskInv ); + HeapFree( GetProcessHeap(), 0, bitMask32 ); XFreeGC( display, gc ); } return cursor;

1 0

Jeff Zaroyko : dsound: Check for invalid parameter when unlocking primary buffers.
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: 14db70036d37285fb751f829b609e2e74b56ba66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14db70036d37285fb751f829b… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Fri Jan 2 17:03:00 2009 +1100 dsound: Check for invalid parameter when unlocking primary buffers. --- dlls/dsound/primary.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 5812f00..f0ba854 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -999,8 +999,12 @@ static HRESULT WINAPI PrimaryBufferImpl_Unlock( if (!(device->drvdesc.dwFlags & DSDDESC_DONTNEEDPRIMARYLOCK) && device->hwbuf) { HRESULT hres; - - hres = IDsDriverBuffer_Unlock(device->hwbuf, p1, x1, p2, x2); + + if ((char *)p1 - (char *)device->buffer + x1 > device->buflen) + hres = DSERR_INVALIDPARAM; + else + hres = IDsDriverBuffer_Unlock(device->hwbuf, p1, x1, p2, x2); + if (hres != DS_OK) { WARN("IDsDriverBuffer_Unlock failed\n"); return hres;

1 0

Jeff Zaroyko : dsound: Check for invalid parameter when locking primary and secondary buffers.
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: aff1dbe5316db08d7c71ebbde0d3894b5630e428 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aff1dbe5316db08d7c71ebbde… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Fri Jan 2 17:39:10 2009 +1100 dsound: Check for invalid parameter when locking primary and secondary buffers. --- dlls/dsound/buffer.c | 3 +++ dlls/dsound/primary.c | 3 +++ dlls/dsound/tests/ds3d.c | 4 ++++ 3 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 6659a47..038a90e 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -532,6 +532,9 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock( GetTickCount() ); + if (!audiobytes1) + return DSERR_INVALIDPARAM; + /* when this flag is set, writecursor is meaningless and must be calculated */ if (flags & DSBLOCK_FROMWRITECURSOR) { /* GetCurrentPosition does too much magic to duplicate here */ diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index f0ba854..288466a 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -837,6 +837,9 @@ static HRESULT WINAPI PrimaryBufferImpl_Lock( GetTickCount() ); + if (!audiobytes1) + return DSERR_INVALIDPARAM; + if (device->priolevel != DSSCL_WRITEPRIMARY) { WARN("failed priority check!\n"); return DSERR_PRIOLEVELNEEDED; diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index c3fa0ed..db662c0 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -184,6 +184,10 @@ static int buffer_refill(play_state_t* state, DWORD size) if (size>state->wave_len-state->written) size=state->wave_len-state->written; + /* some broken apps like Navyfield mistakenly pass NULL for a ppValue */ + rc=IDirectSoundBuffer_Lock(state->dsbo,state->offset,size, + &ptr1,NULL,&ptr2,&len2,0); + ok(rc==DSERR_INVALIDPARAM,"expected %08x got %08x\n",DSERR_INVALIDPARAM, rc); rc=IDirectSoundBuffer_Lock(state->dsbo,state->offset,size, &ptr1,&len1,&ptr2,&len2,0); ok(rc==DS_OK,"IDirectSoundBuffer_Lock() failed: %08x\n", rc);

1 0

Michael Karcher : widl: Recurse search for need of delegation.
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: 2fe1f36793cbc84a62238a0ce5a30a7f9afb8567 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fe1f36793cbc84a62238a0ce… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Thu Jan 1 11:25:39 2009 +0100 widl: Recurse search for need of delegation. If any ancestor of an interface needs delegation, the interface itself has holes in the vtables and thus needs delegation, too. --- tools/widl/proxy.c | 29 ++++++++++++++++++++++++----- 1 files changed, 24 insertions(+), 5 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 5d4d2af..9585d2c 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -197,6 +197,24 @@ static int need_delegation(const type_t *iface) return iface->ref && iface->ref->ref && iface->ref->ignore; } +static int get_delegation_indirect(const type_t *iface, const type_t ** delegate_to) +{ + const type_t * cur_iface; + for (cur_iface = iface; cur_iface != NULL; cur_iface = cur_iface->ref) + if (need_delegation(cur_iface)) + { + if(delegate_to) + *delegate_to = cur_iface->ref; + return 1; + } + return 0; +} + +static int need_delegation_indirect(const type_t *iface) +{ + return get_delegation_indirect(iface, NULL); +} + static void proxy_check_pointers( const var_list_t *args ) { const var_t *arg; @@ -626,7 +644,7 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) fprintf(proxy, "};\n"); print_proxy( "\n"); print_proxy( "static %sCInterfaceStubVtbl _%sStubVtbl =\n", - need_delegation(iface) ? "" : "const ", iface->name); + need_delegation_indirect(iface) ? "" : "const ", iface->name); print_proxy( "{\n"); indent++; print_proxy( "{\n"); @@ -639,7 +657,7 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) print_proxy( "},\n", iface->name); print_proxy( "{\n"); indent++; - print_proxy( "CStdStubBuffer_%s\n", need_delegation(iface) ? "DELEGATING_METHODS" : "METHODS"); + print_proxy( "CStdStubBuffer_%s\n", need_delegation_indirect(iface) ? "DELEGATING_METHODS" : "METHODS"); indent--; print_proxy( "}\n"); indent--; @@ -773,6 +791,7 @@ void write_proxies(const statement_list_t *stmts) char *file_id = proxy_token; int i, count, have_baseiid; type_t **interfaces; + const type_t * delegate_to; if (!do_proxies) return; if (do_everything && !need_proxy_file(stmts)) return; @@ -826,14 +845,14 @@ void write_proxies(const statement_list_t *stmts) fprintf(proxy, "};\n"); fprintf(proxy, "\n"); - if ((have_baseiid = does_any_iface(stmts, need_delegation))) + if ((have_baseiid = does_any_iface(stmts, need_delegation_indirect))) { fprintf(proxy, "static const IID * _%s_BaseIIDList[] =\n", file_id); fprintf(proxy, "{\n"); for (i = 0; i < count; i++) { - if (need_delegation(interfaces[i])) - fprintf( proxy, " &IID_%s, /* %s */\n", interfaces[i]->ref->name, interfaces[i]->name ); + if (get_delegation_indirect(interfaces[i], &delegate_to)) + fprintf( proxy, " &IID_%s, /* %s */\n", delegate_to->name, interfaces[i]->name ); else fprintf( proxy, " 0,\n" ); }

1 0

Alexandre Julliard : kernel32/tests: Use the correct value for invalid heap sizes on 64-bit.
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: 02229896bee41309156a8be0a26139105807a495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02229896bee41309156a8be0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 2 12:20:53 2009 +0100 kernel32/tests: Use the correct value for invalid heap sizes on 64-bit. --- dlls/kernel32/tests/heap.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index c196c23..4aa6b7e 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -64,13 +64,13 @@ START_TEST(heap) /* test some border cases of HeapAlloc and HeapReAlloc */ mem = HeapAlloc(GetProcessHeap(), 0, 0); ok(mem != NULL, "memory not allocated for size 0\n"); - msecond = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, ~0UL - 7); - ok(msecond == NULL, "HeapReAlloc(0xfffffff8) should have failed\n"); - msecond = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, ~0UL); - ok(msecond == NULL, "HeapReAlloc(0xffffffff) should have failed\n"); + msecond = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, ~(SIZE_T)0 - 7); + ok(msecond == NULL, "HeapReAlloc(~0 - 7) should have failed\n"); + msecond = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, ~(SIZE_T)0); + ok(msecond == NULL, "HeapReAlloc(~0) should have failed\n"); HeapFree(GetProcessHeap(), 0, mem); - mem = HeapAlloc(GetProcessHeap(), 0, ~0UL); - ok(mem == NULL, "memory allocated for size ~0UL\n"); + mem = HeapAlloc(GetProcessHeap(), 0, ~(SIZE_T)0); + ok(mem == NULL, "memory allocated for size ~0\n"); /* large blocks must be 16-byte aligned */ mem = HeapAlloc(GetProcessHeap(), 0, 512 * 1024);

1 0

Maarten Lankhorst : dsound: Correct amount of buffers used for playing.
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: 94c620cf95ed31add0e5ef40b0da0f571e1540de URL: http://source.winehq.org/git/wine.git/?a=commit;h=94c620cf95ed31add0e5ef40b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jan 1 13:24:53 2009 +0100 dsound: Correct amount of buffers used for playing. Fixes regression caused by ce06de420874b9983324508f8257a580fee341ca Amount of time per buffer was doubled, but amount of buffers wasn't halved, so latency was doubled. --- dlls/dsound/capture.c | 2 +- dlls/dsound/dsound_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index d84a8fe..cd051b6 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1140,7 +1140,7 @@ IDirectSoundCaptureBufferImpl_Start( if (device->buffer) { int c; - DWORD blocksize = 4 * DSOUND_fraglen(device->pwfx->nSamplesPerSec, device->pwfx->nBlockAlign); + DWORD blocksize = DSOUND_fraglen(device->pwfx->nSamplesPerSec, device->pwfx->nBlockAlign); device->nrofpwaves = device->buflen / blocksize + !!(device->buflen % blocksize); TRACE("nrofpwaves=%d\n", device->nrofpwaves); diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index dddcf28..5ebf2e6 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -91,8 +91,8 @@ HRESULT mmErr(UINT err) /* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */ int ds_emuldriver = 0; int ds_hel_buflen = 32768 * 2; -int ds_snd_queue_max = 20; -int ds_snd_queue_min = 14; +int ds_snd_queue_max = 10; +int ds_snd_queue_min = 6; int ds_snd_shadow_maxsize = 2; int ds_hw_accel = DS_HW_ACCEL_FULL; int ds_default_playback = 0;

1 0

Alexandre Julliard : include: Fix a couple of winsock structures for 64-bit .
by Alexandre Julliard 02 Jan '09

02 Jan '09

Module: wine Branch: master Commit: 3b22148532599fb5912278c437bb64c93c265241 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b22148532599fb5912278c43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 2 12:20:33 2009 +0100 include: Fix a couple of winsock structures for 64-bit. --- include/winsock.h | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/include/winsock.h b/include/winsock.h index b531bb3..537e16a 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -144,9 +144,6 @@ typedef unsigned int u_long; extern "C" { #endif /* defined(__cplusplus) */ -/* proper 4-byte packing */ -#include <pshpack4.h> - /* * Address families */ @@ -365,8 +362,13 @@ typedef struct WS(servent) { char* s_name; /* official service name */ char** s_aliases; /* alias list */ +#ifdef _WIN64 + char* s_proto; /* protocol to use */ + short s_port; /* port # */ +#else short s_port; /* port # */ char* s_proto; /* protocol to use */ +#endif } SERVENT, *PSERVENT, *LPSERVENT; @@ -647,11 +649,19 @@ typedef struct WS(WSAData) { WORD wVersion; WORD wHighVersion; +#ifdef _WIN64 + WORD iMaxSockets; + WORD iMaxUdpDg; + char *lpVendorInfo; + char szDescription[WSADESCRIPTION_LEN+1]; + char szSystemStatus[WSASYS_STATUS_LEN+1]; +#else char szDescription[WSADESCRIPTION_LEN+1]; char szSystemStatus[WSASYS_STATUS_LEN+1]; WORD iMaxSockets; WORD iMaxUdpDg; char *lpVendorInfo; +#endif } WSADATA, *LPWSADATA; @@ -1051,9 +1061,6 @@ SOCKET WINAPI WS(socket)(int,int,int); #endif /* !defined(__WINE_WINSOCK2__) || WS_API_PROTOTYPES */ - -#include <poppack.h> - #ifdef __cplusplus } #endif

1 0