September 2009 - Wine-commits

Roderick Colenbrander : winex11: Use ColorShifts from physDev in X11DRV_PALETTE_ToPhysical.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: 5fc017c49734edc89a93b18d87c80f34da2444ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fc017c49734edc89a93b18d8… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Sep 1 21:48:29 2009 +0200 winex11: Use ColorShifts from physDev in X11DRV_PALETTE_ToPhysical. --- dlls/winex11.drv/bitmap.c | 14 +++++++++++++- dlls/winex11.drv/dib.c | 10 +++++++++- dlls/winex11.drv/init.c | 2 ++ dlls/winex11.drv/palette.c | 5 ++++- dlls/winex11.drv/x11drv.h | 3 +++ 5 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index a288352..4d635aa 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -110,6 +110,10 @@ HBITMAP CDECL X11DRV_SelectBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap ) if (physDev->depth != physBitmap->pixmap_depth) { physDev->depth = physBitmap->pixmap_depth; + if(physDev->depth == 1) + physDev->color_shifts = NULL; + else + physDev->color_shifts = &physBitmap->pixmap_color_shifts; wine_tsx11_lock(); XFreeGC( gdi_display, physDev->gc ); physDev->gc = XCreateGC( gdi_display, physDev->drawable, 0, NULL ); @@ -158,7 +162,15 @@ BOOL CDECL X11DRV_CreateBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, LPVOID /* Create the pixmap */ wine_tsx11_lock(); - physBitmap->pixmap_depth = (bitmap.bmBitsPixel == 1) ? 1 : screen_depth; + if(bitmap.bmBitsPixel == 1) + { + physBitmap->pixmap_depth = 1; + } + else + { + physBitmap->pixmap_depth = screen_depth; + physBitmap->pixmap_color_shifts = X11DRV_PALETTE_default_shifts; + } physBitmap->pixmap = XCreatePixmap(gdi_display, root_window, bitmap.bmWidth, bitmap.bmHeight, physBitmap->pixmap_depth); wine_tsx11_unlock(); diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index b40215a..8a61332 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4746,7 +4746,15 @@ HBITMAP CDECL X11DRV_CreateDIBSection( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, /* create pixmap and X image */ wine_tsx11_lock(); - physBitmap->pixmap_depth = (dib.dsBm.bmBitsPixel == 1) ? 1 : screen_depth; + if(dib.dsBm.bmBitsPixel == 1) + { + physBitmap->pixmap_depth = 1; + } + else + { + physBitmap->pixmap_depth = screen_depth; + physBitmap->pixmap_color_shifts = X11DRV_PALETTE_default_shifts; + } #ifdef HAVE_LIBXXSHM physBitmap->shminfo.shmid = -1; diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 480486f..ba6cc51 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -138,6 +138,7 @@ BOOL CDECL X11DRV_CreateDC( HDC hdc, X11DRV_PDEVICE **pdev, LPCWSTR driver, LPCW physDev->bitmap = &BITMAP_stock_phys_bitmap; physDev->drawable = BITMAP_stock_phys_bitmap.pixmap; physDev->depth = 1; + physDev->color_shifts = NULL; SetRect( &physDev->drawable_rect, 0, 0, 1, 1 ); physDev->dc_rect = physDev->drawable_rect; } @@ -146,6 +147,7 @@ BOOL CDECL X11DRV_CreateDC( HDC hdc, X11DRV_PDEVICE **pdev, LPCWSTR driver, LPCW physDev->bitmap = NULL; physDev->drawable = root_window; physDev->depth = screen_depth; + physDev->color_shifts = &X11DRV_PALETTE_default_shifts; physDev->drawable_rect = virtual_screen_rect; SetRect( &physDev->dc_rect, 0, 0, virtual_screen_rect.right - virtual_screen_rect.left, virtual_screen_rect.bottom - virtual_screen_rect.top ); diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index d934b65..bf2cee8 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -60,7 +60,7 @@ Colormap X11DRV_PALETTE_PaletteXColormap = 0; UINT16 X11DRV_PALETTE_PaletteFlags = 0; /* initialize to zero to handle abortive X11DRV_PALETTE_VIRTUAL visuals */ -static ColorShifts X11DRV_PALETTE_default_shifts = { {0,0,0,}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0} }; +ColorShifts X11DRV_PALETTE_default_shifts = { {0,0,0,}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0} }; static int X11DRV_PALETTE_Graymax = 0; static int palette_size; @@ -874,6 +874,9 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color ) PALETTEENTRY entry; ColorShifts *shifts = &X11DRV_PALETTE_default_shifts; + if(physDev->color_shifts) + shifts = physDev->color_shifts; + if ( X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_FIXED ) { /* there is no colormap limitation; we are going to have to compute diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e879c4c..828eebe 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -118,6 +118,7 @@ typedef struct Pixmap pixmap; XID glxpixmap; int pixmap_depth; + ColorShifts pixmap_color_shifts; /* the following fields are only used for DIB section bitmaps */ int status, p_status; /* mapping status */ XImage *image; /* cached XImage */ @@ -155,6 +156,7 @@ typedef struct int backgroundPixel; int textPixel; int depth; /* bit depth of the DC */ + ColorShifts *color_shifts; /* color shifts of the DC */ int exposures; /* count of graphics exposures operations */ int current_pf; Drawable gl_drawable; @@ -480,6 +482,7 @@ extern UINT16 X11DRV_PALETTE_PaletteFlags; extern int *X11DRV_PALETTE_PaletteToXPixel; extern int *X11DRV_PALETTE_XPixelToPalette; +extern ColorShifts X11DRV_PALETTE_default_shifts; extern int X11DRV_PALETTE_mapEGAPixel[16];

1 0

Roderick Colenbrander : winex11: Prepare X11DRV_PALETTE_ToPhysical/ _ToLogical for a new ColorShift structure.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: 3ad349f316f1b531da8479527adbcf697b61683c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad349f316f1b531da8479527… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Sep 1 20:50:48 2009 +0200 winex11: Prepare X11DRV_PALETTE_ToPhysical/_ToLogical for a new ColorShift structure. --- dlls/winex11.drv/palette.c | 137 +++++++++++++++++++++----------------------- dlls/winex11.drv/x11drv.h | 12 ++++ 2 files changed, 77 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ad349f316f1b531da847…

1 0

Roderick Colenbrander : winex11: Introduce a new function for looking up the physical color of a pixel for use with colormap generation-like functions .
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: 3878b4810e9e97d95bda0ca2e4b09d9114b21e5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3878b4810e9e97d95bda0ca2e… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Sep 1 20:10:32 2009 +0200 winex11: Introduce a new function for looking up the physical color of a pixel for use with colormap generation-like functions. This prepares to a rewrite of X11DRV_PALETTE_ToPhysical which requires the physDev for retrieving the color shifts. --- dlls/winex11.drv/dib.c | 4 +- dlls/winex11.drv/palette.c | 67 ++++++++++++++++++++++++++++++++++++++++++- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 68 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 794029a..b40215a 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -371,7 +371,7 @@ static int *X11DRV_DIB_GenColorMap( X11DRV_PDEVICE *physDev, int *colorMapping, } else for (i = start; i < end; i++, rgb++) - colorMapping[i] = X11DRV_PALETTE_ToPhysical( NULL, RGB(rgb->rgbRed, + colorMapping[i] = X11DRV_PALETTE_LookupPixel(RGB(rgb->rgbRed, rgb->rgbGreen, rgb->rgbBlue)); } @@ -395,7 +395,7 @@ static int *X11DRV_DIB_GenColorMap( X11DRV_PDEVICE *physDev, int *colorMapping, } else for (i = start; i < end; i++, rgb++) - colorMapping[i] = X11DRV_PALETTE_ToPhysical( NULL, RGB(rgb->rgbtRed, + colorMapping[i] = X11DRV_PALETTE_LookupPixel(RGB(rgb->rgbtRed, rgb->rgbtGreen, rgb->rgbtBlue)); } diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index 356cb95..1863e9a 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -1016,6 +1016,70 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color ) } /*********************************************************************** + * X11DRV_PALETTE_LookupPixel + */ +int X11DRV_PALETTE_LookupPixel(COLORREF color ) +{ + unsigned char spec_type = color >> 24; + + /* Only accept RGB which has spec_type = 0 */ + if(spec_type) + return 0; + + color &= 0xffffff; + + if ( X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_FIXED ) + { + unsigned long red, green, blue; + red = GetRValue(color); green = GetGValue(color); blue = GetBValue(color); + + if (X11DRV_PALETTE_Graymax) + { + /* grayscale only; return scaled value */ + return ( (red * 30 + green * 59 + blue * 11) * X11DRV_PALETTE_Graymax) / 25500; + } + else + { + /* scale each individually and construct the TrueColor pixel value */ + if (X11DRV_PALETTE_PRed.scale < 8) + red = red >> (8-X11DRV_PALETTE_PRed.scale); + else if (X11DRV_PALETTE_PRed.scale > 8) + red = red << (X11DRV_PALETTE_PRed.scale-8) | + red >> (16-X11DRV_PALETTE_PRed.scale); + if (X11DRV_PALETTE_PGreen.scale < 8) + green = green >> (8-X11DRV_PALETTE_PGreen.scale); + else if (X11DRV_PALETTE_PGreen.scale > 8) + green = green << (X11DRV_PALETTE_PGreen.scale-8) | + green >> (16-X11DRV_PALETTE_PGreen.scale); + if (X11DRV_PALETTE_PBlue.scale < 8) + blue = blue >> (8-X11DRV_PALETTE_PBlue.scale); + else if (X11DRV_PALETTE_PBlue.scale > 8) + blue = blue << (X11DRV_PALETTE_PBlue.scale-8) | + blue >> (16-X11DRV_PALETTE_PBlue.scale); + + return (red << X11DRV_PALETTE_PRed.shift) | (green << X11DRV_PALETTE_PGreen.shift) | (blue << X11DRV_PALETTE_PBlue.shift); + } + } + else + { + WORD index; + HPALETTE hPal = GetStockObject(DEFAULT_PALETTE); + int *mapping = palette_get_mapping( hPal ); + + if (!mapping) + WARN("Palette %p is not realized\n", hPal); + + EnterCriticalSection( &palette_cs ); + index = X11DRV_SysPaletteLookupPixel( color, FALSE); + if (X11DRV_PALETTE_PaletteToXPixel) + index = X11DRV_PALETTE_PaletteToXPixel[index]; + LeaveCriticalSection( &palette_cs ); + return index; + } +} + + +/*********************************************************************** * X11DRV_PALETTE_LookupSystemXPixel */ static int X11DRV_PALETTE_LookupSystemXPixel(COLORREF col) @@ -1192,8 +1256,7 @@ UINT X11DRV_RealizePalette( X11DRV_PDEVICE *physDev, HPALETTE hpal, BOOL primary } else if ( X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_VIRTUAL ) { - index = X11DRV_PALETTE_ToPhysical( NULL, - RGB( entries[i].peRed, entries[i].peGreen, entries[i].peBlue )); + index = X11DRV_PALETTE_LookupPixel( RGB( entries[i].peRed, entries[i].peGreen, entries[i].peBlue )); } /* we have to map to existing entry in the system palette */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 26671eb..7f94153 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -477,6 +477,7 @@ extern BOOL X11DRV_IsSolidColor(COLORREF color); extern COLORREF X11DRV_PALETTE_ToLogical(int pixel); extern int X11DRV_PALETTE_ToPhysical(X11DRV_PDEVICE *physDev, COLORREF color); +extern int X11DRV_PALETTE_LookupPixel(COLORREF color); extern unsigned int depth_to_bpp( unsigned int depth );

1 0

Vincent Povirk : oleaut32/tests: Add test for tlibattr->lcid.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: a9221d7688f4584f731c080b849db54895431202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9221d7688f4584f731c080b8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 25 12:46:44 2009 -0500 oleaut32/tests: Add test for tlibattr->lcid. --- dlls/oleaut32/tests/tmarshal.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 6b309fe..b73a0da 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1399,6 +1399,29 @@ static void test_StaticWidget(void) ITypeInfo_Release(type_info); } +static void test_libattr(void) +{ + ITypeLib *pTypeLib; + HRESULT hr; + TLIBATTR *pattr; + + hr = LoadRegTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, &pTypeLib); + ok_ole_success(hr, LoadRegTypeLib); + if (FAILED(hr)) + return; + + hr = ITypeLib_GetLibAttr(pTypeLib, &pattr); + ok_ole_success(hr, GetLibAttr); + if (SUCCEEDED(hr)) + { + ok(pattr->lcid == MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), "lcid %x\n", pattr->lcid); + + ITypeLib_ReleaseTLibAttr(pTypeLib, pattr); + } + + ITypeLib_Release(pTypeLib); +} + START_TEST(tmarshal) { HRESULT hr; @@ -1411,6 +1434,7 @@ START_TEST(tmarshal) test_typelibmarshal(); test_DispCallFunc(); test_StaticWidget(); + test_libattr(); hr = UnRegisterTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, sizeof(void*) == 8 ? SYS_WIN64 : SYS_WIN32);

