February 2017 - Wine-commits

Zebediah Figura : storage.dll16: Simplify operations in IStream16::Seek.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: 3085e7339210ce946481150f9dd55bb5b3c824a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3085e7339210ce946481150f9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 14 09:41:53 2017 -0600 storage.dll16: Simplify operations in IStream16::Seek. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/storage.dll16/storage.c | 63 ++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 37 deletions(-) diff --git a/dlls/storage.dll16/storage.c b/dlls/storage.dll16/storage.c index 74aa7f9..2ce3571 100644 --- a/dlls/storage.dll16/storage.c +++ b/dlls/storage.dll16/storage.c @@ -1179,44 +1179,33 @@ ULONG CDECL IStream16_fnRelease(IStream16 *iface) * Does not handle 64 bits */ HRESULT CDECL IStream16_fnSeek(IStream16 *iface, LARGE_INTEGER offset, DWORD whence, - ULARGE_INTEGER *newpos) + ULARGE_INTEGER *newpos) { - IStream16Impl *This = impl_from_IStream16(iface); - TRACE_(relay)("(%p)->([%d.%d],%d,%p)\n",This,offset.u.HighPart,offset.u.LowPart,whence,newpos); - - switch (whence) { - /* unix SEEK_xx should be the same as win95 ones */ - case SEEK_SET: - /* offset must be ==0 (<0 is invalid, and >0 cannot be handled - * right now. - */ - assert(offset.u.HighPart==0); - This->offset.u.HighPart = offset.u.HighPart; - This->offset.u.LowPart = offset.u.LowPart; - break; - case SEEK_CUR: - if (offset.u.HighPart < 0) { - /* FIXME: is this negation correct ? */ - offset.u.HighPart = -offset.u.HighPart; - offset.u.LowPart = (0xffffffff ^ offset.u.LowPart)+1; - - assert(offset.u.HighPart==0); - assert(This->offset.u.LowPart >= offset.u.LowPart); - This->offset.u.LowPart -= offset.u.LowPart; - } else { - assert(offset.u.HighPart==0); - This->offset.u.LowPart+= offset.u.LowPart; - } - break; - case SEEK_END: - assert(offset.u.HighPart==0); - This->offset.u.LowPart = This->stde.pps_size-offset.u.LowPart; - break; - } - if (This->offset.u.LowPart>This->stde.pps_size) - This->offset.u.LowPart=This->stde.pps_size; - if (newpos) *newpos = This->offset; - return S_OK; + IStream16Impl *This = impl_from_IStream16(iface); + TRACE_(relay)("(%p)->([%d.%d],%d,%p)\n",This,offset.u.HighPart,offset.u.LowPart,whence,newpos); + + switch (whence) { + case STREAM_SEEK_SET: + This->offset.QuadPart = offset.QuadPart; + break; + case STREAM_SEEK_CUR: + if ((offset.QuadPart < 0 && -offset.QuadPart > This->offset.QuadPart) || + (offset.QuadPart > 0 && -offset.QuadPart <= This->offset.QuadPart)) + return STG_E_INVALIDFUNCTION; + This->offset.QuadPart += offset.QuadPart; + break; + case STREAM_SEEK_END: + if (-offset.QuadPart > This->stde.pps_size) + return STG_E_INVALIDFUNCTION; + + This->offset.QuadPart = This->stde.pps_size + offset.QuadPart; + break; + } + + if (This->offset.QuadPart>This->stde.pps_size) + This->offset.QuadPart=This->stde.pps_size; + if (newpos) *newpos = This->offset; + return S_OK; } /******************************************************************************

1 0

Zebediah Figura : storage.dll16: Set OpenStorage/ OpenStream output to NULL on failure.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: 74ed392f85834555bc1f5fb235ccb54abaffbb38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74ed392f85834555bc1f5fb23… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Feb 11 17:40:11 2017 -0600 storage.dll16: Set OpenStorage/OpenStream output to NULL on failure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/storage.dll16/storage.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/storage.dll16/storage.c b/dlls/storage.dll16/storage.c index 2ce3571..cac616c 100644 --- a/dlls/storage.dll16/storage.c +++ b/dlls/storage.dll16/storage.c @@ -1859,11 +1859,13 @@ HRESULT CDECL IStorage16_fnOpenStorage(IStorage16 *iface, LPCOLESTR16 pwcsName, newpps = STORAGE_look_for_named_pps(&lpstg->str,This->stde.pps_dir,name); if (newpps==-1) { IStorage16_fnRelease(&lpstg->IStorage16_iface); + *ppstg = NULL; return E_FAIL; } if (1!=STORAGE_get_pps_entry(&lpstg->str,newpps,&(lpstg->stde))) { IStorage16_fnRelease(&lpstg->IStorage16_iface); + *ppstg = NULL; return E_FAIL; } lpstg->ppsent = newpps; @@ -1899,11 +1901,13 @@ HRESULT CDECL IStorage16_fnOpenStream(IStorage16 *iface, LPCOLESTR16 pwcsName, v newpps = STORAGE_look_for_named_pps(&lpstr->str,This->stde.pps_dir,name); if (newpps==-1) { IStream16_fnRelease(&lpstr->IStream16_iface); + *ppstm = NULL; return E_FAIL; } if (1!=STORAGE_get_pps_entry(&lpstr->str,newpps,&(lpstr->stde))) { IStream16_fnRelease(&lpstr->IStream16_iface); + *ppstm = NULL; return E_FAIL; } lpstr->offset.u.LowPart = 0;

1 0

Nikolay Sivov : comctl32/propsheet: Add helpers to do string duplication.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: 1a750f7b10c0acfbbb21b2b2272436f724b0b8c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a750f7b10c0acfbbb21b2b22… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 16 21:34:19 2017 +0300 comctl32/propsheet: Add helpers to do string duplication. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/propsheet.c | 84 +++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 50 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index caf7181..be787cd 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -177,6 +177,26 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); WINE_DEFAULT_DEBUG_CHANNEL(propsheet); +static WCHAR *heap_strdupW(const WCHAR *str) +{ + int len = strlenW(str) + 1; + WCHAR *ret = Alloc(len * sizeof(WCHAR)); + strcpyW(ret, str); + return ret; +} + +static WCHAR *heap_strdupAtoW(const char *str) +{ + WCHAR *ret; + INT len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, 0, 0); + ret = Alloc(len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + + return ret; +} + #define add_flag(a) if (dwFlags & a) {strcat(string, #a );strcat(string," ");} /****************************************************************************** * PROPSHEET_UnImplementedFlags @@ -270,23 +290,6 @@ static INT PROPSHEET_FindPageByResId(const PropSheetInfo * psInfo, LRESULT resId } /****************************************************************************** - * PROPSHEET_AtoW - * - * Convert ASCII to Unicode since all data is saved as Unicode. - */ -static void PROPSHEET_AtoW(LPCWSTR *tostr, LPCSTR frstr) -{ - INT len; - WCHAR *to; - - TRACE("<%s>\n", frstr); - len = MultiByteToWideChar(CP_ACP, 0, frstr, -1, 0, 0); - to = Alloc(len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, frstr, -1, to, len); - *tostr = to; -} - -/****************************************************************************** * PROPSHEET_CollectSheetInfoCommon * * Common code for PROPSHEET_CollectSheetInfoA/W @@ -374,12 +377,7 @@ static void PROPSHEET_CollectSheetInfoW(LPCPROPSHEETHEADERW lppsh, else { if (!IS_INTRESOURCE(lppsh->pszCaption)) - { - int len = strlenW(lppsh->pszCaption); - WCHAR *caption = Alloc( (len+1)*sizeof(WCHAR) ); - - psInfo->ppshheader.pszCaption = strcpyW( caption, lppsh->pszCaption ); - } + psInfo->ppshheader.pszCaption = heap_strdupW( lppsh->pszCaption ); } psInfo->nPages = lppsh->nPages; @@ -552,8 +550,6 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, WCHAR szTitle[256]; const WCHAR *pTitle; static const WCHAR pszNull[] = { '(','n','u','l','l',')',0 }; - WCHAR *text; - int len; if (IS_INTRESOURCE( lppsp->pszTitle )) { @@ -567,9 +563,7 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, else pTitle = lppsp->pszTitle; - len = strlenW(pTitle); - text = Alloc( (len+1)*sizeof (WCHAR) ); - psInfo->proppage[index].pszText = strcpyW( text, pTitle); + psInfo->proppage[index].pszText = heap_strdupW( pTitle ); } /* @@ -2945,15 +2939,15 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageA( if (ppsp->dwFlags & PSP_USEICONID) { if (!IS_INTRESOURCE( ppsp->u2.pszIcon )) - PROPSHEET_AtoW(&ppsp->u2.pszIcon, lpPropSheetPage->u2.pszIcon); + ppsp->u2.pszIcon = heap_strdupAtoW( lpPropSheetPage->u2.pszIcon ); } if (ppsp->dwFlags & PSP_USETITLE) { - if (!IS_INTRESOURCE( ppsp->pszTitle )) - PROPSHEET_AtoW( &ppsp->pszTitle, lpPropSheetPage->pszTitle ); - else + if (IS_INTRESOURCE( ppsp->pszTitle )) ppsp->pszTitle = load_string( ppsp->hInstance, ppsp->pszTitle ); + else + ppsp->pszTitle = heap_strdupAtoW( lpPropSheetPage->pszTitle ); } else ppsp->pszTitle = NULL; @@ -2963,20 +2957,20 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageA( if (ppsp->dwFlags & PSP_USEHEADERTITLE) { - if (!IS_INTRESOURCE( ppsp->pszHeaderTitle )) - PROPSHEET_AtoW(&ppsp->pszHeaderTitle, lpPropSheetPage->pszHeaderTitle); - else + if (IS_INTRESOURCE( ppsp->pszHeaderTitle )) ppsp->pszHeaderTitle = load_string( ppsp->hInstance, ppsp->pszHeaderTitle ); + else + ppsp->pszHeaderTitle = heap_strdupAtoW( lpPropSheetPage->pszHeaderTitle ); } else ppsp->pszHeaderTitle = NULL; if (ppsp->dwFlags & PSP_USEHEADERSUBTITLE) { - if (!IS_INTRESOURCE( ppsp->pszHeaderSubTitle )) - PROPSHEET_AtoW(&ppsp->pszHeaderSubTitle, lpPropSheetPage->pszHeaderSubTitle); - else + if (IS_INTRESOURCE( ppsp->pszHeaderSubTitle )) ppsp->pszHeaderSubTitle = load_string( ppsp->hInstance, ppsp->pszHeaderSubTitle ); + else + ppsp->pszHeaderSubTitle = heap_strdupAtoW( lpPropSheetPage->pszHeaderSubTitle ); } else ppsp->pszHeaderSubTitle = NULL; @@ -3000,23 +2994,13 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage if ( !(ppsp->dwFlags & PSP_DLGINDIRECT) ) { if (!IS_INTRESOURCE( ppsp->u.pszTemplate )) - { - int len = strlenW(lpPropSheetPage->u.pszTemplate) + 1; - WCHAR *template = Alloc( len * sizeof (WCHAR) ); - - ppsp->u.pszTemplate = strcpyW( template, lpPropSheetPage->u.pszTemplate ); - } + ppsp->u.pszTemplate = heap_strdupW( lpPropSheetPage->u.pszTemplate ); } if ( ppsp->dwFlags & PSP_USEICONID ) { if (!IS_INTRESOURCE( ppsp->u2.pszIcon )) - { - int len = strlenW(lpPropSheetPage->u2.pszIcon) + 1; - WCHAR *icon = Alloc( len * sizeof (WCHAR) ); - - ppsp->u2.pszIcon = strcpyW( icon, lpPropSheetPage->u2.pszIcon ); - } + ppsp->u2.pszIcon = heap_strdupW( lpPropSheetPage->u2.pszIcon ); } if (ppsp->dwFlags & PSP_USETITLE)

1 0

Nikolay Sivov : comctl32/propsheet: Implement PSM_SETHEADERTITLE.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: ce9c06be2b30b1218bb416c28d8f569fcaec3dd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce9c06be2b30b1218bb416c28… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 16 21:34:20 2017 +0300 comctl32/propsheet: Implement PSM_SETHEADERTITLE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/propsheet.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index be787cd..5fc1474 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -34,7 +34,6 @@ * - Messages: * o PSM_RECALCPAGESIZES * o PSM_SETHEADERSUBTITLE - * o PSM_SETHEADERTITLE * o WM_HELP * o WM_CONTEXTMENU * - Notifications: @@ -2497,17 +2496,37 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags) /****************************************************************************** * PROPSHEET_SetHeaderTitleW */ -static void PROPSHEET_SetHeaderTitleW(HWND hwndDlg, int iPageIndex, LPCWSTR pszHeaderTitle) +static void PROPSHEET_SetHeaderTitleW(HWND hwndDlg, UINT page_index, const WCHAR *title) { - FIXME("(%p, %d, %s): stub\n", hwndDlg, iPageIndex, debugstr_w(pszHeaderTitle)); + PropSheetInfo *psInfo = GetPropW(hwndDlg, PropSheetInfoStr); + PROPSHEETPAGEW *page; + + TRACE("(%p, %u, %s)\n", hwndDlg, page_index, debugstr_w(title)); + + if (page_index >= psInfo->nPages) + return; + + page = (PROPSHEETPAGEW *)psInfo->proppage[page_index].hpage; + + if (!IS_INTRESOURCE(page->pszHeaderTitle)) + Free((void *)page->pszHeaderTitle); + + page->pszHeaderTitle = heap_strdupW(title); + page->dwFlags |= PSP_USEHEADERTITLE; } /****************************************************************************** * PROPSHEET_SetHeaderTitleA */ -static void PROPSHEET_SetHeaderTitleA(HWND hwndDlg, int iPageIndex, LPCSTR pszHeaderTitle) +static void PROPSHEET_SetHeaderTitleA(HWND hwndDlg, UINT page_index, const char *title) { - FIXME("(%p, %d, %s): stub\n", hwndDlg, iPageIndex, debugstr_a(pszHeaderTitle)); + WCHAR *titleW; + + TRACE("(%p, %u, %s)\n", hwndDlg, page_index, debugstr_a(title)); + + titleW = heap_strdupAtoW(title); + PROPSHEET_SetHeaderTitleW(hwndDlg, page_index, titleW); + Free(titleW); } /****************************************************************************** @@ -3723,11 +3742,11 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) } case PSM_SETHEADERTITLEW: - PROPSHEET_SetHeaderTitleW(hwnd, (int)wParam, (LPCWSTR)lParam); + PROPSHEET_SetHeaderTitleW(hwnd, wParam, (LPCWSTR)lParam); return TRUE; case PSM_SETHEADERTITLEA: - PROPSHEET_SetHeaderTitleA(hwnd, (int)wParam, (LPCSTR)lParam); + PROPSHEET_SetHeaderTitleA(hwnd, wParam, (LPCSTR)lParam); return TRUE; case PSM_SETHEADERSUBTITLEW:

1 0

Piotr Caban : gdiplus: Make GpBitmap->bitmapbits access thread safe.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: 0eaaa1514454d584eb6638e0c7a31bb64bbc773b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eaaa1514454d584eb6638e0c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 14 10:24:36 2017 +0100 gdiplus: Make GpBitmap->bitmapbits access thread safe. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 14 ++++++++++++ dlls/gdiplus/image.c | 51 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index b44340f..2e98065 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -348,6 +348,7 @@ struct GpImage{ UINT frame_count, current_frame; ColorPalette *palette; REAL xres, yres; + LONG busy; }; struct GpMetafile{ @@ -515,4 +516,17 @@ GpStatus gdip_format_string(HDC hdc, void get_log_fontW(const GpFont *, GpGraphics *, LOGFONTW *) DECLSPEC_HIDDEN; +static inline BOOL image_lock(GpImage *image, BOOL *unlock) +{ + LONG tid = GetCurrentThreadId(), owner_tid; + owner_tid = InterlockedCompareExchange(&image->busy, tid, 0); + *unlock = !owner_tid; + return !owner_tid || owner_tid==tid; +} + +static inline void image_unlock(GpImage *image, BOOL unlock) +{ + if (unlock) image->busy = 0; +} + #endif diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 21d5a3a..4de8ecc 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1027,16 +1027,22 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, INT bitspp = PIXELFORMATBPP(format); GpRect act_rect; /* actual rect to be used */ GpStatus stat; + BOOL unlock; TRACE("%p %p %d 0x%x %p\n", bitmap, rect, flags, format, lockeddata); if(!lockeddata || !bitmap) return InvalidParameter; + if(!image_lock(&bitmap->image, &unlock)) + return ObjectBusy; if(rect){ if(rect->X < 0 || rect->Y < 0 || (rect->X + rect->Width > bitmap->width) || (rect->Y + rect->Height > bitmap->height) || !flags) + { + image_unlock(&bitmap->image, unlock); return InvalidParameter; + } act_rect = *rect; } @@ -1049,6 +1055,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, if(bitmap->lockmode) { WARN("bitmap is already locked and cannot be locked again\n"); + image_unlock(&bitmap->image, unlock); return WrongState; } @@ -1066,6 +1073,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, bitmap->lockmode = flags | ImageLockModeRead; bitmap->numlocks++; + image_unlock(&bitmap->image, unlock); return Ok; } @@ -1076,6 +1084,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, if (stat == NotImplemented) { FIXME("cannot read bitmap from %x to %x\n", bitmap->format, format); + image_unlock(&bitmap->image, unlock); return NotImplemented; } } @@ -1088,6 +1097,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, if (stat == NotImplemented) { FIXME("cannot write bitmap from %x to %x\n", format, bitmap->format); + image_unlock(&bitmap->image, unlock); return NotImplemented; } } @@ -1103,7 +1113,11 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, bitmap->bitmapbits = heap_alloc_zero(lockeddata->Stride * act_rect.Height); - if (!bitmap->bitmapbits) return OutOfMemory; + if (!bitmap->bitmapbits) + { + image_unlock(&bitmap->image, unlock); + return OutOfMemory; + } lockeddata->Scan0 = bitmap->bitmapbits; } @@ -1128,6 +1142,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, { heap_free(bitmap->bitmapbits); bitmap->bitmapbits = NULL; + image_unlock(&bitmap->image, unlock); return stat; } } @@ -1137,6 +1152,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, bitmap->lockx = act_rect.X; bitmap->locky = act_rect.Y; + image_unlock(&bitmap->image, unlock); return Ok; } @@ -1158,14 +1174,20 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, { GpStatus stat; static BOOL fixme = FALSE; + BOOL unlock; TRACE("(%p,%p)\n", bitmap, lockeddata); if(!bitmap || !lockeddata) return InvalidParameter; + if(!image_lock(&bitmap->image, &unlock)) + return ObjectBusy; if(!bitmap->lockmode) + { + image_unlock(&bitmap->image, unlock); return WrongState; + } if(!(lockeddata->Reserved & ImageLockModeWrite)){ if(!(--bitmap->numlocks)) @@ -1173,6 +1195,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, heap_free(bitmap->bitmapbits); bitmap->bitmapbits = NULL; + image_unlock(&bitmap->image, unlock); return Ok; } @@ -1181,6 +1204,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, /* we passed a direct reference; no need to do anything */ bitmap->lockmode = 0; bitmap->numlocks = 0; + image_unlock(&bitmap->image, unlock); return Ok; } @@ -1206,6 +1230,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, bitmap->lockmode = 0; bitmap->numlocks = 0; + image_unlock(&bitmap->image, unlock); return stat; } @@ -3746,6 +3771,7 @@ static GpStatus select_frame_wic(GpImage *image, UINT active_frame) if(status != Ok) return status; + new_image->busy = image->busy; memcpy(&new_image->format, &image->format, sizeof(GUID)); free_image_data(image); if (image->type == ImageTypeBitmap) @@ -4219,30 +4245,39 @@ GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage *image, GDIPCONST GUID *d { GpStatus stat; const struct image_codec *codec = NULL; + BOOL unlock; TRACE("(%p,%s,%u)\n", image, debugstr_guid(dimensionID), frame); if (!image || !dimensionID) return InvalidParameter; + if(!image_lock(image, &unlock)) + return ObjectBusy; if (frame >= image->frame_count) { WARN("requested frame %u, but image has only %u\n", frame, image->frame_count); + image_unlock(image, unlock); return InvalidParameter; } if (image->type != ImageTypeBitmap && image->type != ImageTypeMetafile) { WARN("invalid image type %d\n", image->type); + image_unlock(image, unlock); return InvalidParameter; } if (image->current_frame == frame) + { + image_unlock(image, unlock); return Ok; + } if (!image->decoder) { TRACE("image doesn't have an associated decoder\n"); + image_unlock(image, unlock); return Ok; } @@ -4251,10 +4286,13 @@ GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage *image, GDIPCONST GUID *d if (stat != Ok) { WARN("can't find decoder info\n"); + image_unlock(image, unlock); return stat; } - return codec->select_func(image, frame); + stat = codec->select_func(image, frame); + image_unlock(image, unlock); + return stat; } GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream *stream, GpImage **image) @@ -5264,11 +5302,14 @@ GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage *image, RotateFlipType type) UINT x, y, width, height; BitmapData src_lock, dst_lock; GpStatus stat; + BOOL unlock; TRACE("(%p, %u)\n", image, type); if (!image) return InvalidParameter; + if (!image_lock(image, &unlock)) + return ObjectBusy; rotate_90 = type&1; flip_x = (type&6) == 2 || (type&6) == 4; @@ -5277,6 +5318,7 @@ GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage *image, RotateFlipType type) if (image->type != ImageTypeBitmap) { FIXME("Not implemented for type %i\n", image->type); + image_unlock(image, unlock); return NotImplemented; } @@ -5286,6 +5328,7 @@ GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage *image, RotateFlipType type) if (bpp < 8) { FIXME("Not implemented for %i bit images\n", bpp); + image_unlock(image, unlock); return NotImplemented; } @@ -5305,7 +5348,10 @@ GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage *image, RotateFlipType type) stat = GdipCreateBitmapFromScan0(width, height, 0, bitmap->format, NULL, &new_bitmap); if (stat != Ok) + { + image_unlock(image, unlock); return stat; + } stat = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead, bitmap->format, &src_lock); @@ -5365,6 +5411,7 @@ GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage *image, RotateFlipType type) else GdipDisposeImage(&new_bitmap->image); + image_unlock(image, unlock); return stat; }

