May 2014 - Wine-commits - list.winehq.org

Piotr Caban : oleacc: Prepare CreateStdAccessibleObject to support class specific accessibility objects.
by Alexandre Julliard 16 May '14

16 May '14

Module: wine Branch: master Commit: e73bbd0c810332f0eef93bd3d44149a82115edfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e73bbd0c810332f0eef93bd3d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 16 16:37:03 2014 +0200 oleacc: Prepare CreateStdAccessibleObject to support class specific accessibility objects. --- dlls/oleacc/main.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 97 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 9d5320e..c7a622b 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "ole2.h" +#include "commctrl.h" #include "initguid.h" #include "oleacc_private.h" @@ -36,6 +37,54 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); static const WCHAR lresult_atom_prefix[] = {'w','i','n','e','_','o','l','e','a','c','c',':'}; +static const WCHAR menuW[] = {'#','3','2','7','6','8',0}; +static const WCHAR desktopW[] = {'#','3','2','7','6','9',0}; +static const WCHAR dialogW[] = {'#','3','2','7','7','0',0}; +static const WCHAR winswitchW[] = {'#','3','2','7','7','1',0}; +static const WCHAR mdi_clientW[] = {'M','D','I','C','l','i','e','n','t',0}; +static const WCHAR richeditW[] = {'R','I','C','H','E','D','I','T',0}; +static const WCHAR richedit20aW[] = {'R','i','c','h','E','d','i','t','2','0','A',0}; +static const WCHAR richedit20wW[] = {'R','i','c','h','E','d','i','t','2','0','W',0}; + +typedef HRESULT (WINAPI *accessible_create)(HWND, const IID*, void**); + +static struct { + const WCHAR *name; + DWORD idx; + accessible_create create_client; + accessible_create create_window; +} builtin_classes[] = { + {WC_LISTBOXW, 0x10000, NULL, NULL}, + {menuW, 0x10001, NULL, NULL}, + {WC_BUTTONW, 0x10002, NULL, NULL}, + {WC_STATICW, 0x10003, NULL, NULL}, + {WC_EDITW, 0x10004, NULL, NULL}, + {WC_COMBOBOXW, 0x10005, NULL, NULL}, + {dialogW, 0x10006, NULL, NULL}, + {winswitchW, 0x10007, NULL, NULL}, + {mdi_clientW, 0x10008, NULL, NULL}, + {desktopW, 0x10009, NULL, NULL}, + {WC_SCROLLBARW, 0x1000a, NULL, NULL}, + {STATUSCLASSNAMEW, 0x1000b, NULL, NULL}, + {TOOLBARCLASSNAMEW, 0x1000c, NULL, NULL}, + {PROGRESS_CLASSW, 0x1000d, NULL, NULL}, + {ANIMATE_CLASSW, 0x1000e, NULL, NULL}, + {WC_TABCONTROLW, 0x1000f, NULL, NULL}, + {HOTKEY_CLASSW, 0x10010, NULL, NULL}, + {WC_HEADERW, 0x10011, NULL, NULL}, + {TRACKBAR_CLASSW, 0x10012, NULL, NULL}, + {WC_LISTVIEWW, 0x10013, NULL, NULL}, + {UPDOWN_CLASSW, 0x10016, NULL, NULL}, + {TOOLTIPS_CLASSW, 0x10018, NULL, NULL}, + {WC_TREEVIEWW, 0x10019, NULL, NULL}, + {MONTHCAL_CLASSW, 0, NULL, NULL}, + {DATETIMEPICK_CLASSW, 0, NULL, NULL}, + {WC_IPADDRESSW, 0, NULL, NULL}, + {richeditW, 0x1001c, NULL, NULL}, + {richedit20aW, 0, NULL, NULL}, + {richedit20wW, 0, NULL, NULL}, +}; + static HINSTANCE oleacc_handle = 0; const char *debugstr_variant(const VARIANT *v) @@ -81,20 +130,65 @@ int convert_child_id(VARIANT *v) } } +static accessible_create get_builtin_accessible_obj(HWND hwnd, LONG objid) +{ + WCHAR class_name[64]; + int i, idx; + + if(!RealGetWindowClassW(hwnd, class_name, sizeof(class_name)/sizeof(WCHAR))) + return NULL; + TRACE("got window class: %s\n", debugstr_w(class_name)); + + for(i=0; i<sizeof(builtin_classes)/sizeof(builtin_classes[0]); i++) { + if(!strcmpiW(class_name, builtin_classes[i].name)) { + accessible_create ret; + + ret = (objid==OBJID_CLIENT ? + builtin_classes[i].create_client : + builtin_classes[i].create_window); + if(!ret) + FIXME("unhandled window class: %s\n", debugstr_w(class_name)); + return ret; + } + } + + idx = SendMessageW(hwnd, WM_GETOBJECT, 0, OBJID_QUERYCLASSNAMEIDX); + if(idx) { + for(i=0; i<sizeof(builtin_classes)/sizeof(builtin_classes[0]); i++) { + if(idx == builtin_classes[i].idx) { + accessible_create ret; + + ret = (objid==OBJID_CLIENT ? + builtin_classes[i].create_client : + builtin_classes[i].create_window); + if(!ret) + FIXME("unhandled class name idx: %x\n", idx); + return ret; + } + } + + WARN("unhandled class name idx: %x\n", idx); + } + + return NULL; +} + HRESULT WINAPI CreateStdAccessibleObject( HWND hwnd, LONG idObject, REFIID riidInterface, void** ppvObject ) { - WCHAR class_name[64]; + accessible_create create; TRACE("%p %d %s %p\n", hwnd, idObject, debugstr_guid( riidInterface ), ppvObject ); - if(GetClassNameW(hwnd, class_name, sizeof(class_name)/sizeof(WCHAR))) - FIXME("unhandled window class: %s\n", debugstr_w(class_name)); switch(idObject) { case OBJID_CLIENT: + create = get_builtin_accessible_obj(hwnd, idObject); + if(create) return create(hwnd, riidInterface, ppvObject); return create_client_object(hwnd, riidInterface, ppvObject); case OBJID_WINDOW: + create = get_builtin_accessible_obj(hwnd, idObject); + if(create) return create(hwnd, riidInterface, ppvObject); return create_window_object(hwnd, riidInterface, ppvObject); default: FIXME("unhandled object id: %d\n", idObject);

