wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

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 : 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

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

Christian Costa : d3dx9_36: Add stub for D3DXCleanMesh.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: fcb9c5fadbf0b070bee1b300623c2c9e8f88780e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcb9c5fadbf0b070bee1b3006… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Sep 23 20:45:44 2012 +0200 d3dx9_36: Add stub for D3DXCleanMesh. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 5c880a4..4278ae1 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -8,7 +8,7 @@ @ stdcall D3DXCheckTextureRequirements(ptr ptr ptr ptr long ptr ptr) @ stdcall D3DXCheckVersion(long long) @ stdcall D3DXCheckVolumeTextureRequirements(ptr ptr ptr ptr ptr long ptr ptr) -@ stub D3DXCleanMesh(ptr ptr ptr ptr ptr) +@ stdcall D3DXCleanMesh(long ptr ptr ptr ptr ptr) @ stdcall D3DXColorAdjustContrast(ptr ptr float) @ stdcall D3DXColorAdjustSaturation(ptr ptr float) @ stdcall D3DXCompileShader(ptr long ptr ptr str str long ptr ptr ptr) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 35365eb..de4049a 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3818,6 +3818,14 @@ cleanup: return hr; } +HRESULT WINAPI D3DXCleanMesh(D3DXCLEANTYPE clean_type, LPD3DXMESH mesh_in, const DWORD *adjacency_in, + LPD3DXMESH *mesh_out, DWORD *adjacency_out, LPD3DXBUFFER *errors_and_warnings) +{ + FIXME("(%u, %p, %p, %p, %p, %p)\n", clean_type, mesh_in, adjacency_in, mesh_out, adjacency_out, errors_and_warnings); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DXFrameDestroy(LPD3DXFRAME frame, LPD3DXALLOCATEHIERARCHY alloc_hier) { HRESULT hr;

1 0

Francois Gouget : wininet: Make URLCacheContainers_{Create, Delete}All() static.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 51c90eba233540c6c0018f30d6790bab0e092755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51c90eba233540c6c0018f30d… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 24 08:42:21 2012 +0200 wininet: Make URLCacheContainers_{Create,Delete}All() static. --- dlls/wininet/urlcache.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 87789fe..89be901 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -542,7 +542,7 @@ static void URLCacheContainer_DeleteContainer(URLCACHECONTAINER * pContainer) heap_free(pContainer); } -void URLCacheContainers_CreateDefaults(void) +static void URLCacheContainers_CreateDefaults(void) { static const WCHAR UrlSuffix[] = {'C','o','n','t','e','n','t','.','I','E','5',0}; static const WCHAR UrlPrefix[] = {0}; @@ -601,7 +601,7 @@ void URLCacheContainers_CreateDefaults(void) } } -void URLCacheContainers_DeleteAll(void) +static void URLCacheContainers_DeleteAll(void) { while(!list_empty(&UrlContainers)) URLCacheContainer_DeleteContainer(

1 0

Francois Gouget : mshtml: Make navigate_uri() static.
by Alexandre Julliard 24 Sep '12

24 Sep '12

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

Francois Gouget : d3dcompiler_43: Make compare_hlsl_types_rb() static.
by Alexandre Julliard 24 Sep '12

24 Sep '12

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 24 Sep '12

24 Sep '12

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 : regedit: Fix the spelling of multi-string.
by Alexandre Julliard 24 Sep '12

24 Sep '12

1 0

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

24 Sep '12

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

← Newer
1
...
19
20
21
22
23
24
25
...
83
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 September 2012