September 2012 - Wine-commits

Christian Costa : comctl32: Invalid format returned by NF_QUERY defaults to ANSI in treeview.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 55ff2549860315622e265e9eb7b3c8faeb84b481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55ff2549860315622e265e9eb… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Sep 23 20:46:31 2012 +0200 comctl32: Invalid format returned by NF_QUERY defaults to ANSI in treeview. --- dlls/comctl32/tests/treeview.c | 13 ++++++++++++- dlls/comctl32/treeview.c | 9 ++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 5a4fde3..baf0e02 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -956,6 +956,10 @@ static void test_get_set_unicodeformat(void) hTree = create_treeview_control(0); fill_tree(hTree); + /* Check that an invalid format returned by NF_QUERY defaults to ANSI */ + bPreviousSetting = (BOOL)SendMessage( hTree, TVM_GETUNICODEFORMAT, 0, 0 ); + ok(bPreviousSetting == 0, "Format should be ANSI.\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); /* Set to Unicode */ @@ -1007,10 +1011,17 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, } switch(message) { + case WM_NOTIFYFORMAT: + { + /* Make NF_QUERY return an invalid format to show that it defaults to ANSI */ + if (lParam == NF_QUERY) return 0; + break; + } + case WM_NOTIFY: { NMHDR *pHdr = (NMHDR *)lParam; - + ok(pHdr->code != NM_TOOLTIPSCREATED, "Treeview should not send NM_TOOLTIPSCREATED\n"); if (pHdr->idFrom == 100) { diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index d8fe635..7d195a0 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -848,7 +848,9 @@ static INT TREEVIEW_NotifyFormat (TREEVIEW_INFO *infoPtr, HWND hwndFrom, UINT nC format = SendMessageW(hwndFrom, WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwnd, NF_QUERY); TRACE("format=%d\n", format); - if (format != NFR_ANSI && format != NFR_UNICODE) return 0; + /* Invalid format returned by NF_QUERY defaults to ANSI*/ + if (format != NFR_ANSI && format != NFR_UNICODE) + format = NFR_ANSI; infoPtr->bNtfUnicode = (format == NFR_UNICODE); @@ -5067,10 +5069,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->hwndNotify = lpcs->hwndParent; infoPtr->hwndToolTip = 0; - infoPtr->bNtfUnicode = IsWindowUnicode (hwnd); - - /* Determine what type of notify should be issued */ - /* sets infoPtr->bNtfUnicode */ + /* Determine what type of notify should be issued (sets infoPtr->bNtfUnicode) */ TREEVIEW_NotifyFormat(infoPtr, infoPtr->hwndNotify, NF_REQUERY); if (!(infoPtr->dwStyle & TVS_NOTOOLTIPS))

1 0

Nikolay Sivov : msxml3: Implemented IConnectionPoint_Advise for document object.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 65598b975c3dc659e11909ab3ede3fdf7a69436e URL: http://source.winehq.org/git/wine.git/?a=commit;h=65598b975c3dc659e11909ab3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 23 15:55:13 2012 +0400 msxml3: Implemented IConnectionPoint_Advise for document object. --- dlls/msxml3/domdoc.c | 39 +++++++++++++++++++++++++++++++++++---- 1 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 54c601e..d1e0ebb 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -3248,12 +3248,43 @@ static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoi return S_OK; } -static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown *pUnkSink, - DWORD *pdwCookie) +static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown *unk_sink, + DWORD *cookie) { ConnectionPoint *This = impl_from_IConnectionPoint(iface); - FIXME("(%p)->(%p %p): stub\n", This, pUnkSink, pdwCookie); - return E_NOTIMPL; + IUnknown *sink; + HRESULT hr; + int i; + + TRACE("(%p)->(%p %p)\n", This, unk_sink, cookie); + + hr = IUnknown_QueryInterface(unk_sink, This->iid, (void**)&sink); + if(FAILED(hr) && !IsEqualGUID(&IID_IPropertyNotifySink, This->iid)) + hr = IUnknown_QueryInterface(unk_sink, &IID_IDispatch, (void**)&sink); + if(FAILED(hr)) + return CONNECT_E_CANNOTCONNECT; + + if(This->sinks) + { + for (i = 0; i < This->sinks_size; i++) + if (!This->sinks[i].unk) + break; + + if (i == This->sinks_size) + This->sinks = heap_realloc(This->sinks,(++This->sinks_size)*sizeof(*This->sinks)); + } + else + { + This->sinks = heap_alloc(sizeof(*This->sinks)); + This->sinks_size = 1; + i = 0; + } + + This->sinks[i].unk = sink; + if (cookie) + *cookie = i+1; + + return S_OK; } static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD cookie)

1 0

Nikolay Sivov : po: Update Russian translations.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 62569cc4ba622e64c101b6ecb4b1a50c9d811734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62569cc4ba622e64c101b6ecb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 23 16:09:58 2012 +0400 po: Update Russian translations. --- po/ru.po | 46 +++++++++++++++++----------------------------- 1 files changed, 17 insertions(+), 29 deletions(-) diff --git a/po/ru.po b/po/ru.po index 2a6cad2..57c0843 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3431,65 +3431,59 @@ msgstr "Высокий" #: joy.rc:33 msgid "Joysticks" -msgstr "" +msgstr "Джойстики" #: joy.rc:36 winecfg.rc:204 msgid "&Disable" -msgstr "&Блокировать загрузку" +msgstr "&Отключить" #: joy.rc:37 -#, fuzzy -#| msgid "&enable" msgid "&Enable" -msgstr "&включить" +msgstr "&Включить" #: joy.rc:38 -#, fuzzy -#| msgid "Disconnected" msgid "Connected" -msgstr "Отключено" +msgstr "Подключено" #: joy.rc:40 -#, fuzzy -#| msgid "&Disable" msgid "Disabled" -msgstr "&Блокировать загрузку" +msgstr "Выключено" #: joy.rc:42 msgid "" "After disabling or enabling a device, the connected joysticks won't be " "updated here until you restart this applet." msgstr "" +"Список подключенных джойстиков не обновляется автоматически при подключении/" +"отключении устройств, требуется перезапуск этой программы." #: joy.rc:47 msgid "Test Joystick" -msgstr "" +msgstr "Проверить джойстик" #: joy.rc:51 msgid "Buttons" -msgstr "" +msgstr "Кнопки" #: joy.rc:60 msgid "Test Force Feedback" -msgstr "" +msgstr "Проверить отдачу" #: joy.rc:64 -#, fuzzy -#| msgid "Available formats" msgid "Available Effects" -msgstr "Доступные форматы" +msgstr "Доступные эффекты" #: joy.rc:66 msgid "" "Press any button in the controller to activate the chosen effect. The effect " "direction can be changed with the controller axis." msgstr "" +"Нажмите любую кнопку на контроллере, чтобы активировать выбранный эффект. " +"Направление эффекта может быть изменено с помощью осей контроллера." #: joy.rc:28 -#, fuzzy -#| msgid "Create Control" msgid "Game Controllers" -msgstr "Создать элемент управления" +msgstr "Игровые контроллеры" #: jscript.rc:25 msgid "Error converting object to primitive type" @@ -13661,22 +13655,16 @@ msgid "Help topics: " msgstr "Содержание: " #: wmic.rc:25 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "Error: Command line not supported\n" -msgstr "Ошибка: неправильные параметры командной строки\n" +msgstr "Ошибка: командная строка не поддерживается\n" #: wmic.rc:26 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Error: Alias not found\n" -msgstr "Набор свойств не найден.\n" +msgstr "Ошибка: псевдоним не найден\n" #: wmic.rc:27 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "Error: Invalid query\n" -msgstr "Ошибка: неправильное имя раздела\n" +msgstr "Ошибка: некорректный запрос\n" #: wordpad.rc:28 msgid "&New...\tCtrl+N"

1 0

Nikolay Sivov : mlang: Added IMLangConvertCharset stub.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: f5edf34c6cae2feb4626298182f24e1729b9fb24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5edf34c6cae2feb462629818… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 24 00:01:55 2012 +0400 mlang: Added IMLangConvertCharset stub. --- dlls/mlang/mlang.c | 171 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 159 insertions(+), 12 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index e9f48a0..b5fd0eb 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -47,6 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mlang); #define CP_UNICODE 1200 static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj); +static HRESULT MLangConvertCharset_create(IUnknown *outer, void **obj); static HRESULT EnumRfc1766_create(LANGID LangId, IEnumRfc1766 **ppEnum); static HINSTANCE instance; @@ -1297,6 +1298,7 @@ struct object_creation_info static const struct object_creation_info object_creation[] = { { &CLSID_CMultiLanguage, "CLSID_CMultiLanguage", MultiLanguage_create }, + { &CLSID_CMLangConvertCharset, "CLSID_CMLangConvertCharset", MLangConvertCharset_create } }; static HRESULT WINAPI MLANGCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) @@ -2583,13 +2585,13 @@ static HRESULT WINAPI fnIMultiLanguage_GetRfc1766Info( static HRESULT WINAPI fnIMultiLanguage_CreateConvertCharset( IMultiLanguage* iface, - UINT uiSrcCodePage, - UINT uiDstCodePage, - DWORD dwProperty, - IMLangConvertCharset** ppMLangConvertCharset) + UINT src_cp, + UINT dst_cp, + DWORD prop, + IMLangConvertCharset** convert_charset) { - FIXME("\n"); - return E_NOTIMPL; + MLang_impl *This = impl_from_IMultiLanguage(iface); + return IMultiLanguage3_CreateConvertCharset(&This->IMultiLanguage3_iface, src_cp, dst_cp, prop, convert_charset); } static const IMultiLanguageVtbl IMultiLanguage_vtbl = @@ -2955,13 +2957,19 @@ static HRESULT WINAPI fnIMultiLanguage2_GetRfc1766Info( static HRESULT WINAPI fnIMultiLanguage2_CreateConvertCharset( IMultiLanguage3* iface, - UINT uiSrcCodePage, - UINT uiDstCodePage, - DWORD dwProperty, - IMLangConvertCharset** ppMLangConvertCharset) + UINT src_cp, + UINT dst_cp, + DWORD prop, + IMLangConvertCharset** convert_charset) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%u %u 0x%08x %p)\n", src_cp, dst_cp, prop, convert_charset); + + hr = MLangConvertCharset_create(NULL, (void**)convert_charset); + if (FAILED(hr)) return hr; + + return IMLangConvertCharset_Initialize(*convert_charset, src_cp, dst_cp, prop); } static HRESULT WINAPI fnIMultiLanguage2_ConvertStringInIStream( @@ -3552,6 +3560,123 @@ static const IMLangLineBreakConsoleVtbl IMLangLineBreakConsole_vtbl = fnIMLangLineBreakConsole_BreakLineA }; +struct convert_charset { + IMLangConvertCharset IMLangConvertCharset_iface; + LONG ref; +}; + +static inline struct convert_charset *impl_from_IMLangConvertCharset(IMLangConvertCharset *iface) +{ + return CONTAINING_RECORD(iface, struct convert_charset, IMLangConvertCharset_iface); +} + +static HRESULT WINAPI MLangConvertCharset_QueryInterface(IMLangConvertCharset *iface, REFIID riid, void **obj) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IMLangConvertCharset)) + { + *obj = &This->IMLangConvertCharset_iface; + IMLangConvertCharset_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI MLangConvertCharset_AddRef(IMLangConvertCharset *iface) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + return ref; +} + +static ULONG WINAPI MLangConvertCharset_Release(IMLangConvertCharset *iface) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%u)\n", This, ref); + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + UnlockModule(); + } + + return ref; +} + +static HRESULT WINAPI MLangConvertCharset_Initialize(IMLangConvertCharset *iface, + UINT src_cp, UINT dst_cp, DWORD prop) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + FIXME("(%p)->(%u %u 0x%08x): stub\n", This, src_cp, dst_cp, prop); + return E_NOTIMPL; +} + +static HRESULT WINAPI MLangConvertCharset_GetSourceCodePage(IMLangConvertCharset *iface, UINT *src_cp) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + FIXME("(%p)->(%p): stub\n", This, src_cp); + return E_NOTIMPL; +} + +static HRESULT WINAPI MLangConvertCharset_GetDestinationCodePage(IMLangConvertCharset *iface, UINT *dst_cp) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + FIXME("(%p)->(%p): stub\n", This, dst_cp); + return E_NOTIMPL; +} + +static HRESULT WINAPI MLangConvertCharset_GetProperty(IMLangConvertCharset *iface, DWORD *prop) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + FIXME("(%p)->(%p): stub\n", This, prop); + return E_NOTIMPL; +} + +static HRESULT WINAPI MLangConvertCharset_DoConversion(IMLangConvertCharset *iface, BYTE *src, + UINT *src_size, BYTE *dest, UINT *dest_size) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + FIXME("(%p)->(%p %p %p %p): stub\n", This, src, src_size, dest, dest_size); + return E_NOTIMPL; +} + +static HRESULT WINAPI MLangConvertCharset_DoConversionToUnicode(IMLangConvertCharset *iface, CHAR *src, + UINT *src_size, WCHAR *dest, UINT *dest_size) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + FIXME("(%p)->(%p %p %p %p): stub\n", This, src, src_size, dest, dest_size); + return E_NOTIMPL; +} + +static HRESULT WINAPI MLangConvertCharset_DoConversionFromUnicode(IMLangConvertCharset *iface, + WCHAR *src, UINT *src_size, CHAR *dest, UINT *dest_size) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + FIXME("(%p)->(%p %p %p %p): stub\n", This, src, src_size, dest, dest_size); + return E_NOTIMPL; +} + +static const IMLangConvertCharsetVtbl MLangConvertCharsetVtbl = +{ + MLangConvertCharset_QueryInterface, + MLangConvertCharset_AddRef, + MLangConvertCharset_Release, + MLangConvertCharset_Initialize, + MLangConvertCharset_GetSourceCodePage, + MLangConvertCharset_GetDestinationCodePage, + MLangConvertCharset_GetProperty, + MLangConvertCharset_DoConversion, + MLangConvertCharset_DoConversionToUnicode, + MLangConvertCharset_DoConversionFromUnicode +}; + static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj) { MLang_impl *mlang; @@ -3585,6 +3710,28 @@ static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj) return S_OK; } +static HRESULT MLangConvertCharset_create(IUnknown *outer, void **obj) +{ + struct convert_charset *convert; + + if (outer) + return CLASS_E_NOAGGREGATION; + + *obj = NULL; + + convert = HeapAlloc(GetProcessHeap(), 0, sizeof(struct convert_charset)); + if (!convert) return E_OUTOFMEMORY; + + convert->IMLangConvertCharset_iface.lpVtbl = &MLangConvertCharsetVtbl; + convert->ref = 1; + + *obj = &convert->IMLangConvertCharset_iface; + + LockModule(); + + return S_OK; +} + /******************************************************************************/ HRESULT WINAPI DllCanUnloadNow(void)