1 0

Vincent Povirk : oleaut32: Handle LCID arguments in ITypeInfo::Invoke.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: 34f1d8a20015726979d1d6c3340c541938051514 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34f1d8a20015726979d1d6c33… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 10 17:50:18 2009 -0500 oleaut32: Handle LCID arguments in ITypeInfo::Invoke. --- dlls/oleaut32/tests/tmarshal.c | 4 ---- dlls/oleaut32/typelib.c | 36 +++++++++++++++++++++++++++++------- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index f79fbc6..6b309fe 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1299,7 +1299,6 @@ static void test_typelibmarshal(void) dispparams.rgvarg = vararg; VariantInit(&varresult); hr = IDispatch_Invoke(pDispatch, DISPID_TM_PROP_WITH_LCID, &IID_NULL, 0x40c, DISPATCH_PROPERTYPUT, &dispparams, &varresult, &excepinfo, NULL); -todo_wine ok_ole_success(hr, ITypeInfo_Invoke); VariantClear(&varresult); @@ -1309,12 +1308,9 @@ todo_wine dispparams.rgvarg = NULL; dispparams.rgdispidNamedArgs = NULL; hr = IDispatch_Invoke(pDispatch, DISPID_TM_PROP_WITH_LCID, &IID_NULL, 0x40c, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); -todo_wine -{ ok_ole_success(hr, ITypeInfo_Invoke); ok(V_VT(&varresult) == VT_I4, "got %x\n", V_VT(&varresult)); ok(V_I4(&varresult) == 0x409, "got %x\n", V_I4(&varresult)); -} VariantClear(&varresult); /* test propget of INT value */ diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index be8462a..887c6be 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -930,6 +930,7 @@ typedef struct tagITypeLibImpl const ITypeCompVtbl *lpVtblTypeComp; LONG ref; TLIBATTR LibAttr; /* guid,lcid,syskind,version,flags */ + LCID lcid; /* strings can be stored in tlb as multibyte strings BUT they are *always* * exported to the application as a UNICODE string. @@ -2878,6 +2879,8 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) pTypeLibImpl->LibAttr.wMinorVerNum = HIWORD(tlbHeader.version); pTypeLibImpl->LibAttr.wLibFlags = (WORD) tlbHeader.flags & 0xffff;/* check mask */ + pTypeLibImpl->lcid = tlbHeader.lcid; + /* name, eventually add to a hash table */ pTypeLibImpl->Name = MSFT_ReadName(&cx, tlbHeader.NameOffset); @@ -3099,9 +3102,9 @@ static DWORD SLTG_ReadLibBlk(LPVOID pLibBlk, ITypeLibImpl *pTypeLibImpl) ptr += 2; if(SUBLANGID(*(WORD*)ptr) == SUBLANG_NEUTRAL) - pTypeLibImpl->LibAttr.lcid = MAKELCID(MAKELANGID(PRIMARYLANGID(*(WORD*)ptr),0),0); + pTypeLibImpl->lcid = pTypeLibImpl->LibAttr.lcid = MAKELCID(MAKELANGID(PRIMARYLANGID(*(WORD*)ptr),0),0); else - pTypeLibImpl->LibAttr.lcid = 0; + pTypeLibImpl->lcid = pTypeLibImpl->LibAttr.lcid = 0; ptr += 2; ptr += 4; /* skip res12 */ @@ -6063,6 +6066,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( VARTYPE *rgvt = INVBUF_GET_ARG_TYPE_ARRAY(buffer, func_desc->cParams); UINT cNamedArgs = pDispParams->cNamedArgs; DISPID *rgdispidNamedArgs = pDispParams->rgdispidNamedArgs; + UINT vargs_converted=0; hres = S_OK; @@ -6100,6 +6104,15 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( USHORT wParamFlags = func_desc->lprgelemdescParam[i].u.paramdesc.wParamFlags; VARIANTARG *src_arg; + if (wParamFlags & PARAMFLAG_FLCID) + { + VARIANTARG *arg; + arg = prgpvarg[i] = &rgvarg[i]; + V_VT(arg) = VT_I4; + V_I4(arg) = This->pTypeLib->lcid; + continue; + } + if (cNamedArgs) { USHORT j; @@ -6112,7 +6125,10 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( } } else - src_arg = i < pDispParams->cArgs ? &pDispParams->rgvarg[pDispParams->cArgs - 1 - i] : NULL; + { + src_arg = vargs_converted < pDispParams->cArgs ? &pDispParams->rgvarg[pDispParams->cArgs - 1 - vargs_converted] : NULL; + vargs_converted++; + } if (wParamFlags & PARAMFLAG_FRETVAL) { @@ -6278,10 +6294,15 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( V_VT(&varresult), func_desc->cParams, rgvt, prgpvarg, &varresult); + vargs_converted = 0; + for (i = 0; i < func_desc->cParams; i++) { USHORT wParamFlags = func_desc->lprgelemdescParam[i].u.paramdesc.wParamFlags; - if (wParamFlags & PARAMFLAG_FRETVAL) + + if (wParamFlags & PARAMFLAG_FLCID) + continue; + else if (wParamFlags & PARAMFLAG_FRETVAL) { if (TRACE_ON(ole)) { @@ -6309,11 +6330,11 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( } break; } - else if (i < pDispParams->cArgs) + else if (vargs_converted < pDispParams->cArgs) { if (wParamFlags & PARAMFLAG_FOUT) { - VARIANTARG *arg = &pDispParams->rgvarg[pDispParams->cArgs - 1 - i]; + VARIANTARG *arg = &pDispParams->rgvarg[pDispParams->cArgs - 1 - vargs_converted]; if ((rgvt[i] == VT_BYREF) && (V_VT(arg) != VT_BYREF)) hres = VariantChangeType(arg, &rgvarg[i], 0, V_VT(arg)); @@ -6321,7 +6342,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( if (FAILED(hres)) { ERR("failed to convert param %d to vt %d\n", i, - V_VT(&pDispParams->rgvarg[pDispParams->cArgs - 1 - i])); + V_VT(&pDispParams->rgvarg[pDispParams->cArgs - 1 - vargs_converted])); break; } } @@ -6354,6 +6375,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( } } VariantClear(&rgvarg[i]); + vargs_converted++; } else if (wParamFlags & PARAMFLAG_FOPT) {

1 0

Vladimir Pankratov : urlmon: Handle NULL parameter.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: 1327ae0c74dd59861bdaf80e0cdbf3e1d7e1f75f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1327ae0c74dd59861bdaf80e0… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Wed Sep 2 16:12:03 2009 +0500 urlmon: Handle NULL parameter. --- dlls/urlmon/tests/misc.c | 9 +++++++++ dlls/urlmon/urlmon_main.c | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 327b90d..5b59626 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1326,6 +1326,14 @@ static void test_MkParseDisplayNameEx(void) IBindCtx_Release(bctx); } +static void test_IsValidURL(void) +{ + HRESULT hr; + + hr = IsValidURL(NULL, 0, 0); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); +} + START_TEST(misc) { OleInitialize(NULL); @@ -1345,6 +1353,7 @@ START_TEST(misc) test_UrlMkGetSessionOption(); test_user_agent(); test_MkParseDisplayNameEx(); + test_IsValidURL(); OleUninitialize(); } diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 3640adc..a420308 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -393,10 +393,10 @@ HRESULT WINAPI DllRegisterServerEx(void) HRESULT WINAPI IsValidURL(LPBC pBC, LPCWSTR szURL, DWORD dwReserved) { FIXME("(%p, %s, %d): stub\n", pBC, debugstr_w(szURL), dwReserved); - - if (pBC != NULL || dwReserved != 0) + + if (pBC || dwReserved || !szURL) return E_INVALIDARG; - + return S_OK; }

1 0

Ge van Geldorp : msvcrt/tests: Add acceptable error codes for W2K8+.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: d24a5a74b1cbb1e6d7ce0775c9471bb3ebb589c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d24a5a74b1cbb1e6d7ce0775c… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Wed Sep 2 12:16:29 2009 +0200 msvcrt/tests: Add acceptable error codes for W2K8+. --- dlls/msvcrt/tests/string.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 0999241..5a97bad 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -670,27 +670,28 @@ static void test_strtol(void) unsigned long ul; /* errno is only set in case of error, so reset errno to EBADF to check for errno modification */ + /* errno is modified on W2K8+ */ errno = EBADF; l = strtol("-1234", &e, 0); ok(l==-1234, "wrong value %ld\n", l); - ok(errno == EBADF, "wrong errno %d\n", errno); + ok(errno == EBADF || broken(errno == 0), "wrong errno %d\n", errno); errno = EBADF; ul = strtoul("1234", &e, 0); ok(ul==1234, "wrong value %lu\n", ul); - ok(errno == EBADF, "wrong errno %d\n", errno); + ok(errno == EBADF || broken(errno == 0), "wrong errno %d\n", errno); errno = EBADF; l = strtol("2147483647L", &e, 0); ok(l==2147483647, "wrong value %ld\n", l); - ok(errno == EBADF, "wrong errno %d\n", errno); + ok(errno == EBADF || broken(errno == 0), "wrong errno %d\n", errno); errno = EBADF; l = strtol("-2147483648L", &e, 0); ok(l==-2147483647L - 1, "wrong value %ld\n", l); - ok(errno == EBADF, "wrong errno %d\n", errno); + ok(errno == EBADF || broken(errno == 0), "wrong errno %d\n", errno); errno = EBADF; ul = strtoul("4294967295UL", &e, 0); ok(ul==4294967295ul, "wrong value %lu\n", ul); - ok(errno == EBADF, "wrong errno %d\n", errno); + ok(errno == EBADF || broken(errno == 0), "wrong errno %d\n", errno); errno = 0; l = strtol("9223372036854775807L", &e, 0);

1 0

Nikolay Sivov : comctl32/trackbar: Reduce parameter count for some helpers.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: 4845dc36e437c13a295bf3da0db346689144dd64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4845dc36e437c13a295bf3da0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Sep 2 16:16:52 2009 +0400 comctl32/trackbar: Reduce parameter count for some helpers. --- dlls/comctl32/trackbar.c | 52 +++++++++++++++++++++++----------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 2b9b064..979be11 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -185,12 +185,12 @@ static void TRACKBAR_RecalculateTics (TRACKBAR_INFO *infoPtr) (in range of trackbar) */ static inline LONG -TRACKBAR_ConvertPlaceToPosition (const TRACKBAR_INFO *infoPtr, int place, int vertical) +TRACKBAR_ConvertPlaceToPosition (const TRACKBAR_INFO *infoPtr, int place) { double range, width, pos, offsetthumb; range = infoPtr->lRangeMax - infoPtr->lRangeMin; - if (vertical) { + if (infoPtr->dwStyle & TBS_VERT) { offsetthumb = (infoPtr->rcThumb.bottom - infoPtr->rcThumb.top)/2; width = infoPtr->rcChannel.bottom - infoPtr->rcChannel.top - (offsetthumb * 2) - 1; pos = (range*(place - infoPtr->rcChannel.top - offsetthumb)) / width; @@ -233,8 +233,8 @@ TRACKBAR_GetAutoPageDirection (const TRACKBAR_INFO *infoPtr, POINT clickPoint) { int clickPlace = (infoPtr->dwStyle & TBS_VERT) ? clickPoint.y : clickPoint.x; - LONG clickPos = TRACKBAR_ConvertPlaceToPosition(infoPtr, clickPlace, - infoPtr->dwStyle & TBS_VERT); + LONG clickPos = TRACKBAR_ConvertPlaceToPosition(infoPtr, clickPlace); + return clickPos - infoPtr->lPos; } @@ -469,7 +469,7 @@ TRACKBAR_AutoPage (TRACKBAR_INFO *infoPtr, POINT clickPoint) /* Trackbar drawing code. I like my spaghetti done milanese. */ static void -TRACKBAR_DrawChannel (const TRACKBAR_INFO *infoPtr, HDC hdc, DWORD dwStyle) +TRACKBAR_DrawChannel (const TRACKBAR_INFO *infoPtr, HDC hdc) { RECT rcChannel = infoPtr->rcChannel; HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); @@ -483,7 +483,7 @@ TRACKBAR_DrawChannel (const TRACKBAR_INFO *infoPtr, HDC hdc, DWORD dwStyle) else { DrawEdge (hdc, &rcChannel, EDGE_SUNKEN, BF_RECT | BF_ADJUST); - if (dwStyle & TBS_ENABLESELRANGE) { /* fill the channel */ + if (infoPtr->dwStyle & TBS_ENABLESELRANGE) { /* fill the channel */ FillRect (hdc, &rcChannel, GetStockObject(WHITE_BRUSH)); if (TRACKBAR_HasSelection(infoPtr)) FillRect (hdc, &infoPtr->rcSelection, GetSysColorBrush(COLOR_HIGHLIGHT)); @@ -577,17 +577,17 @@ TRACKBAR_DrawTic (const TRACKBAR_INFO *infoPtr, HDC hdc, LONG ticPos, int flags) } static void -TRACKBAR_DrawTics (const TRACKBAR_INFO *infoPtr, HDC hdc, DWORD dwStyle) +TRACKBAR_DrawTics (const TRACKBAR_INFO *infoPtr, HDC hdc) { unsigned int i; - int ticFlags = dwStyle & 0x0f; + int ticFlags = infoPtr->dwStyle & 0x0f; LOGPEN ticPen = { PS_SOLID, {1, 0}, GetSysColor (COLOR_3DDKSHADOW) }; HPEN hOldPen, hTicPen; HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); if (theme) { - int part = (dwStyle & TBS_VERT) ? TKP_TICSVERT : TKP_TICS; + int part = (infoPtr->dwStyle & TBS_VERT) ? TKP_TICSVERT : TKP_TICS; GetThemeColor (theme, part, TSS_NORMAL, TMT_COLOR, &ticPen.lopnColor); } /* create the pen to draw the tics with */ @@ -601,7 +601,7 @@ TRACKBAR_DrawTics (const TRACKBAR_INFO *infoPtr, HDC hdc, DWORD dwStyle) TRACKBAR_DrawTic (infoPtr, hdc, infoPtr->lRangeMin, ticFlags | TIC_EDGE); TRACKBAR_DrawTic (infoPtr, hdc, infoPtr->lRangeMax, ticFlags | TIC_EDGE); - if ((dwStyle & TBS_ENABLESELRANGE) && TRACKBAR_HasSelection(infoPtr)) { + if ((infoPtr->dwStyle & TBS_ENABLESELRANGE) && TRACKBAR_HasSelection(infoPtr)) { TRACKBAR_DrawTic (infoPtr, hdc, infoPtr->lSelMin, ticFlags | TIC_SELECTIONMARKMIN); TRACKBAR_DrawTic (infoPtr, hdc, infoPtr->lSelMax, @@ -616,7 +616,7 @@ TRACKBAR_DrawTics (const TRACKBAR_INFO *infoPtr, HDC hdc, DWORD dwStyle) } static void -TRACKBAR_DrawThumb (const TRACKBAR_INFO *infoPtr, HDC hdc, DWORD dwStyle) +TRACKBAR_DrawThumb (const TRACKBAR_INFO *infoPtr, HDC hdc) { HBRUSH oldbr; HPEN oldpen; @@ -632,14 +632,14 @@ TRACKBAR_DrawThumb (const TRACKBAR_INFO *infoPtr, HDC hdc, DWORD dwStyle) { int partId; int stateId; - if (dwStyle & TBS_BOTH) - partId = (dwStyle & TBS_VERT) ? TKP_THUMBVERT : TKP_THUMB; - else if (dwStyle & TBS_LEFT) - partId = (dwStyle & TBS_VERT) ? TKP_THUMBLEFT : TKP_THUMBTOP; + if (infoPtr->dwStyle & TBS_BOTH) + partId = (infoPtr->dwStyle & TBS_VERT) ? TKP_THUMBVERT : TKP_THUMB; + else if (infoPtr->dwStyle & TBS_LEFT) + partId = (infoPtr->dwStyle & TBS_VERT) ? TKP_THUMBLEFT : TKP_THUMBTOP; else - partId = (dwStyle & TBS_VERT) ? TKP_THUMBRIGHT : TKP_THUMBBOTTOM; + partId = (infoPtr->dwStyle & TBS_VERT) ? TKP_THUMBRIGHT : TKP_THUMBBOTTOM; - if (dwStyle & WS_DISABLED) + if (infoPtr->dwStyle & WS_DISABLED) stateId = TUS_DISABLED; else if (infoPtr->flags & TB_DRAG_MODE) stateId = TUS_PRESSED; @@ -657,7 +657,7 @@ TRACKBAR_DrawThumb (const TRACKBAR_INFO *infoPtr, HDC hdc, DWORD dwStyle) oldbr = SelectObject (hdc, GetSysColorBrush(fillClr)); SetPolyFillMode (hdc, WINDING); - if (dwStyle & TBS_BOTH) + if (infoPtr->dwStyle & TBS_BOTH) { points[0].x=thumb.right; points[0].y=thumb.top; @@ -674,10 +674,10 @@ TRACKBAR_DrawThumb (const TRACKBAR_INFO *infoPtr, HDC hdc, DWORD dwStyle) } else { - if (dwStyle & TBS_VERT) + if (infoPtr->dwStyle & TBS_VERT) { PointDepth = (thumb.bottom - thumb.top) / 2; - if (dwStyle & TBS_LEFT) + if (infoPtr->dwStyle & TBS_LEFT) { points[0].x=thumb.right; points[0].y=thumb.top; @@ -712,7 +712,7 @@ TRACKBAR_DrawThumb (const TRACKBAR_INFO *infoPtr, HDC hdc, DWORD dwStyle) else { PointDepth = (thumb.right - thumb.left) / 2; - if (dwStyle & TBS_TOP) + if (infoPtr->dwStyle & TBS_TOP) { points[0].x=(thumb.right - thumb.left) / 2 + thumb.left + 1; points[0].y=thumb.top; @@ -885,7 +885,7 @@ TRACKBAR_Refresh (TRACKBAR_INFO *infoPtr, HDC hdcDst) icdrf = notify_customdraw(infoPtr, &nmcd, CDDS_ITEMPREPAINT); } else icdrf = CDRF_DODEFAULT; if ( !(icdrf & CDRF_SKIPDEFAULT) ) { - TRACKBAR_DrawChannel (infoPtr, hdc, infoPtr->dwStyle); + TRACKBAR_DrawChannel (infoPtr, hdc); if (icdrf & CDRF_NOTIFYPOSTPAINT) notify_customdraw(infoPtr, &nmcd, CDDS_ITEMPOSTPAINT); } @@ -900,7 +900,7 @@ TRACKBAR_Refresh (TRACKBAR_INFO *infoPtr, HDC hdcDst) icdrf = notify_customdraw(infoPtr, &nmcd, CDDS_ITEMPREPAINT); } else icdrf = CDRF_DODEFAULT; if ( !(icdrf & CDRF_SKIPDEFAULT) ) { - TRACKBAR_DrawTics (infoPtr, hdc, infoPtr->dwStyle); + TRACKBAR_DrawTics (infoPtr, hdc); if (icdrf & CDRF_NOTIFYPOSTPAINT) notify_customdraw(infoPtr, &nmcd, CDDS_ITEMPOSTPAINT); } @@ -915,7 +915,7 @@ TRACKBAR_Refresh (TRACKBAR_INFO *infoPtr, HDC hdcDst) icdrf = notify_customdraw(infoPtr, &nmcd, CDDS_ITEMPREPAINT); } else icdrf = CDRF_DODEFAULT; if ( !(icdrf & CDRF_SKIPDEFAULT) ) { - TRACKBAR_DrawThumb(infoPtr, hdc, infoPtr->dwStyle); + TRACKBAR_DrawThumb(infoPtr, hdc); if (icdrf & CDRF_NOTIFYPOSTPAINT) notify_customdraw(infoPtr, &nmcd, CDDS_ITEMPOSTPAINT); } @@ -1648,8 +1648,8 @@ TRACKBAR_MouseMove (TRACKBAR_INFO *infoPtr, INT x, INT y) return TRUE; } - dragPos = TRACKBAR_ConvertPlaceToPosition (infoPtr, clickPlace, - infoPtr->dwStyle & TBS_VERT); + dragPos = TRACKBAR_ConvertPlaceToPosition (infoPtr, clickPlace); + if (dragPos == oldPos) return TRUE; infoPtr->lPos = dragPos;

1 0

Nikolay Sivov : comctl32/trackbar: Cache window style.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: 6f395805b18205cd6f9079c9aff35736871d0482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f395805b18205cd6f9079c9a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Sep 2 16:02:59 2009 +0400 comctl32/trackbar: Cache window style. --- dlls/comctl32/trackbar.c | 114 +++++++++++++++++++++++---------------------- 1 files changed, 58 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f395805b18205cd6f907…

1 0

Nikolay Sivov : comctl32/trackbar: Fix tic count calculation.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: 42c83b9dc7b5094384e718926eddd4b297c7bbae URL: http://source.winehq.org/git/wine.git/?a=commit;h=42c83b9dc7b5094384e718926… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Sep 2 15:43:21 2009 +0400 comctl32/trackbar: Fix tic count calculation. --- dlls/comctl32/tests/trackbar.c | 25 +++++++++++++++++++++---- dlls/comctl32/trackbar.c | 13 +++++++------ 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 9454a5c..68fdb96 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -30,6 +30,7 @@ #define PARENT_SEQ_INDEX 0 #define TRACKBAR_SEQ_INDEX 1 +HWND hWndParent; static struct msg_sequence *sequences[NUM_MSG_SEQUENCE]; @@ -846,9 +847,7 @@ static void test_tic_placement(HWND hWndTrackbar){ r = SendMessage(hWndTrackbar, TBM_GETTIC, 2,0); expect(4, r); r = SendMessage(hWndTrackbar, TBM_GETTIC, 4,0); - todo_wine{ - expect(-1, r); - } + expect(-1, r); /* test TBM_GETTICPIC */ r = SendMessage(hWndTrackbar, TBM_GETTICPOS, 0, 0); @@ -967,11 +966,27 @@ static void test_ignore_selection(HWND hWndTrackbar){ ok_sequence(sequences, PARENT_SEQ_INDEX, parent_empty_test_seq, "parent ignore selection setting test sequence", FALSE); } +static void test_initial_state(void) +{ + HWND hWnd; + DWORD ret; + + hWnd = create_trackbar(0, hWndParent); + + ret = SendMessage(hWnd, TBM_GETNUMTICS, 0, 0); + expect(2, ret); + ret = SendMessage(hWnd, TBM_GETTIC, 0, 0); + expect(-1, ret); + ret = SendMessage(hWnd, TBM_GETTICPOS, 0, 0); + expect(-1, ret); + + DestroyWindow(hWnd); +} + START_TEST(trackbar) { DWORD style = WS_VISIBLE | TBS_TOOLTIPS | TBS_ENABLESELRANGE | TBS_FIXEDLENGTH | TBS_AUTOTICKS; HWND hWndTrackbar; - HWND hWndParent; init_msg_sequences(sequences, NUM_MSG_SEQUENCE); InitCommonControls(); @@ -1036,5 +1051,7 @@ START_TEST(trackbar) DestroyWindow(hWndTrackbar); + test_initial_state(); + DestroyWindow(hWndParent); } diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 849ebcd..3e991ff 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -151,8 +151,12 @@ static void TRACKBAR_RecalculateTics (TRACKBAR_INFO *infoPtr) int tic; unsigned nrTics, i; - if (infoPtr->uTicFreq && infoPtr->lRangeMax >= infoPtr->lRangeMin) - nrTics=(infoPtr->lRangeMax - infoPtr->lRangeMin)/infoPtr->uTicFreq; + if (infoPtr->uTicFreq && infoPtr->lRangeMax >= infoPtr->lRangeMin) { + nrTics=(infoPtr->lRangeMax - infoPtr->lRangeMin)/infoPtr->uTicFreq; + /* don't add extra tic if there's no remainder */ + if ((infoPtr->lRangeMax - infoPtr->lRangeMin) % infoPtr->uTicFreq == 0) + nrTics--; + } else { Free (infoPtr->tics); infoPtr->tics = NULL; @@ -1042,10 +1046,7 @@ TRACKBAR_GetNumTics (const TRACKBAR_INFO *infoPtr) if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_NOTICKS) return 0; - if(infoPtr->uNumTics == 0) - return 2; - else - return infoPtr->uNumTics + 1; + return infoPtr->uNumTics + 2; }

1 0