1 0

Piotr Caban : gdiplus: GpBitmap can be only locked once, get rid of numlocks field.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: 5673d82b8e90112d03e80fb709faec23644f9878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5673d82b8e90112d03e80fb70… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 14 10:24:43 2017 +0100 gdiplus: GpBitmap can be only locked once, get rid of numlocks field. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 1 - dlls/gdiplus/image.c | 8 +------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 2e98065..dd210fc 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -391,7 +391,6 @@ struct GpBitmap{ INT height; PixelFormat format; ImageLockMode lockmode; - INT numlocks; BYTE *bitmapbits; /* pointer to the buffer we passed in BitmapLockBits */ HBITMAP hbitmap; HDC hdc; diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 4de8ecc..dd01f77 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1071,7 +1071,6 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, bitmap->stride * act_rect.Y; bitmap->lockmode = flags | ImageLockModeRead; - bitmap->numlocks++; image_unlock(&bitmap->image, unlock); return Ok; @@ -1148,7 +1147,6 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, } bitmap->lockmode = flags | ImageLockModeRead; - bitmap->numlocks++; bitmap->lockx = act_rect.X; bitmap->locky = act_rect.Y; @@ -1190,9 +1188,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, } if(!(lockeddata->Reserved & ImageLockModeWrite)){ - if(!(--bitmap->numlocks)) - bitmap->lockmode = 0; - + bitmap->lockmode = 0; heap_free(bitmap->bitmapbits); bitmap->bitmapbits = NULL; image_unlock(&bitmap->image, unlock); @@ -1203,7 +1199,6 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, { /* we passed a direct reference; no need to do anything */ bitmap->lockmode = 0; - bitmap->numlocks = 0; image_unlock(&bitmap->image, unlock); return Ok; } @@ -1228,7 +1223,6 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, heap_free(bitmap->bitmapbits); bitmap->bitmapbits = NULL; bitmap->lockmode = 0; - bitmap->numlocks = 0; image_unlock(&bitmap->image, unlock); return stat;

1 0

Piotr Caban : gdiplus: Reimplement GdipCreateHBITMAPFromBitmap so it can work on locked bitmaps.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: b58276af4dad993bdac52b979da2d8d9baa1ea8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b58276af4dad993bdac52b979… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 14 10:24:47 2017 +0100 gdiplus: Reimplement GdipCreateHBITMAPFromBitmap so it can work on locked bitmaps. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 53 +++++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index dd01f77..07609ac 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1477,10 +1477,12 @@ GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap* bitmap, UINT width, height; BITMAPINFOHEADER bih; LPBYTE bits; - BitmapData lockeddata; + BOOL unlock; + TRACE("(%p,%p,%x)\n", bitmap, hbmReturn, background); if (!bitmap || !hbmReturn) return InvalidParameter; + if (!image_lock(&bitmap->image, &unlock)) return ObjectBusy; GdipGetImageWidth(&bitmap->image, &width); GdipGetImageHeight(&bitmap->image, &height); @@ -1498,41 +1500,36 @@ GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap* bitmap, bih.biClrImportant = 0; result = CreateDIBSection(0, (BITMAPINFO*)&bih, DIB_RGB_COLORS, (void**)&bits, NULL, 0); - - if (result) + if (!result) { - lockeddata.Stride = -width * 4; - lockeddata.Scan0 = bits + (width * 4 * (height - 1)); - - stat = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead|ImageLockModeUserInputBuf, - PixelFormat32bppPARGB, &lockeddata); - - if (stat == Ok) - stat = GdipBitmapUnlockBits(bitmap, &lockeddata); - - if (stat == Ok && (background & 0xffffff)) - { - DWORD *ptr; - UINT i; - for (ptr = (DWORD*)bits, i = 0; i < width * height; ptr++, i++) - { - if ((*ptr & 0xff000000) == 0xff000000) continue; - *ptr = blend_argb_no_bkgnd_alpha(*ptr, background); - } - } + image_unlock(&bitmap->image, unlock); + return GenericError; } - else - stat = GenericError; - if (stat != Ok && result) + stat = convert_pixels(width, height, -width*4, + bits + (width * 4 * (height - 1)), PixelFormat32bppPARGB, + bitmap->stride, bitmap->bits, bitmap->format, bitmap->image.palette); + if (stat != Ok) { DeleteObject(result); - result = NULL; + image_unlock(&bitmap->image, unlock); + return stat; } - *hbmReturn = result; + if (background & 0xffffff) + { + DWORD *ptr; + UINT i; + for (ptr = (DWORD*)bits, i = 0; i < width * height; ptr++, i++) + { + if ((*ptr & 0xff000000) == 0xff000000) continue; + *ptr = blend_argb_no_bkgnd_alpha(*ptr, background); + } + } - return stat; + *hbmReturn = result; + image_unlock(&bitmap->image, unlock); + return Ok; } GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT width, INT height,

