March 2015 - Wine-commits - list.winehq.org

Michael Stefaniuc : version: VS_FILE_INFO is already and INTRESOURCE ( PVS-Studio).
by Alexandre Julliard 05 Mar '15

05 Mar '15

Module: wine Branch: master Commit: e8b76b32e6c660a21675f022fe35dcb923e60aec URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8b76b32e6c660a21675f022f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 5 10:50:46 2015 +0100 version: VS_FILE_INFO is already and INTRESOURCE (PVS-Studio). --- dlls/version/version.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index 680fa31..68dab66 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -636,7 +636,7 @@ DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle ) if ((magic == 1) && (hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE ))) { HRSRC hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), - MAKEINTRESOURCEW(VS_FILE_INFO) ); + (LPWSTR)VS_FILE_INFO ); if (hRsrc) { magic = IMAGE_NT_SIGNATURE; @@ -733,7 +733,7 @@ BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, if ((magic == 1) && (hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE ))) { HRSRC hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), - MAKEINTRESOURCEW(VS_FILE_INFO) ); + (LPWSTR)VS_FILE_INFO ); if (hRsrc) { HGLOBAL hMem = LoadResource( hModule, hRsrc );

1 0

Piotr Caban : windowscodecs: Initialize unused part of metadata PROPVARIANT to 0.
by Alexandre Julliard 05 Mar '15

05 Mar '15

Module: wine Branch: master Commit: ca5c0f6b14a7f5774589c4e0dba602dcf94ca8de URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca5c0f6b14a7f5774589c4e0d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 5 12:12:50 2015 +0100 windowscodecs: Initialize unused part of metadata PROPVARIANT to 0. --- dlls/windowscodecs/gifformat.c | 10 +++++----- dlls/windowscodecs/metadatahandler.c | 4 ++-- dlls/windowscodecs/pngformat.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 054a749..861920b 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -75,7 +75,7 @@ static HRESULT load_LSD_metadata(IStream *stream, const GUID *vendor, DWORD opti hr = IStream_Read(stream, &lsd_data, sizeof(lsd_data), &bytesread); if (FAILED(hr) || bytesread != sizeof(lsd_data)) return S_OK; - result = HeapAlloc(GetProcessHeap(), 0, sizeof(MetadataItem) * 9); + result = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MetadataItem) * 9); if (!result) return E_OUTOFMEMORY; for (i = 0; i < 9; i++) @@ -180,7 +180,7 @@ static HRESULT load_IMD_metadata(IStream *stream, const GUID *vendor, DWORD opti hr = IStream_Read(stream, &imd_data, sizeof(imd_data), &bytesread); if (FAILED(hr) || bytesread != sizeof(imd_data)) return S_OK; - result = HeapAlloc(GetProcessHeap(), 0, sizeof(MetadataItem) * 8); + result = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MetadataItem) * 8); if (!result) return E_OUTOFMEMORY; for (i = 0; i < 8; i++) @@ -273,7 +273,7 @@ static HRESULT load_GCE_metadata(IStream *stream, const GUID *vendor, DWORD opti hr = IStream_Read(stream, &gce_data, sizeof(gce_data), &bytesread); if (FAILED(hr) || bytesread != sizeof(gce_data)) return S_OK; - result = HeapAlloc(GetProcessHeap(), 0, sizeof(MetadataItem) * 5); + result = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MetadataItem) * 5); if (!result) return E_OUTOFMEMORY; for (i = 0; i < 5; i++) @@ -388,7 +388,7 @@ static HRESULT load_APE_metadata(IStream *stream, const GUID *vendor, DWORD opti data_size += subblock_size + 1; } - result = HeapAlloc(GetProcessHeap(), 0, sizeof(MetadataItem) * 2); + result = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MetadataItem) * 2); if (!result) { HeapFree(GetProcessHeap(), 0, data); @@ -493,7 +493,7 @@ static HRESULT load_GifComment_metadata(IStream *stream, const GUID *vendor, DWO data[data_size] = 0; - result = HeapAlloc(GetProcessHeap(), 0, sizeof(MetadataItem)); + result = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MetadataItem)); if (!result) { HeapFree(GetProcessHeap(), 0, data); diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index 32ac247..fb35f80 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -696,7 +696,7 @@ static HRESULT LoadUnknownMetadata(IStream *input, const GUID *preferred_vendor, return hr; } - result = HeapAlloc(GetProcessHeap(), 0, sizeof(MetadataItem)); + result = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MetadataItem)); if (!result) { HeapFree(GetProcessHeap(), 0, data); @@ -1126,7 +1126,7 @@ static HRESULT LoadIfdMetadata(IStream *input, const GUID *preferred_vendor, return WINCODEC_ERR_BADMETADATAHEADER; } - result = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*result)); + result = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, count * sizeof(*result)); if (!result) { HeapFree(GetProcessHeap(), 0, entry); diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index b3e6cc6..59b1976 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -111,7 +111,7 @@ static HRESULT LoadTextMetadata(IStream *stream, const GUID *preferred_vendor, value_len = data_size - name_len - 1; - result = HeapAlloc(GetProcessHeap(), 0, sizeof(MetadataItem)); + result = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MetadataItem)); name = HeapAlloc(GetProcessHeap(), 0, name_len + 1); value = HeapAlloc(GetProcessHeap(), 0, value_len + 1); if (!result || !name || !value)