1 0

Nikolay Sivov : mlang: Store source and destination codepage ids in IMLangConvertCharset_Initialize .
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: ed42bf08dbd5077adf0db2ea6468f7f27cd9c418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed42bf08dbd5077adf0db2ea6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 24 01:15:11 2012 +0400 mlang: Store source and destination codepage ids in IMLangConvertCharset_Initialize. --- dlls/mlang/mlang.c | 15 +++++++++++++-- include/mlang.idl | 11 +++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index b5fd0eb..388b99c 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3563,6 +3563,9 @@ static const IMLangLineBreakConsoleVtbl IMLangLineBreakConsole_vtbl = struct convert_charset { IMLangConvertCharset IMLangConvertCharset_iface; LONG ref; + + UINT src_cp; + UINT dst_cp; }; static inline struct convert_charset *impl_from_IMLangConvertCharset(IMLangConvertCharset *iface) @@ -3614,8 +3617,16 @@ static HRESULT WINAPI MLangConvertCharset_Initialize(IMLangConvertCharset *iface UINT src_cp, UINT dst_cp, DWORD prop) { struct convert_charset *This = impl_from_IMLangConvertCharset(iface); - FIXME("(%p)->(%u %u 0x%08x): stub\n", This, src_cp, dst_cp, prop); - return E_NOTIMPL; + + TRACE("(%p)->(%u %u 0x%08x)\n", This, src_cp, dst_cp, prop); + + if (prop) + FIXME("property 0x%08x not supported\n", prop); + + This->src_cp = src_cp; + This->dst_cp = dst_cp; + + return S_OK; } static HRESULT WINAPI MLangConvertCharset_GetSourceCodePage(IMLangConvertCharset *iface, UINT *src_cp) diff --git a/include/mlang.idl b/include/mlang.idl index 7cdc970..e153565 100644 --- a/include/mlang.idl +++ b/include/mlang.idl @@ -375,6 +375,17 @@ interface IEnumCodePage : IUnknown ] interface IMLangConvertCharset : IUnknown { + typedef enum tagMLCONVCHARF + { + MLCONVCHARF_AUTODETECT = 1, + MLCONVCHARF_ENTITIZE = 2, + MLCONVCHARF_NCR_ENTITIZE = 2, + MLCONVCHARF_NAME_ENTITIZE = 4, + MLCONVCHARF_USEDEFCHAR = 8, + MLCONVCHARF_NOBESTFITCHARS = 16, + MLCONVCHARF_DETECTJPN = 32 + } MLCONVCHAR; + HRESULT Initialize( [in] UINT uiSrcCodePage, [in] UINT uiDstCodePage,

1 0

Nikolay Sivov : mlang: Implement get source/ dest codepages for IMLangConvertCharset.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 031f3ca16714b78e7586efdd92890f8f5cc2bf2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=031f3ca16714b78e7586efdd9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 24 12:06:28 2012 +0400 mlang: Implement get source/dest codepages for IMLangConvertCharset. --- dlls/mlang/mlang.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 388b99c..caae2c2 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3632,15 +3632,21 @@ static HRESULT WINAPI MLangConvertCharset_Initialize(IMLangConvertCharset *iface static HRESULT WINAPI MLangConvertCharset_GetSourceCodePage(IMLangConvertCharset *iface, UINT *src_cp) { struct convert_charset *This = impl_from_IMLangConvertCharset(iface); - FIXME("(%p)->(%p): stub\n", This, src_cp); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, src_cp); + + *src_cp = This->src_cp; + return S_OK; } static HRESULT WINAPI MLangConvertCharset_GetDestinationCodePage(IMLangConvertCharset *iface, UINT *dst_cp) { struct convert_charset *This = impl_from_IMLangConvertCharset(iface); - FIXME("(%p)->(%p): stub\n", This, dst_cp); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, dst_cp); + + *dst_cp = This->dst_cp; + return S_OK; } static HRESULT WINAPI MLangConvertCharset_GetProperty(IMLangConvertCharset *iface, DWORD *prop)

1 0

Alistair Leslie-Hughes : uuid: Add msdasc.h.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: eda7615d699eb01a73e7bf7e30b12b7e804459e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda7615d699eb01a73e7bf7e3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 24 13:44:00 2012 +1000 uuid: Add msdasc.h. --- dlls/uuid/uuid.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index cae55c7..fd96fe3 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -84,6 +84,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "ocmm.h" #include "commoncontrols.h" #include "tlogstg.h" +#include "msdasc.h" /* FIXME: cguids declares GUIDs but does not define their values */

1 0

Alistair Leslie-Hughes : oledb32: Add IDataInitialize interface support.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 0fd6649988b72837d17de7fe28d10ec967cde801 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fd6649988b72837d17de7fe2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 24 14:20:13 2012 +1000 oledb32: Add IDataInitialize interface support. --- dlls/oledb32/Makefile.in | 1 + dlls/oledb32/datainit.c | 193 ++++++++++++++++++++++++++++++++++++++++++ dlls/oledb32/main.c | 7 ++ dlls/oledb32/oledb_private.h | 1 + 4 files changed, 202 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/Makefile.in b/dlls/oledb32/Makefile.in index 5c66a2c..71e352b 100644 --- a/dlls/oledb32/Makefile.in +++ b/dlls/oledb32/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = uuid oleaut32 ole32 user32 advapi32 C_SRCS = \ convert.c \ + datainit.c \ main.c IDL_I_SRCS = convert.idl diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c new file mode 100644 index 0000000..af596fe --- /dev/null +++ b/dlls/oledb32/datainit.c @@ -0,0 +1,193 @@ +/* + * Copyright (C) 2012 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include <stdarg.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "ole2.h" +#include "msdasc.h" +#include "oledberr.h" + +#include "oledb_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(oledb); + + +typedef struct datainit +{ + IDataInitialize IDataInitialize_iface; + + LONG ref; +} datainit; + +static inline datainit *impl_from_IDataInitialize(IDataInitialize *iface) +{ + return CONTAINING_RECORD(iface, datainit, IDataInitialize_iface); +} + +static HRESULT WINAPI datainit_QueryInterface(IDataInitialize *iface, REFIID riid, void **obj) +{ + datainit *This = impl_from_IDataInitialize(iface); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), obj); + + *obj = NULL; + + if(IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDataInitialize)) + { + *obj = &This->IDataInitialize_iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IDataInitialize_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI datainit_AddRef(IDataInitialize *iface) +{ + datainit *This = impl_from_IDataInitialize(iface); + TRACE("(%p)\n", This); + + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI datainit_Release(IDataInitialize *iface) +{ + datainit *This = impl_from_IDataInitialize(iface); + LONG ref; + + TRACE("(%p)\n", This); + + ref = InterlockedDecrement(&This->ref); + if(ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +/*** IDataInitialize methods ***/ +static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *pUnkOuter, DWORD dwClsCtx, + LPWSTR pwszInitializationString, REFIID riid, IUnknown **ppDataSource) +{ + datainit *This = impl_from_IDataInitialize(iface); + + FIXME("(%p)->(%p %d %s %s %p)\n", This, pUnkOuter, dwClsCtx, debugstr_w(pwszInitializationString), + debugstr_guid(riid), ppDataSource); + + return E_NOTIMPL; +} + +static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, IUnknown *pDataSource, + boolean fIncludePassword, LPWSTR *ppwszInitString) +{ + datainit *This = impl_from_IDataInitialize(iface); + + FIXME("(%p)->(%p %d %p)\n", This, pDataSource, fIncludePassword, ppwszInitString); + + return E_NOTIMPL; +} + +static HRESULT WINAPI datainit_CreateDBInstance(IDataInitialize *iface, REFCLSID clsidProvider, + IUnknown *pUnkOuter, DWORD dwClsCtx, LPWSTR pwszReserved, REFIID riid, + IUnknown **ppDataSource) +{ + datainit *This = impl_from_IDataInitialize(iface); + + FIXME("(%p)->()\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI datainit_RemoteCreateDBInstanceEx(IDataInitialize *iface, REFCLSID clsidProvider, + IUnknown *pUnkOuter, DWORD dwClsCtx, LPWSTR pwszReserved, COSERVERINFO *pServerInfo, + DWORD cmq, GUID **rgpIID, IUnknown **rgpItf, HRESULT *rghr) +{ + datainit *This = impl_from_IDataInitialize(iface); + + FIXME("(%p)->()\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI datainit_LoadStringFromStorage(IDataInitialize *iface, LPWSTR pwszFileName, + LPWSTR *ppwszInitializationString) +{ + datainit *This = impl_from_IDataInitialize(iface); + + FIXME("(%p)->(%s %p)\n", This, debugstr_w(pwszFileName), ppwszInitializationString); + + return E_NOTIMPL; +} + +static HRESULT WINAPI datainit_WriteStringToStorage(IDataInitialize *iface, LPWSTR pwszFileName, + LPWSTR pwszInitializationString, DWORD dwCreationDisposition) +{ + datainit *This = impl_from_IDataInitialize(iface); + + FIXME("(%p)->(%s %s %d)\n", This, debugstr_w(pwszFileName), debugstr_w(pwszInitializationString), dwCreationDisposition); + + return E_NOTIMPL; +} + + +static const struct IDataInitializeVtbl datainit_vtbl = +{ + datainit_QueryInterface, + datainit_AddRef, + datainit_Release, + datainit_GetDataSource, + datainit_GetInitializationString, + datainit_CreateDBInstance, + datainit_RemoteCreateDBInstanceEx, + datainit_LoadStringFromStorage, + datainit_WriteStringToStorage +}; + +HRESULT create_data_init(IUnknown *outer, void **obj) +{ + datainit *This; + + TRACE("(%p)\n", obj); + + if(outer) return CLASS_E_NOAGGREGATION; + + *obj = NULL; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if(!This) return E_OUTOFMEMORY; + + This->IDataInitialize_iface.lpVtbl = &datainit_vtbl; + This->ref = 1; + + *obj = &This->IDataInitialize_iface; + + return S_OK; +} diff --git a/dlls/oledb32/main.c b/dlls/oledb32/main.c index af81d77..e8a1d46 100644 --- a/dlls/oledb32/main.c +++ b/dlls/oledb32/main.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "ole2.h" #include "rpcproxy.h" +#include "msdasc.h" #include "initguid.h" #include "msdaguid.h" @@ -127,6 +128,7 @@ static const IClassFactoryVtbl CF_Vtbl = }; static cf oledb_convert_cf = { { &CF_Vtbl }, create_oledb_convert }; +static cf oledb_datainit_cf = { { &CF_Vtbl }, create_data_init }; /****************************************************************** * DllGetClassObject @@ -140,6 +142,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **obj) *obj = &oledb_convert_cf; return S_OK; } + else if ( IsEqualCLSID (rclsid, &CLSID_MSDAINITIALIZE) ) + { + *obj = &oledb_datainit_cf; + return S_OK; + } return CLASS_E_CLASSNOTAVAILABLE; } diff --git a/dlls/oledb32/oledb_private.h b/dlls/oledb32/oledb_private.h index a79d251..ad5d67f 100644 --- a/dlls/oledb32/oledb_private.h +++ b/dlls/oledb32/oledb_private.h @@ -18,3 +18,4 @@ */ HRESULT create_oledb_convert(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; +HRESULT create_data_init(IUnknown *outer, void **obj) DECLSPEC_HIDDEN;

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapDecoder_CopyPalette for the GIF decoder.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 54800a80744768cef06c2f6d8b273950dfd11b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=54800a80744768cef06c2f6d8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 24 13:23:04 2012 +0900 windowscodecs: Implement IWICBitmapDecoder_CopyPalette for the GIF decoder. --- dlls/windowscodecs/gifformat.c | 31 +++++++++++++++++++++++++++---- dlls/windowscodecs/tests/gifformat.c | 6 ++---- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index fc6909b..b27b3ad 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1165,11 +1165,34 @@ static HRESULT WINAPI GifDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, return hr; } -static HRESULT WINAPI GifDecoder_CopyPalette(IWICBitmapDecoder *iface, - IWICPalette *pIPalette) +static HRESULT WINAPI GifDecoder_CopyPalette(IWICBitmapDecoder *iface, IWICPalette *palette) { - TRACE("(%p,%p)\n", iface, pIPalette); - return WINCODEC_ERR_FRAMEMISSING; + GifDecoder *This = impl_from_IWICBitmapDecoder(iface); + WICColor colors[256]; + ColorMapObject *cm; + int i; + + TRACE("(%p,%p)\n", iface, palette); + + cm = This->gif->SColorMap; + if (!cm) return WINCODEC_ERR_FRAMEMISSING; + + if (cm->ColorCount > 256) + { + ERR("GIF contains invalid number of colors: %d\n", cm->ColorCount); + return E_FAIL; + } + + for (i = 0; i < cm->ColorCount; i++) + { + colors[i] = 0xff000000 | /* alpha */ + cm->Colors[i].Red << 16 | + cm->Colors[i].Green << 8 | + cm->Colors[i].Blue; + } + + /* FIXME: transparent color? */ + return IWICPalette_InitializeCustom(palette, colors, cm->ColorCount); } static HRESULT WINAPI GifDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/tests/gifformat.c b/dlls/windowscodecs/tests/gifformat.c index b633ad0..4a5ea5c 100644 --- a/dlls/windowscodecs/tests/gifformat.c +++ b/dlls/windowscodecs/tests/gifformat.c @@ -103,23 +103,21 @@ static void test_global_gif_palette(void) /* global palette */ hr = IWICBitmapDecoder_CopyPalette(decoder, palette); -todo_wine ok(hr == S_OK, "CopyPalette error %#x\n", hr); hr = IWICPalette_GetColorCount(palette, &count); ok(hr == S_OK, "GetColorCount error %#x\n", hr); -todo_wine ok(count == 4, "expected 4, got %u\n", count); hr = IWICPalette_GetColors(palette, count, color, &ret); ok(hr == S_OK, "GetColors error %#x\n", hr); ok(ret == count, "expected %u, got %u\n", count, ret); -todo_wine { ok(color[0] == 0xff010203, "expected 0xff010203, got %#x\n", color[0]); +todo_wine ok(color[1] == 0x00040506, "expected 0x00040506, got %#x\n", color[1]); ok(color[2] == 0xff070809, "expected 0xff070809, got %#x\n", color[2]); ok(color[3] == 0xff0a0b0c, "expected 0xff0a0b0c, got %#x\n", color[3]); -} + /* frame palette */ hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); ok(hr == S_OK, "GetFrame error %#x\n", hr);

