June 2012 - Wine-Commits - list.winehq.org

Vincent Povirk : windowscodecs: Add metadata reader information to the registry.
by Alexandre Julliard June 8, 2012

June 8, 2012

Module: wine Branch: master Commit: d3f7247ea5996067e312db772d136c4bf4894f9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3f7247ea5996067e312db772… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jun 5 15:35:08 2012 -0500 windowscodecs: Add metadata reader information to the registry. --- dlls/windowscodecs/regsvr.c | 283 ++++++++++++++++++++++++++++++++++++++++++- include/wincodec.idl | 1 + 2 files changed, 278 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d3f7247ea5996067e312d…

1 0

Daniel Jelinski : comctl32: Allow label edit only if treeview style allows editing.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: 1196aed33f2e0765abc063c8d35cbf9148a99850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1196aed33f2e0765abc063c8d… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Jun 2 07:23:32 2012 +0200 comctl32: Allow label edit only if treeview style allows editing. --- dlls/comctl32/treeview.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 63e3507..8c93f8c 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3810,6 +3810,9 @@ TREEVIEW_EditLabel(TREEVIEW_INFO *infoPtr, HTREEITEM hItem) TEXTMETRICW textMetric; TRACE("%p %p\n", hwnd, hItem); + if (!(infoPtr->dwStyle & TVS_EDITLABELS)) + return NULL; + if (!TREEVIEW_ValidItem(infoPtr, hItem)) return NULL;

1 0

Daniel Jelinski : shell32: Make folder names in folder picker editable.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: fccee5d20c2bfa88968402d10a03bbf4af9ba64e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fccee5d20c2bfa88968402d10… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Wed Jun 6 23:38:51 2012 +0200 shell32: Make folder names in folder picker editable. --- dlls/shell32/shell32.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index b1f3626..5f96b94 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -289,7 +289,7 @@ FONT 8, "MS Shell Dlg" LTEXT "", IDD_STATUS, 5, 25, 198, 12 LTEXT "Folder:", IDD_FOLDER, 5, 156, 40, 12 CONTROL "", IDD_TREEVIEW, "SysTreeView32", - TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 5, 38, 205, 105 EDITTEXT IDD_FOLDERTEXT, 46, 154, 164, 14, WS_BORDER | WS_GROUP | WS_TABSTOP

1 0