1 0

Michael Stefaniuc : dmusic: Move a struct to the .c file it is used.
by Alexandre Julliard 16 May '14

16 May '14

Module: wine Branch: master Commit: 176b7aa8423ada08261d26ca6343ce6687984c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=176b7aa8423ada08261d26ca6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 15 23:55:43 2014 +0200 dmusic: Move a struct to the .c file it is used. --- dlls/dmusic/collection.c | 25 ++++++++++++++++++++++--- dlls/dmusic/dmusic_private.h | 25 ------------------------- 2 files changed, 22 insertions(+), 28 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 90a7918..acbc2a5 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -23,6 +23,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic); WINE_DECLARE_DEBUG_CHANNEL(dmfile); +/***************************************************************************** + * IDirectMusicCollectionImpl implementation + */ +typedef struct IDirectMusicCollectionImpl { + IDirectMusicCollection IDirectMusicCollection_iface; + IDirectMusicObject IDirectMusicObject_iface; + IPersistStream IPersistStream_iface; + LONG ref; + /* IDirectMusicCollectionImpl fields */ + IStream *pStm; /* stream from which we load collection and later instruments */ + LARGE_INTEGER liCollectionPosition; /* offset in a stream where collection was loaded from */ + LARGE_INTEGER liWavePoolTablePosition; /* offset in a stream where wave pool table can be found */ + DMUS_OBJECTDESC *pDesc; + CHAR *szCopyright; /* FIXME: should probably placed somewhere else */ + DLSHEADER *pHeader; + /* pool table */ + POOLTABLE *pPoolTable; + POOLCUE *pPoolCues; + /* instruments */ + struct list Instruments; +} IDirectMusicCollectionImpl; + static inline IDirectMusicCollectionImpl *impl_from_IDirectMusicCollection(IDirectMusicCollection *iface) { return CONTAINING_RECORD(iface, IDirectMusicCollectionImpl, IDirectMusicCollection_iface); @@ -38,9 +60,6 @@ static inline IDirectMusicCollectionImpl *impl_from_IPersistStream(IPersistStrea return CONTAINING_RECORD(iface, IDirectMusicCollectionImpl, IPersistStream_iface); } -/***************************************************************************** - * IDirectMusicCollectionImpl implementation - */ /* IDirectMusicCollectionImpl IUnknown part: */ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_QueryInterface(LPDIRECTMUSICCOLLECTION iface, REFIID riid, LPVOID *ret_iface) { diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index badc2df..6a87bee 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -51,7 +51,6 @@ typedef struct IDirectMusicDownloadedInstrumentImpl IDirectMusicDownloadedInstru typedef struct IDirectMusicDownloadImpl IDirectMusicDownloadImpl; typedef struct IReferenceClockImpl IReferenceClockImpl; -typedef struct IDirectMusicCollectionImpl IDirectMusicCollectionImpl; typedef struct IDirectMusicInstrumentImpl IDirectMusicInstrumentImpl; typedef struct SynthPortImpl SynthPortImpl; @@ -210,30 +209,6 @@ typedef struct _DMUS_PRIVATE_POOLCUE { } DMUS_PRIVATE_POOLCUE, *LPDMUS_PRIVATE_POOLCUE; /***************************************************************************** - * IDirectMusicCollectionImpl implementation structure - */ -struct IDirectMusicCollectionImpl { - /* IUnknown fields */ - IDirectMusicCollection IDirectMusicCollection_iface; - IDirectMusicObject IDirectMusicObject_iface; - IPersistStream IPersistStream_iface; - LONG ref; - - /* IDirectMusicCollectionImpl fields */ - IStream *pStm; /* stream from which we load collection and later instruments */ - LARGE_INTEGER liCollectionPosition; /* offset in a stream where collection was loaded from */ - LARGE_INTEGER liWavePoolTablePosition; /* offset in a stream where wave pool table can be found */ - LPDMUS_OBJECTDESC pDesc; - CHAR* szCopyright; /* FIXME: should probably placed somewhere else */ - LPDLSHEADER pHeader; - /* pool table */ - LPPOOLTABLE pPoolTable; - LPPOOLCUE pPoolCues; - /* instruments */ - struct list Instruments; -}; - -/***************************************************************************** * IDirectMusicInstrumentImpl implementation structure */ struct IDirectMusicInstrumentImpl {

1 0

Nikolay Sivov : ntdll: Implement non-blocking mode for LdrLockLoaderLock() .
by Alexandre Julliard 16 May '14

16 May '14

Module: wine Branch: master Commit: 97e2af1f73b6985bd9c91fce18d0de1a1d95dc85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97e2af1f73b6985bd9c91fce1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 16 09:03:27 2014 +0400 ntdll: Implement non-blocking mode for LdrLockLoaderLock(). --- dlls/ntdll/loader.c | 26 +++++++++++++++++----- dlls/ntdll/tests/rtl.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d458a31..6471290 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1337,17 +1337,33 @@ NTSTATUS WINAPI LdrFindEntryForAddress(const void* addr, PLDR_MODULE* pmod) /****************************************************************** * LdrLockLoaderLock (NTDLL.@) * - * Note: flags are not implemented. + * Note: some flags are not implemented. * Flag 0x01 is used to raise exceptions on errors. - * Flag 0x02 is used to avoid waiting on the section (does RtlTryEnterCriticalSection instead). */ NTSTATUS WINAPI LdrLockLoaderLock( ULONG flags, ULONG *result, ULONG *magic ) { - if (flags) FIXME( "flags %x not supported\n", flags ); + if (flags & ~0x2) FIXME( "flags %x not supported\n", flags ); - if (result) *result = 1; + if (result) *result = 0; + if (magic) *magic = 0; + if (flags & ~0x3) return STATUS_INVALID_PARAMETER_1; + if (!result && (flags & 0x2)) return STATUS_INVALID_PARAMETER_2; if (!magic) return STATUS_INVALID_PARAMETER_3; - RtlEnterCriticalSection( &loader_section ); + + if (flags & 0x2) + { + if (!RtlTryEnterCriticalSection( &loader_section )) + { + *result = 2; + return STATUS_SUCCESS; + } + *result = 1; + } + else + { + RtlEnterCriticalSection( &loader_section ); + if (result) *result = 1; + } *magic = GetCurrentThreadId(); return STATUS_SUCCESS; } diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 6eb6de3..72cee05 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -90,6 +90,8 @@ static CHAR * (WINAPI *pRtlIpv4AddressToStringA)(const IN_ADDR *, LPSTR); static NTSTATUS (WINAPI *pRtlIpv4AddressToStringExA)(const IN_ADDR *, USHORT, LPSTR, PULONG); static NTSTATUS (WINAPI *pRtlIpv4StringToAddressA)(PCSTR, BOOLEAN, PCSTR *, IN_ADDR *); static NTSTATUS (WINAPI *pLdrAddRefDll)(ULONG, HMODULE); +static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG*, ULONG*); +static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -135,6 +137,8 @@ static void InitFunctionPtrs(void) pRtlIpv4AddressToStringExA = (void *)GetProcAddress(hntdll, "RtlIpv4AddressToStringExA"); pRtlIpv4StringToAddressA = (void *)GetProcAddress(hntdll, "RtlIpv4StringToAddressA"); pLdrAddRefDll = (void *)GetProcAddress(hntdll, "LdrAddRefDll"); + pLdrLockLoaderLock = (void *)GetProcAddress(hntdll, "LdrLockLoaderLock"); + pLdrUnlockLoaderLock = (void *)GetProcAddress(hntdll, "LdrUnlockLoaderLock"); } hkernel32 = LoadLibraryA("kernel32.dll"); ok(hkernel32 != 0, "LoadLibrary failed\n"); @@ -1543,6 +1547,57 @@ static void test_LdrAddRefDll(void) ok(mod2 != NULL, "got %p\n", mod2); } +static void test_LdrLockLoaderLock(void) +{ + ULONG result, magic; + NTSTATUS status; + + if (!pLdrLockLoaderLock) + { + win_skip("LdrLockLoaderLock() is not available\n"); + return; + } + + /* invalid flags */ + result = 10; + magic = 0xdeadbeef; + status = pLdrLockLoaderLock(0x10, &result, &magic); + ok(status == STATUS_INVALID_PARAMETER_1, "got 0x%08x\n", status); + ok(result == 0, "got %d\n", result); + ok(magic == 0, "got 0x%08x\n", magic); + + magic = 0xdeadbeef; + status = pLdrLockLoaderLock(0x10, NULL, &magic); + ok(status == STATUS_INVALID_PARAMETER_1, "got 0x%08x\n", status); + ok(magic == 0, "got 0x%08x\n", magic); + + result = 10; + status = pLdrLockLoaderLock(0x10, &result, NULL); + ok(status == STATUS_INVALID_PARAMETER_1, "got 0x%08x\n", status); + ok(result == 0, "got %d\n", result); + + /* non-blocking mode, result is null */ + magic = 0xdeadbeef; + status = pLdrLockLoaderLock(0x2, NULL, &magic); + ok(status == STATUS_INVALID_PARAMETER_2, "got 0x%08x\n", status); + ok(magic == 0, "got 0x%08x\n", magic); + + /* magic pointer is null */ + result = 10; + status = pLdrLockLoaderLock(0, &result, NULL); + ok(status == STATUS_INVALID_PARAMETER_3, "got 0x%08x\n", status); + ok(result == 0, "got %d\n", result); + + /* lock in non-blocking mode */ + result = 0; + magic = 0; + status = pLdrLockLoaderLock(0x2, &result, &magic); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + ok(result == 1, "got %d\n", result); + ok(magic != 0, "got 0x%08x\n", magic); + pLdrUnlockLoaderLock(0, magic); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -1568,4 +1623,5 @@ START_TEST(rtl) test_RtlIpv4AddressToStringEx(); test_RtlIpv4StringToAddress(); test_LdrAddRefDll(); + test_LdrLockLoaderLock(); }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 16 May '14