1 0

Piotr Caban : gdiplus: Add GdipCreateHBITMAPFromBitmap tests when bitmap bits are locked.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: e1006611cddd904e6361e0010a6eb1988afab033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1006611cddd904e6361e0010… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 14 10:24:53 2017 +0100 gdiplus: Add GdipCreateHBITMAPFromBitmap tests when bitmap bits are locked. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 6abd026..0ef72b2 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1666,6 +1666,7 @@ static void test_createhbitmap(void) HDC hdc; COLORREF pixel; BYTE bits[640]; + BitmapData lockeddata; memset(bits, 0x68, 640); @@ -1850,6 +1851,30 @@ static void test_createhbitmap(void) stat = GdipDisposeImage((GpImage*)bitmap); expect(Ok, stat); + + /* create HBITMAP from locked data */ + memset(bits, 0x68, 640); + stat = GdipCreateBitmapFromScan0(10, 20, 32, PixelFormat24bppRGB, bits, &bitmap); + expect(Ok, stat); + + memset(&lockeddata, 0, sizeof(lockeddata)); + stat = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead | ImageLockModeWrite, + PixelFormat32bppRGB, &lockeddata); + expect(Ok, stat); + ((DWORD*)lockeddata.Scan0)[0] = 0xff242424; + stat = GdipCreateHBITMAPFromBitmap(bitmap, &hbitmap, 0); + expect(Ok, stat); + stat = GdipBitmapUnlockBits(bitmap, &lockeddata); + expect(Ok, stat); + stat = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, stat); + + hdc = CreateCompatibleDC(NULL); + oldhbitmap = SelectObject(hdc, hbitmap); + pixel = GetPixel(hdc, 0, 0); + expect(0x686868, pixel); + SelectObject(hdc, oldhbitmap); + DeleteDC(hdc); } static void test_getthumbnail(void)