Daniel Jelinski : comdlg32: Make tests pass with native comctl32.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: 51c77f56a7ef8b7eaf5f781987c642cf01257362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51c77f56a7ef8b7eaf5f78198… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Thu Jun 7 00:48:13 2012 +0200 comdlg32: Make tests pass with native comctl32. --- dlls/comdlg32/itemdlg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 05bea2b..69ef528 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -3041,6 +3041,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnAddMenu(IFileDialogCustomize *iface This->cctrl_def_height, &ctrl); if(SUCCEEDED(hr)) { + SendMessageW(ctrl->hwnd, TB_BUTTONSTRUCTSIZE, sizeof(tbb), 0); ctrl->type = IDLG_CCTRL_MENU; /* Add the actual button with a popup menu. */

1 0

Daniel Jelinski : comdlg32: Fixed support for deleting items other than the first.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: aec1c9562d69168626f5018eb29074e8c3d4ab08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aec1c9562d69168626f5018eb… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Thu Jun 7 00:46:47 2012 +0200 comdlg32: Fixed support for deleting items other than the first. --- dlls/comdlg32/itemdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 3955a75..05bea2b 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -3380,7 +3380,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnRemoveControlItem(IFileDialogCustom return E_FAIL; for(i = 0; i < count; i++) - if(SendMessageW(ctrl->hwnd, CB_GETITEMDATA, 0, 0) == dwIDItem) + if(SendMessageW(ctrl->hwnd, CB_GETITEMDATA, i, 0) == dwIDItem) { if(SendMessageW(ctrl->hwnd, CB_DELETESTRING, i, 0) == CB_ERR) return E_FAIL;

1 0

Jacek Caban : urlmon: Improved ERROR_INTERNET_SEC_CERT_REV_FAILED error handling.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: 31907e0c964f2edd67b149b41534adb8539ead79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31907e0c964f2edd67b149b41… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 7 16:32:56 2012 +0200 urlmon: Improved ERROR_INTERNET_SEC_CERT_REV_FAILED error handling. --- dlls/urlmon/http.c | 61 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 36 insertions(+), 25 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index a030d0b..d5f2b33 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -193,35 +193,46 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error) } } - hres = IServiceProvider_QueryService(serv_prov, &IID_IWindowForBindingUI, &IID_IWindowForBindingUI, - (void**)&wfb_ui); - if(SUCCEEDED(hres)) { - const IID *iid_reason; - - if(security_problem) - iid_reason = &IID_IHttpSecurity; - else if(error == ERROR_INTERNET_INCORRECT_PASSWORD) - iid_reason = &IID_IAuthenticate; - else - iid_reason = &IID_IWindowForBindingUI; + switch(error) { + case ERROR_INTERNET_SEC_CERT_REV_FAILED: + if(hres == S_FALSE) { + hres = internet_error_to_hres(error); + }else { + /* Silently ignore the error. We will get more detailed error from wininet anyway. */ + set_security_flag(This, SECURITY_FLAG_IGNORE_REVOCATION); + hres = RPC_E_RETRY; + } + break; - hres = IWindowForBindingUI_GetWindow(wfb_ui, iid_reason, &hwnd); - IWindowForBindingUI_Release(wfb_ui); - if(FAILED(hres)) - hwnd = NULL; - } + default: + hres = IServiceProvider_QueryService(serv_prov, &IID_IWindowForBindingUI, &IID_IWindowForBindingUI, (void**)&wfb_ui); + if(SUCCEEDED(hres)) { + const IID *iid_reason; + + if(security_problem) + iid_reason = &IID_IHttpSecurity; + else if(error == ERROR_INTERNET_INCORRECT_PASSWORD) + iid_reason = &IID_IAuthenticate; + else + iid_reason = &IID_IWindowForBindingUI; + + hres = IWindowForBindingUI_GetWindow(wfb_ui, iid_reason, &hwnd); + IWindowForBindingUI_Release(wfb_ui); + if(FAILED(hres)) + hwnd = NULL; + } - IServiceProvider_Release(serv_prov); - dlg_flags = FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS | FLAGS_ERROR_UI_FLAGS_GENERATE_DATA; - if(This->base.bindf & BINDF_NO_UI) - dlg_flags |= FLAGS_ERROR_UI_FLAGS_NO_UI; + dlg_flags = FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS | FLAGS_ERROR_UI_FLAGS_GENERATE_DATA; + if(This->base.bindf & BINDF_NO_UI) + dlg_flags |= FLAGS_ERROR_UI_FLAGS_NO_UI; - res = InternetErrorDlg(hwnd, This->base.request, error, dlg_flags, NULL); - if(res == ERROR_INTERNET_FORCE_RETRY || res == ERROR_SUCCESS) - return RPC_E_RETRY; + res = InternetErrorDlg(hwnd, This->base.request, error, dlg_flags, NULL); + hres = res == ERROR_INTERNET_FORCE_RETRY || res == ERROR_SUCCESS ? RPC_E_RETRY : internet_error_to_hres(error); + } - return internet_error_to_hres(error); + IServiceProvider_Release(serv_prov); + return hres; } static ULONG send_http_request(HttpProtocol *This)

1 0

Dmitry Timoshkov : kernel32: Print in the CopyFileW trace also fail_if_exists parameter.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: 99c10bd7a1d9ffcfb7a69a8db8554d986c4e4a3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=99c10bd7a1d9ffcfb7a69a8db… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 7 17:05:23 2012 +0900 kernel32: Print in the CopyFileW trace also fail_if_exists parameter. --- dlls/kernel32/path.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index e376def..a326058 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -925,7 +925,7 @@ BOOL WINAPI CopyFileW( LPCWSTR source, LPCWSTR dest, BOOL fail_if_exists ) return FALSE; } - TRACE("%s -> %s\n", debugstr_w(source), debugstr_w(dest)); + TRACE("%s -> %s, %d\n", debugstr_w(source), debugstr_w(dest), fail_if_exists); if ((h1 = CreateFileW(source, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0)) == INVALID_HANDLE_VALUE)