16 May '14

Module: wine Branch: master Commit: 4a06f84b9f6108ef5bc1a2fbb69f0332fdcbebb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a06f84b9f6108ef5bc1a2fbb… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri May 16 08:21:22 2014 +0300 po: Update Lithuanian translation. --- po/lt.po | 110 +++++++++++++++++++------------------------------------------- 1 file changed, 34 insertions(+), 76 deletions(-) diff --git a/po/lt.po b/po/lt.po index e142410..a3a2e51 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-04-03 21:16+0300\n" +"PO-Revision-Date: 2014-05-16 08:19+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -7124,206 +7124,164 @@ msgid "outline button" msgstr "plano mygtukas" #: oleacc.rc:97 -#, fuzzy -#| msgid "Normal" msgctxt "object state" msgid "normal" -msgstr "&Normalus" +msgstr "normalus" #: oleacc.rc:98 -#, fuzzy -#| msgid "Unavailable" msgctxt "object state" msgid "unavailable" -msgstr "Nepasiekiamas" +msgstr "nepasiekiamas" #: oleacc.rc:99 -#, fuzzy -#| msgid "Select" msgctxt "object state" msgid "selected" -msgstr "Iš&rinkti" +msgstr "pasirinktas" #: oleacc.rc:100 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focused" -msgstr "Pristabdyta" +msgstr "židinyje" #: oleacc.rc:101 -#, fuzzy -#| msgid "&Compressed" msgctxt "object state" msgid "pressed" -msgstr "Su&glaudintas" +msgstr "paspaustas" #: oleacc.rc:102 msgctxt "object state" msgid "checked" -msgstr "" +msgstr "pažymėtas" #: oleacc.rc:103 -#, fuzzy -#| msgid "Mixed" msgctxt "object state" msgid "mixed" -msgstr "Maišytas" +msgstr "mišrus" #: oleacc.rc:104 -#, fuzzy -#| msgid "&Read Only" msgctxt "object state" msgid "read only" -msgstr "&Tik skaitymui" +msgstr "tik skaitymui" #: oleacc.rc:105 -#, fuzzy -#| msgid "Hot Tracked Item" msgctxt "object state" msgid "hot tracked" -msgstr "Pažymėtas elementas" +msgstr "sekamas" #: oleacc.rc:106 -#, fuzzy -#| msgid "Defaults" msgctxt "object state" msgid "default" -msgstr "Numatytosios reikšmės" +msgstr "numatytasis" #: oleacc.rc:107 msgctxt "object state" msgid "expanded" -msgstr "" +msgstr "išplėstas" #: oleacc.rc:108 msgctxt "object state" msgid "collapsed" -msgstr "" +msgstr "sutrauktas" #: oleacc.rc:109 msgctxt "object state" msgid "busy" -msgstr "" +msgstr "užimtas" #: oleacc.rc:110 msgctxt "object state" msgid "floating" -msgstr "" +msgstr "slankus" #: oleacc.rc:111 msgctxt "object state" msgid "marqueed" -msgstr "" +msgstr "grupėje" #: oleacc.rc:112 -#, fuzzy -#| msgid "animation" msgctxt "object state" msgid "animated" -msgstr "animacija" +msgstr "animuotas" #: oleacc.rc:113 msgctxt "object state" msgid "invisible" -msgstr "" +msgstr "nematomas" #: oleacc.rc:114 msgctxt "object state" msgid "offscreen" -msgstr "" +msgstr "ne ekrane" #: oleacc.rc:115 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "sizeable" -msgstr "įjun&gti" +msgstr "didinamas" #: oleacc.rc:116 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "moveable" -msgstr "įjun&gti" +msgstr "perkeliamas" #: oleacc.rc:117 msgctxt "object state" msgid "self voicing" -msgstr "" +msgstr "save įgarsina" #: oleacc.rc:118 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focusable" -msgstr "Pristabdyta" +msgstr "fokusuojamas" #: oleacc.rc:119 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "selectable" -msgstr "lentelė" +msgstr "pasirenkamas" #: oleacc.rc:120 -#, fuzzy -#| msgid "link" msgctxt "object state" msgid "linked" -msgstr "nuoroda" +msgstr "susietas" #: oleacc.rc:121 msgctxt "object state" msgid "traversed" -msgstr "" +msgstr "pereitas" #: oleacc.rc:122 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "multi selectable" -msgstr "lentelė" +msgstr "pasirenkama daug" #: oleacc.rc:123 -#, fuzzy -#| msgid "Please select a file." msgctxt "object state" msgid "extended selectable" -msgstr "Išrinkite failą." +msgstr "pasirenkama išplėstai" #: oleacc.rc:124 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert low" -msgstr "įspėjimas" +msgstr "žemas įspėjimas" #: oleacc.rc:125 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert medium" -msgstr "įspėjimas" +msgstr "vidutinis įspėjimas" #: oleacc.rc:126 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert high" -msgstr "įspėjimas" +msgstr "aukštas įspėjimas" #: oleacc.rc:127 -#, fuzzy -#| msgid "Write protected.\n" msgctxt "object state" msgid "protected" -msgstr "Apsaugotas nuo rašymo.\n" +msgstr "apsaugotas" #: oleacc.rc:128 msgctxt "object state" msgid "has popup" -msgstr "" +msgstr "turi iškylantį langą" #: oleaut32.rc:30 oleview.rc:147 msgid "True" @@ -13435,7 +13393,7 @@ msgstr "Valdiklių alternatyvus fonas" #: winecfg.rc:120 msgid "Hot Tracked Item" -msgstr "Pažymėtas elementas" +msgstr "Sekamas elementas" #: winecfg.rc:121 msgid "Active Title Bar Gradient"

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 16 May '14

