September 2012 - Wine-Commits

Nikolay Sivov : mlang: Added IMLangConvertCharset stub.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

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 : po: Update Russian translations.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

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 : msxml3: Implemented IConnectionPoint_Advise for document object.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

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

Christian Costa : comctl32: Invalid format returned by NF_QUERY defaults to ANSI in treeview.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

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

Francois Gouget : d3dcompiler_43: Make compare_hlsl_types_rb() static.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 919db661e51ec51ce693fcf597bf2faaa328d2ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=919db661e51ec51ce693fcf59… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 24 08:42:08 2012 +0200 d3dcompiler_43: Make compare_hlsl_types_rb() static. --- dlls/d3dcompiler_43/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index cc35ce9..d50a9be 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1671,7 +1671,7 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig return &assign->node; } -int compare_hlsl_types_rb(const void *key, const struct wine_rb_entry *entry) +static int compare_hlsl_types_rb(const void *key, const struct wine_rb_entry *entry) { const char *name = (const char *)key; const struct hlsl_type *type = WINE_RB_ENTRY_VALUE(entry, const struct hlsl_type, scope_entry);

1 0

Francois Gouget : kernel32: Add line wrapping support to FormatMessage().
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 49cf27ab2aa73b1247efb59b325255f4d038e248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49cf27ab2aa73b1247efb59b3… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 24 08:38:13 2012 +0200 kernel32: Add line wrapping support to FormatMessage(). --- dlls/kernel32/format_msg.c | 65 +++++++++++++++++++++----- dlls/kernel32/tests/format_msg.c | 96 +++++++++++++++++++------------------- 2 files changed, 101 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49cf27ab2aa73b1247efb…

1 0

Francois Gouget : mshtml: Make navigate_uri() static.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 7af53b5f485ddca8c4d37e35f0eee445c9866c69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7af53b5f485ddca8c4d37e35f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 24 08:42:13 2012 +0200 mshtml: Make navigate_uri() static. --- dlls/mshtml/navigate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 3b618e2..fea8b4c 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2245,7 +2245,7 @@ HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, nsChannel *nschanne return hres; } -HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *display_uri) +static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *display_uri) { nsWineURI *nsuri; HRESULT hres;

1 0

Nikolay Sivov : mlang: Implement get source/ dest codepages for IMLangConvertCharset.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

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

Francois Gouget : oleaut32/tests: Fix compilation on systems that don' t support nameless structs or unions.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: 085b1ba3f50e2f1d8af51c6a760d19389ee3cf67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=085b1ba3f50e2f1d8af51c6a7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 24 08:03:29 2012 +0200 oleaut32/tests: Fix compilation on systems that don't support nameless structs or unions. --- dlls/oleaut32/tests/vartest.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 94bbf7e..c7b46db 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -3375,10 +3375,10 @@ static void test_VarRound(void) i, S(U(V_DECIMAL(&vDst))).sign, ptr->ret.sign); ok(V_DECIMAL(&vDst).Hi32 == ptr->ret.Hi32, "%d: got Hi32 %d, expected %d\n", i, V_DECIMAL(&vDst).Hi32, ptr->ret.Hi32); - ok(S(U(V_DECIMAL(&vDst))).Mid32 == ptr->ret.Mid32, "%d: got Mid32 %d, expected %d\n", - i, S(U(V_DECIMAL(&vDst))).Mid32, ptr->ret.Mid32); - ok(S(U(V_DECIMAL(&vDst))).Lo32 == ptr->ret.Lo32, "%d: got Lo32 %d, expected %d\n", - i, S(U(V_DECIMAL(&vDst))).Lo32, ptr->ret.Lo32); + ok(S1(U1(V_DECIMAL(&vDst))).Mid32 == ptr->ret.Mid32, "%d: got Mid32 %d, expected %d\n", + i, S1(U1(V_DECIMAL(&vDst))).Mid32, ptr->ret.Mid32); + ok(S1(U1(V_DECIMAL(&vDst))).Lo32 == ptr->ret.Lo32, "%d: got Lo32 %d, expected %d\n", + i, S1(U1(V_DECIMAL(&vDst))).Lo32, ptr->ret.Lo32); } }

1 0

Francois Gouget : d3dx9_36/tests: Fix compilation on systems that don' t support nameless structs or unions.
by Alexandre Julliard Sept. 24, 2012

Sept. 24, 2012