1 0

Piotr Caban : windowscodecs: Make it possible to use MetadataReaders when COM was not initialized.
by Alexandre Julliard 05 Mar '15

05 Mar '15

Module: wine Branch: master Commit: f623042fb951ee662ac6b081b7585b889c9a555b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f623042fb951ee662ac6b081b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 5 12:13:00 2015 +0100 windowscodecs: Make it possible to use MetadataReaders when COM was not initialized. --- dlls/windowscodecs/clsfactory.c | 2 +- dlls/windowscodecs/gifformat.c | 31 +++++++++++++++---------------- dlls/windowscodecs/tiffformat.c | 3 +-- dlls/windowscodecs/wincodecs_private.h | 1 + 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index 71f1ce6..614a5d1 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -41,7 +41,7 @@ extern HRESULT WINAPI WIC_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC typedef struct { REFCLSID classid; - HRESULT (*constructor)(REFIID,void**); + class_constructor constructor; } classinfo; static const classinfo wic_classes[] = { diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 861920b..7fccb5e 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -545,7 +545,8 @@ static IStream *create_stream(const void *data, int data_size) } static HRESULT create_metadata_reader(const void *data, int data_size, - const CLSID *clsid, IWICMetadataReader **reader) + class_constructor constructor, + IWICMetadataReader **reader) { HRESULT hr; IWICMetadataReader *metadata_reader; @@ -554,8 +555,7 @@ static HRESULT create_metadata_reader(const void *data, int data_size, /* FIXME: Use IWICComponentFactory_CreateMetadataReader once it's implemented */ - hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICMetadataReader, (void **)&metadata_reader); + hr = constructor(&IID_IWICMetadataReader, (void**)&metadata_reader); if (FAILED(hr)) return hr; hr = IWICMetadataReader_QueryInterface(metadata_reader, &IID_IWICPersistStream, (void **)&persist); @@ -900,8 +900,7 @@ static HRESULT create_IMD_metadata_reader(GifFrameDecode *This, IWICMetadataRead /* FIXME: Use IWICComponentFactory_CreateMetadataReader once it's implemented */ - hr = CoCreateInstance(&CLSID_WICIMDMetadataReader, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICMetadataReader, (void **)&metadata_reader); + hr = IMDReader_CreateInstance(&IID_IWICMetadataReader, (void **)&metadata_reader); if (FAILED(hr)) return hr; hr = IWICMetadataReader_QueryInterface(metadata_reader, &IID_IWICPersistStream, (void **)&persist); @@ -957,7 +956,7 @@ static HRESULT WINAPI GifFrameDecode_Block_GetReaderByIndex(IWICMetadataBlockRea for (i = 0; i < This->frame->Extensions.ExtensionBlockCount; i++) { - const CLSID *clsid; + class_constructor constructor; const void *data; int data_size; @@ -971,24 +970,24 @@ static HRESULT WINAPI GifFrameDecode_Block_GetReaderByIndex(IWICMetadataBlockRea } else if (This->frame->Extensions.ExtensionBlocks[i].Function == COMMENT_EXT_FUNC_CODE) { - clsid = &CLSID_WICGifCommentMetadataReader; + constructor = GifCommentReader_CreateInstance; data = This->frame->Extensions.ExtensionBlocks[i].Bytes; data_size = This->frame->Extensions.ExtensionBlocks[i].ByteCount; } else { - clsid = &CLSID_WICUnknownMetadataReader; + constructor = UnknownMetadataReader_CreateInstance; data = This->frame->Extensions.ExtensionBlocks[i].Bytes; data_size = This->frame->Extensions.ExtensionBlocks[i].ByteCount; } - return create_metadata_reader(data, data_size, clsid, reader); + return create_metadata_reader(data, data_size, constructor, reader); } if (gce_index == -1) return E_INVALIDARG; return create_metadata_reader(This->frame->Extensions.ExtensionBlocks[gce_index].Bytes + 3, This->frame->Extensions.ExtensionBlocks[gce_index].ByteCount - 4, - &CLSID_WICGCEMetadataReader, reader); + GCEReader_CreateInstance, reader); } static HRESULT WINAPI GifFrameDecode_Block_GetEnumerator(IWICMetadataBlockReader *iface, @@ -1376,24 +1375,24 @@ static HRESULT WINAPI GifDecoder_Block_GetReaderByIndex(IWICMetadataBlockReader if (index == 0) return create_metadata_reader(This->LSD_data, sizeof(This->LSD_data), - &CLSID_WICLSDMetadataReader, reader); + LSDReader_CreateInstance, reader); for (i = 0; i < This->gif->Extensions.ExtensionBlockCount; i++) { - const CLSID *clsid; + class_constructor constructor; if (index != i + 1) continue; if (This->gif->Extensions.ExtensionBlocks[i].Function == APPLICATION_EXT_FUNC_CODE) - clsid = &CLSID_WICAPEMetadataReader; + constructor = APEReader_CreateInstance; else if (This->gif->Extensions.ExtensionBlocks[i].Function == COMMENT_EXT_FUNC_CODE) - clsid = &CLSID_WICGifCommentMetadataReader; + constructor = GifCommentReader_CreateInstance; else - clsid = &CLSID_WICUnknownMetadataReader; + constructor = UnknownMetadataReader_CreateInstance; return create_metadata_reader(This->gif->Extensions.ExtensionBlocks[i].Bytes, This->gif->Extensions.ExtensionBlocks[i].ByteCount, - clsid, reader); + constructor, reader); } return E_INVALIDARG; diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 74a73bc..7f987de 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1223,8 +1223,7 @@ static HRESULT create_metadata_reader(TiffFrameDecode *This, IWICMetadataReader /* FIXME: Use IWICComponentFactory_CreateMetadataReader once it's implemented */ - hr = CoCreateInstance(&CLSID_WICIfdMetadataReader, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICMetadataReader, (void **)&metadata_reader); + hr = IfdMetadataReader_CreateInstance(&IID_IWICMetadataReader, (void **)&metadata_reader); if (FAILED(hr)) return hr; hr = IWICMetadataReader_QueryInterface(metadata_reader, &IID_IWICPersistStream, (void **)&persist); diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index fbbc34f..f6ac785 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -67,6 +67,7 @@ DECLARE_INTERFACE_(IMILUnknown2,IUnknown) }; #undef INTERFACE +typedef HRESULT(*class_constructor)(REFIID,void**); extern HRESULT FormatConverter_CreateInstance(REFIID riid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT ComponentFactory_CreateInstance(REFIID riid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT BmpDecoder_CreateInstance(REFIID riid, void** ppv) DECLSPEC_HIDDEN;

1 0

Mark Harmstone : comctl32: Add hit testing for themed scrollbars.
by Alexandre Julliard 05 Mar '15

05 Mar '15

Module: wine Branch: master Commit: d9708ecb93ee40d1dcda98f2e51c3e82a6a66111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9708ecb93ee40d1dcda98f2e… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Mar 3 21:56:31 2015 +0000 comctl32: Add hit testing for themed scrollbars. --- dlls/comctl32/theme_scrollbar.c | 83 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/comctl32/theme_scrollbar.c b/dlls/comctl32/theme_scrollbar.c index 9be8384..5a44994 100644 --- a/dlls/comctl32/theme_scrollbar.c +++ b/dlls/comctl32/theme_scrollbar.c @@ -38,6 +38,16 @@ /* Minimum size of the rectangle between the arrows */ #define SCROLL_MIN_RECT 4 +enum SCROLL_HITTEST +{ + SCROLL_NOWHERE, /* Outside the scroll bar */ + SCROLL_TOP_ARROW, /* Top or left arrow */ + SCROLL_TOP_RECT, /* Rectangle between the top arrow and the thumb */ + SCROLL_THUMB, /* Thumb rectangle */ + SCROLL_BOTTOM_RECT, /* Rectangle between the thumb and the bottom arrow */ + SCROLL_BOTTOM_ARROW /* Bottom or right arrow */ +}; + WINE_DEFAULT_DEBUG_CHANNEL(theme_scroll); static void calc_thumb_dimensions(unsigned int size, SCROLLINFO *si, unsigned int *thumbpos, unsigned int *thumbsize) @@ -66,6 +76,79 @@ static void calc_thumb_dimensions(unsigned int size, SCROLLINFO *si, unsigned in } } +static enum SCROLL_HITTEST hit_test(HWND hwnd, HTHEME theme, POINT pt) +{ + RECT r; + DWORD style = GetWindowLongW(hwnd, GWL_STYLE); + BOOL vertical = style & SBS_VERT; + SIZE sz; + SCROLLINFO si; + unsigned int offset, size, upsize, downsize, thumbpos, thumbsize; + + GetWindowRect(hwnd, &r); + OffsetRect(&r, -r.left, -r.top); + + if (vertical) { + offset = pt.y; + size = r.bottom; + + if (FAILED(GetThemePartSize(theme, NULL, SBP_ARROWBTN, ABS_UPNORMAL, NULL, TS_DRAW, &sz))) { + WARN("Could not get up arrow size.\n"); + upsize = 0; + } else + upsize = sz.cy; + + if (FAILED(GetThemePartSize(theme, NULL, SBP_ARROWBTN, ABS_DOWNNORMAL, NULL, TS_DRAW, &sz))) { + WARN("Could not get down arrow size.\n"); + downsize = 0; + } else + downsize = sz.cy; + } else { + offset = pt.x; + size = r.right; + + if (FAILED(GetThemePartSize(theme, NULL, SBP_ARROWBTN, ABS_LEFTNORMAL, NULL, TS_DRAW, &sz))) { + WARN("Could not get left arrow size.\n"); + upsize = 0; + } else + upsize = sz.cx; + + if (FAILED(GetThemePartSize(theme, NULL, SBP_ARROWBTN, ABS_RIGHTNORMAL, NULL, TS_DRAW, &sz))) { + WARN("Could not get right arrow size.\n"); + downsize = 0; + } else + downsize = sz.cx; + } + + if (pt.x < 0 || pt.x > r.right || pt.y < 0 || pt.y > r.bottom) + return SCROLL_NOWHERE; + + if (size < SCROLL_MIN_RECT + upsize + downsize) + upsize = downsize = (size - SCROLL_MIN_RECT)/2; + + if (offset < upsize) + return SCROLL_TOP_ARROW; + + if (offset > size - downsize) + return SCROLL_BOTTOM_ARROW; + + si.cbSize = sizeof(si); + si.fMask = SIF_ALL; + if (!GetScrollInfo(hwnd, SB_CTL, &si)) { + WARN("GetScrollInfo failed.\n"); + return SCROLL_NOWHERE; + } + + calc_thumb_dimensions(size - upsize - downsize, &si, &thumbpos, &thumbsize); + + if (offset < upsize + thumbpos) + return SCROLL_TOP_RECT; + else if (offset < upsize + thumbpos + thumbsize) + return SCROLL_THUMB; + else + return SCROLL_BOTTOM_RECT; +} + static void paint_scrollbar(HWND hwnd, HTHEME theme) { HDC dc;

1 0

Mark Harmstone : comctl32: Draw hot parts of themed scrollbars.
by Alexandre Julliard 05 Mar '15

05 Mar '15

Module: wine Branch: master Commit: a20c920bbdd31394220370c8aac695cb189b4cc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a20c920bbdd31394220370c8a… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Mar 3 21:56:37 2015 +0000 comctl32: Draw hot parts of themed scrollbars. --- dlls/comctl32/theme_scrollbar.c | 195 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 195 insertions(+) diff --git a/dlls/comctl32/theme_scrollbar.c b/dlls/comctl32/theme_scrollbar.c index 5a44994..bb42267 100644 --- a/dlls/comctl32/theme_scrollbar.c +++ b/dlls/comctl32/theme_scrollbar.c @@ -48,6 +48,9 @@ enum SCROLL_HITTEST SCROLL_BOTTOM_ARROW /* Bottom or right arrow */ }; +static HWND tracking_win = 0; +static enum SCROLL_HITTEST tracking_hot_part = SCROLL_NOWHERE; + WINE_DEFAULT_DEBUG_CHANNEL(theme_scroll); static void calc_thumb_dimensions(unsigned int size, SCROLLINFO *si, unsigned int *thumbpos, unsigned int *thumbsize) @@ -149,6 +152,164 @@ static enum SCROLL_HITTEST hit_test(HWND hwnd, HTHEME theme, POINT pt) return SCROLL_BOTTOM_RECT; } +static void redraw_part(HWND hwnd, HTHEME theme, enum SCROLL_HITTEST part) +{ + DWORD style = GetWindowLongW(hwnd, GWL_STYLE); + BOOL vertical = style & SBS_VERT; + SIZE sz; + RECT r, partrect; + unsigned int size, upsize, downsize; + + if (part == SCROLL_NOWHERE) { /* redraw everything */ + InvalidateRect(hwnd, NULL, TRUE); + return; + } + + GetWindowRect(hwnd, &r); + OffsetRect(&r, -r.left, -r.top); + + if (vertical) { + size = r.bottom; + + if (FAILED(GetThemePartSize(theme, NULL, SBP_ARROWBTN, ABS_UPNORMAL, NULL, TS_DRAW, &sz))) { + WARN("Could not get up arrow size.\n"); + upsize = 0; + } else + upsize = sz.cy; + + if (FAILED(GetThemePartSize(theme, NULL, SBP_ARROWBTN, ABS_DOWNNORMAL, NULL, TS_DRAW, &sz))) { + WARN("Could not get down arrow size.\n"); + downsize = 0; + } else + downsize = sz.cy; + } else { + size = r.right; + + if (FAILED(GetThemePartSize(theme, NULL, SBP_ARROWBTN, ABS_LEFTNORMAL, NULL, TS_DRAW, &sz))) { + WARN("Could not get left arrow size.\n"); + upsize = 0; + } else + upsize = sz.cx; + + if (FAILED(GetThemePartSize(theme, NULL, SBP_ARROWBTN, ABS_RIGHTNORMAL, NULL, TS_DRAW, &sz))) { + WARN("Could not get right arrow size.\n"); + downsize = 0; + } else + downsize = sz.cx; + } + + if (size < SCROLL_MIN_RECT + upsize + downsize) + upsize = downsize = (size - SCROLL_MIN_RECT)/2; + + partrect = r; + + if (part == SCROLL_TOP_ARROW) { + if (vertical) + partrect.bottom = partrect.top + upsize; + else + partrect.right = partrect.left + upsize; + } else if (part == SCROLL_BOTTOM_ARROW) { + if (vertical) + partrect.top = partrect.bottom - downsize; + else + partrect.left = partrect.right - downsize; + } else { + unsigned int thumbpos, thumbsize; + SCROLLINFO si; + + si.cbSize = sizeof(si); + si.fMask = SIF_ALL; + if (!GetScrollInfo(hwnd, SB_CTL, &si)) { + WARN("GetScrollInfo failed.\n"); + return; + } + + calc_thumb_dimensions(size - upsize - downsize, &si, &thumbpos, &thumbsize); + + if (part == SCROLL_TOP_RECT) { + if (vertical) { + partrect.top = r.top + upsize; + partrect.bottom = partrect.top + thumbpos; + } else { + partrect.left = r.left + upsize; + partrect.right = partrect.left + thumbpos; + } + } else if (part == SCROLL_THUMB) { + if (vertical) { + partrect.top = r.top + upsize + thumbpos; + partrect.bottom = partrect.top + thumbsize; + } else { + partrect.left = r.left + upsize + thumbpos; + partrect.right = partrect.left + thumbsize; + } + } else if (part == SCROLL_BOTTOM_RECT) { + if (vertical) { + partrect.top = r.top + upsize + thumbpos + thumbsize; + partrect.bottom = r.bottom - downsize; + } else { + partrect.left = r.left + upsize + thumbpos + thumbsize; + partrect.right = r.right - downsize; + } + } + } + + InvalidateRect(hwnd, &partrect, TRUE); +} + +static void scroll_event(HWND hwnd, HTHEME theme, UINT msg, POINT pt) +{ + enum SCROLL_HITTEST hittest; + TRACKMOUSEEVENT tme; + + if (GetWindowLongW(hwnd, GWL_STYLE) & (SBS_SIZEGRIP | SBS_SIZEBOX)) + return; + + hittest = hit_test(hwnd, theme, pt); + + switch (msg) + { + case WM_MOUSEMOVE: + hittest = hit_test(hwnd, theme, pt); + tracking_win = hwnd; + break; + + case WM_MOUSELEAVE: + if (tracking_win == hwnd) { + hittest = SCROLL_NOWHERE; + } + break; + } + + tme.cbSize = sizeof(tme); + tme.dwFlags = TME_QUERY; + TrackMouseEvent(&tme); + + if (!(tme.dwFlags & TME_LEAVE) || tme.hwndTrack != hwnd) { + tme.dwFlags = TME_LEAVE; + tme.hwndTrack = hwnd; + TrackMouseEvent(&tme); + } + + if (tracking_win != hwnd && msg == WM_MOUSELEAVE) { + redraw_part(hwnd, theme, SCROLL_NOWHERE); + return; + } + + if (tracking_win == hwnd && hittest != tracking_hot_part) { + enum SCROLL_HITTEST oldhotpart = tracking_hot_part; + + tracking_hot_part = hittest; + + if (hittest != SCROLL_NOWHERE) + redraw_part(hwnd, theme, hittest); + else + tracking_win = 0; + + if (oldhotpart != SCROLL_NOWHERE) + redraw_part(hwnd, theme, oldhotpart); + } +} + static void paint_scrollbar(HWND hwnd, HTHEME theme) { HDC dc; @@ -197,6 +358,15 @@ static void paint_scrollbar(HWND hwnd, HTHEME theme) uppertrackstate = SCRBS_NORMAL; lowertrackstate = SCRBS_NORMAL; thumbstate = SCRBS_NORMAL; + + if (tracking_win == hwnd) { + if (tracking_hot_part == SCROLL_TOP_RECT) + uppertrackstate = SCRBS_HOT; + else if (tracking_hot_part == SCROLL_BOTTOM_RECT) + lowertrackstate = SCRBS_HOT; + else if (tracking_hot_part == SCROLL_THUMB) + thumbstate = SCRBS_HOT; + } } if (vertical) { @@ -209,6 +379,13 @@ static void paint_scrollbar(HWND hwnd, HTHEME theme) } else { uparrowstate = ABS_UPNORMAL; downarrowstate = ABS_DOWNNORMAL; + + if (tracking_win == hwnd) { + if (tracking_hot_part == SCROLL_TOP_ARROW) + uparrowstate = ABS_UPHOT; + else if (tracking_hot_part == SCROLL_BOTTOM_ARROW) + downarrowstate = ABS_DOWNHOT; + } } if (FAILED(GetThemePartSize(theme, dc, SBP_ARROWBTN, uparrowstate, NULL, TS_DRAW, &upsize))) { @@ -277,6 +454,13 @@ static void paint_scrollbar(HWND hwnd, HTHEME theme) } else { leftarrowstate = ABS_LEFTNORMAL; rightarrowstate = ABS_RIGHTNORMAL; + + if (tracking_win == hwnd) { + if (tracking_hot_part == SCROLL_TOP_ARROW) + leftarrowstate = ABS_LEFTHOT; + else if (tracking_hot_part == SCROLL_BOTTOM_ARROW) + rightarrowstate = ABS_RIGHTHOT; + } } if (FAILED(GetThemePartSize(theme, dc, SBP_ARROWBTN, leftarrowstate, NULL, TS_DRAW, &leftsize))) { @@ -348,6 +532,7 @@ LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND hwnd, UINT msg, const WCHAR* themeClass = WC_SCROLLBARW; HTHEME theme; LRESULT result; + POINT pt; TRACE("(%p, 0x%x, %lu, %lu, %lu)\n", hwnd, msg, wParam, lParam, dwRefData); @@ -382,6 +567,16 @@ LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND hwnd, UINT msg, paint_scrollbar(hwnd, theme); break; + case WM_MOUSEMOVE: + case WM_MOUSELEAVE: + theme = GetWindowTheme(hwnd); + if (!theme) return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + + pt.x = (short)LOWORD(lParam); + pt.y = (short)HIWORD(lParam); + scroll_event(hwnd, theme, msg, pt); + break; + default: return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); }