1 0

Daniel Jelinski : comctl32/tests: Treeview shouldn' t modify cChildren if it was explicitly set.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: 4c6803d858933e40c6391067661d1010b2a50258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6803d858933e40c63910676… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Thu Jun 7 14:17:50 2012 +0200 comctl32/tests: Treeview shouldn't modify cChildren if it was explicitly set. --- dlls/comctl32/tests/treeview.c | 50 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index a669df9..5a4fde3 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1602,6 +1602,55 @@ static void test_delete_items(void) DestroyWindow(hTree); } +static void test_cchildren(void) +{ + HWND hTree; + INT ret; + TVITEMA item; + + hTree = create_treeview_control(0); + fill_tree(hTree); + + ret = SendMessage(hTree, TVM_DELETEITEM, 0, (LPARAM)hChild); + expect(TRUE, ret); + + /* check cChildren - automatic mode */ + item.hItem = hRoot; + item.mask = TVIF_CHILDREN; + + ret = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, ret); + expect(0, item.cChildren); + + DestroyWindow(hTree); + + /* start over */ + hTree = create_treeview_control(0); + fill_tree(hTree); + + /* turn off automatic mode by setting cChildren explicitly */ + item.hItem = hRoot; + item.mask = TVIF_CHILDREN; + + ret = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, ret); + expect(1, item.cChildren); + + ret = SendMessageA(hTree, TVM_SETITEMA, 0, (LPARAM)&item); + expect(TRUE, ret); + + ret = SendMessage(hTree, TVM_DELETEITEM, 0, (LPARAM)hChild); + expect(TRUE, ret); + + /* check cChildren */ + ret = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, ret); +todo_wine + expect(1, item.cChildren); + + DestroyWindow(hTree); +} + struct _ITEM_DATA { HTREEITEM parent; /* for root value of parent field is unidetified */ @@ -1908,6 +1957,7 @@ START_TEST(treeview) test_TVS_SINGLEEXPAND(); test_WM_PAINT(); test_delete_items(); + test_cchildren(); test_htreeitem_layout(); test_TVS_CHECKBOXES(); test_TVM_GETNEXTITEM();

1 0

Dmitry Timoshkov : windowscodecs: Add a stubbed out IWICMetadataBlockReader to TIFF decoder.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: 34229e5fb6238a872b9f239711d1490e0b040145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34229e5fb6238a872b9f23971… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 6 18:44:11 2012 +0900 windowscodecs: Add a stubbed out IWICMetadataBlockReader to TIFF decoder. --- dlls/windowscodecs/tiffformat.c | 71 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 79e5c60..1040fa6 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -33,6 +33,7 @@ #include "winbase.h" #include "objbase.h" #include "wincodec.h" +#include "wincodecsdk.h" #include "wincodecs_private.h" @@ -231,6 +232,7 @@ typedef struct { typedef struct { IWICBitmapFrameDecode IWICBitmapFrameDecode_iface; + IWICMetadataBlockReader IWICMetadataBlockReader_iface; LONG ref; TiffDecoder *parent; UINT index; @@ -240,6 +242,7 @@ typedef struct { } TiffFrameDecode; static const IWICBitmapFrameDecodeVtbl TiffFrameDecode_Vtbl; +static const IWICMetadataBlockReaderVtbl TiffFrameDecode_BlockVtbl; static inline TiffDecoder *impl_from_IWICBitmapDecoder(IWICBitmapDecoder *iface) { @@ -251,6 +254,11 @@ static inline TiffFrameDecode *impl_from_IWICBitmapFrameDecode(IWICBitmapFrameDe return CONTAINING_RECORD(iface, TiffFrameDecode, IWICBitmapFrameDecode_iface); } +static inline TiffFrameDecode *impl_from_IWICMetadataBlockReader(IWICMetadataBlockReader *iface) +{ + return CONTAINING_RECORD(iface, TiffFrameDecode, IWICMetadataBlockReader_iface); +} + static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) { uint16 photometric, bps, samples, planar; @@ -690,6 +698,7 @@ static HRESULT WINAPI TiffDecoder_GetFrame(IWICBitmapDecoder *iface, if (result) { result->IWICBitmapFrameDecode_iface.lpVtbl = &TiffFrameDecode_Vtbl; + result->IWICMetadataBlockReader_iface.lpVtbl = &TiffFrameDecode_BlockVtbl; result->ref = 1; result->parent = This; result->index = index; @@ -744,6 +753,10 @@ static HRESULT WINAPI TiffFrameDecode_QueryInterface(IWICBitmapFrameDecode *ifac { *ppv = This; } + else if (IsEqualIID(&IID_IWICMetadataBlockReader, iid)) + { + *ppv = &This->IWICMetadataBlockReader_iface; + } else { *ppv = NULL; @@ -1098,6 +1111,64 @@ static const IWICBitmapFrameDecodeVtbl TiffFrameDecode_Vtbl = { TiffFrameDecode_GetThumbnail }; +static HRESULT WINAPI TiffFrameDecode_Block_QueryInterface(IWICMetadataBlockReader *iface, + REFIID iid, void **ppv) +{ + TiffFrameDecode *This = impl_from_IWICMetadataBlockReader(iface); + return IWICBitmapFrameDecode_QueryInterface(&This->IWICBitmapFrameDecode_iface, iid, ppv); +} + +static ULONG WINAPI TiffFrameDecode_Block_AddRef(IWICMetadataBlockReader *iface) +{ + TiffFrameDecode *This = impl_from_IWICMetadataBlockReader(iface); + return IWICBitmapFrameDecode_AddRef(&This->IWICBitmapFrameDecode_iface); +} + +static ULONG WINAPI TiffFrameDecode_Block_Release(IWICMetadataBlockReader *iface) +{ + TiffFrameDecode *This = impl_from_IWICMetadataBlockReader(iface); + return IWICBitmapFrameDecode_Release(&This->IWICBitmapFrameDecode_iface); +} + +static HRESULT WINAPI TiffFrameDecode_Block_GetContainerFormat(IWICMetadataBlockReader *iface, + GUID *guid) +{ + FIXME("(%p,%p): stub\n", iface, guid); + return E_NOTIMPL; +} + +static HRESULT WINAPI TiffFrameDecode_Block_GetCount(IWICMetadataBlockReader *iface, + UINT *count) +{ + FIXME("(%p,%p): stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI TiffFrameDecode_Block_GetReaderByIndex(IWICMetadataBlockReader *iface, + UINT index, IWICMetadataReader **reader) +{ + FIXME("(%p,%u,%p): stub\n", iface, index, reader); + return E_NOTIMPL; +} + +static HRESULT WINAPI TiffFrameDecode_Block_GetEnumerator(IWICMetadataBlockReader *iface, + IEnumUnknown **enum_metadata) +{ + FIXME("(%p,%p): stub\n", iface, enum_metadata); + return E_NOTIMPL; +} + +static const IWICMetadataBlockReaderVtbl TiffFrameDecode_BlockVtbl = +{ + TiffFrameDecode_Block_QueryInterface, + TiffFrameDecode_Block_AddRef, + TiffFrameDecode_Block_Release, + TiffFrameDecode_Block_GetContainerFormat, + TiffFrameDecode_Block_GetCount, + TiffFrameDecode_Block_GetReaderByIndex, + TiffFrameDecode_Block_GetEnumerator +}; + HRESULT TiffDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) { HRESULT ret;

1 0

André Hentschel : d3drm: Improve IDirect3DRMWinDevice_HandlePaint stub.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: 89d43a3dd7f746661c40e366de0596d683510222 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89d43a3dd7f746661c40e366d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 7 13:55:03 2012 +0200 d3drm: Improve IDirect3DRMWinDevice_HandlePaint stub. --- dlls/d3drm/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 519dc11..8dca026 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -1125,7 +1125,7 @@ static HRESULT WINAPI IDirect3DRMWinDeviceImpl_HandlePaint(IDirect3DRMWinDevice* FIXME("(%p/%p)->(%p): stub\n", iface, This, hdc); - return E_NOTIMPL; + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMWinDeviceImpl_HandleActivate(IDirect3DRMWinDevice* iface, WORD wparam)

1 0