wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

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

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

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

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

Michael Stefaniuc : wininet: Remove unused code, sizeof(void*) %4 is always false (PVS-Studio).
by Alexandre Julliard 05 Mar '15

05 Mar '15

Module: wine Branch: master Commit: 745a54997263eedb668e1487d85c149d1bb18351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=745a54997263eedb668e1487d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 5 10:48:43 2015 +0100 wininet: Remove unused code, sizeof(void*)%4 is always false (PVS-Studio). --- dlls/wininet/urlcache.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index af830c5..c5755fe 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1296,9 +1296,6 @@ static DWORD urlcache_copy_entry(cache_container *container, const urlcache_head dos_date_time_to_file_time(url_entry->sync_date, url_entry->sync_time, &entry_info->LastSyncTime); } - if(size%4 && size<*info_size) - ZeroMemory((LPBYTE)entry_info+size, 4-size%4); - size = DWORD_ALIGN(size); if(unicode) url_len = urlcache_decode_url((const char*)url_entry+url_entry->url_off, NULL, 0); else

1 0

Nikolay Sivov : services: Fix GetNotifyResults() prototype.
by Alexandre Julliard 05 Mar '15

05 Mar '15

Module: wine Branch: master Commit: ebbb8fa5daf4d529986f535db571d69eb584557e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebbb8fa5daf4d529986f535db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 5 10:56:53 2015 +0300 services: Fix GetNotifyResults() prototype. --- include/wine/svcctl.idl | 2 +- programs/services/rpc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl index 4af6b9a..cadc5fd 100644 --- a/include/wine/svcctl.idl +++ b/include/wine/svcctl.idl @@ -741,7 +741,7 @@ typedef [switch_type(DWORD)] union _SC_RPC_SERVICE_CONTROL_OUT_PARAMSW { /* Function 48 */ DWORD svcctl_GetNotifyResults( [in] SC_NOTIFY_RPC_HANDLE notify, - [out] SC_RPC_NOTIFY_PARAMS_LIST *params + [out] SC_RPC_NOTIFY_PARAMS_LIST **params ); /* Function 49 */ diff --git a/programs/services/rpc.c b/programs/services/rpc.c index a3d5a24..89a8c91 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1573,7 +1573,7 @@ DWORD __cdecl svcctl_NotifyServiceStatusChange( DWORD __cdecl svcctl_GetNotifyResults( SC_NOTIFY_RPC_HANDLE notify, - SC_RPC_NOTIFY_PARAMS_LIST *params) + SC_RPC_NOTIFY_PARAMS_LIST **params) { WINE_FIXME("\n"); return ERROR_CALL_NOT_IMPLEMENTED;

1 0

Hans Leidekker : msi: Add offsets to file patch sequence numbers.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: 4c1791f53ef4fefe9ed4f4475cb0c23a1fbb001a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c1791f53ef4fefe9ed4f4475… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 4 14:30:42 2015 +0100 msi: Add offsets to file patch sequence numbers. --- dlls/msi/action.c | 14 +--- dlls/msi/msipriv.h | 2 + dlls/msi/patch.c | 220 ++++++++++++++++++++++++++++++++++++++--------------- 3 files changed, 166 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c1791f53ef4fefe9ed4f…

1 0

Hans Leidekker : msi: Support updating streams.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: 123428942d773454b4d388aabdca0caae939e79c URL: http://source.winehq.org/git/wine.git/?a=commit;h=123428942d773454b4d388aab… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 4 14:30:08 2015 +0100 msi: Support updating streams. --- dlls/msi/table.c | 54 +++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 15 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index cfe5612..e1f7d9b 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1054,7 +1054,7 @@ static UINT TABLE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT * return ERROR_SUCCESS; } -static UINT msi_stream_name( const MSITABLEVIEW *tv, UINT row, LPWSTR *pstname ) +static UINT get_stream_name( const MSITABLEVIEW *tv, UINT row, WCHAR **pstname ) { LPWSTR p, stname = NULL; UINT i, r, type, ival; @@ -1154,7 +1154,7 @@ static UINT TABLE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, ISt if( !view->ops->fetch_int ) return ERROR_INVALID_PARAMETER; - r = msi_stream_name( tv, row, &name ); + r = get_stream_name( tv, row, &name ); if (r != ERROR_SUCCESS) { ERR("fetching stream, error = %u\n", r); @@ -1216,39 +1216,63 @@ static UINT TABLE_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec ) return msi_view_get_row(tv->db, view, row, rec); } -static UINT msi_addstreamW( MSIDATABASE *db, LPCWSTR name, IStream *data ) +static UINT add_stream( MSIDATABASE *db, const WCHAR *name, IStream *data ) { static const WCHAR insert[] = { 'I','N','S','E','R','T',' ','I','N','T','O',' ', '`','_','S','t','r','e','a','m','s','`',' ', '(','`','N','a','m','e','`',',','`','D','a','t','a','`',')',' ', 'V','A','L','U','E','S',' ','(','?',',','?',')',0}; - MSIQUERY *query = NULL; + static const WCHAR update[] = { + 'U','P','D','A','T','E',' ','`','_','S','t','r','e','a','m','s','`',' ', + 'S','E','T',' ','`','D','a','t','a','`',' ','=',' ','?',' ', + 'W','H','E','R','E',' ','`','N','a','m','e','`',' ','=',' ','?',0}; + MSIQUERY *query; MSIRECORD *rec; UINT r; TRACE("%p %s %p\n", db, debugstr_w(name), data); - rec = MSI_CreateRecord( 2 ); - if ( !rec ) + if (!(rec = MSI_CreateRecord( 2 ))) return ERROR_OUTOFMEMORY; r = MSI_RecordSetStringW( rec, 1, name ); - if ( r != ERROR_SUCCESS ) - goto err; + if (r != ERROR_SUCCESS) + goto done; r = MSI_RecordSetIStream( rec, 2, data ); - if ( r != ERROR_SUCCESS ) - goto err; + if (r != ERROR_SUCCESS) + goto done; r = MSI_DatabaseOpenViewW( db, insert, &query ); - if ( r != ERROR_SUCCESS ) - goto err; + if (r != ERROR_SUCCESS) + goto done; r = MSI_ViewExecute( query, rec ); + msiobj_release( &query->hdr ); + if (r == ERROR_SUCCESS) + goto done; -err: + msiobj_release( &rec->hdr ); + if (!(rec = MSI_CreateRecord( 2 ))) + return ERROR_OUTOFMEMORY; + + r = MSI_RecordSetIStream( rec, 1, data ); + if (r != ERROR_SUCCESS) + goto done; + + r = MSI_RecordSetStringW( rec, 2, name ); + if (r != ERROR_SUCCESS) + goto done; + + r = MSI_DatabaseOpenViewW( db, update, &query ); + if (r != ERROR_SUCCESS) + goto done; + + r = MSI_ViewExecute( query, rec ); msiobj_release( &query->hdr ); + +done: msiobj_release( &rec->hdr ); return r; } @@ -1345,14 +1369,14 @@ static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI if ( r != ERROR_SUCCESS ) return r; - r = msi_stream_name( tv, row, &stname ); + r = get_stream_name( tv, row, &stname ); if ( r != ERROR_SUCCESS ) { IStream_Release( stm ); return r; } - r = msi_addstreamW( tv->db, stname, stm ); + r = add_stream( tv->db, stname, stm ); IStream_Release( stm ); msi_free ( stname );

1 0

Hans Leidekker : msi: Decode stream names in load_streams.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: af6281701da714b6333b7a8a9263545adb9f8512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6281701da714b6333b7a8a9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 4 14:29:29 2015 +0100 msi: Decode stream names in load_streams. --- dlls/msi/streams.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 44a322c..4b151bb 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -425,23 +425,22 @@ static MSISTREAM *find_stream( MSIDATABASE *db, const WCHAR *name ) static UINT append_stream( MSIDATABASE *db, const WCHAR *name, IStream *stream ) { - WCHAR decoded[MAX_STREAM_NAME_LEN + 1]; UINT i = db->num_streams; if (!streams_resize_table( db, db->num_streams + 1 )) return ERROR_OUTOFMEMORY; - decode_streamname( name, decoded ); - db->streams[i].str_index = msi_add_string( db->strings, decoded, -1, StringNonPersistent ); + db->streams[i].str_index = msi_add_string( db->strings, name, -1, StringNonPersistent ); db->streams[i].stream = stream; db->num_streams++; - TRACE("added %s\n", debugstr_w( decoded )); + TRACE("added %s\n", debugstr_w( name )); return ERROR_SUCCESS; } static UINT load_streams( MSIDATABASE *db ) { + WCHAR decoded[MAX_STREAM_NAME_LEN + 1]; IEnumSTATSTG *stgenum; STATSTG stat; HRESULT hr; @@ -460,25 +459,29 @@ static UINT load_streams( MSIDATABASE *db ) break; /* table streams are not in the _Streams table */ - if (stat.type != STGTY_STREAM || *stat.pwcsName == 0x4840 || - find_stream( db, stat.pwcsName )) + if (stat.type != STGTY_STREAM || *stat.pwcsName == 0x4840) { CoTaskMemFree( stat.pwcsName ); continue; } - TRACE("found new stream %s\n", debugstr_w( stat.pwcsName )); + decode_streamname( stat.pwcsName, decoded ); + if (find_stream( db, decoded )) + { + CoTaskMemFree( stat.pwcsName ); + continue; + } + TRACE("found new stream %s\n", debugstr_w( decoded )); hr = open_stream( db, stat.pwcsName, &stream ); + CoTaskMemFree( stat.pwcsName ); if (FAILED( hr )) { ERR("unable to open stream %08x\n", hr); - CoTaskMemFree( stat.pwcsName ); r = ERROR_FUNCTION_FAILED; break; } - r = append_stream( db, stat.pwcsName, stream ); - CoTaskMemFree( stat.pwcsName ); + r = append_stream( db, decoded, stream ); if (r != ERROR_SUCCESS) break; }

1 0

Alexandre Julliard : ntoskrnl: Get rid of the IRP instance list.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: a85d23bfc345dfa25f615a172740581515dab504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a85d23bfc345dfa25f615a172… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 22:22:14 2015 +0900 ntoskrnl: Get rid of the IRP instance list. --- dlls/ntoskrnl.exe/ntoskrnl.c | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a282b37..65702aa 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -64,14 +64,6 @@ KSERVICE_TABLE_DESCRIPTOR KeServiceDescriptorTable[4] = { { 0 } }; typedef void (WINAPI *PCREATE_PROCESS_NOTIFY_ROUTINE)(HANDLE,HANDLE,BOOLEAN); typedef void (WINAPI *PCREATE_THREAD_NOTIFY_ROUTINE)(HANDLE,HANDLE,BOOLEAN); -static struct list Irps = LIST_INIT(Irps); - -struct IrpInstance -{ - struct list entry; - IRP *irp; -}; - /* tid of the thread running client request */ static DWORD request_thread; @@ -496,7 +488,6 @@ PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG code, PDEVICE_OBJECT device, { PIRP irp; PIO_STACK_LOCATION irpsp; - struct IrpInstance *instance; TRACE( "%x, %p, %p, %u, %p, %u, %u, %p, %p\n", code, device, in_buff, in_len, out_buff, out_len, internal, event, iosb ); @@ -508,15 +499,6 @@ PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG code, PDEVICE_OBJECT device, if (irp == NULL) return NULL; - instance = HeapAlloc( GetProcessHeap(), 0, sizeof(struct IrpInstance) ); - if (instance == NULL) - { - IoFreeIrp( irp ); - return NULL; - } - instance->irp = irp; - list_add_tail( &Irps, &instance->entry ); - irpsp = IoGetNextIrpStackLocation( irp ); irpsp->MajorFunction = internal ? IRP_MJ_INTERNAL_DEVICE_CONTROL : IRP_MJ_DEVICE_CONTROL; irpsp->Parameters.DeviceIoControl.IoControlCode = code; @@ -540,7 +522,6 @@ PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG majorfunc, PDEVICE_OBJECT device, PKEVENT event, PIO_STATUS_BLOCK iosb) { PIRP irp; - struct IrpInstance *instance; PIO_STACK_LOCATION irpsp; FIXME("(%d %p %p %d %p %p %p) stub\n", majorfunc, device, buffer, length, startoffset, event, iosb); @@ -549,15 +530,6 @@ PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG majorfunc, PDEVICE_OBJECT device, if (irp == NULL) return NULL; - instance = HeapAlloc( GetProcessHeap(), 0, sizeof(struct IrpInstance) ); - if (instance == NULL) - { - IoFreeIrp( irp ); - return NULL; - } - instance->irp = irp; - list_add_tail( &Irps, &instance->entry ); - irpsp = IoGetNextIrpStackLocation( irp ); irpsp->MajorFunction = majorfunc; /*irpsp->Parameters.DeviceIoControl.IoControlCode = IoControlCode;*/ @@ -987,7 +959,6 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) IO_STACK_LOCATION *irpsp; PIO_COMPLETION_ROUTINE routine; IO_STATUS_BLOCK *iosb; - struct IrpInstance *instance; NTSTATUS status, stat; int call_flag = 0; @@ -1025,16 +996,7 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) iosb->u.Status = irp->IoStatus.u.Status; if (iosb->u.Status >= 0) iosb->Information = irp->IoStatus.Information; } - LIST_FOR_EACH_ENTRY( instance, &Irps, struct IrpInstance, entry ) - { - if (instance->irp == irp) - { - list_remove( &instance->entry ); - HeapFree( GetProcessHeap(), 0, instance ); - IoFreeIrp( irp ); - break; - } - } + IoFreeIrp( irp ); }

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2015