August 2011 - Wine-commits - list.winehq.org

Aric Stewart : usp10: When calling ShapeIndicSyllables we need to use cChars which is the actual number of original characters .
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: 8b14f3f542a38d32317ec766c7513bef21c7beaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b14f3f542a38d32317ec766c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Aug 29 14:55:04 2011 -0500 usp10: When calling ShapeIndicSyllables we need to use cChars which is the actual number of original characters. --- dlls/usp10/shape.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 0068b41..499829f 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -2417,7 +2417,7 @@ static void ContextualShape_Sinhala(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS * /* Step 4: Base Form application to syllables */ GetGlyphIndicesW(hdc, input, cCount, pwOutGlyphs, 0); *pcGlyphs = cCount; - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, sinhala_lex, NULL, TRUE); + ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, sinhala_lex, NULL, TRUE); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2474,7 +2474,7 @@ static void ContextualShape_Devanagari(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSI *pcGlyphs = cCount; /* Step 3: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, devanagari_lex, NULL, modern); + ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, devanagari_lex, NULL, modern); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2544,7 +2544,7 @@ static void ContextualShape_Bengali(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS * } /* Step 4: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, bengali_lex, NULL, modern); + ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, bengali_lex, NULL, modern); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2592,7 +2592,7 @@ static void ContextualShape_Gurmukhi(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *pcGlyphs = cCount; /* Step 3: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, gurmukhi_lex, NULL, modern); + ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, gurmukhi_lex, NULL, modern); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2632,7 +2632,7 @@ static void ContextualShape_Gujarati(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *pcGlyphs = cCount; /* Step 2: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, gujarati_lex, NULL, modern); + ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, gujarati_lex, NULL, modern); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2688,7 +2688,7 @@ static void ContextualShape_Oriya(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps *pcGlyphs = cCount; /* Step 3: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, oriya_lex, NULL, modern); + ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, oriya_lex, NULL, modern); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2738,7 +2738,7 @@ static void ContextualShape_Tamil(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps *pcGlyphs = cCount; /* Step 3: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, tamil_lex, SecondReorder_Like_Tamil, modern); + ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, tamil_lex, SecondReorder_Like_Tamil, modern); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2787,7 +2787,7 @@ static void ContextualShape_Telugu(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p *pcGlyphs = cCount; /* Step 3: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, telugu_lex, SecondReorder_Like_Telugu, modern); + ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, telugu_lex, SecondReorder_Like_Telugu, modern); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2839,7 +2839,7 @@ static void ContextualShape_Kannada(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS * *pcGlyphs = cCount; /* Step 3: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, kannada_lex, SecondReorder_Like_Telugu, modern); + ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, kannada_lex, SecondReorder_Like_Telugu, modern); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2884,7 +2884,7 @@ static void ContextualShape_Malayalam(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *pcGlyphs = cCount; /* Step 3: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, malayalam_lex, SecondReorder_Like_Tamil, modern); + ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, malayalam_lex, SecondReorder_Like_Tamil, modern); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables);

1 0

Andrew Talbot : shell32: Remove unneeded address-of operators from function name.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: 2e4224fe2c878cf3acca77d5979f7076ccf772c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e4224fe2c878cf3acca77d59… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Aug 29 22:36:16 2011 +0100 shell32: Remove unneeded address-of operators from function name. --- dlls/shell32/shv_item_cmenu.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index 2dd8cd6..245bbd4 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -382,7 +382,7 @@ static BOOL DoCopyOrCut(ItemCmImpl *This, HWND hwnd, BOOL bCut) * Used by DoOpenProperties through SHCreatePropSheetExtArrayEx to add * propertysheet pages from shell extensions. */ -static BOOL Properties_AddPropSheetCallback(HPROPSHEETPAGE hpage, LPARAM lparam) +static BOOL CALLBACK Properties_AddPropSheetCallback(HPROPSHEETPAGE hpage, LPARAM lparam) { LPPROPSHEETHEADERW psh = (LPPROPSHEETHEADERW) lparam; psh->u3.phpage[psh->nPages++] = hpage; @@ -476,17 +476,13 @@ static void DoOpenProperties(ItemCmImpl *This, HWND hwnd) hpsxa = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, wszFiletype, MAX_PROP_PAGES - psh.nPages, lpDo); if (hpsxa != NULL) { - SHAddFromPropSheetExtArray((HPSXA)hpsxa, - (LPFNADDPROPSHEETPAGE)&Properties_AddPropSheetCallback, - (LPARAM)&psh); + SHAddFromPropSheetExtArray(hpsxa, Properties_AddPropSheetCallback, (LPARAM)&psh); SHDestroyPropSheetExtArray(hpsxa); } hpsxa = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, wszFiletypeAll, MAX_PROP_PAGES - psh.nPages, lpDo); if (hpsxa != NULL) { - SHAddFromPropSheetExtArray((HPSXA)hpsxa, - (LPFNADDPROPSHEETPAGE)&Properties_AddPropSheetCallback, - (LPARAM)&psh); + SHAddFromPropSheetExtArray(hpsxa, Properties_AddPropSheetCallback, (LPARAM)&psh); SHDestroyPropSheetExtArray(hpsxa); } IDataObject_Release(lpDo);