1 0

Christian Costa : d3dx9_36: Fix d3dx9_skin_info_ConvertToIndexedBlendedMesh stub.
by Alexandre Julliard 05 Mar '15

05 Mar '15

Module: wine Branch: master Commit: 27c72ae986fbc6f168e2001b43cf80a131de03cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=27c72ae986fbc6f168e2001b4… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Dec 31 10:42:01 2014 +0100 d3dx9_36: Fix d3dx9_skin_info_ConvertToIndexedBlendedMesh stub. --- dlls/d3dx9_36/skin.c | 6 +++--- include/d3dx9mesh.h | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c index aa5acf2..9b93af6 100644 --- a/dlls/d3dx9_36/skin.c +++ b/dlls/d3dx9_36/skin.c @@ -395,13 +395,13 @@ static HRESULT WINAPI d3dx9_skin_info_ConvertToBlendedMesh(ID3DXSkinInfo *iface, } static HRESULT WINAPI d3dx9_skin_info_ConvertToIndexedBlendedMesh(ID3DXSkinInfo *iface, ID3DXMesh *mesh_in, - DWORD options, const DWORD *adjacency_in, DWORD *adjacency_out, DWORD *face_remap, + DWORD options, DWORD palette_size, const DWORD *adjacency_in, DWORD *adjacency_out, DWORD *face_remap, ID3DXBuffer **vertex_remap, DWORD *max_face_infl, DWORD *num_bone_combinations, ID3DXBuffer **bone_combination_table, ID3DXMesh **mesh_out) { - FIXME("iface %p, mesh_in %p, options %#x, adjacency_in %p, adjacency_out %p, face_remap %p, vertex_remap %p, " + FIXME("iface %p, mesh_in %p, options %#x, palette_size %u, adjacency_in %p, adjacency_out %p, face_remap %p, vertex_remap %p, " "max_face_infl %p, num_bone_combinations %p, bone_combination_table %p, mesh_out %p stub!\n", - iface, mesh_in, options, adjacency_in, adjacency_out, face_remap, vertex_remap, + iface, mesh_in, options, palette_size, adjacency_in, adjacency_out, face_remap, vertex_remap, max_face_infl, num_bone_combinations, bone_combination_table, mesh_out); return E_NOTIMPL; diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 1dcc244..8777749 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -544,9 +544,10 @@ DECLARE_INTERFACE_(ID3DXSkinInfo, IUnknown) STDMETHOD(ConvertToBlendedMesh)(THIS_ ID3DXMesh *mesh_in, DWORD options, const DWORD *adjacency_in, DWORD *adjacency_out, DWORD *face_remap, ID3DXBuffer **vertex_remap, DWORD *max_face_infl, DWORD *num_bone_combinations, ID3DXBuffer **bone_combination_table, ID3DXMesh **mesh_out) PURE; - STDMETHOD(ConvertToIndexedBlendedMesh)(THIS_ ID3DXMesh *mesh_in, DWORD options, const DWORD *adjacency_in, - DWORD *adjacency_out, DWORD *face_remap, ID3DXBuffer **vertex_remap, DWORD *max_face_infl, - DWORD *num_bone_combinations, ID3DXBuffer **bone_combination_table, ID3DXMesh **mesh_out) PURE; + STDMETHOD(ConvertToIndexedBlendedMesh)(THIS_ ID3DXMesh *mesh_in, DWORD options, DWORD palette_size, + const DWORD *adjacency_in, DWORD *adjacency_out, DWORD *face_remap, ID3DXBuffer **vertex_remap, + DWORD *max_face_infl, DWORD *num_bone_combinations, ID3DXBuffer **bone_combination_table, + ID3DXMesh **mesh_out) PURE; }; #undef INTERFACE

1 0

Michael Stefaniuc : d3d9/tests: Actually test some return values ( PVS-Studio).
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: 148d6e3c10270206ebd12e98abc79460c2de1290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=148d6e3c10270206ebd12e98a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 4 09:21:17 2015 +0100 d3d9/tests: Actually test some return values (PVS-Studio). --- dlls/d3d9/tests/d3d9ex.c | 2 ++ dlls/d3d9/tests/device.c | 3 +++ dlls/d3d9/tests/visual.c | 3 +++ 3 files changed, 8 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index b17ceb5..a3a9226 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -738,6 +738,7 @@ static void test_user_memory(void) ok(locked_rect.Pitch == 128 * 4, "Got unexpected pitch %d.\n", locked_rect.Pitch); ok(locked_rect.pBits == mem, "Got unexpected pBits %p, expected %p.\n", locked_rect.pBits, mem); hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); IDirect3DSurface9_Release(surface); hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurfaceEx(device, 128, 128, D3DFMT_A8R8G8B8, @@ -750,6 +751,7 @@ static void test_user_memory(void) ok(locked_rect.Pitch == 128 * 4, "Got unexpected pitch %d.\n", locked_rect.Pitch); ok(locked_rect.pBits == mem, "Got unexpected pBits %p, expected %p.\n", locked_rect.pBits, mem); hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); IDirect3DSurface9_Release(surface); } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index fde2bb6..f1c75e4 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1081,6 +1081,7 @@ static void test_swapchain(void) ok(SUCCEEDED(hr), "Failed to get the implicit swapchain (%08x)\n", hr); /* Check if the back buffer count was modified */ hr = IDirect3DSwapChain9_GetPresentParameters(swapchain0, &d3dpp); + ok(SUCCEEDED(hr), "Failed to get present parameters, hr %#x.\n", hr); ok(d3dpp.BackBufferCount == 1, "Got unexpected back buffer count %u.\n", d3dpp.BackBufferCount); IDirect3DSwapChain9_Release(swapchain0); @@ -8821,6 +8822,7 @@ static void test_volume_blocks(void) { hr = IDirect3DDevice9_CreateVolumeTexture(device, formats[i].block_width, formats[i].block_height, 2, 2, 0, formats[i].fmt, D3DPOOL_SCRATCH, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); hr = IDirect3DVolumeTexture9_LockBox(texture, 1, &locked_box, NULL, 0); ok(SUCCEEDED(hr), "Failed to lock volume texture mipmap, hr %#x.\n", hr); @@ -9728,6 +9730,7 @@ static void test_resource_type(void) { hr = IDirect3DDevice9_CreateVolumeTexture(device, 2, 4, 8, 4, 0, D3DFMT_X8R8G8B8, D3DPOOL_SYSTEMMEM, &volume_texture, NULL); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); type = IDirect3DVolumeTexture9_GetType(volume_texture); ok(type == D3DRTYPE_VOLUMETEXTURE, "Expected type D3DRTYPE_VOLUMETEXTURE, got %u.\n", type); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index fb0b1b5..fcafb37 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12095,6 +12095,7 @@ static void loop_index_test(void) ok(SUCCEEDED(hr), "IDirect3DDevice9_SetVertexShaderConstantI returned %#x.\n", hr); hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 3 * sizeof(float)); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice9_EndScene(device); @@ -14793,6 +14794,7 @@ static void multisampled_depth_buffer_test(void) IDirect3DSurface9_Release(ds); hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 640, 480, D3DFMT_D24S8, D3DMULTISAMPLE_2_SAMPLES, 0, TRUE, &ds, NULL); + ok(SUCCEEDED(hr), "Failed to create depth/stencil, hr %#x.\n", hr); hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds); ok(SUCCEEDED(hr), "Failed to set depth/stencil, hr %#x.\n", hr); @@ -15074,6 +15076,7 @@ static void resz_test(void) ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 640, 480, D3DFMT_D24S8, D3DMULTISAMPLE_2_SAMPLES, 0, TRUE, &ds, NULL); + ok(SUCCEEDED(hr), "Failed to create depth/stencil, hr %#x.\n", hr); hr = IDirect3DDevice9_CreateRenderTarget(device, 640, 480, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &readback, NULL); ok(SUCCEEDED(hr), "Failed to create readback surface, hr %#x.\n", hr);