16 May '14

Module: wine Branch: master Commit: f54e8527b1cf8e5f641d6bf2f9d30a4642e4ea05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f54e8527b1cf8e5f641d6bf2f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 16 10:27:19 2014 +0400 po: Update Russian translation. --- po/ru.po | 106 +++++++++++++++++++------------------------------------------- 1 file changed, 32 insertions(+), 74 deletions(-) diff --git a/po/ru.po b/po/ru.po index 626c596..8b110eb 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7125,206 +7125,164 @@ msgid "outline button" msgstr "кнопка структуры" #: oleacc.rc:97 -#, fuzzy -#| msgid "Normal" msgctxt "object state" msgid "normal" -msgstr "Обычный" +msgstr "обычный" #: oleacc.rc:98 -#, fuzzy -#| msgid "Unavailable" msgctxt "object state" msgid "unavailable" -msgstr "Недоступно" +msgstr "сведения отсутствуют" #: oleacc.rc:99 -#, fuzzy -#| msgid "Select" msgctxt "object state" msgid "selected" -msgstr "&Выбрать" +msgstr "выделенный" #: oleacc.rc:100 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focused" -msgstr "Приостановлена" +msgstr "с фокусом ввода" #: oleacc.rc:101 -#, fuzzy -#| msgid "&Compressed" msgctxt "object state" msgid "pressed" -msgstr "С&жатый" +msgstr "нажато" #: oleacc.rc:102 msgctxt "object state" msgid "checked" -msgstr "" +msgstr "отмечено" #: oleacc.rc:103 -#, fuzzy -#| msgid "Mixed" msgctxt "object state" msgid "mixed" -msgstr "Смешанный" +msgstr "оба типа" #: oleacc.rc:104 -#, fuzzy -#| msgid "&Read Only" msgctxt "object state" msgid "read only" -msgstr "&Только для чтения" +msgstr "только чтение" #: oleacc.rc:105 -#, fuzzy -#| msgid "Hot Tracked Item" msgctxt "object state" msgid "hot tracked" -msgstr "Ссылка, Подсветка" +msgstr "отслеженное" #: oleacc.rc:106 -#, fuzzy -#| msgid "Defaults" msgctxt "object state" msgid "default" -msgstr "По умолчанию" +msgstr "по умолчанию" #: oleacc.rc:107 msgctxt "object state" msgid "expanded" -msgstr "" +msgstr "развернуто" #: oleacc.rc:108 msgctxt "object state" msgid "collapsed" -msgstr "" +msgstr "свернуто" #: oleacc.rc:109 msgctxt "object state" msgid "busy" -msgstr "" +msgstr "занято" #: oleacc.rc:110 msgctxt "object state" msgid "floating" -msgstr "" +msgstr "перемещаемый" #: oleacc.rc:111 msgctxt "object state" msgid "marqueed" -msgstr "" +msgstr "бегущая строка" #: oleacc.rc:112 -#, fuzzy -#| msgid "animation" msgctxt "object state" msgid "animated" -msgstr "анимация" +msgstr "анимировано" #: oleacc.rc:113 msgctxt "object state" msgid "invisible" -msgstr "" +msgstr "невидимо" #: oleacc.rc:114 msgctxt "object state" msgid "offscreen" -msgstr "" +msgstr "за экраном" #: oleacc.rc:115 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "sizeable" -msgstr "&включить" +msgstr "изменяемого размера" #: oleacc.rc:116 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "moveable" -msgstr "&включить" +msgstr "перемещаемое" #: oleacc.rc:117 msgctxt "object state" msgid "self voicing" -msgstr "" +msgstr "говорящее" #: oleacc.rc:118 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focusable" -msgstr "Приостановлена" +msgstr "фокусируемое" #: oleacc.rc:119 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "selectable" -msgstr "таблица" +msgstr "выделяемое" #: oleacc.rc:120 -#, fuzzy -#| msgid "link" msgctxt "object state" msgid "linked" -msgstr "ссылка" +msgstr "связанное" #: oleacc.rc:121 msgctxt "object state" msgid "traversed" -msgstr "" +msgstr "пройденное" #: oleacc.rc:122 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "multi selectable" -msgstr "таблица" +msgstr "со множественным выделением" #: oleacc.rc:123 -#, fuzzy -#| msgid "Please select a file." msgctxt "object state" msgid "extended selectable" -msgstr "Выберите файл." +msgstr "с расширенным выделением" #: oleacc.rc:124 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert low" -msgstr "оповещение" +msgstr "низкий уровень оповещений" #: oleacc.rc:125 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert medium" -msgstr "оповещение" +msgstr "средний уровень оповещений" #: oleacc.rc:126 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert high" -msgstr "оповещение" +msgstr "высокий уровень оповещений" #: oleacc.rc:127 -#, fuzzy -#| msgid "Write protected.\n" msgctxt "object state" msgid "protected" -msgstr "Защищено от записи.\n" +msgstr "защищенный режим" #: oleacc.rc:128 msgctxt "object state" msgid "has popup" -msgstr "" +msgstr "есть всплывающая подсказка" #: oleaut32.rc:30 oleview.rc:147 msgid "True"

