wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Alexandre Julliard : configure: Don' t allow using config.h when cross-compiling.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: ce09e564d71eec1633cdc8385d6f851f575ed5c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce09e564d71eec1633cdc838… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 13:57:06 2019 +0200 configure: Don't allow using config.h when cross-compiling. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 7 ++++--- dlls/winecrt0/register.c | 1 - dlls/winecrt0/stub.c | 2 -- include/config.h.in | 5 +++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 7509dc7..10cef9c 100644 --- a/configure.ac +++ b/configure.ac @@ -2715,9 +2715,10 @@ dnl **** Generate output files **** AH_TOP([#ifndef __WINE_CONFIG_H #define __WINE_CONFIG_H -#ifndef WINE_CROSS_PE]) -AH_BOTTOM([#endif /* WINE_CROSS_PE */ -#endif /* __WINE_CONFIG_H */]) +#ifdef WINE_CROSS_PE +#error config.h should not be used when cross-compiling +#endif]) +AH_BOTTOM([#endif /* __WINE_CONFIG_H */]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) AS_ECHO_N("creating Makefile rules...") >&AS_MESSAGE_FD diff --git a/dlls/winecrt0/register.c b/dlls/winecrt0/register.c index 70a4a35..8c15d1b 100644 --- a/dlls/winecrt0/register.c +++ b/dlls/winecrt0/register.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #define COBJMACROS diff --git a/dlls/winecrt0/stub.c b/dlls/winecrt0/stub.c index 913181a..49e179e 100644 --- a/dlls/winecrt0/stub.c +++ b/dlls/winecrt0/stub.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h" #include "winbase.h" diff --git a/include/config.h.in b/include/config.h.in index 836008f..7998764 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -2,7 +2,9 @@ #ifndef __WINE_CONFIG_H #define __WINE_CONFIG_H -#ifndef WINE_CROSS_PE +#ifdef WINE_CROSS_PE +#error config.h should not be used when cross-compiling +#endif /* Define to the file extension for executables. */ #undef EXEEXT @@ -1475,5 +1477,4 @@ #undef inline #endif -#endif /* WINE_CROSS_PE */ #endif /* __WINE_CONFIG_H */

1 0

Alexandre Julliard : configure: Rename WINE_CROSSTEST to WINE_CROSS_PE.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: b8daf1f134c19df2295097191b753d234b77f990 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8daf1f134c19df229509719… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 13:54:17 2019 +0200 configure: Rename WINE_CROSSTEST to WINE_CROSS_PE. It's not used only in tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 6 +++--- include/config.h.in | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index b15803c..ac543f0 100755 --- a/configure +++ b/configure @@ -9755,7 +9755,7 @@ test -n "$CROSSCC" || CROSSCC="false" saved_CFLAGS=$CFLAGS CROSSCFLAGS=${CROSSCFLAGS:-"-g -O2"} - EXTRACROSSCFLAGS="-DWINE_CROSSTEST -Wall" + EXTRACROSSCFLAGS="-DWINE_CROSS_PE -Wall" CC="$CROSSCC" diff --git a/configure.ac b/configure.ac index 9dd300d..7509dc7 100644 --- a/configure.ac +++ b/configure.ac @@ -1026,7 +1026,7 @@ then ac_save_CC="$CC" saved_CFLAGS=$CFLAGS AC_SUBST(CROSSCFLAGS,${CROSSCFLAGS:-"-g -O2"}) - AC_SUBST(EXTRACROSSCFLAGS,"-DWINE_CROSSTEST -Wall") + AC_SUBST(EXTRACROSSCFLAGS,"-DWINE_CROSS_PE -Wall") CC="$CROSSCC" CFLAGS=$CROSSCFLAGS @@ -2715,8 +2715,8 @@ dnl **** Generate output files **** AH_TOP([#ifndef __WINE_CONFIG_H #define __WINE_CONFIG_H -#ifndef WINE_CROSSTEST]) -AH_BOTTOM([#endif /* WINE_CROSSTEST */ +#ifndef WINE_CROSS_PE]) +AH_BOTTOM([#endif /* WINE_CROSS_PE */ #endif /* __WINE_CONFIG_H */]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) diff --git a/include/config.h.in b/include/config.h.in index b172e0a..836008f 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -2,7 +2,7 @@ #ifndef __WINE_CONFIG_H #define __WINE_CONFIG_H -#ifndef WINE_CROSSTEST +#ifndef WINE_CROSS_PE /* Define to the file extension for executables. */ #undef EXEEXT @@ -1475,5 +1475,5 @@ #undef inline #endif -#endif /* WINE_CROSSTEST */ +#endif /* WINE_CROSS_PE */ #endif /* __WINE_CONFIG_H */

1 0

Alexandre Julliard : winecrt0: Don' t build unneeded code for Windows platforms.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: 3346132a0b83d4a46ffbcc4e6911ed21f8710be6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3346132a0b83d4a46ffbcc4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 13:52:31 2019 +0200 winecrt0: Don't build unneeded code for Windows platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/delay_load.c | 4 ++++ dlls/winecrt0/dll_entry.c | 4 ++++ dlls/winecrt0/drv_entry.c | 4 ++++ dlls/winecrt0/exe16_entry.c | 4 ++-- dlls/winecrt0/exe_entry.c | 4 ++++ dlls/winecrt0/exe_main.c | 4 ++++ dlls/winecrt0/exe_wentry.c | 4 ++++ dlls/winecrt0/exe_wmain.c | 4 ++++ dlls/winecrt0/init.c | 4 ++++ 9 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/winecrt0/delay_load.c b/dlls/winecrt0/delay_load.c index ac257ba..aab4079 100644 --- a/dlls/winecrt0/delay_load.c +++ b/dlls/winecrt0/delay_load.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef _WIN32 + #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -61,3 +63,5 @@ static void free_delay_imports(void) if (*descr->phmod) FreeLibrary( *descr->phmod ); } #endif + +#endif /* _WIN32 */ diff --git a/dlls/winecrt0/dll_entry.c b/dlls/winecrt0/dll_entry.c index 9bbe8c4..591aa07 100644 --- a/dlls/winecrt0/dll_entry.c +++ b/dlls/winecrt0/dll_entry.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef _WIN32 + #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -43,3 +45,5 @@ BOOL WINAPI DECLSPEC_HIDDEN __wine_spec_dll_entry( HINSTANCE inst, DWORD reason, return ret; } + +#endif /* _WIN32 */ diff --git a/dlls/winecrt0/drv_entry.c b/dlls/winecrt0/drv_entry.c index 32a87ee..4750168 100644 --- a/dlls/winecrt0/drv_entry.c +++ b/dlls/winecrt0/drv_entry.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef _WIN32 + #include <stdarg.h> #include "windef.h" #include "winternl.h" @@ -35,3 +37,5 @@ NTSTATUS DECLSPEC_HIDDEN WINAPI __wine_spec_drv_entry( struct _DRIVER_OBJECT *ob return DriverEntry( obj, path ); /* there is no detach routine so we can't call destructors */ } + +#endif /* _WIN32 */ diff --git a/dlls/winecrt0/exe16_entry.c b/dlls/winecrt0/exe16_entry.c index 2599332..1e477bd 100644 --- a/dlls/winecrt0/exe16_entry.c +++ b/dlls/winecrt0/exe16_entry.c @@ -18,14 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if defined(__i386__) && !defined(_WIN32) + #include <stdarg.h> #include "windef.h" #include "winbase.h" #include "wownt32.h" #include "wine/winbase16.h" -#ifdef __i386__ - extern WORD WINAPI WinMain16( HINSTANCE16 inst, HINSTANCE16 prev, LPSTR cmdline, WORD show ); void WINAPI DECLSPEC_HIDDEN __wine_spec_exe16_entry( CONTEXT *context ) diff --git a/dlls/winecrt0/exe_entry.c b/dlls/winecrt0/exe_entry.c index 4165651..60c11aa 100644 --- a/dlls/winecrt0/exe_entry.c +++ b/dlls/winecrt0/exe_entry.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef _WIN32 + #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -37,3 +39,5 @@ DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_entry( PEB *peb ) if (needs_init) _fini(); ExitProcess( ret ); } + +#endif /* _WIN32 */ diff --git a/dlls/winecrt0/exe_main.c b/dlls/winecrt0/exe_main.c index 89ffa7b..94a96d1 100644 --- a/dlls/winecrt0/exe_main.c +++ b/dlls/winecrt0/exe_main.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef _WIN32 + #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -48,3 +50,5 @@ int main( int argc, char *argv[] ) if (!(info.dwFlags & STARTF_USESHOWWINDOW)) info.wShowWindow = SW_SHOWNORMAL; return WinMain( GetModuleHandleA(0), 0, cmdline, info.wShowWindow ); } + +#endif /* _WIN32 */ diff --git a/dlls/winecrt0/exe_wentry.c b/dlls/winecrt0/exe_wentry.c index 11cff89..ed1bd20 100644 --- a/dlls/winecrt0/exe_wentry.c +++ b/dlls/winecrt0/exe_wentry.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef _WIN32 + #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -37,3 +39,5 @@ DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_wentry( PEB *peb ) if (needs_init) _fini(); ExitProcess( ret ); } + +#endif /* _WIN32 */ diff --git a/dlls/winecrt0/exe_wmain.c b/dlls/winecrt0/exe_wmain.c index ce685f8..d697e90 100644 --- a/dlls/winecrt0/exe_wmain.c +++ b/dlls/winecrt0/exe_wmain.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef _WIN32 + #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -50,3 +52,5 @@ int wmain( int argc, WCHAR *argv[] ) if (!(info.dwFlags & STARTF_USESHOWWINDOW)) info.wShowWindow = SW_SHOWNORMAL; return wWinMain( GetModuleHandleW(0), 0, cmdline, info.wShowWindow ); } + +#endif /* _WIN32 */ diff --git a/dlls/winecrt0/init.c b/dlls/winecrt0/init.c index 74eca43..bd9d9fc 100644 --- a/dlls/winecrt0/init.c +++ b/dlls/winecrt0/init.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef _WIN32 + #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -40,3 +42,5 @@ void DECLSPEC_HIDDEN __wine_spec_init_ctor(void) if (__wine_spec_init_state == NO_INIT_DONE) __wine_spec_init(); __wine_spec_init_state = CONSTRUCTORS_DONE; } + +#endif /* _WIN32 */

1 0

Alexandre Julliard : winecrt0: Reimplement __wine_rtl_unwind() as a proper asm function.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: 351bd3306914066dc8c9219353eeef585bb3bf41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=351bd3306914066dc8c92193… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 13:27:38 2019 +0200 winecrt0: Reimplement __wine_rtl_unwind() as a proper asm function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/exception.c | 64 ++++++++++++++++++++++++++++------------------- include/wine/exception.h | 4 +-- 2 files changed, 40 insertions(+), 28 deletions(-) diff --git a/dlls/winecrt0/exception.c b/dlls/winecrt0/exception.c index 98132fa..d141d28 100644 --- a/dlls/winecrt0/exception.c +++ b/dlls/winecrt0/exception.c @@ -23,38 +23,50 @@ #include "wine/exception.h" #include "wine/asm.h" -#ifdef __x86_64__ -extern void __wine_unwind_trampoline(void); -/* we need an extra call to make sure the stack is correctly aligned */ -__ASM_GLOBAL_FUNC( __wine_unwind_trampoline, "callq *%rax" ); -#endif - -/* wrapper for RtlUnwind since it clobbers registers on Windows */ -void __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record, - void (*target)(void) ) -{ #if defined(__GNUC__) && defined(__i386__) - int dummy1, dummy2, dummy3, dummy4; - __asm__ __volatile__("pushl %%ebp\n\t" - "pushl %%ebx\n\t" - "pushl $0\n\t" - "pushl %3\n\t" - "pushl %2\n\t" - "pushl %1\n\t" - "call *%0\n\t" - "popl %%ebx\n\t" - "popl %%ebp" - : "=a" (dummy1), "=S" (dummy2), "=D" (dummy3), "=c" (dummy4) - : "0" (RtlUnwind), "1" (frame), "2" (target), "3" (record) - : "edx", "memory" ); -#elif defined(__x86_64__) - RtlUnwind( frame, __wine_unwind_trampoline, record, target ); + +__ASM_GLOBAL_FUNC( __wine_rtl_unwind, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "subl $8,%esp\n\t" + "pushl $0\n\t" /* retval */ + "pushl 12(%ebp)\n\t" /* record */ + "pushl 16(%ebp)\n\t" /* target */ + "pushl 8(%ebp)\n\t" /* frame */ + "call " __ASM_NAME("RtlUnwind") __ASM_STDCALL(16) "\n\t" + "call *16(%ebp)" ) + +#elif defined(__GNUC__) && defined(__x86_64__) + +__ASM_GLOBAL_FUNC( __wine_rtl_unwind, + "pushq %rbp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") + __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") + "movq %rsp,%rbp\n\t" + __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") + "subq $0x20,%rsp\n\t" + "movq %r8,%r9\n\t" /* retval = final target */ + "movq %rdx,%r8\n\t" /* record */ + "leaq __wine_unwind_trampoline(%rip),%rdx\n\t" /* target = trampoline */ + "call " __ASM_NAME("RtlUnwind") "\n" + "__wine_unwind_trampoline:\n\t" + /* we need an extra call to make sure the stack is correctly aligned */ + "callq *%rax" ) + #else + +void __cdecl __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record, + void (*target)(void) ) +{ RtlUnwind( frame, target, record, 0 ); -#endif for (;;) target(); } +#endif + static void DECLSPEC_NORETURN unwind_target(void) { __WINE_FRAME *wine_frame = (__WINE_FRAME *)__wine_get_frame(); diff --git a/include/wine/exception.h b/include/wine/exception.h index f30807e..f4e9166 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -98,8 +98,8 @@ static inline int sigsetjmp( sigjmp_buf buf, int sigs ) { return setjmp( buf ); static inline void siglongjmp( sigjmp_buf buf, int val ) { longjmp( buf, val ); } #endif -extern void __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record, - void (*target)(void) ) DECLSPEC_HIDDEN DECLSPEC_NORETURN; +extern void __cdecl __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record, + void (*target)(void) ) DECLSPEC_HIDDEN DECLSPEC_NORETURN; extern DWORD __wine_exception_handler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context,

1 0

Alexandre Julliard : winecrt0: Store the appropriate longjmp() function in the exception frame.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: 9177a75acc36b6d593917262fb62f42098a1fcf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9177a75acc36b6d593917262… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 13:14:35 2019 +0200 winecrt0: Store the appropriate longjmp() function in the exception frame. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/exception.c | 2 +- include/wine/exception.h | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/winecrt0/exception.c b/dlls/winecrt0/exception.c index 8a7f2a5..98132fa 100644 --- a/dlls/winecrt0/exception.c +++ b/dlls/winecrt0/exception.c @@ -59,7 +59,7 @@ static void DECLSPEC_NORETURN unwind_target(void) { __WINE_FRAME *wine_frame = (__WINE_FRAME *)__wine_get_frame(); __wine_pop_frame( &wine_frame->frame ); - siglongjmp( wine_frame->jmp, 1 ); + for (;;) wine_frame->longjmp( wine_frame->jmp, 1 ); } static void DECLSPEC_NORETURN unwind_frame( EXCEPTION_RECORD *record, diff --git a/include/wine/exception.h b/include/wine/exception.h index e93968f..f30807e 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -94,8 +94,8 @@ extern "C" { #if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__WINE_SETJMP_H) #define sigjmp_buf jmp_buf -#define sigsetjmp(buf,sigs) setjmp(buf) -#define siglongjmp(buf,val) longjmp(buf,val) +static inline int sigsetjmp( sigjmp_buf buf, int sigs ) { return setjmp( buf ); } +static inline void siglongjmp( sigjmp_buf buf, int val ) { longjmp( buf, val ); } #endif extern void __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record, @@ -139,6 +139,7 @@ extern DWORD __wine_finally_ctx_handler( EXCEPTION_RECORD *record, } else { \ __f.frame.Handler = __wine_exception_handler; \ __f.u.filter = (func); \ + __f.longjmp = siglongjmp; \ if (sigsetjmp( __f.jmp, 0 )) { \ const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { @@ -151,6 +152,7 @@ extern DWORD __wine_finally_ctx_handler( EXCEPTION_RECORD *record, __f.frame.Handler = __wine_exception_ctx_handler; \ __f.u.filter_ctx = (func); \ __f.ctx = context; \ + __f.longjmp = siglongjmp; \ if (sigsetjmp( __f.jmp, 0 )) { \ const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { @@ -162,6 +164,7 @@ extern DWORD __wine_finally_ctx_handler( EXCEPTION_RECORD *record, break; \ } else { \ __f.frame.Handler = __wine_exception_handler_page_fault; \ + __f.longjmp = siglongjmp; \ if (sigsetjmp( __f.jmp, 0 )) { \ const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { @@ -173,6 +176,7 @@ extern DWORD __wine_finally_ctx_handler( EXCEPTION_RECORD *record, break; \ } else { \ __f.frame.Handler = __wine_exception_handler_all; \ + __f.longjmp = siglongjmp; \ if (sigsetjmp( __f.jmp, 0 )) { \ const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { @@ -237,6 +241,7 @@ typedef struct __tagWINE_FRAME } u; void *ctx; sigjmp_buf jmp; + void (*longjmp)(sigjmp_buf,int); /* hack to make GetExceptionCode() work in handler */ DWORD ExceptionCode; const struct __tagWINE_FRAME *ExceptionRecord;

1 0

Alexandre Julliard : include: Move inline assembly definitions to a new wine/asm.h header.
by Alexandre Julliard 14 May '19

14 May '19

1 0

Alistair Leslie-Hughes : dinput: Handle setting DIPROP_CALIBRATIONMODE mode in generic implementation.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: 132cf25ed6df160db9df479fb7974c00110aaa58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=132cf25ed6df160db9df479f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 14 01:10:39 2019 +0000 dinput: Handle setting DIPROP_CALIBRATIONMODE mode in generic implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47183 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick.c | 5 +++++ dlls/dinput/joystick_linuxinput.c | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 8b3edb2..f758092 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -405,6 +405,11 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF } break; } + case (DWORD_PTR)DIPROP_CALIBRATIONMODE: { + LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; + FIXME("DIPROP_CALIBRATIONMODE(%d)\n", pd->dwData); + break; + } default: return IDirectInputDevice2WImpl_SetProperty(iface, rguid, ph); } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 3c27f0d..e4f5db8 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -934,11 +934,6 @@ static HRESULT WINAPI JoystickWImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF if (IS_DIPROP(rguid)) { switch (LOWORD(rguid)) { - case (DWORD_PTR)DIPROP_CALIBRATIONMODE: { - LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; - FIXME("DIPROP_CALIBRATIONMODE(%d)\n", pd->dwData); - break; - } case (DWORD_PTR)DIPROP_AUTOCENTER: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph;

1 0

Jimi Huotari : winegstreamer: Fix spelling of 'initialized' in a TRACE().
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: eca00491cd7da7d1a755152f8a9fe8f3de136538 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eca00491cd7da7d1a755152f… Author: Jimi Huotari <chiitoo(a)gentoo.org> Date: Tue May 14 01:14:31 2019 +0300 winegstreamer: Fix spelling of 'initialized' in a TRACE(). Signed-off-by: Jimi Huotari <chiitoo(a)gentoo.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index fa0b7e6..f11e59a 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -272,7 +272,7 @@ static BOOL CALLBACK init_gstreamer_proc(INIT_ONCE *once, void *param, void **ct { HINSTANCE handle; - TRACE("Inititialized, version %s. Built with %d.%d.%d.\n", gst_version_string(), + TRACE("Initialized, version %s. Built with %d.%d.%d.\n", gst_version_string(), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); /* Unloading glib is a bad idea.. it installs atexit handlers,

1 0

Zebediah Figura : winegstreamer: Use CONTAINING_RECORD instead of casting.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: cade211d06898534927f62a5f528c88ca28f30ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=cade211d06898534927f62a5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 13 22:17:58 2019 -0500 winegstreamer: Use CONTAINING_RECORD instead of casting. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 98 +++++++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cade211d06898534927f…

1 0

Zebediah Figura : strmbase: Get rid of the "pfnGetPinCount" callback.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: dad885e2b977401313493e94d86d32a56f0febfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=dad885e2b977401313493e94… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 13 22:17:57 2019 -0500 strmbase: Get rid of the "pfnGetPinCount" callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/mediastreamfilter.c | 8 -------- dlls/evr/evr.c | 7 ------- dlls/qcap/audiorecord.c | 8 -------- dlls/qcap/avico.c | 6 ------ dlls/qcap/avimux.c | 8 -------- dlls/qcap/smartteefilter.c | 5 ----- dlls/qcap/vfwcapture.c | 6 ------ dlls/qedit/samplegrabber.c | 6 ------ dlls/quartz/filesource.c | 13 ------------- dlls/quartz/parser.c | 10 ---------- dlls/strmbase/filter.c | 3 +-- dlls/strmbase/renderer.c | 6 ------ dlls/strmbase/transform.c | 6 ------ dlls/winegstreamer/gstdemux.c | 8 -------- dlls/wineqtdecoder/qtsplitter.c | 10 ---------- include/wine/strmbase.h | 2 -- 16 files changed, 1 insertion(+), 111 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 8636718..a61d1e7 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -321,16 +321,8 @@ static IPin* WINAPI MediaStreamFilterImpl_GetPin(BaseFilter *iface, int pos) return NULL; } -static LONG WINAPI MediaStreamFilterImpl_GetPinCount(BaseFilter *iface) -{ - IMediaStreamFilterImpl* This = (IMediaStreamFilterImpl*)iface; - - return This->nb_streams; -} - static const BaseFilterFuncTable BaseFuncTable = { MediaStreamFilterImpl_GetPin, - MediaStreamFilterImpl_GetPinCount }; HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, void **ppObj) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index ba5b544..5ab6572 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -194,16 +194,9 @@ static IPin* WINAPI filter_GetPin(BaseFilter *iface, int position) return NULL; } -static LONG WINAPI filter_GetPinCount(BaseFilter *iface) -{ - FIXME("(%p): stub!\n", iface); - return 0; -} - static const BaseFilterFuncTable basefilter_functable = { filter_GetPin, - filter_GetPinCount, }; HRESULT evr_filter_create(IUnknown *outer_unk, void **ppv) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 3674bbb..8fad7f7 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -177,16 +177,8 @@ static IPin* WINAPI AudioRecord_GetPin(BaseFilter *iface, int pos) return NULL; } -static LONG WINAPI AudioRecord_GetPinCount(BaseFilter *iface) -{ - AudioRecord *This = impl_from_BaseFilter(iface); - FIXME("(%p): stub\n", This); - return 0; -} - static const BaseFilterFuncTable AudioRecordFuncs = { AudioRecord_GetPin, - AudioRecord_GetPinCount }; static HRESULT WINAPI PPB_QueryInterface(IPersistPropertyBag *iface, REFIID riid, LPVOID *ppv) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index f8eade9..83a7804 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -266,14 +266,8 @@ static IPin* WINAPI AVICompressor_GetPin(BaseFilter *iface, int pos) return ret; } -static LONG WINAPI AVICompressor_GetPinCount(BaseFilter *iface) -{ - return 2; -} - static const BaseFilterFuncTable filter_func_table = { AVICompressor_GetPin, - AVICompressor_GetPinCount }; static AVICompressor *impl_from_IPersistPropertyBag(IPersistPropertyBag *iface) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index dd78d71..3a269a3 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -133,16 +133,8 @@ static IPin* WINAPI AviMux_GetPin(BaseFilter *iface, int pos) return NULL; } -static LONG WINAPI AviMux_GetPinCount(BaseFilter *iface) -{ - AviMux *This = impl_from_BaseFilter(iface); - TRACE("(%p)\n", This); - return This->input_pin_no+1; -} - static const BaseFilterFuncTable filter_func_table = { AviMux_GetPin, - AviMux_GetPinCount }; static inline AviMux* impl_from_IBaseFilter(IBaseFilter *iface) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 4e22b95..268e7a2 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -224,13 +224,8 @@ static IPin* WINAPI SmartTeeFilter_GetPin(BaseFilter *iface, int pos) return ret; } -static LONG WINAPI SmartTeeFilter_GetPinCount(BaseFilter *iface) -{ - return 3; -} static const BaseFilterFuncTable SmartTeeFilterFuncs = { SmartTeeFilter_GetPin, - SmartTeeFilter_GetPinCount }; static ULONG WINAPI SmartTeeFilterInput_AddRef(IPin *iface) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 178609a..0139dbc 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -203,14 +203,8 @@ static IPin* WINAPI VfwCapture_GetPin(BaseFilter *iface, int pos) return This->pOutputPin; } -static LONG WINAPI VfwCapture_GetPinCount(BaseFilter *iface) -{ - return 1; -} - static const BaseFilterFuncTable BaseFuncTable = { VfwCapture_GetPin, - VfwCapture_GetPinCount }; IUnknown * WINAPI QCAP_createVFWCaptureFilter(IUnknown *pUnkOuter, HRESULT *phr) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index e66a000..9474a58 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -354,14 +354,8 @@ static IPin *WINAPI SampleGrabber_GetPin(BaseFilter *iface, int pos) return pin; } -static LONG WINAPI SampleGrabber_GetPinCount(BaseFilter *iface) -{ - return 2; -} - static const BaseFilterFuncTable basefunc_vtbl = { SampleGrabber_GetPin, - SampleGrabber_GetPinCount }; /* Helper that buffers data and/or calls installed sample callbacks */ diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index a54e948..b4afae9 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -405,21 +405,8 @@ static IPin* WINAPI AsyncReader_GetPin(BaseFilter *iface, int pos) return This->pOutputPin; } -static LONG WINAPI AsyncReader_GetPinCount(BaseFilter *iface) -{ - AsyncReader *This = impl_from_BaseFilter(iface); - - TRACE("%p->()\n", This); - - if (!This->pOutputPin) - return 0; - else - return 1; -} - static const BaseFilterFuncTable BaseFuncTable = { AsyncReader_GetPin, - AsyncReader_GetPinCount }; HRESULT AsyncReader_create(IUnknown * pUnkOuter, LPVOID * ppv) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index c3b69cd..a8917d9 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -77,18 +77,8 @@ static IPin* WINAPI Parser_GetPin(BaseFilter *iface, int pos) return This->ppPins[pos]; } -static LONG WINAPI Parser_GetPinCount(BaseFilter *iface) -{ - ParserImpl *This = impl_from_BaseFilter(iface); - - TRACE("%p->()\n", This); - - return This->cStreams + 1; -} - static const BaseFilterFuncTable BaseFuncTable = { Parser_GetPin, - Parser_GetPinCount }; HRESULT Parser_Create(ParserImpl *pParser, const IBaseFilterVtbl *Parser_Vtbl, diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index ed0039f..44e0188 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -144,9 +144,8 @@ HRESULT WINAPI BaseFilterImpl_FindPin(IBaseFilter *iface, const WCHAR *id, IPin TRACE("(%p)->(%s, %p)\n", This, debugstr_w(id), ret); - for (i = 0; i < This->pFuncsTable->pfnGetPinCount(This); ++i) + for (i = 0; (pin = This->pFuncsTable->pfnGetPin(This, i)); ++i) { - pin = This->pFuncsTable->pfnGetPin(This, i); hr = IPin_QueryPinInfo(pin, &info); if (FAILED(hr)) { diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 52e753f..c357102 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -194,11 +194,6 @@ static IPin* WINAPI BaseRenderer_GetPin(BaseFilter *iface, int pos) return &This->pInputPin->pin.IPin_iface; } -static LONG WINAPI BaseRenderer_GetPinCount(BaseFilter *iface) -{ - return 1; -} - static HRESULT WINAPI BaseRenderer_Input_CheckMediaType(BasePin *pin, const AM_MEDIA_TYPE * pmt) { BaseRenderer *This = impl_from_IBaseFilter(pin->pinInfo.pFilter); @@ -213,7 +208,6 @@ static HRESULT WINAPI BaseRenderer_Receive(BaseInputPin *pin, IMediaSample * pSa static const BaseFilterFuncTable RendererBaseFilterFuncTable = { BaseRenderer_GetPin, - BaseRenderer_GetPinCount }; static const BaseInputPinFuncTable input_BaseInputFuncTable = { diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 544b77a..78796cc 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -139,14 +139,8 @@ static IPin *WINAPI TransformFilter_GetPin(BaseFilter *iface, int index) return filter->ppPins[index]; } -static LONG WINAPI TransformFilter_GetPinCount(BaseFilter *iface) -{ - return 2; -} - static const BaseFilterFuncTable tfBaseFuncTable = { TransformFilter_GetPin, - TransformFilter_GetPinCount }; static const BaseInputPinFuncTable tf_input_BaseInputFuncTable = { diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 32b871d..fc598a4 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1210,16 +1210,8 @@ static IPin* WINAPI GST_GetPin(BaseFilter *iface, int pos) return pin; } -static LONG WINAPI GST_GetPinCount(BaseFilter *iface) -{ - GSTImpl *This = (GSTImpl *)iface; - TRACE("%p -> %u\n", This, This->cStreams + 1); - return (This->cStreams + 1); -} - static const BaseFilterFuncTable BaseFuncTable = { GST_GetPin, - GST_GetPinCount }; IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 614b891..19042ed 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -233,18 +233,8 @@ static IPin * WINAPI QT_GetPin(BaseFilter *base, int index) return NULL; } -static LONG WINAPI QT_GetPinCount(BaseFilter *iface) -{ - QTSplitter *This = impl_from_BaseFilter(iface); - int c = 1; - if (This->pAudio_Pin) c++; - if (This->pVideo_Pin) c++; - return c; -} - static const BaseFilterFuncTable BaseFuncTable = { QT_GetPin, - QT_GetPinCount }; IUnknown * CALLBACK QTSplitter_create(IUnknown *punkout, HRESULT *phr) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 477f162..4e0d190 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -169,12 +169,10 @@ typedef struct BaseFilter } BaseFilter; typedef IPin* (WINAPI *BaseFilter_GetPin)(BaseFilter* iface, int iPosition); -typedef LONG (WINAPI *BaseFilter_GetPinCount)(BaseFilter* iface); typedef struct BaseFilterFuncTable { /* Required */ BaseFilter_GetPin pfnGetPin; - BaseFilter_GetPinCount pfnGetPinCount; } BaseFilterFuncTable; HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv);

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 May 2019