1 0

Michael Stefaniuc : ddraw/tests: Actually test some return values ( PVS-Studio).
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: bd9d41080f0f43edbc9a9eddc2c9621a65f46500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd9d41080f0f43edbc9a9eddc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 4 09:34:39 2015 +0100 ddraw/tests: Actually test some return values (PVS-Studio). --- dlls/ddraw/tests/ddraw2.c | 2 ++ dlls/ddraw/tests/ddraw4.c | 2 ++ dlls/ddraw/tests/ddraw7.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 090f731..f448455 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -972,6 +972,7 @@ static void test_depth_blit(void) memset(&ddsd_existing, 0, sizeof(ddsd_existing)); ddsd_existing.dwSize = sizeof(ddsd_existing); hr = IDirectDrawSurface_GetSurfaceDesc(ds1, &ddsd_existing); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); ddsd_new.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; ddsd_new.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; ddsd_new.dwWidth = ddsd_existing.dwWidth; @@ -3733,6 +3734,7 @@ static void test_lighting_interface_versions(void) ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, tests[i].vertextype, tests[i].data, 4, tests[i].draw_flags | D3DDP_WAIT); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice2_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index e5c808a..49f6de7 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1180,6 +1180,7 @@ static void test_depth_blit(void) memset(&ddsd_existing, 0, sizeof(ddsd_existing)); ddsd_existing.dwSize = sizeof(ddsd_existing); hr = IDirectDrawSurface4_GetSurfaceDesc(ds1, &ddsd_existing); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); ddsd_new.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; ddsd_new.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; ddsd_new.dwWidth = ddsd_existing.dwWidth; @@ -4090,6 +4091,7 @@ static void test_lighting_interface_versions(void) ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, tests[i].vertextype, tests[i].data, 4, tests[i].draw_flags | D3DDP_WAIT); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice3_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index c558385..084fbd3 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1090,6 +1090,7 @@ static void test_depth_blit(void) memset(&ddsd_existing, 0, sizeof(ddsd_existing)); ddsd_existing.dwSize = sizeof(ddsd_existing); hr = IDirectDrawSurface7_GetSurfaceDesc(ds1, &ddsd_existing); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); ddsd_new.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; ddsd_new.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; ddsd_new.dwWidth = ddsd_existing.dwWidth; @@ -3854,6 +3855,7 @@ static void test_lighting_interface_versions(void) ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, tests[i].vertextype, tests[i].data, 4, tests[i].draw_flags | D3DDP_WAIT); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice7_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);