1 0

Nikolay Sivov : xmllite/writer: Fix Flush() behaviour on partial writes.
by Alexandre Julliard 16 May '14

16 May '14

Module: wine Branch: master Commit: 81d2516449f0c2df39d76b493230853e8afa7a91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81d2516449f0c2df39d76b493… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 16 12:42:52 2014 +0400 xmllite/writer: Fix Flush() behaviour on partial writes. --- dlls/xmllite/tests/writer.c | 78 +++++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 33 +++++++++--------- 2 files changed, 93 insertions(+), 18 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index b6b8fe3..d7cfe44 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -67,6 +67,53 @@ static const IUnknownVtbl testoutputvtbl = { static IUnknown testoutput = { &testoutputvtbl }; +static HRESULT WINAPI teststream_QueryInterface(ISequentialStream *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_ISequentialStream)) + { + *obj = iface; + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI teststream_AddRef(ISequentialStream *iface) +{ + return 2; +} + +static ULONG WINAPI teststream_Release(ISequentialStream *iface) +{ + return 1; +} + +static HRESULT WINAPI teststream_Read(ISequentialStream *iface, void *pv, ULONG cb, ULONG *pread) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static ULONG g_write_len; +static HRESULT WINAPI teststream_Write(ISequentialStream *iface, const void *pv, ULONG cb, ULONG *written) +{ + g_write_len = cb; + *written = cb; + return S_OK; +} + +static const ISequentialStreamVtbl teststreamvtbl = +{ + teststream_QueryInterface, + teststream_AddRef, + teststream_Release, + teststream_Read, + teststream_Write +}; + +static ISequentialStream teststream = { &teststreamvtbl }; + static void test_writer_create(void) { HRESULT hr; @@ -235,6 +282,36 @@ static void test_writestartdocument(void) IXmlWriter_Release(writer); } +static void test_flush(void) +{ + IXmlWriter *writer; + HRESULT hr; + + hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, (IUnknown*)&teststream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == S_OK, "got 0x%08x\n", hr); + + g_write_len = 0; + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(g_write_len > 0, "got %d\n", g_write_len); + + g_write_len = 1; + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(g_write_len == 0, "got %d\n", g_write_len); + + /* Release() flushes too */ + g_write_len = 1; + IXmlWriter_Release(writer); + ok(g_write_len == 0, "got %d\n", g_write_len); +} + START_TEST(writer) { if (!init_pointers()) @@ -243,4 +320,5 @@ START_TEST(writer) test_writer_create(); test_writeroutput(); test_writestartdocument(); + test_flush(); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 0a1d361..de5f755 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -63,7 +63,6 @@ typedef struct IMalloc *imalloc; xml_encoding encoding; struct output_buffer buffer; - ULONG stream_written; } xmlwriteroutput; static const struct IUnknownVtbl xmlwriteroutputvtbl; @@ -225,11 +224,6 @@ static HRESULT write_output_buffer_quoted(xmlwriteroutput *output, const WCHAR * return S_OK; } -static inline void reset_output_buffer(xmlwriteroutput *output) -{ - output->stream_written = 0; -} - static void writeroutput_release_stream(xmlwriteroutput *writeroutput) { if (writeroutput->stream) { @@ -253,7 +247,7 @@ static inline HRESULT writeroutput_query_for_stream(xmlwriteroutput *writeroutpu static HRESULT writeroutput_flush_stream(xmlwriteroutput *output) { struct output_buffer *buffer; - ULONG written = 0, len; + ULONG written, offset = 0; HRESULT hr; if (!output || !output->stream) @@ -261,17 +255,20 @@ static HRESULT writeroutput_flush_stream(xmlwriteroutput *output) buffer = &output->buffer; - len = buffer->written - output->stream_written; - if (!len) - return S_OK; + /* It will loop forever until everything is written or an error occured. */ + do { + written = 0; + hr = ISequentialStream_Write(output->stream, buffer->data + offset, buffer->written, &written); + if (FAILED(hr)) { + WARN("write to stream failed (0x%08x)\n", hr); + buffer->written = 0; + return hr; + } - hr = ISequentialStream_Write(output->stream, buffer->data + output->stream_written, len, &written); - if (FAILED(hr)) { - WARN("write to stream failed (0x%08x)\n", hr); - return hr; - } + offset += written; + buffer->written -= written; + } while (buffer->written > 0); - output->stream_written += written; return S_OK; } @@ -309,6 +306,8 @@ static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface) ref = InterlockedDecrement(&This->ref); if (ref == 0) { IMalloc *imalloc = This->imalloc; + + IXmlWriter_Flush(iface); if (This->output) IUnknown_Release(&This->output->IXmlWriterOutput_iface); writer_free(This, This); if (imalloc) IMalloc_Release(imalloc); @@ -327,7 +326,6 @@ static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *output) TRACE("(%p)->(%p)\n", This, output); if (This->output) { - reset_output_buffer(This->output); writeroutput_release_stream(This->output); IUnknown_Release(&This->output->IXmlWriterOutput_iface); This->output = NULL; @@ -858,7 +856,6 @@ HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, if (imalloc) IMalloc_AddRef(imalloc); writeroutput->encoding = parse_encoding_name(encoding ? encoding : utf8W, -1); writeroutput->stream = NULL; - writeroutput->stream_written = 0; hr = init_output_buffer(writeroutput); if (FAILED(hr)) { IUnknown_Release(&writeroutput->IXmlWriterOutput_iface);

1 0

Alexandre Julliard : bcrypt: Remove unnecessary DllMain implementation.
by Alexandre Julliard 16 May '14

16 May '14

Module: wine Branch: master Commit: cf40121ed67c65e83999bc04a1e86aae724c5fbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf40121ed67c65e83999bc04a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 11:33:29 2014 +0200 bcrypt: Remove unnecessary DllMain implementation. --- dlls/bcrypt/bcrypt_main.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index fcad58c..ee203a6 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -31,20 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) -{ - TRACE("fdwReason %u\n", fdwReason); - - switch(fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - break; - } - - return TRUE; -} - NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount, BCRYPT_ALGORITHM_IDENTIFIER **ppAlgList, ULONG dwFlags) {

1 0

Alexandre Julliard : d2d1: Remove unnecessary DllMain implementation.
by Alexandre Julliard 16 May '14

16 May '14

Module: wine Branch: master Commit: ddfaafc16d59771dcc4d3ad472448fcc774177b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddfaafc16d59771dcc4d3ad47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 11:33:40 2014 +0200 d2d1: Remove unnecessary DllMain implementation. --- dlls/d2d1/d2d1_main.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/d2d1/d2d1_main.c b/dlls/d2d1/d2d1_main.c index 9a389a2..f438de9 100644 --- a/dlls/d2d1/d2d1_main.c +++ b/dlls/d2d1/d2d1_main.c @@ -26,18 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) -{ - switch (reason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - - return TRUE; -} - HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory) {

1 0

Alexandre Julliard : d3d10core: Remove unnecessary DllMain implementation.
by Alexandre Julliard 16 May '14

16 May '14

Module: wine Branch: master Commit: a3ab118b1e3eeea214a8d9b8e9dd26781625d07e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3ab118b1e3eeea214a8d9b8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 11:33:45 2014 +0200 d3d10core: Remove unnecessary DllMain implementation. --- dlls/d3d10core/d3d10core_main.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c index abc8434..9006d95 100644 --- a/dlls/d3d10core/d3d10core_main.c +++ b/dlls/d3d10core/d3d10core_main.c @@ -25,18 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) -{ - switch (reason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - - return TRUE; -} - static HRESULT WINAPI layer_init(enum dxgi_device_layer_id id, DWORD *count, DWORD *values) { TRACE("id %#x, count %p, values %p\n", id, count, values);

1 0

Alexandre Julliard : winemapi: Remove unnecessary DllMain implementation.
by Alexandre Julliard 16 May '14

16 May '14

Module: wine Branch: master Commit: 78cf6059bc320aa983daa2fd02d7babb49081c56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78cf6059bc320aa983daa2fd0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 11:34:04 2014 +0200 winemapi: Remove unnecessary DllMain implementation. --- dlls/winemapi/main.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/winemapi/main.c b/dlls/winemapi/main.c index 0627aa2..8cd6b6d 100644 --- a/dlls/winemapi/main.c +++ b/dlls/winemapi/main.c @@ -31,14 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winemapi); -/*********************************************************************** - * DllMain (MAPI32.init) - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) -{ - TRACE("(%p,%d,%p)\n", hinstDLL, fdwReason, fImpLoad); - return TRUE; -} ULONG WINAPI MAPIAddress(LHANDLE session, ULONG_PTR uiparam, LPSTR caption, ULONG editfields, LPSTR labels, ULONG nRecips, lpMapiRecipDesc lpRecips,

1 0