1 0

Andrew Talbot : wined3d: Remove unneeded address-of operators from function names.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: 094dd38b007345979ce6a146ca214a5da092d305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=094dd38b007345979ce6a146c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Aug 29 22:36:22 2011 +0100 wined3d: Remove unneeded address-of operators from function names. --- dlls/wined3d/utils.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=094dd38b007345979ce6a…

1 0

Andrew Talbot : comctl32: Remove unneeded address-of operator from function name.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: 92c408cd66bebfd08b7ada328545090d1d916975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92c408cd66bebfd08b7ada328… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Aug 29 22:36:10 2011 +0100 comctl32: Remove unneeded address-of operator from function name. --- dlls/comctl32/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index bcfd173..cc997c1 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2594,7 +2594,7 @@ static INT LISTVIEW_MapIdToIndex(const LISTVIEW_INFO *infoPtr, UINT iID) if (infoPtr->nItemCount == 0) return -1; ID.id = iID; - index = DPA_Search(infoPtr->hdpaItemIds, &ID, -1, &MapIdSearchCompare, 0, DPAS_SORTED); + index = DPA_Search(infoPtr->hdpaItemIds, &ID, -1, MapIdSearchCompare, 0, DPAS_SORTED); if (index != -1) {

1 0

Andrew Talbot : winex11.drv: Remove unneeded address-of operator from function name.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: 42df50ab662b50fbc3c2d9b3a0850be1ea417918 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42df50ab662b50fbc3c2d9b3a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Aug 29 22:36:29 2011 +0100 winex11.drv: Remove unneeded address-of operator from function name. --- dlls/winex11.drv/clipboard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index cda8f9e..caf2406 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2574,7 +2574,7 @@ int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) else { HANDLE event = CreateEventW(NULL, FALSE, FALSE, NULL); - selectionThread = CreateThread(NULL, 0, &selection_thread_proc, event, 0, NULL); + selectionThread = CreateThread(NULL, 0, selection_thread_proc, event, 0, NULL); if (!selectionThread) {

1 0

Michael Stefaniuc : ole32: COM cleanup in filemoniker.c.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: 70c038dc2f5287da3e9dce469da9a7872736626a URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c038dc2f5287da3e9dce469… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 30 00:36:57 2011 +0200 ole32: COM cleanup in filemoniker.c. --- dlls/ole32/filemoniker.c | 82 +++++++++++++++++++++------------------------- 1 files changed, 37 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70c038dc2f5287da3e9dc…

1 0

Alexandre Julliard : gdi32: Store the initial bitmap bits with DIB alignment.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: a13df5ce6c15df1e14ee7e05f943b3faa31a720a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a13df5ce6c15df1e14ee7e05f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 29 15:09:45 2011 +0200 gdi32: Store the initial bitmap bits with DIB alignment. --- dlls/gdi32/bitmap.c | 74 +++++++++++++++++++++++++++++++++++++------------- 1 files changed, 55 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index e5008fb..226f358 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -87,7 +87,7 @@ DWORD nulldrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, src->y -= src->visrect.top; offset_rect( &src->visrect, 0, -src->visrect.top ); - if (bmp->bitmap.bmBits && bmp->bitmap.bmWidthBytes == width_bytes) + if (bmp->bitmap.bmBits) { bits->ptr = (char *)bmp->bitmap.bmBits + src->visrect.top * width_bytes; bits->is_copy = FALSE; @@ -95,20 +95,10 @@ DWORD nulldrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, } else { - bits->ptr = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ); + /* return all-zero bits */ + bits->ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, info->bmiHeader.biSizeImage ); bits->is_copy = TRUE; bits->free = free_heap_bits; - if (bmp->bitmap.bmBits) - { - /* fixup the line alignment */ - char *src = bmp->bitmap.bmBits, *dst = bits->ptr; - for ( ; height > 0; height--, src += bmp->bitmap.bmWidthBytes, dst += width_bytes) - { - memcpy( dst, src, bmp->bitmap.bmWidthBytes ); - memset( dst + bmp->bitmap.bmWidthBytes, 0, width_bytes - bmp->bitmap.bmWidthBytes ); - } - } - else memset( bits->ptr, 0, info->bmiHeader.biSizeImage ); } done: GDI_ReleaseObj( hbitmap ); @@ -153,12 +143,13 @@ DWORD nulldrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *inf } if (!bmp->bitmap.bmBits && - !(bmp->bitmap.bmBits = HeapAlloc( GetProcessHeap(), 0, - bmp->bitmap.bmHeight * bmp->bitmap.bmWidthBytes ))) + !(bmp->bitmap.bmBits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, + bmp->bitmap.bmHeight * width_bytes ))) { GDI_ReleaseObj( hbitmap ); return ERROR_OUTOFMEMORY; } + dst_bits = (unsigned char *)bmp->bitmap.bmBits + dst->visrect.top * width_bytes; src_bits = bits->ptr; if (info->bmiHeader.biHeight > 0) { @@ -168,14 +159,13 @@ DWORD nulldrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *inf else src_bits += src->visrect.top * width_bytes; - dst_bits = (unsigned char *)bmp->bitmap.bmBits + dst->visrect.top * bmp->bitmap.bmWidthBytes; if (width_bytes != bmp->bitmap.bmWidthBytes) { for (i = 0; i < dst->visrect.bottom - dst->visrect.top; i++) { - memcpy( dst_bits, src_bits, min( abs(width_bytes), bmp->bitmap.bmWidthBytes )); + memcpy( dst_bits, src_bits, bmp->bitmap.bmWidthBytes ); src_bits += width_bytes; - dst_bits += bmp->bitmap.bmWidthBytes; + dst_bits += abs(width_bytes); } } else memcpy( dst_bits, src_bits, width_bytes * (dst->visrect.bottom - dst->visrect.top) ); @@ -691,8 +681,54 @@ HBITMAP BITMAP_CopyBitmap(HBITMAP hbitmap) static void set_initial_bitmap_bits( HBITMAP hbitmap, BITMAPOBJ *bmp ) { + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *info = (BITMAPINFO *)buffer; + DWORD err; + int width_bytes; + struct bitblt_coords src, dst; + struct gdi_image_bits bits; + if (!bmp->bitmap.bmBits) return; - SetBitmapBits( hbitmap, bmp->bitmap.bmHeight * bmp->bitmap.bmWidthBytes, bmp->bitmap.bmBits ); + if (bmp->funcs->pPutImage == nulldrv_PutImage) return; + + width_bytes = get_dib_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); + + src.visrect.left = src.x = 0; + src.visrect.top = src.y = 0; + src.visrect.right = src.width = bmp->bitmap.bmWidth; + src.visrect.bottom = src.height = bmp->bitmap.bmHeight; + dst = src; + + bits.ptr = bmp->bitmap.bmBits; + bits.is_copy = TRUE; + bits.free = free_heap_bits; + bmp->bitmap.bmBits = NULL; + + /* query the color info */ + info->bmiHeader.biSize = sizeof(info->bmiHeader); + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + info->bmiHeader.biWidth = 0; + info->bmiHeader.biHeight = 0; + info->bmiHeader.biSizeImage = 0; + err = bmp->funcs->pPutImage( NULL, hbitmap, 0, info, NULL, NULL, NULL, SRCCOPY ); + + if (!err || err == ERROR_BAD_FORMAT) + { + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; + info->bmiHeader.biWidth = bmp->bitmap.bmWidth; + info->bmiHeader.biHeight = -dst.height; + info->bmiHeader.biSizeImage = dst.height * width_bytes; + bmp->funcs->pPutImage( NULL, hbitmap, 0, info, &bits, &src, &dst, SRCCOPY ); + } + + if (bits.free) bits.free( &bits ); } /***********************************************************************

1 0

Alexandre Julliard : gdi32: Add a helper function to initialize DIB info from a bitmap object.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: 79ef408cd76d41c4d3ecfb0ac9f5534c8ea46503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ef408cd76d41c4d3ecfb0ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 29 15:26:50 2011 +0200 gdi32: Add a helper function to initialize DIB info from a bitmap object. --- dlls/gdi32/dibdrv/bitblt.c | 10 ++-------- dlls/gdi32/dibdrv/dc.c | 10 ++++++++-- dlls/gdi32/dibdrv/dibdrv.h | 1 + 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 646aaf0..563cb0a 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -621,10 +621,7 @@ DWORD dibdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, BITMAPOBJ *bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); if (!bmp) return ERROR_INVALID_HANDLE; - assert(bmp->dib); - - if (!init_dib_info( &stand_alone, &bmp->dib->dsBmih, bmp->dib->dsBitfields, - bmp->color_table, bmp->nb_colors, bmp->dib->dsBm.bmBits, 0 )) + if (!init_dib_info_from_bitmapobj( &stand_alone, bmp, 0 )) { ret = ERROR_BAD_FORMAT; goto done; @@ -722,10 +719,7 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info BITMAPOBJ *bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); if (!bmp) return ERROR_INVALID_HANDLE; - assert(bmp->dib); - - if (!init_dib_info( &stand_alone, &bmp->dib->dsBmih, bmp->dib->dsBitfields, - bmp->color_table, bmp->nb_colors, bmp->dib->dsBm.bmBits, 0 )) + if (!init_dib_info_from_bitmapobj( &stand_alone, bmp, 0 )) { ret = ERROR_BAD_FORMAT; goto done; diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 234f827..245e7c7 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -211,6 +211,13 @@ BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void * return init_dib_info( dib, &info->bmiHeader, bitfields, colors ? colorptr : NULL, colors, bits, flags ); } +BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_flags flags) +{ + assert(bmp->dib); + return init_dib_info( dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields, + bmp->color_table, bmp->nb_colors, bmp->dib->dsBm.bmBits, flags ); +} + static void clear_dib_info(dib_info *dib) { dib->color_table = NULL; @@ -368,8 +375,7 @@ static HBITMAP dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) clear_dib_info(&pdev->brush_dib); pdev->brush_and_bits = pdev->brush_xor_bits = NULL; - if(!init_dib_info(&pdev->dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields, - bmp->color_table, bmp->nb_colors, bmp->dib->dsBm.bmBits, private_color_table)) + if(!init_dib_info_from_bitmapobj(&pdev->dib, bmp, private_color_table)) pdev->defer |= DEFER_FORMAT; GDI_ReleaseObj( bitmap ); diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 2e555e3..23a59ee 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -80,6 +80,7 @@ extern BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD extern BOOL init_dib_info_from_packed(dib_info *dib, const BITMAPINFOHEADER *bi, WORD usage, HPALETTE pal) DECLSPEC_HIDDEN; extern BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits, enum dib_info_flags flags) DECLSPEC_HIDDEN; +extern BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_flags flags) DECLSPEC_HIDDEN; extern void free_dib_info(dib_info *dib) DECLSPEC_HIDDEN; extern void free_pattern_brush(dibdrv_physdev *pdev) DECLSPEC_HIDDEN; extern void copy_dib_color_info(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN;

1 0

Francois Gouget : services: Cleanup when a service fails to start so it is still fully considered to be stopped .
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: 9183a171f16aec2c5c2c0d2746d8a6e3a2d3e134 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9183a171f16aec2c5c2c0d274… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 29 19:52:45 2011 +0200 services: Cleanup when a service fails to start so it is still fully considered to be stopped. --- dlls/advapi32/tests/service.c | 25 ++++++++++------------- programs/services/services.c | 44 ++++++++++++++++++++++++++++------------ 2 files changed, 42 insertions(+), 27 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 9b6e313..044394a 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2065,7 +2065,7 @@ cleanup: CloseServiceHandle(scm_handle); } -static DWORD try_start_stop(SC_HANDLE svc_handle, const char* name, int todo, DWORD is_nt4) +static DWORD try_start_stop(SC_HANDLE svc_handle, const char* name, DWORD is_nt4) { BOOL ret; DWORD le1, le2; @@ -2082,24 +2082,21 @@ static DWORD try_start_stop(SC_HANDLE svc_handle, const char* name, int todo, DW ret = pQueryServiceStatusEx(svc_handle, SC_STATUS_PROCESS_INFO, (BYTE*)&statusproc, sizeof(statusproc), &needed); ok(ret, "%s: QueryServiceStatusEx() failed le=%u\n", name, GetLastError()); - todo_wine ok(statusproc.dwCurrentState == SERVICE_STOPPED, "%s: should be stopped state=%x\n", name, statusproc.dwCurrentState); - todo_wine ok(statusproc.dwProcessId == 0, "%s: ProcessId should be 0 instead of %x\n", name, statusproc.dwProcessId); + ok(statusproc.dwCurrentState == SERVICE_STOPPED, "%s: should be stopped state=%x\n", name, statusproc.dwCurrentState); + ok(statusproc.dwProcessId == 0, "%s: ProcessId should be 0 instead of %x\n", name, statusproc.dwProcessId); } ret = StartServiceA(svc_handle, 0, NULL); le2 = GetLastError(); ok(!ret, "%s: StartServiceA() should have failed\n", name); - if (todo) - todo_wine ok(le2 == le1, "%s: the second try should yield the same error: %u != %u\n", name, le1, le2); - else - ok(le2 == le1, "%s: the second try should yield the same error: %u != %u\n", name, le1, le2); + ok(le2 == le1, "%s: the second try should yield the same error: %u != %u\n", name, le1, le2); status.dwCurrentState = 0xdeadbeef; ret = ControlService(svc_handle, SERVICE_CONTROL_STOP, &status); le2 = GetLastError(); ok(!ret, "%s: ControlService() should have failed\n", name); todo_wine ok(le2 == ERROR_SERVICE_NOT_ACTIVE, "%s: %d != ERROR_SERVICE_NOT_ACTIVE\n", name, le2); - todo_wine ok(status.dwCurrentState == SERVICE_STOPPED || + ok(status.dwCurrentState == SERVICE_STOPPED || broken(is_nt4), /* NT4 returns a random value */ "%s: should be stopped state=%x\n", name, status.dwCurrentState); @@ -2153,14 +2150,14 @@ static void test_start_stop(void) ok(FALSE, "Could not create the service: %d\n", GetLastError()); goto cleanup; } - le = try_start_stop(svc_handle, displayname, 1, is_nt4); + le = try_start_stop(svc_handle, displayname, is_nt4); todo_wine ok(le == ERROR_SERVICE_DISABLED, "%d != ERROR_SERVICE_DISABLED\n", le); /* Then one with a bad path */ displayname = "Winetest Bad Path"; ret = ChangeServiceConfigA(svc_handle, SERVICE_NO_CHANGE, SERVICE_DEMAND_START, SERVICE_NO_CHANGE, "c:\\no_such_file.exe", NULL, NULL, NULL, NULL, NULL, displayname); ok(ret, "ChangeServiceConfig() failed le=%u\n", GetLastError()); - try_start_stop(svc_handle, displayname, 0, is_nt4); + try_start_stop(svc_handle, displayname, is_nt4); if (is_nt4) { @@ -2175,8 +2172,8 @@ static void test_start_stop(void) displayname = "Winetest Exit Service"; ret = ChangeServiceConfigA(svc_handle, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, cmd, NULL, NULL, NULL, NULL, NULL, displayname); ok(ret, "ChangeServiceConfig() failed le=%u\n", GetLastError()); - le = try_start_stop(svc_handle, displayname, 0, is_nt4); - todo_wine ok(le == ERROR_SERVICE_REQUEST_TIMEOUT, "%d != ERROR_SERVICE_REQUEST_TIMEOUT\n", le); + le = try_start_stop(svc_handle, displayname, is_nt4); + ok(le == ERROR_SERVICE_REQUEST_TIMEOUT, "%d != ERROR_SERVICE_REQUEST_TIMEOUT\n", le); /* And finally with a service that plays dead, forcing a timeout. * This time we will put no quotes. That should work too, even if there are @@ -2187,8 +2184,8 @@ static void test_start_stop(void) ret = ChangeServiceConfigA(svc_handle, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, cmd, NULL, NULL, NULL, NULL, NULL, displayname); ok(ret, "ChangeServiceConfig() failed le=%u\n", GetLastError()); - le = try_start_stop(svc_handle, displayname, 0, is_nt4); - todo_wine ok(le == ERROR_SERVICE_REQUEST_TIMEOUT, "%d != ERROR_SERVICE_REQUEST_TIMEOUT\n", le); + le = try_start_stop(svc_handle, displayname, is_nt4); + ok(le == ERROR_SERVICE_REQUEST_TIMEOUT, "%d != ERROR_SERVICE_REQUEST_TIMEOUT\n", le); cleanup: if (svc_handle) diff --git a/programs/services/services.c b/programs/services/services.c index 35edbba..742f17d 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -772,25 +772,43 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * { WINE_ERR("failed to create pipe for %s, error = %d\n", wine_dbgstr_w(service->name), GetLastError()); - scmdatabase_unlock_startup(service->db); - return GetLastError(); + err = GetLastError(); } + else + { + err = service_start_process(service, &process_handle); + if (err == ERROR_SUCCESS) + { + if (!service_send_start_message(service, process_handle, service_argv, service_argc)) + err = ERROR_SERVICE_REQUEST_TIMEOUT; + } - err = service_start_process(service, &process_handle); + if (err == ERROR_SUCCESS) + err = service_wait_for_startup(service, process_handle); - if (err == ERROR_SUCCESS) - { - if (!service_send_start_message(service, process_handle, service_argv, service_argc)) - err = ERROR_SERVICE_REQUEST_TIMEOUT; + if (process_handle) + CloseHandle(process_handle); } if (err == ERROR_SUCCESS) - err = service_wait_for_startup(service, process_handle); - - if (process_handle) - CloseHandle(process_handle); - - ReleaseMutex(service->control_mutex); + ReleaseMutex(service->control_mutex); + else + { + CloseHandle(service->overlapped_event); + service->overlapped_event = NULL; + CloseHandle(service->status_changed_event); + service->status_changed_event = NULL; + CloseHandle(service->control_mutex); + service->control_mutex = NULL; + if (service->control_pipe != INVALID_HANDLE_VALUE) + CloseHandle(service->control_pipe); + service->control_pipe = INVALID_HANDLE_VALUE; + + service->status.dwProcessId = 0; + service_lock_exclusive(service); + service->status.dwCurrentState = SERVICE_STOPPED; + service_unlock(service); + } scmdatabase_unlock_startup(service->db); WINE_TRACE("returning %d\n", err);

1 0

Francois Gouget : services: Refuse to start disabled services.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: eafb44d4e1fd6ac455e9529b1d74385c2163b1f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eafb44d4e1fd6ac455e9529b1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 29 19:53:04 2011 +0200 services: Refuse to start disabled services. --- dlls/advapi32/tests/service.c | 2 +- programs/services/rpc.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 044394a..d2ef54d 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2151,7 +2151,7 @@ static void test_start_stop(void) goto cleanup; } le = try_start_stop(svc_handle, displayname, is_nt4); - todo_wine ok(le == ERROR_SERVICE_DISABLED, "%d != ERROR_SERVICE_DISABLED\n", le); + ok(le == ERROR_SERVICE_DISABLED, "%d != ERROR_SERVICE_DISABLED\n", le); /* Then one with a bad path */ displayname = "Winetest Bad Path"; diff --git a/programs/services/rpc.c b/programs/services/rpc.c index fe33ce1..573b748 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -961,6 +961,9 @@ DWORD __cdecl svcctl_StartServiceW( if ((err = validate_service_handle(hService, SERVICE_START, &service)) != 0) return err; + if (service->service_entry->config.dwStartType == SERVICE_DISABLED) + return ERROR_SERVICE_DISABLED; + err = service_start(service->service_entry, dwNumServiceArgs, lpServiceArgVectors); return err;

1 0