1 0

Henri Verbeet : wined3d: Use create_primary_opengl_context() in wined3d_device_init_3d().
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: 325d415ea480f2c2667efaefef340a1cd98b636c URL: http://source.winehq.org/git/wine.git/?a=commit;h=325d415ea480f2c2667efaefe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 16 00:58:52 2017 +0100 wined3d: Use create_primary_opengl_context() in wined3d_device_init_3d(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a7ee5bc..57bec83 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1013,7 +1013,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, static const struct wined3d_color black = {0.0f, 0.0f, 0.0f, 0.0f}; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_swapchain *swapchain = NULL; - struct wined3d_context *context; DWORD clear_flags = 0; HRESULT hr; @@ -1027,18 +1026,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, if (!(device->fb.render_targets = wined3d_calloc(gl_info->limits.buffers, sizeof(*device->fb.render_targets)))) return E_OUTOFMEMORY; - if (FAILED(hr = device->shader_backend->shader_alloc_private(device, - device->adapter->vertex_pipe, device->adapter->fragment_pipe))) - { - TRACE("Shader private data couldn't be allocated\n"); - goto err_out; - } - if (FAILED(hr = device->blitter->alloc_private(device))) - { - TRACE("Blitter private data couldn't be allocated\n"); - goto err_out; - } - /* Setup the implicit swapchain. This also initializes a context. */ TRACE("Creating implicit swapchain\n"); hr = device->device_parent->ops->create_swapchain(device->device_parent, @@ -1075,19 +1062,15 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, goto err_out; } device->swapchains[0] = swapchain; - device_init_swapchain_state(device, swapchain); - context = context_acquire(device, NULL, 0); - - create_dummy_textures(device, context); - create_default_samplers(device, context); + if (FAILED(hr = create_primary_opengl_context(device, swapchain))) + goto err_out; + device_init_swapchain_state(device, swapchain); device->contexts[0]->last_was_rhw = 0; TRACE("All defaults now set up, leaving 3D init.\n"); - context_release(context); - /* Clear the screen */ if (swapchain->back_buffers && swapchain->back_buffers[0]) clear_flags |= WINED3DCLEAR_TARGET; @@ -1103,17 +1086,13 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, return WINED3D_OK; err_out: - HeapFree(GetProcessHeap(), 0, device->fb.render_targets); HeapFree(GetProcessHeap(), 0, device->swapchains); device->swapchain_count = 0; if (device->back_buffer_view) wined3d_rendertarget_view_decref(device->back_buffer_view); if (swapchain) wined3d_swapchain_decref(swapchain); - if (device->blit_priv) - device->blitter->free_private(device); - if (device->shader_priv) - device->shader_backend->shader_free_private(device); + HeapFree(GetProcessHeap(), 0, device->fb.render_targets); return hr; }

1 0

Henri Verbeet : wined3d: Send sampler GL initialisation through the command stream.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: 9e2498f25e47d64a044c51f2abf60e3104bd4bf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e2498f25e47d64a044c51f2a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 16 00:58:53 2017 +0100 wined3d: Send sampler GL initialisation through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/cs.c | 26 ++++++++++++++++++-------- dlls/wined3d/palette.c | 2 +- dlls/wined3d/query.c | 2 +- dlls/wined3d/resource.c | 2 +- dlls/wined3d/sampler.c | 25 ++++++++++++++++--------- dlls/wined3d/shader.c | 2 +- dlls/wined3d/state.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/view.c | 6 +++--- dlls/wined3d/wined3d_private.h | 7 ++++--- 12 files changed, 49 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e2498f25e47d64a044c5…

1 0