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

Austin English : winedump: Update README.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: d259eaf28f938c396263c5d9072257ed41205c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d259eaf28f938c396263c5d90… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jul 31 12:33:30 2015 -0500 winedump: Update README. --- tools/winedump/README | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/winedump/README b/tools/winedump/README index cc8b3ec..1f8a442 100644 --- a/tools/winedump/README +++ b/tools/winedump/README @@ -203,10 +203,10 @@ If a prototype is found, or correctly demangled, the following is emitted: @ stdcall _OpenZipFile ZIPEXTRA__OpenZipFile .h: -BOOL __stdcall ZIPEXTRA__OpenZipFile(LPCSTR pszFileName); +BOOL __stdcall ZIPEXTRA__OpenZipFile(const char *filename); .c: -BOOL __stdcall ZIPEXTRA__OpenZipFile(LPCSTR pszFileName) +BOOL __stdcall ZIPEXTRA__OpenZipFile(const char *filename) { TRACE("stub\n"); return 0; @@ -245,16 +245,16 @@ forward DLL automatically: HMODULE hDLL = 0; /* DLL to call through to */ -BOOL WINAPI ZIPEXTRA_Init(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI ZIPEXTRA_Init(HINSTANCE dll, DWORD reason, void *reserved) { - TRACE("(0x%08x, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved); + TRACE("(0x%08x, %u, %p)\n", dll, reason, reserved); - if (fdwReason == DLL_PROCESS_ATTACH) + if (reason == DLL_PROCESS_ATTACH) { hDLL = LoadLibraryA( "real_zipextra" ); TRACE ("Forwarding DLL (real_zipextra) loaded\n" ); } - else if (fdwReason == DLL_PROCESS_DETACH) + else if (reason == DLL_PROCESS_DETACH) { FreeLibrary( hDLL ); TRACE ("Forwarding DLL (real_zipextra) freed\n" ); @@ -265,12 +265,12 @@ BOOL WINAPI ZIPEXTRA_Init(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserve The stub function is changed to call the forwarding DLL and return that value. -BOOL __stdcall ZIPEXTRA__OpenZipFile(LPCSTR pszFileName) +BOOL __stdcall ZIPEXTRA__OpenZipFile(const char *filename) { - BOOL (__stdcall *pFunc)(LPCSTR) = (void*)GetProcAddress(hDLL,"_OpenZipFile"); + BOOL (__stdcall *pFunc)(const char *) = (void*)GetProcAddress(hDLL,"_OpenZipFile"); BOOL retVal; - TRACE("((LPCSTR)%s) stub\n", pszFileName); - retVal = pFunc(pszFileName); + TRACE("((const char *)%s) stub\n", filename); + retVal = pFunc(filename); TRACE("returned (%ld)\n",(LONG)retVal)); return retVal; }

1 0

Austin English : vcomp110: Add dll.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: 824b81ea114f2f414415769529dac3abdcf8445f URL: http://source.winehq.org/git/wine.git/?a=commit;h=824b81ea114f2f41441576952… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jul 31 12:00:00 2015 -0500 vcomp110: Add dll. --- configure | 2 + configure.ac | 1 + dlls/vcomp110/Makefile.in | 4 ++ dlls/vcomp110/main.c | 46 ++++++++++++++++++ dlls/vcomp110/vcomp110.spec | 113 ++++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 6 files changed, 167 insertions(+) diff --git a/configure b/configure index dff3e10..b2a6fb2 100755 --- a/configure +++ b/configure @@ -1294,6 +1294,7 @@ enable_uxtheme enable_vbscript enable_vcomp enable_vcomp100 +enable_vcomp110 enable_vcomp90 enable_vdmdbg enable_version @@ -17722,6 +17723,7 @@ wine_fn_config_test dlls/vbscript/tests vbscript_test clean wine_fn_config_dll vcomp enable_vcomp wine_fn_config_test dlls/vcomp/tests vcomp_test wine_fn_config_dll vcomp100 enable_vcomp100 +wine_fn_config_dll vcomp110 enable_vcomp110 wine_fn_config_dll vcomp90 enable_vcomp90 wine_fn_config_dll vdhcp.vxd enable_win16 wine_fn_config_dll vdmdbg enable_vdmdbg implib diff --git a/configure.ac b/configure.ac index 0489739..1329786 100644 --- a/configure.ac +++ b/configure.ac @@ -3324,6 +3324,7 @@ WINE_CONFIG_TEST(dlls/vbscript/tests,[clean]) WINE_CONFIG_DLL(vcomp) WINE_CONFIG_TEST(dlls/vcomp/tests) WINE_CONFIG_DLL(vcomp100) +WINE_CONFIG_DLL(vcomp110) WINE_CONFIG_DLL(vcomp90) WINE_CONFIG_DLL(vdhcp.vxd,enable_win16) WINE_CONFIG_DLL(vdmdbg,,[implib]) diff --git a/dlls/vcomp110/Makefile.in b/dlls/vcomp110/Makefile.in new file mode 100644 index 0000000..b33bbaa --- /dev/null +++ b/dlls/vcomp110/Makefile.in @@ -0,0 +1,4 @@ +MODULE = vcomp110.dll + +C_SRCS = \ + main.c diff --git a/dlls/vcomp110/main.c b/dlls/vcomp110/main.c new file mode 100644 index 0000000..6771c12 --- /dev/null +++ b/dlls/vcomp110/main.c @@ -0,0 +1,46 @@ +/* + * + * vcomp110 implementation + * + * Copyright 2015 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(vcomp110); + +BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) +{ + TRACE("(0x%p, %d, %p)\n", dll, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(dll); + break; + } + + return TRUE; +} diff --git a/dlls/vcomp110/vcomp110.spec b/dlls/vcomp110/vcomp110.spec new file mode 100644 index 0000000..b288e52 --- /dev/null +++ b/dlls/vcomp110/vcomp110.spec @@ -0,0 +1,113 @@ +@ stub C2VectParallel +@ stub _vcomp_atomic_add_i1 +@ stub _vcomp_atomic_add_i2 +@ cdecl _vcomp_atomic_add_i4(ptr long) vcomp._vcomp_atomic_add_i4 +@ stub _vcomp_atomic_add_i8 +@ cdecl _vcomp_atomic_add_r4(ptr float) vcomp._vcomp_atomic_add_r4 +@ cdecl _vcomp_atomic_add_r8(ptr double) vcomp._vcomp_atomic_add_r8 +@ stub _vcomp_atomic_and_i1 +@ stub _vcomp_atomic_and_i2 +@ cdecl _vcomp_atomic_and_i4(ptr long) vcomp._vcomp_atomic_and_i4 +@ stub _vcomp_atomic_and_i8 +@ stub _vcomp_atomic_div_i1 +@ stub _vcomp_atomic_div_i2 +@ cdecl _vcomp_atomic_div_i4(ptr long) vcomp._vcomp_atomic_div_i4 +@ stub _vcomp_atomic_div_i8 +@ cdecl _vcomp_atomic_div_r4(ptr float) vcomp._vcomp_atomic_div_r4 +@ cdecl _vcomp_atomic_div_r8(ptr double) vcomp._vcomp_atomic_div_r8 +@ stub _vcomp_atomic_div_ui1 +@ stub _vcomp_atomic_div_ui2 +@ cdecl _vcomp_atomic_div_ui4(ptr long) vcomp._vcomp_atomic_div_ui4 +@ stub _vcomp_atomic_div_ui8 +@ stub _vcomp_atomic_mul_i1 +@ stub _vcomp_atomic_mul_i2 +@ cdecl _vcomp_atomic_mul_i4(ptr long) vcomp._vcomp_atomic_mul_i4 +@ stub _vcomp_atomic_mul_i8 +@ cdecl _vcomp_atomic_mul_r4(ptr float) vcomp._vcomp_atomic_mul_r4 +@ cdecl _vcomp_atomic_mul_r8(ptr double) vcomp._vcomp_atomic_mul_r8 +@ stub _vcomp_atomic_or_i1 +@ stub _vcomp_atomic_or_i2 +@ cdecl _vcomp_atomic_or_i4(ptr long) vcomp._vcomp_atomic_or_i4 +@ stub _vcomp_atomic_or_i8 +@ stub _vcomp_atomic_shl_i1 +@ stub _vcomp_atomic_shl_i2 +@ cdecl _vcomp_atomic_shl_i4(ptr long) vcomp._vcomp_atomic_shl_i4 +@ stub _vcomp_atomic_shl_i8 +@ stub _vcomp_atomic_shr_i1 +@ stub _vcomp_atomic_shr_i2 +@ cdecl _vcomp_atomic_shr_i4(ptr long) vcomp._vcomp_atomic_shr_i4 +@ stub _vcomp_atomic_shr_i8 +@ stub _vcomp_atomic_shr_ui1 +@ stub _vcomp_atomic_shr_ui2 +@ cdecl _vcomp_atomic_shr_ui4(ptr long) vcomp._vcomp_atomic_shr_ui4 +@ stub _vcomp_atomic_shr_ui8 +@ stub _vcomp_atomic_sub_i1 +@ stub _vcomp_atomic_sub_i2 +@ cdecl _vcomp_atomic_sub_i4(ptr long) vcomp._vcomp_atomic_sub_i4 +@ stub _vcomp_atomic_sub_i8 +@ cdecl _vcomp_atomic_sub_r4(ptr float) vcomp._vcomp_atomic_sub_r4 +@ cdecl _vcomp_atomic_sub_r8(ptr double) vcomp._vcomp_atomic_sub_r8 +@ stub _vcomp_atomic_xor_i1 +@ stub _vcomp_atomic_xor_i2 +@ cdecl _vcomp_atomic_xor_i4(ptr long) vcomp._vcomp_atomic_xor_i4 +@ stub _vcomp_atomic_xor_i8 +@ cdecl _vcomp_barrier() vcomp._vcomp_barrier +@ stub _vcomp_copyprivate_broadcast +@ stub _vcomp_copyprivate_receive +@ stub _vcomp_enter_critsect +@ stub _vcomp_flush +@ stub _vcomp_for_dynamic_init +@ stub _vcomp_for_dynamic_init_i8 +@ stub _vcomp_for_dynamic_next +@ stub _vcomp_for_dynamic_next_i8 +@ cdecl _vcomp_for_static_end() vcomp._vcomp_for_static_end +@ cdecl _vcomp_for_static_init(long long long long ptr ptr ptr ptr ptr) vcomp._vcomp_for_static_init +@ stub _vcomp_for_static_init_i8 +@ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) vcomp._vcomp_for_static_simple_init +@ stub _vcomp_for_static_simple_init_i8 +@ varargs _vcomp_fork(long long ptr) vcomp._vcomp_fork +@ stub _vcomp_get_thread_num +@ stub _vcomp_leave_critsect +@ stub _vcomp_master_barrier +@ stub _vcomp_master_begin +@ stub _vcomp_master_end +@ stub _vcomp_ordered_begin +@ stub _vcomp_ordered_end +@ stub _vcomp_ordered_loop_end +@ stub _vcomp_reduction_i1 +@ stub _vcomp_reduction_i2 +@ stub _vcomp_reduction_i4 +@ stub _vcomp_reduction_i8 +@ stub _vcomp_reduction_r4 +@ stub _vcomp_reduction_r8 +@ stub _vcomp_reduction_u1 +@ stub _vcomp_reduction_u2 +@ stub _vcomp_reduction_u4 +@ stub _vcomp_reduction_u8 +@ cdecl _vcomp_sections_init(long) vcomp._vcomp_sections_init +@ cdecl _vcomp_sections_next() vcomp._vcomp_sections_next +@ cdecl _vcomp_set_num_threads(long) vcomp._vcomp_set_num_threads +@ cdecl _vcomp_single_begin(long) vcomp._vcomp_single_begin +@ cdecl _vcomp_single_end() vcomp._vcomp_single_end +@ stub omp_destroy_lock +@ stub omp_destroy_nest_lock +@ cdecl omp_get_dynamic() vcomp.omp_get_dynamic +@ cdecl omp_get_max_threads() vcomp.omp_get_max_threads +@ cdecl omp_get_nested() vcomp.omp_get_nested +@ cdecl omp_get_num_procs() vcomp.omp_get_num_procs +@ cdecl omp_get_num_threads() vcomp.omp_get_num_threads +@ cdecl omp_get_thread_num() vcomp.omp_get_thread_num +@ stub omp_get_wtick +@ cdecl omp_get_wtime() vcomp.omp_get_wtime +@ cdecl omp_in_parallel() vcomp.omp_in_parallel +@ stub omp_init_lock +@ stub omp_init_nest_lock +@ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic +@ stub omp_set_lock +@ stub omp_set_nest_lock +@ cdecl omp_set_nested(long) vcomp.omp_set_nested +@ cdecl omp_set_num_threads(long) vcomp.omp_set_num_threads +@ stub omp_test_lock +@ stub omp_test_nest_lock +@ stub omp_unset_lock +@ stub omp_unset_nest_lock diff --git a/tools/make_specfiles b/tools/make_specfiles index e967e68..00e609c 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -120,6 +120,7 @@ my @dll_groups = ], [ "vcomp", + "vcomp110", "vcomp100", "vcomp90", ],

1 0

Hans Leidekker : ole32: Add stub implementations of CoGetActivationState and CoGetCallState.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: 4062db444cc528e3da50837d4d01d291aaa340cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4062db444cc528e3da50837d4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Aug 3 11:25:33 2015 +0200 ole32: Add stub implementations of CoGetActivationState and CoGetCallState. --- dlls/combase/combase.spec | 4 ++-- dlls/ole32/ole32.spec | 2 ++ dlls/ole32/ole32_main.c | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index ac095ce..90f6c9d 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -88,11 +88,11 @@ @ stub CoEnableCallCancellation @ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries @ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx -@ stub CoGetActivationState +@ stdcall CoGetActivationState(int128 long ptr) ole32.CoGetActivationState @ stub CoGetApartmentID @ stub CoGetApartmentType @ stdcall CoGetCallContext(ptr ptr) ole32.CoGetCallContext -@ stub CoGetCallState +@ stdcall CoGetCallState(long ptr) ole32.CoGetCallState @ stdcall CoGetCallerTID(ptr) ole32.CoGetCallerTID @ stub CoGetCancelObject @ stdcall CoGetClassObject(ptr long ptr ptr ptr) ole32.CoGetClassObject diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index b36e683..8c4e8e3 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -22,7 +22,9 @@ @ stdcall CoFreeLibrary(long) @ stdcall CoFreeUnusedLibraries() @ stdcall CoFreeUnusedLibrariesEx(long long) +@ stdcall CoGetActivationState(int128 long ptr) @ stdcall CoGetCallContext(ptr ptr) +@ stdcall CoGetCallState(long ptr) @ stdcall CoGetCallerTID(ptr) @ stdcall CoGetClassObject(ptr long ptr ptr ptr) @ stdcall CoGetContextToken(ptr) diff --git a/dlls/ole32/ole32_main.c b/dlls/ole32/ole32_main.c index 97b18a0..7c12f1c 100644 --- a/dlls/ole32/ole32_main.c +++ b/dlls/ole32/ole32_main.c @@ -160,3 +160,21 @@ HGLOBAL WINAPI OleMetafilePictFromIconAndLabel(HICON hIcon, LPOLESTR lpszLabel, return hmem; } + +/*********************************************************************** + * CoGetActivationState (ole32.@) + */ +HRESULT WINAPI CoGetActivationState(GUID guid, DWORD unknown, DWORD *unknown2) +{ + FIXME("%s, %x, %p\n", debugstr_guid(&guid), unknown, unknown2); + return E_NOTIMPL; +} + +/*********************************************************************** + * CoGetCallState (ole32.@) + */ +HRESULT WINAPI CoGetCallState(int unknown, PULONG unknown2) +{ + FIXME("%d, %p\n", unknown, unknown2); + return E_NOTIMPL; +}

1 0

Hans Leidekker : advapi32: Add a stub implementation of RegisterWaitChainCOMCallback.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: 09de5cdb38bf41f4530dfd9c8e42ce7c76de3075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09de5cdb38bf41f4530dfd9c8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Aug 3 11:26:33 2015 +0200 advapi32: Add a stub implementation of RegisterWaitChainCOMCallback. --- dlls/advapi32/advapi.c | 10 ++++++++++ dlls/advapi32/advapi32.spec | 2 +- include/Makefile.in | 1 + include/wct.h | 27 +++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index 646be59..748a5df 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -30,6 +30,7 @@ #include "winternl.h" #include "winerror.h" #include "wincred.h" +#include "wct.h" #include "wine/library.h" #include "wine/unicode.h" @@ -321,3 +322,12 @@ DWORD WINAPI CommandLineFromMsiDescriptor( WCHAR *szDescriptor, FreeLibrary( hmsi ); return r; } + +/*********************************************************************** + * RegisterWaitChainCOMCallback (ole32.@) + */ +void WINAPI RegisterWaitChainCOMCallback(PCOGETCALLSTATE call_state_cb, + PCOGETACTIVATIONSTATE activation_state_cb) +{ + FIXME("%p, %p\n", call_state_cb, activation_state_cb); +} diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index ec27440..8b1c0d5 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -609,7 +609,7 @@ @ stdcall RegGetKeySecurity(long long ptr ptr) @ stdcall RegGetValueA(long str str long ptr ptr ptr) @ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr) -# @ stub RegisterWaitChainCOMCallback +@ stdcall RegisterWaitChainCOMCallback(ptr ptr) # @ stub RegLoadAppKeyA # @ stub RegLoadAppKeyW @ stdcall RegLoadKeyA(long str str) diff --git a/include/Makefile.in b/include/Makefile.in index f829712..2431895 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -599,6 +599,7 @@ SRCDIR_INCLUDES = \ vsstyle.h \ vssym32.h \ vswriter.h \ + wct.h \ webservices.h \ werapi.h \ wfext.h \ diff --git a/include/wct.h b/include/wct.h new file mode 100644 index 0000000..0cef59d --- /dev/null +++ b/include/wct.h @@ -0,0 +1,27 @@ +/* + * Copyright 2015 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WCT_H +#define __WINE_WCT_H + +typedef HRESULT (WINAPI *PCOGETCALLSTATE)(int,PULONG); +typedef HRESULT (WINAPI *PCOGETACTIVATIONSTATE)(GUID,DWORD,DWORD*); + +void WINAPI RegisterWaitChainCOMCallback(PCOGETCALLSTATE,PCOGETACTIVATIONSTATE); + +#endif /* __WINE_WCT_H */

1 0

Hans Leidekker : winhttp: Always clear last error on success.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: 1def0982f16b1030de0b39c41dfe0496b27845da URL: http://source.winehq.org/git/wine.git/?a=commit;h=1def0982f16b1030de0b39c41… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Aug 3 11:27:31 2015 +0200 winhttp: Always clear last error on success. --- dlls/winhttp/request.c | 9 +++ dlls/winhttp/session.c | 29 ++++++++- dlls/winhttp/tests/notification.c | 47 +++++++++++--- dlls/winhttp/tests/url.c | 9 ++- dlls/winhttp/tests/winhttp.c | 131 ++++++++++++++++++++++++++++++++------ dlls/winhttp/url.c | 2 + 6 files changed, 194 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1def0982f16b1030de0b3…

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: 2076df9df3197cdd843511d84ebb26d6ceedb4a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2076df9df3197cdd843511d84… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Aug 3 15:18:31 2015 +0300 po: Update Ukrainian translation. --- po/uk.po | 38 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/po/uk.po b/po/uk.po index 2fc3da2..f72fc95 100644 --- a/po/uk.po +++ b/po/uk.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-28 15:57+0200\n" +"PO-Revision-Date: 2015-08-03 15:12+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -7532,10 +7532,8 @@ msgid "Add Control" msgstr "Додати елемент управління" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Font..." msgid "&Convert..." -msgstr "&Шрифт..." +msgstr "&Конвертувати..." #: oledlg.rc:33 oleview.rc:40 msgid "&Object" @@ -9290,24 +9288,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" @@ -13594,16 +13588,12 @@ msgid "Command history" msgstr "Історія команд" #: wineconsole.rc:69 -#, fuzzy -#| msgid "Buffer zone" msgid "&Buffer size:" -msgstr "Зона буфера" +msgstr "&Розмір буфера:" #: wineconsole.rc:72 -#, fuzzy -#| msgid "&Remove doubles" msgid "&Remove duplicates" -msgstr "Видаляти &повтори" +msgstr "&Видаляти повтори" #: wineconsole.rc:74 msgid "Popup menu" @@ -13618,22 +13608,16 @@ msgid "S&hift" msgstr "" #: wineconsole.rc:78 -#, fuzzy -#| msgid "&Close console" msgid "Console" -msgstr "&Закрити консоль" +msgstr "Консоль" #: wineconsole.rc:79 -#, fuzzy -#| msgid "Quick edit" msgid "&Quick Edit mode" -msgstr "Швидке редагування" +msgstr "&Швидке редагування" #: wineconsole.rc:80 -#, fuzzy -#| msgid "&Expert mode" msgid "&Insert mode" -msgstr "&Режим експерта" +msgstr "&Режим вставки" #: wineconsole.rc:88 msgid "&Font"

1 0

Jacek Caban : widl: Added widl-specific winrt pragma.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: a9503166fe3c64051cd9b4f18f1331e01102afc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9503166fe3c64051cd9b4f18… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 3 14:38:27 2015 +0200 widl: Added widl-specific winrt pragma. --- tools/widl/parser.l | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index b4f2af5..c95277c 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -147,6 +147,15 @@ UUID *parse_uuid(const char *u) input_name = xstrdup(fname); } <PP_PRAGMA>midl_echo[^\n]* yyless(9); yy_pop_state(); return tCPPQUOTE; +<PP_PRAGMA>winrt[^\n]* { + if(import_stack_ptr) { + if(!winrt_mode) + error_loc("winrt IDL file imported in non-winrt mode\n"); + }else { + winrt_mode = TRUE; + } + yy_pop_state(); + } <PP_PRAGMA>[^\n]* parser_lval.str = xstrdup(yytext); yy_pop_state(); return aPRAGMA; <INITIAL,ATTR>\" yy_push_state(QUOTE); cbufidx = 0; <QUOTE>\" {

1 0

Jacek Caban : windows.foundation.idl: Added new file.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: e3c6777edda76f319e5c465faf6c20bb91ed9f17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3c6777edda76f319e5c465fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 3 14:38:40 2015 +0200 windows.foundation.idl: Added new file. --- include/Makefile.in | 1 + include/windows.foundation.idl | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 2431895..6317510 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -132,6 +132,7 @@ PUBLIC_IDL_H_SRCS = \ wia_xp.idl \ wincodec.idl \ wincodecsdk.idl \ + windows.foundation.idl \ wine/itss.idl \ wine/svcctl.idl \ winsxs.idl \ diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl new file mode 100644 index 0000000..f926202 --- /dev/null +++ b/include/windows.foundation.idl @@ -0,0 +1,39 @@ +/* + * Copyright 2015 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt +#endif + +import "inspectable.idl"; +/* import "asyncinfo.idl"; */ +/* import "eventtoken.idl"; */ +/* import "ivectorchangedeventargs.idl"; */ + +namespace Windows { + namespace Foundation { + [ + version(0x06030000), + uuid(96369f54-8eb6-48f0-abce-c1b211e627c3) + ] + interface IStringable : IInspectable + { + HRESULT ToString([out, retval] HSTRING *value); + } + } +}

1 0

Bernhard Übelacker : include: Fix packing of digitalv.h.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: c0646664d43f44921c5dc5d93fd9bc2b8eabe7e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0646664d43f44921c5dc5d93… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Sun Aug 2 21:13:20 2015 +0200 include: Fix packing of digitalv.h. --- dlls/winmm/tests/generated.c | 1525 ++++++++++++++++++++++++++++++++++++++++++ include/digitalv.h | 4 + tools/winapi/tests.dat | 39 ++ 3 files changed, 1568 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0646664d43f44921c5dc…

1 0

Henri Verbeet : d2d1: Implement d2d_rectangle_geometry_GetFactory().
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: 47f9f09c73d0b72583f4520df9a2e796255e98a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47f9f09c73d0b72583f4520df… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 2 18:56:05 2015 +0200 d2d1: Implement d2d_rectangle_geometry_GetFactory(). --- dlls/d2d1/geometry.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 777b7ec..056923e 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -1629,9 +1629,11 @@ static ULONG STDMETHODCALLTYPE d2d_rectangle_geometry_Release(ID2D1RectangleGeom static void STDMETHODCALLTYPE d2d_rectangle_geometry_GetFactory(ID2D1RectangleGeometry *iface, ID2D1Factory **factory) { - FIXME("iface %p, factory %p stub!\n", iface, factory); + struct d2d_geometry *geometry = impl_from_ID2D1RectangleGeometry(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); - *factory = NULL; + ID2D1Factory_AddRef(*factory = geometry->factory); } static HRESULT STDMETHODCALLTYPE d2d_rectangle_geometry_GetBounds(ID2D1RectangleGeometry *iface,

1 0