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

Austin English : version: Move GetFileVersionInfo(A/W) implementation to GetFileVersionInfoEx(A/W).
by Alexandre Julliard 26 May '15

26 May '15

Module: wine Branch: master Commit: 324acd5f1e30b6bbe4f02fe7f9230469b2aa0f95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=324acd5f1e30b6bbe4f02fe7f… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 21 18:32:17 2015 -0700 version: Move GetFileVersionInfo(A/W) implementation to GetFileVersionInfoEx(A/W). --- dlls/version/version.c | 55 +++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index bcc6d01..e1295a0 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -722,10 +722,9 @@ DWORD WINAPI GetFileVersionInfoSizeExA( DWORD flags, LPCSTR filename, LPDWORD ha } /*********************************************************************** - * GetFileVersionInfoW [VERSION.@] + * GetFileVersionInfoExW [VERSION.@] */ -BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, - DWORD datasize, LPVOID data ) +BOOL WINAPI GetFileVersionInfoExW( DWORD flags, LPCWSTR filename, DWORD handle, DWORD datasize, LPVOID data ) { static const char signature[4] = "FE2X"; DWORD len, offset, magic = 1; @@ -734,6 +733,13 @@ BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, HMODULE hModule; VS_VERSION_INFO_STRUCT32* vvis = data; + if (flags) + { + FIXME("stub: %x %s %u %u %p\n", flags, wine_dbgstr_w(filename), handle, datasize, data); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; + } + TRACE("(%s,%d,size=%d,data=%p)\n", debugstr_w(filename), handle, datasize, data ); @@ -797,10 +803,9 @@ BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, } /*********************************************************************** - * GetFileVersionInfoA [VERSION.@] + * GetFileVersionInfoExA [VERSION.@] */ -BOOL WINAPI GetFileVersionInfoA( LPCSTR filename, DWORD handle, - DWORD datasize, LPVOID data ) +BOOL WINAPI GetFileVersionInfoExA( DWORD flags, LPCSTR filename, DWORD handle, DWORD datasize, LPVOID data ) { UNICODE_STRING filenameW; BOOL retval; @@ -813,7 +818,7 @@ BOOL WINAPI GetFileVersionInfoA( LPCSTR filename, DWORD handle, else filenameW.Buffer = NULL; - retval = GetFileVersionInfoW(filenameW.Buffer, handle, datasize, data); + retval = GetFileVersionInfoExW(flags, filenameW.Buffer, handle, datasize, data); RtlFreeUnicodeString(&filenameW); @@ -821,6 +826,22 @@ BOOL WINAPI GetFileVersionInfoA( LPCSTR filename, DWORD handle, } /*********************************************************************** + * GetFileVersionInfoW [VERSION.@] + */ +BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, DWORD datasize, LPVOID data ) +{ + return GetFileVersionInfoExW(0, filename, handle, datasize, data); +} + +/*********************************************************************** + * GetFileVersionInfoA [VERSION.@] + */ +BOOL WINAPI GetFileVersionInfoA( LPCSTR filename, DWORD handle, DWORD datasize, LPVOID data ) +{ + return GetFileVersionInfoExA(0, filename, handle, datasize, data); +} + +/*********************************************************************** * VersionInfo16_FindChild [internal] */ static const VS_VERSION_INFO_STRUCT16 *VersionInfo16_FindChild( const VS_VERSION_INFO_STRUCT16 *info, @@ -1636,23 +1657,3 @@ DWORD WINAPI VerInstallFileW( HeapFree( GetProcessHeap(), 0, wcurd ); return ret; } - -/****************************************************************************** - * GetFileVersionInfoExA [VERSION.@] - */ -BOOL WINAPI GetFileVersionInfoExA(DWORD flags, LPCSTR filename, DWORD handle, DWORD len, LPVOID data) -{ - FIXME("stub: %u %s %u %u %p\n", flags, wine_dbgstr_a(filename), handle, len, data); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/****************************************************************************** - * GetFileVersionInfoExW [VERSION.@] - */ -BOOL WINAPI GetFileVersionInfoExW(DWORD flags, LPCWSTR filename, DWORD handle, DWORD len, LPVOID data) -{ - FIXME("stub: %u %s %u %u %p\n", flags, wine_dbgstr_w(filename), handle, len, data); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -}

1 0

Nikolay Sivov : riched20: Support ITextFont instances detached from a range.
by Alexandre Julliard 26 May '15

26 May '15

Module: wine Branch: master Commit: 0cf3c2f3a1c2bd64b22b3a01b2bb7ef62283ffe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf3c2f3a1c2bd64b22b3a01b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 26 09:12:58 2015 +0300 riched20: Support ITextFont instances detached from a range. --- dlls/riched20/richole.c | 364 +++++++++++++++++++++++++++++------------- dlls/riched20/tests/richole.c | 291 +++++++++++++++++++++++++++++++-- 2 files changed, 527 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0cf3c2f3a1c2bd64b22b3…

1 0

Nikolay Sivov : riched20: Implement tomTrackParms/tomCacheParms.
by Alexandre Julliard 26 May '15

26 May '15

Module: wine Branch: master Commit: 1c0cf0efb324a72d843dcdf97b056703be387f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c0cf0efb324a72d843dcdf97… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 26 09:15:40 2015 +0300 riched20: Implement tomTrackParms/tomCacheParms. --- dlls/riched20/riched_tom.idl | 3 + dlls/riched20/richole.c | 152 +++++++++++++++++++++++++++++++++++------- dlls/riched20/tests/richole.c | 55 ++++++++++++++- include/tom.idl | 3 + 4 files changed, 189 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c0cf0efb324a72d843dc…

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 1812df71b816ff6fa399ca98468e8118ec11aa2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1812df71b816ff6fa399ca984… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 22 14:04:07 2015 +0300 po: Update Russian translation. --- po/ru.po | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/po/ru.po b/po/ru.po index fc9f580..08b2479 100644 --- a/po/ru.po +++ b/po/ru.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: 2015-05-18 19:06+0300\n" +"PO-Revision-Date: 2015-05-22 14:01+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -7454,10 +7454,8 @@ msgid "Add Control" msgstr "Добавить элемент управления" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Font..." msgid "&Convert..." -msgstr "&Шрифт..." +msgstr "&Конвертировать..." #: oledlg.rc:33 oleview.rc:40 msgid "&Object" @@ -9206,24 +9204,20 @@ msgstr "" "места, или проверьте сетевое подключение." #: winmm.rc:136 -#, fuzzy -#| msgid "Wine Mono Installer" msgid "Wine Sound Mapper" -msgstr "Установка Wine Mono" +msgstr "Wine Sound Mapper" #: winmm.rc:137 -#, fuzzy -#| msgid "column" msgid "Volume" -msgstr "столбец" +msgstr "Громкость" #: winmm.rc:138 msgid "Master Volume" -msgstr "" +msgstr "Общая громкость" #: winmm.rc:139 msgid "Mute" -msgstr "" +msgstr "Отключить" #: winspool.rc:37 msgid "Print to File"

1 0

Mark Harmstone : comctl32: Use DPI settings for checkbox size.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: bae599092a3d2ab473d2a61a38d1abf0cf84dd3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bae599092a3d2ab473d2a61a3… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat May 23 01:46:59 2015 +0100 comctl32: Use DPI settings for checkbox size. --- dlls/comctl32/theme_button.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index bdeba93..327c76b 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -155,8 +155,7 @@ static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN { RBS_CHECKEDNORMAL, RBS_CHECKEDDISABLED, RBS_CHECKEDHOT, RBS_CHECKEDPRESSED, RBS_CHECKEDNORMAL } }; - static const int cb_size = 13; - + SIZE sz; RECT bgRect, textRect; HFONT font, hPrevFont = NULL; LRESULT checkState = SendMessageW(hwnd, BM_GETCHECK, 0, 0); @@ -186,15 +185,18 @@ static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN hPrevFont = SelectObject(hDC, font); } + if (FAILED(GetThemePartSize(theme, hDC, part, state, NULL, TS_DRAW, &sz))) + sz.cx = sz.cy = 13; + GetClientRect(hwnd, &bgRect); GetThemeBackgroundContentRect(theme, hDC, part, state, &bgRect, &textRect); if (dtFlags & DT_SINGLELINE) /* Center the checkbox / radio button to the text. */ - bgRect.top = bgRect.top + (textRect.bottom - textRect.top - cb_size) / 2; + bgRect.top = bgRect.top + (textRect.bottom - textRect.top - sz.cy) / 2; /* adjust for the check/radio marker */ - bgRect.bottom = bgRect.top + cb_size; - bgRect.right = bgRect.left + cb_size; + bgRect.bottom = bgRect.top + sz.cy; + bgRect.right = bgRect.left + sz.cx; textRect.left = bgRect.right + 6; DrawThemeParentBackground(hwnd, hDC, NULL);

1 0

Francois Gouget : kernel32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 8efa0fb0c4cf263c5449037e18f8e2d846d73b9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8efa0fb0c4cf263c5449037e1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 23 13:53:06 2015 +0200 kernel32/tests: Fix compilation on systems that don't support nameless unions. --- dlls/kernel32/tests/time.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index d205174..0bcde1e 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -765,8 +765,8 @@ static void test_GetDynamicTimeZoneInformation(void) static ULONGLONG get_longlong_time(FILETIME *time) { ULARGE_INTEGER uli; - uli.LowPart = time->dwLowDateTime; - uli.HighPart = time->dwHighDateTime; + uli.u.LowPart = time->dwLowDateTime; + uli.u.HighPart = time->dwHighDateTime; return uli.QuadPart; }

1 0

Francois Gouget : msvcp120/tests: Make call_once(_ex)?_thread() static.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 13595fd35f53fdf90ddc9b9b7e350327e5f87790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13595fd35f53fdf90ddc9b9b7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 23 17:04:50 2015 +0200 msvcp120/tests: Make call_once(_ex)?_thread() static. --- dlls/msvcp120/tests/msvcp120.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index b5b4301..5db2fa0 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -213,13 +213,13 @@ static void __cdecl call_once_ex_func(void *arg) (*i)++; } -DWORD WINAPI call_once_thread(void *arg) +static DWORD WINAPI call_once_thread(void *arg) { p__Call_once(&once, call_once_func); return 0; } -DWORD WINAPI call_once_ex_thread(void *arg) +static DWORD WINAPI call_once_ex_thread(void *arg) { p__Call_onceEx(&once, call_once_ex_func, &cnt); return 0;

1 0

Francois Gouget : msvcp90: Make call_once_func_wrapper() static.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 79378304b61561757a09ee54b37137b454a714dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=79378304b61561757a09ee54b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 23 17:04:57 2015 +0200 msvcp90: Make call_once_func_wrapper() static. --- dlls/msvcp90/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index c8bb2bd..145e4dc 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -653,7 +653,7 @@ void __cdecl _Call_onceEx(int *once, void (__cdecl *func)(void*), void *argv) LeaveCriticalSection(&call_once_cs); } -void __cdecl call_once_func_wrapper(void *func) +static void __cdecl call_once_func_wrapper(void *func) { ((void (__cdecl*)(void))func)(); }