Module: wine Branch: master Commit: ae3a919ba00cb9a13835a557533b931f4533addc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae3a919ba00cb9a13835a5575… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 24 08:02:31 2012 +0200 d3dx9_36/tests: Fix compilation on systems that don't support nameless structs or unions. --- dlls/d3dx9_36/tests/shader.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index ad092ab..32fab94 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -643,9 +643,9 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) ok(res == D3D_OK, "ID3DXConstantTable_SetMatrix failed on variable f: 0x%08x\n", res); IDirect3DDevice9_GetVertexShaderConstantF(device, 6, out, 1); - ok(out[0] == U(S(mvp))._11 && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f, + ok(out[0] == S(U(mvp))._11 && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f, "The variable f was not set correctly by ID3DXConstantTable_SetMatrix, got %f, should be %f\n", - out[0], U(S(mvp))._11); + out[0], S(U(mvp))._11); /* Clear registers */ memset(out, 0, sizeof(out)); @@ -699,9 +699,9 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixTranspose failed on variable f: 0x%08x\n", res); IDirect3DDevice9_GetVertexShaderConstantF(device, 6, out, 1); - ok(out[0] == U(S(mvp))._11 && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f, + ok(out[0] == S(U(mvp))._11 && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f, "The variable f was not set correctly by ID3DXConstantTable_SetMatrixTranspose, got %f, should be %f\n", - out[0], U(S(mvp))._11); + out[0], S(U(mvp))._11); res = ID3DXConstantTable_SetMatrixTranspose(ctable, device, "f4", &mvp); ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixTranspose failed on variable f4: 0x%08x\n", res); @@ -719,20 +719,20 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixPointerArray failed on variable f: got %#x\n", res); IDirect3DDevice9_GetVertexShaderConstantF(device, 6, out, 1); - ok(out[0] == U(S(mvp))._11 && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f, + ok(out[0] == S(U(mvp))._11 && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f, "The variable f was not set correctly by ID3DXConstantTable_SetMatrixPointerArray, " "got %f, should be %f\n", - out[0], U(S(mvp))._11); + out[0], S(U(mvp))._11); res = ID3DXConstantTable_SetMatrixPointerArray(ctable, device, "f4", matrix_pointer, 1); ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixPointerArray failed on variable f4: got %#x\n", res); IDirect3DDevice9_GetVertexShaderConstantF(device, 7, out, 1); - ok(out[0] == U(S(mvp))._11 && out[1] == U(S(mvp))._12 && out[2] == U(S(mvp))._13 && out[3] == U(S(mvp))._14, + ok(out[0] == S(U(mvp))._11 && out[1] == S(U(mvp))._12 && out[2] == S(U(mvp))._13 && out[3] == S(U(mvp))._14, "The variable f4 was not set correctly by ID3DXConstantTable_SetMatrixPointerArray, " "got {%f, %f, %f, %f}, should be {%f, %f, %f, %f}\n", out[0], out[1], out[2], out[3], - U(S(mvp))._11, U(S(mvp))._12, U(S(mvp))._13, U(S(mvp))._14); + S(U(mvp))._11, S(U(mvp))._12, S(U(mvp))._13, S(U(mvp))._14); memset(out, 0, sizeof(out)); IDirect3DDevice9_SetVertexShaderConstantF(device, 6, out, 1); @@ -740,20 +740,20 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixTransposePointerArray failed on variable f: got %#x\n", res); IDirect3DDevice9_GetVertexShaderConstantF(device, 6, out, 1); - ok(out[0] == U(S(mvp))._11 && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f, + ok(out[0] == S(U(mvp))._11 && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f, "The variable f was not set correctly by ID3DXConstantTable_SetMatrixTransposePointerArray, " "got %f, should be %f\n", - out[0], U(S(mvp))._11); + out[0], S(U(mvp))._11); res = ID3DXConstantTable_SetMatrixTransposePointerArray(ctable, device, "f4", matrix_pointer, 1); ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixTransposePointerArray failed on variable f4: got %#x\n", res); IDirect3DDevice9_GetVertexShaderConstantF(device, 7, out, 1); - ok(out[0] == U(S(mvp))._11 && out[1] == U(S(mvp))._21 && out[2] == U(S(mvp))._31 && out[3] == U(S(mvp))._41, + ok(out[0] == S(U(mvp))._11 && out[1] == S(U(mvp))._21 && out[2] == S(U(mvp))._31 && out[3] == S(U(mvp))._41, "The variable f4 was not set correctly by ID3DXConstantTable_SetMatrixTransposePointerArray, " "got {%f, %f, %f, %f}, should be {%f, %f, %f, %f}\n", out[0], out[1], out[2], out[3], - U(S(mvp))._11, U(S(mvp))._21, U(S(mvp))._31, U(S(mvp))._41); + S(U(mvp))._11, S(U(mvp))._21, S(U(mvp))._31, S(U(mvp))._41); refcnt = ID3DXConstantTable_Release(ctable); ok(refcnt == 0, "The constant table reference count was %u, should be 0\n", refcnt);

1 0