1 0

Dmitry Timoshkov : windowscodecs: Add some tests for palette in a multiframe GIF image.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 3eb499556e34f74e6afe4bff143e7f46201b584a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eb499556e34f74e6afe4bff1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 24 13:23:10 2012 +0900 windowscodecs: Add some tests for palette in a multiframe GIF image. --- dlls/windowscodecs/tests/gifformat.c | 122 ++++++++++++++++++++++++++++++++++ 1 files changed, 122 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/gifformat.c b/dlls/windowscodecs/tests/gifformat.c index 4a5ea5c..549cf2b 100644 --- a/dlls/windowscodecs/tests/gifformat.c +++ b/dlls/windowscodecs/tests/gifformat.c @@ -33,6 +33,20 @@ static const char gif_global_palette[] = { 0x02,0x02,0x44,0x01,0x00,0x3b }; +/* frame 0, GCE transparent index 1 + * frame 1, GCE transparent index 2 + */ +static const char gif_global_palette_2frames[] = { +/* LSD */'G','I','F','8','9','a',0x01,0x00,0x01,0x00,0xa1,0x02,0x00, +/* palette */0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c, +/* GCE */0x21,0xf9,0x04,0x01,0x05,0x00,0x01,0x00, /* index 1 */ +/* IMD */0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00, +0x02,0x02,0x44,0x01,0x00, +/* GCE */0x21,0xf9,0x04,0x01,0x05,0x00,0x02,0x00, /* index 2 */ +/* IMD */0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00, +0x02,0x02,0x44,0x01,0x00,0x3b +}; + static const char gif_local_palette[] = { /* LSD */'G','I','F','8','7','a',0x01,0x00,0x01,0x00,0x27,0x02,0x00, /* GCE */0x21,0xf9,0x04,0x01,0x05,0x00,0x01,0x00, /* index 1 */ @@ -147,6 +161,113 @@ todo_wine IWICBitmapDecoder_Release(decoder); } +static void test_global_gif_palette_2frames(void) +{ + HRESULT hr; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + IWICPalette *palette; + GUID format; + UINT count, ret; + WICColor color[256]; + + decoder = create_decoder(gif_global_palette_2frames, sizeof(gif_global_palette_2frames)); + ok(decoder != 0, "Failed to load GIF image data\n"); + + /* active frame 0, GCE transparent index 1 */ + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + + /* global palette */ + hr = IWICBitmapDecoder_CopyPalette(decoder, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 4, "expected 4, got %u\n", count); + + hr = IWICPalette_GetColors(palette, count, color, &ret); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); + ok(color[0] == 0xff010203, "expected 0xff010203, got %#x\n", color[0]); +todo_wine + ok(color[1] == 0x00040506, "expected 0x00040506, got %#x\n", color[1]); + ok(color[2] == 0xff070809, "expected 0xff070809, got %#x\n", color[2]); + ok(color[3] == 0xff0a0b0c, "expected 0xff0a0b0c, got %#x\n", color[3]); + + /* frame 0 palette */ + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat8bppIndexed), + "wrong pixel format %s\n", debugstr_guid(&format)); + + hr = IWICBitmapFrameDecode_CopyPalette(frame, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 4, "expected 4, got %u\n", count); + + hr = IWICPalette_GetColors(palette, count, color, &ret); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); + ok(color[0] == 0xff010203, "expected 0xff010203, got %#x\n", color[0]); + ok(color[1] == 0x00040506, "expected 0x00040506, got %#x\n", color[1]); + ok(color[2] == 0xff070809, "expected 0xff070809, got %#x\n", color[2]); + ok(color[3] == 0xff0a0b0c, "expected 0xff0a0b0c, got %#x\n", color[3]); + + IWICBitmapFrameDecode_Release(frame); + + /* active frame 1, GCE transparent index 2 */ + hr = IWICBitmapDecoder_GetFrame(decoder, 1, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + /* global palette */ + hr = IWICBitmapDecoder_CopyPalette(decoder, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 4, "expected 4, got %u\n", count); + + hr = IWICPalette_GetColors(palette, count, color, &ret); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); + ok(color[0] == 0xff010203, "expected 0xff010203, got %#x\n", color[0]); + ok(color[1] == 0xff040506 || broken(color[1] == 0x00040506) /* XP */, "expected 0xff040506, got %#x\n", color[1]); +todo_wine + ok(color[2] == 0x00070809 || broken(color[2] == 0xff070809) /* XP */, "expected 0x00070809, got %#x\n", color[2]); + ok(color[3] == 0xff0a0b0c, "expected 0xff0a0b0c, got %#x\n", color[3]); + + /* frame 1 palette */ + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat8bppIndexed), + "wrong pixel format %s\n", debugstr_guid(&format)); + + hr = IWICBitmapFrameDecode_CopyPalette(frame, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 4, "expected 4, got %u\n", count); + + hr = IWICPalette_GetColors(palette, count, color, &ret); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); + ok(color[0] == 0xff010203, "expected 0xff010203, got %#x\n", color[0]); + ok(color[1] == 0xff040506, "expected 0xff040506, got %#x\n", color[1]); + ok(color[2] == 0x00070809, "expected 0x00070809, got %#x\n", color[2]); + ok(color[3] == 0xff0a0b0c, "expected 0xff0a0b0c, got %#x\n", color[3]); + + IWICPalette_Release(palette); + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); +} + static void test_local_gif_palette(void) { HRESULT hr; @@ -208,6 +329,7 @@ START_TEST(gifformat) if (FAILED(hr)) return; test_global_gif_palette(); + test_global_gif_palette_2frames(); test_local_gif_palette(); IWICImagingFactory_Release(factory);

1 0