1 0

Francois Gouget : include: Remove an unneeded include directive from msctf.idl.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 3b6ca071d0c8e58e6d39dbff59dcb975e6ee8b14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b6ca071d0c8e58e6d39dbff5… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 23 17:06:45 2015 +0200 include: Remove an unneeded include directive from msctf.idl. --- include/msctf.idl | 1 - 1 file changed, 1 deletion(-) diff --git a/include/msctf.idl b/include/msctf.idl index 0e2b8b4..db82709 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -22,7 +22,6 @@ import "comcat.idl"; import "textstor.idl"; import "ctfutb.idl"; #endif -cpp_quote("#include <winuser.h>") cpp_quote("#define TF_E_STACKFULL MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0501)") cpp_quote("#define TF_E_DISCONNECTED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0504)")

1 0

Francois Gouget : include: Add more interfaces to ctfutb.idl.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 7da2416e77cb9c9466887a1575759d835ce16b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7da2416e77cb9c9466887a157… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 23 17:17:55 2015 +0200 include: Add more interfaces to ctfutb.idl. --- include/ctfutb.idl | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 154 insertions(+), 1 deletion(-) diff --git a/include/ctfutb.idl b/include/ctfutb.idl index 6d80b38..1a4125b 100644 --- a/include/ctfutb.idl +++ b/include/ctfutb.idl @@ -24,6 +24,128 @@ interface ITfLangBarEventSink; interface ITfLangBarItemMgr; interface ITfInputProcessorProfiles; +const ULONG TF_LBI_DESC_MAXLEN = 32; + +typedef [uuid(12a1d29f-a065-440c-9746-eb2002c8bd19)] struct TF_LANGBARITEMINFO +{ + CLSID clsidService; + GUID guidItem; + DWORD dwStyle; + ULONG ulSort; + WCHAR szDescription[TF_LBI_DESC_MAXLEN]; +} TF_LANGBARITEMINFO; + +[ + object, + uuid(73540d69-edeb-4ee9-96c9-23aa30b25916), + pointer_default(unique), +] +interface ITfLangBarItem : IUnknown +{ + HRESULT GetInfo( + [out] TF_LANGBARITEMINFO *pInfo); + + HRESULT GetStatus( + [out] DWORD *pdwStatus); + + HRESULT Show( + [in] BOOL fShow); + + HRESULT GetTooltipString( + [out] BSTR *pbstrToolTip); +} + +[ + object, + uuid(583f34d0-de25-11d2-afdd-00105a2799b5), + pointer_default(unique), +] +interface IEnumTfLangBarItems : IUnknown +{ + HRESULT Clone( + [out] IEnumTfLangBarItems **ppEnum); + + HRESULT Next( + [in] ULONG ulCount, + [out, size_is(ulCount)] ITfLangBarItem **ppItem, + [in, out, unique] ULONG *pcFetched); + + HRESULT Reset(); + + HRESULT Skip( + [in] ULONG ulCount); +} + +[ + object, + uuid(57dbe1a0-de25-11d2-afdd-00105a2799b5), + pointer_default(unique), +] +interface ITfLangBarItemSink : IUnknown +{ + HRESULT OnUpdate( + [in] DWORD dwFlags); +} + +[ + object, + uuid(ba468c55-9956-4fb1-a59d-52a7dd7cc6aa), + pointer_default(unique), +] +interface ITfLangBarItemMgr : IUnknown +{ + HRESULT EnumItems( + [out] IEnumTfLangBarItems **ppEnum); + + HRESULT GetItem( + [in] REFGUID rguid, + [out] ITfLangBarItem **ppItem); + + HRESULT AddItem( + [in] ITfLangBarItem *punk); + + HRESULT RemoveItem( + [in] ITfLangBarItem *punk); + + HRESULT AdviseItemSink( + [in] ITfLangBarItemSink *punk, + [out] DWORD *pdwCookie, + [in] REFGUID rguidItem); + + HRESULT UnadviseItemSink( + [in] DWORD dwCookie); + + HRESULT GetItemFloatingRect( + [in] DWORD dwThreadId, + [in] REFGUID rguid, + [out] RECT *prc); + + HRESULT GetItemsStatus( + [in] ULONG ulCount, + [in, size_is(ulCount)] const GUID *prgguid, + [out, size_is(ulCount)] DWORD *pdwStatus); + + HRESULT GetItemNum( + [out] ULONG *pulCount); + + HRESULT GetItems( + [in] ULONG ulCount, + [out, size_is(ulCount), length_is(*pcFetched)] ITfLangBarItem **ppItem, + [out, size_is(ulCount), length_is(*pcFetched)] TF_LANGBARITEMINFO *pInfo, + [out, size_is(ulCount), length_is(*pcFetched)] DWORD *pdwStatus, + [in, out, unique] ULONG *pcFetched); + + HRESULT AdviseItemsSink( + [in] ULONG ulCount, + [in, size_is(ulCount)] ITfLangBarItemSink **ppunk, + [in, size_is(ulCount)] const GUID *pguidItem, + [out, size_is(ulCount)] DWORD *pdwCookie); + + HRESULT UnadviseItemsSink( + [in] ULONG ulCount, + [in, size_is(ulCount)] DWORD *pdwCookie); +} + [ object, uuid(87955690-e627-11d2-8ddb-00105a2799b5), @@ -70,4 +192,35 @@ interface ITfLangBarMgr: IUnknown HRESULT GetShowFloatingStatus( [out] DWORD *pdwFlags); -}; +} + +[ + object, + uuid(18a4e900-e0ae-11d2-afdd-00105a2799b5), + pointer_default(unique) +] +interface ITfLangBarEventSink: IUnknown +{ + HRESULT OnSetFocus( + [in] DWORD dwThreadId); + + HRESULT OnThreadTerminate( + [in] DWORD dwThreadId); + + HRESULT OnThreadItemChange( + [in] DWORD dwThreadId); + + HRESULT OnModalInput( + [in] DWORD dwThreadId, + [in] UINT uMsg, + [in] WPARAM wParam, + [in] LPARAM lParam); + + HRESULT ShowFloating( + [in] DWORD dwFlags); + + HRESULT GetItemFloatingRect( + [in] DWORD dwThreadId, + [in] REFGUID rguid, + [out] RECT *prc); +}

1 0