wine-commits August 2015

wine-commits@winehq.org

2 participants
503 discussions

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

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

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 : winedump: Avoid LPVOID when creating stub dll.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: 62c776a7dd98d72f4018337b1c24edddf8c488dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=62c776a7dd98d72f4018337b1… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jul 31 12:15:54 2015 -0500 winedump: Avoid LPVOID when creating stub dll. --- tools/winedump/output.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index aff7f66..6c2bfae 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -237,8 +237,8 @@ void output_c_preamble (void) } fprintf (cfile, - "BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID " - "reserved)\n{\n" + "BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void " + "*reserved)\n{\n" " TRACE(\"(%%p, %%u, %%p)\\n\", instance, reason, reserved);\n\n" " switch (reason)\n" " {\n"

1 0

Mark Harmstone : shell32: Don't hardcode icon sizes in SIC_LoadIcon.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: 77b75ca14b960f8b36134f0e6e9ad1786f97f296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77b75ca14b960f8b36134f0e6… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Aug 1 15:40:05 2015 +0100 shell32: Don't hardcode icon sizes in SIC_LoadIcon. --- dlls/shell32/iconcache.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index b294908..4549d5b 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -310,8 +310,10 @@ static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags) HICON hiconLargeShortcut; HICON hiconSmallShortcut; - PrivateExtractIconsW( sSourceFile, dwSourceIndex, 32, 32, &hiconLarge, 0, 1, 0 ); - PrivateExtractIconsW( sSourceFile, dwSourceIndex, 16, 16, &hiconSmall, 0, 1, 0 ); + PrivateExtractIconsW( sSourceFile, dwSourceIndex, GetSystemMetrics(SM_CXICON), + GetSystemMetrics(SM_CYICON), &hiconLarge, 0, 1, 0 ); + PrivateExtractIconsW( sSourceFile, dwSourceIndex, GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), &hiconSmall, 0, 1, 0 ); if ( !hiconLarge || !hiconSmall) {

1 0

Mark Harmstone : user32: Specify size for default window icon in NC_IconForWindow.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: 27bffea1486b134b58cc30d69be97f7f496010b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27bffea1486b134b58cc30d69… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Aug 1 15:03:13 2015 +0100 user32: Specify size for default window icon in NC_IconForWindow. --- dlls/user32/nonclient.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 11b8d08..1267ab6 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -172,7 +172,8 @@ static HICON NC_IconForWindow( HWND hwnd ) * get the default one. */ if (!hIcon && (GetWindowLongW( hwnd, GWL_STYLE ) & DS_MODALFRAME)) - hIcon = LoadImageW(0, (LPCWSTR)IDI_WINLOGO, IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); + hIcon = LoadImageW(0, (LPCWSTR)IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); return hIcon; }

1 0