1 0

Michael Stefaniuc : kernel32/tests: Actually test a return value ( PVS-Studio).
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: dbe6c5576d6e4b527d493a82c4cae6258e6ed365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbe6c5576d6e4b527d493a82c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 4 09:39:10 2015 +0100 kernel32/tests: Actually test a return value (PVS-Studio). --- dlls/kernel32/tests/pipe.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index cf02e15..b115ed8 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2111,6 +2111,7 @@ static void test_readfileex_pending(void) num_bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(server, read_buf, 0, &num_bytes, &overlapped); + ok(!ret, "ReadFile should fail\n"); todo_wine ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); ok(num_bytes == 0, "bytes %u\n", num_bytes);

1 0

Michael Stefaniuc : oledb32/tests: Remove an unused assignment (PVS-Studio ).
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: e87857a5219aa8dd0cf600431945594e8df7a16e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e87857a5219aa8dd0cf600431… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 4 09:42:44 2015 +0100 oledb32/tests: Remove an unused assignment (PVS-Studio). --- dlls/oledb32/tests/convert.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index f7558da..f679b5c 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2683,7 +2683,6 @@ static void test_converttovar(void) VariantClear(&dst); V_VT(&dst) = VT_EMPTY; - dst_len = 0; dst_status = DBSTATUS_S_DEFAULT; i8.QuadPart = 12345; dst_len = 0x1234;

1 0