Hugh McMaster : kernel32: Restore the original console cursor size on Enter press, if the Insert key toggle is active.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: 0adad1f5730abc1f9c75f7e8fb056f8b47f5abe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0adad1f5730abc1f9c75f7e8f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 3 17:55:01 2015 +1000 kernel32: Restore the original console cursor size on Enter press, if the Insert key toggle is active. --- dlls/kernel32/editline.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 4dfa2cf..f7e42a4 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -61,6 +61,7 @@ typedef struct WCEL_Context { WCHAR* yanked; /* yanked line */ unsigned mark; /* marked point (emacs mode only) */ CONSOLE_SCREEN_BUFFER_INFO csbi; /* current state (initial cursor, window size, attribute) */ + CONSOLE_CURSOR_INFO cinfo; /* original cursor state (size, visibility) */ HANDLE hConIn; HANDLE hConOut; unsigned done : 1, /* to 1 when we're done with editing */ @@ -485,6 +486,8 @@ static void WCEL_Done(WCEL_Context* ctx) ctx->line[ctx->len++] = '\n'; ctx->line[ctx->len] = 0; WriteConsoleW(ctx->hConOut, &nl, 1, NULL, NULL); + if (ctx->insertkey) + SetConsoleCursorInfo(ctx->hConOut, &ctx->cinfo); ctx->done = 1; } @@ -930,6 +933,7 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) if (!GetConsoleMode(ctx.hConOut, &mode)) mode = 0; ctx.can_wrap = (mode & ENABLE_WRAP_AT_EOL_OUTPUT) ? 1 : 0; ctx.can_pos_cursor = can_pos_cursor; + GetConsoleCursorInfo(ctx.hConOut, &ctx.cinfo); if (!WCEL_Grow(&ctx, 1)) {

1 0

Hugh McMaster : kernel32: Restore the original console edit mode on Enter press, if the Insert key toggle is active.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: 68fb8c55258101818e2373726ef95ed0fbddb247 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68fb8c55258101818e2373726… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 3 17:55:00 2015 +1000 kernel32: Restore the original console edit mode on Enter press, if the Insert key toggle is active. --- dlls/kernel32/editline.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 802bfe0..4dfa2cf 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -68,6 +68,7 @@ typedef struct WCEL_Context { can_wrap : 1, /* to 1 when multi-line edition can take place */ shall_echo : 1, /* to 1 when characters should be echo:ed when keyed-in */ insert : 1, /* to 1 when new characters are inserted (otherwise overwrite) */ + insertkey : 1, /* to 1 when the Insert key toggle is active */ can_pos_cursor : 1; /* to 1 when console can (re)position cursor */ unsigned histSize; unsigned histPos; @@ -763,24 +764,13 @@ static void WCEL_RepeatCount(WCEL_Context* ctx) static void WCEL_ToggleInsert(WCEL_Context* ctx) { - DWORD mode; CONSOLE_CURSOR_INFO cinfo; - if (GetConsoleMode(ctx->hConIn, &mode) && GetConsoleCursorInfo(ctx->hConOut, &cinfo)) + ctx->insertkey = !ctx->insertkey; + + if (GetConsoleCursorInfo(ctx->hConOut, &cinfo)) { - if ((mode & (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) == (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) - { - mode &= ~ENABLE_INSERT_MODE; - cinfo.dwSize = 100; - ctx->insert = FALSE; - } - else - { - mode |= ENABLE_INSERT_MODE | ENABLE_EXTENDED_FLAGS; - cinfo.dwSize = 25; - ctx->insert = TRUE; - } - SetConsoleMode(ctx->hConIn, mode); + cinfo.dwSize = ctx->insertkey ? 100 : 25; SetConsoleCursorInfo(ctx->hConOut, &cinfo); } } @@ -990,6 +980,8 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) GetConsoleMode(hConsoleIn, &mode); ctx.insert = (mode & (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) == (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS); + if (ctx.insertkey) + ctx.insert = !ctx.insert; if (func) (func)(&ctx);

1 0

Michael Stefaniuc : qcap: Just use the driver_info pointer from the parent.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: a6bf7bb01fefc6af6c24a801a69817e858090e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6bf7bb01fefc6af6c24a801a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Aug 2 23:19:52 2015 +0200 qcap: Just use the driver_info pointer from the parent. --- dlls/qcap/vfwcapture.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 1952596..f9530a0 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -103,7 +103,6 @@ static inline VfwCapture *impl_from_IPersistPropertyBag(IPersistPropertyBag *ifa typedef struct VfwPinImpl { BaseOutputPin pin; - Capture *driver_info; VfwCapture *parent; const IKsPropertySetVtbl * KSP_VT; } VfwPinImpl; @@ -554,7 +553,6 @@ PPB_Load( IPersistPropertyBag * iface, IPropertyBag *pPropBag, if (This->driver_info) { pin = (VfwPinImpl *)This->pOutputPin; - pin->driver_info = This->driver_info; pin->parent = This; This->init = TRUE; hr = S_OK; @@ -683,7 +681,7 @@ static HRESULT WINAPI VfwPin_GetMediaType(BasePin *iface, int iPosition, AM_MEDI if (iPosition > 0) return VFW_S_NO_MORE_ITEMS; - hr = qcap_driver_get_format(This->driver_info, &vfw_pmt); + hr = qcap_driver_get_format(This->parent->driver_info, &vfw_pmt); if (SUCCEEDED(hr)) { CopyMediaType(pmt, vfw_pmt); DeleteMediaType(vfw_pmt); @@ -797,7 +795,7 @@ VfwPin_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) HRESULT hr; VfwPinImpl *This = (VfwPinImpl *)iface; - hr = qcap_driver_get_format(This->driver_info, &pmt); + hr = qcap_driver_get_format(This->parent->driver_info, &pmt); if (SUCCEEDED(hr)) { hr = BasePinImpl_EnumMediaTypes(iface, ppEnum); DeleteMediaType(pmt);

1 0

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 August 2015