wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

Alexandre Julliard : winetest: Refuse to run if the WoW64 side of the registry is missing.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 5b202367d5d3cd1a5caaab8f8166587f97cfb7fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b202367d5d3cd1a5caaab8f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 27 14:45:17 2010 +0100 winetest: Refuse to run if the WoW64 side of the registry is missing. --- programs/winetest/main.c | 64 ++++++++++++++++++++++++++++----------------- 1 files changed, 40 insertions(+), 24 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 5a7109a..f8c9ac2 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -61,6 +61,7 @@ static int nr_native_dlls; static const char whitespace[] = " \t\r\n"; static const char testexe[] = "_test.exe"; static char build_id[64]; +static BOOL is_wow64; /* filters for running only specific tests */ static char *filters[64]; @@ -149,25 +150,34 @@ static int running_under_wine (void) static int check_mount_mgr(void) { - if (running_under_wine()) - { - HANDLE handle = CreateFileA( "\\\\.\\MountPointManager", GENERIC_READ, - FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); - if (handle == INVALID_HANDLE_VALUE) return FALSE; - CloseHandle( handle ); - } + HANDLE handle = CreateFileA( "\\\\.\\MountPointManager", GENERIC_READ, + FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); + if (handle == INVALID_HANDLE_VALUE) return FALSE; + CloseHandle( handle ); return TRUE; } +static int check_wow64_registry(void) +{ + char buffer[MAX_PATH]; + DWORD type, size = MAX_PATH; + HKEY hkey; + BOOL ret; + + if (!is_wow64) return TRUE; + if (RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", &hkey )) + return FALSE; + ret = !RegQueryValueExA( hkey, "ProgramFilesDir (x86)", NULL, &type, (BYTE *)buffer, &size ); + RegCloseKey( hkey ); + return ret; +} + static int check_display_driver(void) { - if (running_under_wine()) - { - HWND hwnd = CreateWindowA( "STATIC", "", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, - 0, 0, GetModuleHandleA(0), 0 ); - if (!hwnd) return FALSE; - DestroyWindow( hwnd ); - } + HWND hwnd = CreateWindowA( "STATIC", "", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, + 0, 0, GetModuleHandleA(0), 0 ); + if (!hwnd) return FALSE; + DestroyWindow( hwnd ); return TRUE; } @@ -232,11 +242,10 @@ static void print_version (void) # error CPU unknown #endif OSVERSIONINFOEX ver; - BOOL ext, wow64; + BOOL ext; int is_win2k3_r2; const char *(CDECL *wine_get_build_id)(void); void (CDECL *wine_get_host_version)( const char **sysname, const char **release ); - BOOL (WINAPI *pIsWow64Process)(HANDLE hProcess, PBOOL Wow64Process); BOOL (WINAPI *pGetProductInfo)(DWORD, DWORD, DWORD, DWORD, DWORD *); ver.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); @@ -246,10 +255,7 @@ static void print_version (void) if (!GetVersionEx ((OSVERSIONINFO *) &ver)) report (R_FATAL, "Can't get OS version."); } - pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"),"IsWow64Process"); - if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &wow64 )) wow64 = FALSE; - - xprintf (" Platform=%s%s\n", platform, wow64 ? " (WOW64)" : ""); + xprintf (" Platform=%s%s\n", platform, is_wow64 ? " (WOW64)" : ""); xprintf (" bRunningUnderWine=%d\n", running_under_wine ()); xprintf (" bRunningOnVisibleDesktop=%d\n", running_on_visible_desktop ()); xprintf (" Submitter=%s\n", email ); @@ -1041,6 +1047,7 @@ usage (void) int main( int argc, char *argv[] ) { + BOOL (WINAPI *pIsWow64Process)(HANDLE hProcess, PBOOL Wow64Process); char *logname = NULL, *outdir = NULL; const char *extract = NULL; const char *cp, *submit = NULL; @@ -1051,6 +1058,9 @@ int main( int argc, char *argv[] ) if (!LoadStringA( 0, IDS_BUILD_ID, build_id, sizeof(build_id) )) build_id[0] = 0; + pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"),"IsWow64Process"); + if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; + for (i = 1; i < argc && argv[i]; i++) { if (!strcmp(argv[i], "--help")) { @@ -1172,11 +1182,17 @@ int main( int argc, char *argv[] ) if (!running_on_visible_desktop ()) report (R_FATAL, "Tests must be run on a visible desktop"); - if (!check_mount_mgr()) - report (R_FATAL, "Mount manager not running, most likely your WINEPREFIX wasn't created correctly."); + if (running_under_wine()) + { + if (!check_mount_mgr()) + report (R_FATAL, "Mount manager not running, most likely your WINEPREFIX wasn't created correctly."); + + if (!check_wow64_registry()) + report (R_FATAL, "WoW64 keys missing, most likely your WINEPREFIX wasn't created correctly."); - if (!check_display_driver()) - report (R_FATAL, "Unable to create a window, the display driver is not working."); + if (!check_display_driver()) + report (R_FATAL, "Unable to create a window, the display driver is not working."); + } SetConsoleCtrlHandler(ctrl_handler, TRUE);

1 0

Alexandre Julliard : configure: Create a wow64 symlink for the preloader too.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 3c42b62fdb6857d16a7584a636d3299aca8287ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c42b62fdb6857d16a7584a63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 27 14:37:57 2010 +0100 configure: Create a wow64 symlink for the preloader too. --- configure | 6 ++++-- configure.ac | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 0fde42b..f489fd7 100755 --- a/configure +++ b/configure @@ -15388,13 +15388,15 @@ ac_config_files="$ac_config_files Make.tmp:Make.vars.in:Makefile.in" if test -n "$with_wine64" then -wine_fn_append_rule ALL_MAKEFILE_DEPENDS "all: fonts server $with_wine64/loader/wine +wine_fn_append_rule ALL_MAKEFILE_DEPENDS "all: fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader fonts server: \$(RM) \$@ && \$(LN_S) $with_wine64/\$@ \$@ $with_wine64/loader/wine: \$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine \$@ +$with_wine64/loader/wine-preloader: + \$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine-preloader \$@ clean:: - \$(RM) fonts server $with_wine64/loader/wine" + \$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader" fi wine_fn_append_rule ALL_MAKEFILE_DEPENDS "uninstall:: diff --git a/configure.ac b/configure.ac index 5fdcd18..9a68ca6 100644 --- a/configure.ac +++ b/configure.ac @@ -2942,13 +2942,15 @@ dnl Some final makefile rules if test -n "$with_wine64" then WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS], -[all: fonts server $with_wine64/loader/wine +[all: fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader fonts server: \$(RM) \$[@] && \$(LN_S) $with_wine64/\$[@] \$[@] $with_wine64/loader/wine: \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine \$[@] +$with_wine64/loader/wine-preloader: + \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine-preloader \$[@] clean:: - \$(RM) fonts server $with_wine64/loader/wine]) + \$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) fi WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS],

1 0

Alexandre Julliard : configure: Get rid of the replacement function for gettid.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 13eafa047de1cd87dd81f0b3de19134d803e8eed URL: http://source.winehq.org/git/wine.git/?a=commit;h=13eafa047de1cd87dd81f0b3d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 27 12:08:37 2010 +0100 configure: Get rid of the replacement function for gettid. --- configure | 1 - configure.ac | 1 - include/config.h.in | 3 --- include/wine/port.h | 4 ---- libs/port/Makefile.in | 1 - libs/port/gettid.c | 38 -------------------------------------- loader/main.c | 5 ++++- 7 files changed, 4 insertions(+), 49 deletions(-) diff --git a/configure b/configure index f8aa35e..0fde42b 100755 --- a/configure +++ b/configure @@ -12753,7 +12753,6 @@ for ac_func in \ getopt_long \ getpagesize \ getpwuid \ - gettid \ gettimeofday \ getuid \ kqueue \ diff --git a/configure.ac b/configure.ac index 5e1810f..5fdcd18 100644 --- a/configure.ac +++ b/configure.ac @@ -1904,7 +1904,6 @@ AC_CHECK_FUNCS(\ getopt_long \ getpagesize \ getpwuid \ - gettid \ gettimeofday \ getuid \ kqueue \ diff --git a/include/config.h.in b/include/config.h.in index 4fa566d..c7bf082 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -226,9 +226,6 @@ /* Define to 1 if you have the `getservbyport' function. */ #undef HAVE_GETSERVBYPORT -/* Define to 1 if you have the `gettid' function. */ -#undef HAVE_GETTID - /* Define to 1 if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY diff --git a/include/wine/port.h b/include/wine/port.h index 180a6d8..8281653 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -248,10 +248,6 @@ int futimes(int fd, const struct timeval *tv); size_t getpagesize(void); #endif /* HAVE_GETPAGESIZE */ -#ifndef HAVE_GETTID -pid_t gettid(void); -#endif /* HAVE_GETTID */ - #ifndef HAVE_ISINF int isinf(double x); #endif diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 1609aca..f2f6db0 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -9,7 +9,6 @@ C_SRCS = \ getopt.c \ getopt1.c \ getpagesize.c \ - gettid.c \ interlocked.c \ isinf.c \ isnan.c \ diff --git a/libs/port/gettid.c b/libs/port/gettid.c deleted file mode 100644 index fd7a353..0000000 --- a/libs/port/gettid.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * gettid function - * - * Copyright 2003 Alexandre Julliard - * - * 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 "wine/port.h" - -#ifndef HAVE_GETTID - -pid_t gettid(void) -{ -#if defined(__linux__) && defined(__i386__) - pid_t ret; - __asm__("int $0x80" : "=a" (ret) : "0" (224) /* SYS_gettid */); - if (ret < 0) ret = -1; - return ret; -#else - return -1; /* FIXME */ -#endif -} - -#endif /* HAVE_GETTID */ diff --git a/loader/main.c b/loader/main.c index 9fe5e59..e19b1bb 100644 --- a/loader/main.c +++ b/loader/main.c @@ -30,6 +30,9 @@ #ifdef HAVE_SYS_RESOURCE_H # include <sys/resource.h> #endif +#ifdef HAVE_SYS_SYSCALL_H +# include <sys/syscall.h> +#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -104,7 +107,7 @@ static void check_command_line( int argc, char *argv[] ) /* separate thread to check for NPTL and TLS features */ static void *needs_pthread( void *arg ) { - pid_t tid = gettid(); + pid_t tid = syscall( SYS_gettid ); /* check for NPTL */ if (tid != -1 && tid != getpid()) return (void *)1; /* check for TLS glibc */

1 0

Alexandre Julliard : server: Use the tgkill system call on all Linux platforms.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 185f63708084bb396be1d2b7dd80883c6411fa34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=185f63708084bb396be1d2b7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 27 12:07:16 2010 +0100 server: Use the tgkill system call on all Linux platforms. --- server/ptrace.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 99f9d2b..734ac8e 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -37,6 +37,9 @@ #ifdef HAVE_SYS_WAIT_H # include <sys/wait.h> #endif +#ifdef HAVE_SYS_SYSCALL_H +# include <sys/syscall.h> +#endif #ifdef HAVE_SYS_THR_H # include <sys/ucontext.h> # include <sys/thr.h> @@ -213,17 +216,9 @@ static int wait4_thread( struct thread *thread, int signal ) static inline int tkill( int tgid, int pid, int sig ) { #ifdef __linux__ -# ifdef __i386__ - int ret = syscall(270 /*SYS_tgkill*/, tgid, pid, sig); - if (ret < 0 && errno == -ENOSYS) - ret = syscall(238 /*SYS_tkill*/, pid, sig); + int ret = syscall( SYS_tgkill, tgid, pid, sig ); + if (ret < 0 && errno == ENOSYS) ret = syscall( SYS_tkill, pid, sig ); return ret; -# elif defined(__x86_64__) - return syscall(234 /*SYS_tgkill*/, tgid, pid, sig); -# else - errno = ENOSYS; - return -1; -# endif #elif defined(__FreeBSD__) && defined(HAVE_THR_KILL2) return thr_kill2( tgid, pid, sig ); #else

1 0

Alexandre Julliard : ntdll: Use the gettid system call on all Linux platforms.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 086848a45f072c24597ba18b7e3cd405daef6870 URL: http://source.winehq.org/git/wine.git/?a=commit;h=086848a45f072c24597ba18b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 27 12:02:34 2010 +0100 ntdll: Use the gettid system call on all Linux platforms. --- dlls/ntdll/server.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index df46935..270ccd0 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -51,6 +51,9 @@ #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif +#ifdef HAVE_SYS_SYSCALL_H +# include <sys/syscall.h> +#endif #ifdef HAVE_SYS_UIO_H #include <sys/uio.h> #endif @@ -943,10 +946,8 @@ static void send_server_task_port(void) static int get_unix_tid(void) { int ret = -1; -#if defined(linux) && defined(__i386__) - ret = syscall(224 /*SYS_gettid*/); -#elif defined(linux) && defined(__x86_64__) - ret = syscall(186 /*SYS_gettid*/); +#ifdef linux + ret = syscall( SYS_gettid ); #elif defined(__sun) ret = pthread_self(); #elif defined(__APPLE__)

1 0

Alexandre Julliard : ntdll: Use the futex system calls on all Linux platforms.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 264996a75da61d2771d4dfe5d58a9ebac415a4bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=264996a75da61d2771d4dfe5d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 27 12:01:52 2010 +0100 ntdll: Use the futex system calls on all Linux platforms. --- dlls/ntdll/critsection.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index 8a60109..2f1abcf 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -26,6 +26,9 @@ #include <stdarg.h> #include <stdio.h> #include <sys/types.h> +#ifdef HAVE_SYS_SYSCALL_H +#include <sys/syscall.h> +#endif #include <time.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -56,29 +59,27 @@ static inline void small_pause(void) #endif } -#if defined(linux) && defined(__i386__) +#ifdef __linux__ static inline int futex_wait( int *addr, int val, struct timespec *timeout ) { - int ret = syscall( 240/*SYS_futex*/, addr, 0/*FUTEX_WAIT*/, val, timeout, 0, 0 ); - if (ret < 0) - return -errno; - return ret; + return syscall( SYS_futex, addr, 0/*FUTEX_WAIT*/, val, timeout, 0, 0 ); } static inline int futex_wake( int *addr, int val ) { - int ret = syscall( 240/*SYS_futex*/, addr, 1/*FUTEX_WAKE*/, val, NULL, 0, 0 ); - if (ret < 0) - return -errno; - return ret; + return syscall( SYS_futex, addr, 1/*FUTEX_WAKE*/, val, NULL, 0, 0 ); } static inline int use_futexes(void) { static int supported = -1; - if (supported == -1) supported = (futex_wait( &supported, 10, NULL ) != -ENOSYS); + if (supported == -1) + { + futex_wait( &supported, 10, NULL ); + supported = (errno != ENOSYS); + } return supported; } @@ -95,7 +96,7 @@ static inline NTSTATUS fast_wait( RTL_CRITICAL_SECTION *crit, int timeout ) { /* note: this may wait longer than specified in case of signals or */ /* multiple wake-ups, but that shouldn't be a problem */ - if (futex_wait( (int *)&crit->LockSemaphore, val, &timespec ) == -ETIMEDOUT) + if (futex_wait( (int *)&crit->LockSemaphore, val, &timespec ) == -1 && errno == ETIMEDOUT) return STATUS_TIMEOUT; } return STATUS_WAIT_0;

1 0

Alexandre Julliard : ntdll: Use the getdents64 system call on all Linux platforms.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 0f9e93afaa32e5654fab560c5302a1a8b118b2cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f9e93afaa32e5654fab560c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 27 12:01:43 2010 +0100 ntdll: Use the getdents64 system call on all Linux platforms. --- dlls/ntdll/directory.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 0cfa85d..711a0b0 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -41,6 +41,9 @@ #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif +#ifdef HAVE_SYS_SYSCALL_H +# include <sys/syscall.h> +#endif #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif @@ -99,8 +102,7 @@ typedef struct # define O_DIRECTORY 0200000 /* must be directory */ #endif -#ifdef __i386__ - +#ifdef SYS_getdents64 typedef struct { ULONG64 d_ino; @@ -112,11 +114,10 @@ typedef struct static inline int getdents64( int fd, char *de, unsigned int size ) { - return syscall( 220 /* NR_getdents64 */, fd, de, size ); + return syscall( SYS_getdents64, fd, de, size ); } #define USE_GETDENTS - -#endif /* i386 */ +#endif #endif /* linux */

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IObjectWithSite iface.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: b574f2fd9157e365ab77ee3011351dfd6e55105e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b574f2fd9157e365ab77ee301… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 27 01:49:48 2010 +0100 mshtml: COM cleanup for the IObjectWithSite iface. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/mshtml_private.h | 5 ++--- dlls/mshtml/oleobj.c | 19 ++++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 466fc05..7fab469 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1821,7 +1821,7 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = NULL; }else if(IsEqualGUID(&IID_IObjectWithSite, riid)) { TRACE("(%p)->(IID_IObjectWithSite %p)\n", This, ppv); - *ppv = OBJSITE(This); + *ppv = &This->IObjectWithSite_iface; }else if(IsEqualGUID(&IID_IOleContainer, riid)) { TRACE("(%p)->(IID_IOleContainer %p)\n", This, ppv); *ppv = &This->IOleContainer_iface; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 355c325..fa762ec 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -364,8 +364,8 @@ struct HTMLDocument { IPersistStreamInit IPersistStreamInit_iface; const IDispatchExVtbl *lpIDispatchExVtbl; ISupportErrorInfo ISupportErrorInfo_iface; - const IObjectWithSiteVtbl *lpObjectWithSiteVtbl; - IOleContainer IOleContainer_iface; + IObjectWithSite IObjectWithSite_iface; + IOleContainer IOleContainer_iface; IUnknown *unk_impl; IDispatchEx *dispex; @@ -627,7 +627,6 @@ struct HTMLDocumentNode { #define HTMLWINDOW4(x) ((IHTMLWindow4*) &(x)->lpHTMLWindow4Vtbl) #define CONPTCONT(x) ((IConnectionPointContainer*) &(x)->lpConnectionPointContainerVtbl) #define CUSTOMDOC(x) ((ICustomDoc*) &(x)->lpCustomDocVtbl) -#define OBJSITE(x) ((IObjectWithSite*) &(x)->lpObjectWithSiteVtbl) #define NSWBCHROME(x) ((nsIWebBrowserChrome*) &(x)->lpWebBrowserChromeVtbl) #define NSCML(x) ((nsIContextMenuListener*) &(x)->lpContextMenuListenerVtbl) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 2aa30f1..91bf9ef 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -757,42 +757,43 @@ static const IOleControlVtbl OleControlVtbl = { * IObjectWithSite implementation */ -#define OBJSITE_THIS(iface) DEFINE_THIS(HTMLDocument, ObjectWithSite, iface) +static inline HTMLDocument *impl_from_IObjectWithSite(IObjectWithSite *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IObjectWithSite_iface); +} static HRESULT WINAPI ObjectWithSite_QueryInterface(IObjectWithSite *iface, REFIID riid, void **ppv) { - HTMLDocument *This = OBJSITE_THIS(iface); + HTMLDocument *This = impl_from_IObjectWithSite(iface); return htmldoc_query_interface(This, riid, ppv); } static ULONG WINAPI ObjectWithSite_AddRef(IObjectWithSite *iface) { - HTMLDocument *This = OBJSITE_THIS(iface); + HTMLDocument *This = impl_from_IObjectWithSite(iface); return htmldoc_addref(This); } static ULONG WINAPI ObjectWithSite_Release(IObjectWithSite *iface) { - HTMLDocument *This = OBJSITE_THIS(iface); + HTMLDocument *This = impl_from_IObjectWithSite(iface); return htmldoc_release(This); } static HRESULT WINAPI ObjectWithSite_SetSite(IObjectWithSite *iface, IUnknown *pUnkSite) { - HTMLDocument *This = OBJSITE_THIS(iface); + HTMLDocument *This = impl_from_IObjectWithSite(iface); FIXME("(%p)->(%p)\n", This, pUnkSite); return E_NOTIMPL; } static HRESULT WINAPI ObjectWithSite_GetSite(IObjectWithSite* iface, REFIID riid, PVOID *ppvSite) { - HTMLDocument *This = OBJSITE_THIS(iface); + HTMLDocument *This = impl_from_IObjectWithSite(iface); FIXME("(%p)->(%p)\n", This, ppvSite); return E_NOTIMPL; } -#undef OBJSITE_THIS - static const IObjectWithSiteVtbl ObjectWithSiteVtbl = { ObjectWithSite_QueryInterface, ObjectWithSite_AddRef, @@ -876,6 +877,6 @@ void HTMLDocument_OleObj_Init(HTMLDocument *This) This->IOleObject_iface.lpVtbl = &OleObjectVtbl; This->IOleDocument_iface.lpVtbl = &OleDocumentVtbl; This->IOleControl_iface.lpVtbl = &OleControlVtbl; - This->lpObjectWithSiteVtbl = &ObjectWithSiteVtbl; + This->IObjectWithSite_iface.lpVtbl = &ObjectWithSiteVtbl; This->IOleContainer_iface.lpVtbl = &OleContainerVtbl; }

1 0

Michael Stefaniuc : mshtml: COM cleanup for the ISupportErrorInfo iface.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: 2efc64fbc245a28f0e1f5dbd5e4d4b6265749133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2efc64fbc245a28f0e1f5dbd5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 27 01:48:10 2010 +0100 mshtml: COM cleanup for the ISupportErrorInfo iface. --- dlls/mshtml/htmldoc.c | 15 +++++++++------ dlls/mshtml/mshtml_private.h | 4 +--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index c25f7f3..466fc05 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1511,23 +1511,26 @@ static void HTMLDocument_on_advise(IUnknown *iface, cp_static_data_t *cp) update_cp_events(This->window, &This->doc_node->node.event_target, cp, This->doc_node->node.nsnode); } -#define SUPPINFO_THIS(iface) DEFINE_THIS(HTMLDocument, SupportErrorInfo, iface) +static inline HTMLDocument *impl_from_ISupportErrorInfo(ISupportErrorInfo *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, ISupportErrorInfo_iface); +} static HRESULT WINAPI SupportErrorInfo_QueryInterface(ISupportErrorInfo *iface, REFIID riid, void **ppv) { - HTMLDocument *This = SUPPINFO_THIS(iface); + HTMLDocument *This = impl_from_ISupportErrorInfo(iface); return htmldoc_query_interface(This, riid, ppv); } static ULONG WINAPI SupportErrorInfo_AddRef(ISupportErrorInfo *iface) { - HTMLDocument *This = SUPPINFO_THIS(iface); + HTMLDocument *This = impl_from_ISupportErrorInfo(iface); return htmldoc_addref(This); } static ULONG WINAPI SupportErrorInfo_Release(ISupportErrorInfo *iface) { - HTMLDocument *This = SUPPINFO_THIS(iface); + HTMLDocument *This = impl_from_ISupportErrorInfo(iface); return htmldoc_release(This); } @@ -1794,7 +1797,7 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IHTMLDocument2_iface; }else if(IsEqualGUID(&IID_ISupportErrorInfo, riid)) { TRACE("(%p)->(IID_ISupportErrorInfo %p)\n", This, ppv); - *ppv = SUPPERRINFO(This); + *ppv = &This->ISupportErrorInfo_iface; }else if(IsEqualGUID(&IID_IPersistHistory, riid)) { TRACE("(%p)->(IID_IPersistHistory %p)\n", This, ppv); *ppv = &This->IPersistHistory_iface; @@ -1837,7 +1840,7 @@ static void init_doc(HTMLDocument *doc, IUnknown *unk_impl, IDispatchEx *dispex) { doc->IHTMLDocument2_iface.lpVtbl = &HTMLDocumentVtbl; doc->lpIDispatchExVtbl = &DocDispatchExVtbl; - doc->lpSupportErrorInfoVtbl = &SupportErrorInfoVtbl; + doc->ISupportErrorInfo_iface.lpVtbl = &SupportErrorInfoVtbl; doc->unk_impl = unk_impl; doc->dispex = dispex; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 97940e2..355c325 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -363,7 +363,7 @@ struct HTMLDocument { IHlinkTarget IHlinkTarget_iface; IPersistStreamInit IPersistStreamInit_iface; const IDispatchExVtbl *lpIDispatchExVtbl; - const ISupportErrorInfoVtbl *lpSupportErrorInfoVtbl; + ISupportErrorInfo ISupportErrorInfo_iface; const IObjectWithSiteVtbl *lpObjectWithSiteVtbl; IOleContainer IOleContainer_iface; @@ -668,8 +668,6 @@ struct HTMLDocumentNode { #define DISPATCHEX(x) ((IDispatchEx*) &(x)->lpIDispatchExVtbl) -#define SUPPERRINFO(x) ((ISupportErrorInfo*) &(x)->lpSupportErrorInfoVtbl) - #define HOSTSECMGR(x) ((IInternetHostSecurityManager*) &(x)->lpIInternetHostSecurityManagerVtbl) #define DEFINE_THIS2(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,ifc)))

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHlinkTarget iface.
by Alexandre Julliard 27 Dec '10

27 Dec '10

Module: wine Branch: master Commit: a8bb1ab85b697c97e962a2f829b6a6c415a9c233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8bb1ab85b697c97e962a2f82… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 27 01:47:29 2010 +0100 mshtml: COM cleanup for the IHlinkTarget iface. --- dlls/mshtml/hlink.c | 23 +++++++++++++---------- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/mshtml_private.h | 3 +-- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/hlink.c b/dlls/mshtml/hlink.c index 900a0ec..965318f 100644 --- a/dlls/mshtml/hlink.c +++ b/dlls/mshtml/hlink.c @@ -36,43 +36,46 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); * IHlinkTarget implementation */ -#define HLINKTRG_THIS(iface) DEFINE_THIS(HTMLDocument, HlinkTarget, iface) +static inline HTMLDocument *impl_from_IHlinkTarget(IHlinkTarget *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IHlinkTarget_iface); +} static HRESULT WINAPI HlinkTarget_QueryInterface(IHlinkTarget *iface, REFIID riid, void **ppv) { - HTMLDocument *This = HLINKTRG_THIS(iface); + HTMLDocument *This = impl_from_IHlinkTarget(iface); return htmldoc_query_interface(This, riid, ppv); } static ULONG WINAPI HlinkTarget_AddRef(IHlinkTarget *iface) { - HTMLDocument *This = HLINKTRG_THIS(iface); + HTMLDocument *This = impl_from_IHlinkTarget(iface); return htmldoc_addref(This); } static ULONG WINAPI HlinkTarget_Release(IHlinkTarget *iface) { - HTMLDocument *This = HLINKTRG_THIS(iface); + HTMLDocument *This = impl_from_IHlinkTarget(iface); return htmldoc_release(This); } static HRESULT WINAPI HlinkTarget_SetBrowseContext(IHlinkTarget *iface, IHlinkBrowseContext *pihlbc) { - HTMLDocument *This = HLINKTRG_THIS(iface); + HTMLDocument *This = impl_from_IHlinkTarget(iface); FIXME("(%p)->(%p)\n", This, pihlbc); return E_NOTIMPL; } static HRESULT WINAPI HlinkTarget_GetBrowseContext(IHlinkTarget *iface, IHlinkBrowseContext **ppihlbc) { - HTMLDocument *This = HLINKTRG_THIS(iface); + HTMLDocument *This = impl_from_IHlinkTarget(iface); FIXME("(%p)->(%p)\n", This, ppihlbc); return E_NOTIMPL; } static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, LPCWSTR pwzJumpLocation) { - HTMLDocument *This = HLINKTRG_THIS(iface); + HTMLDocument *This = impl_from_IHlinkTarget(iface); TRACE("(%p)->(%08x %s)\n", This, grfHLNF, debugstr_w(pwzJumpLocation)); @@ -87,7 +90,7 @@ static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, L static HRESULT WINAPI HlinkTarget_GetMoniker(IHlinkTarget *iface, LPCWSTR pwzLocation, DWORD dwAssign, IMoniker **ppimkLocation) { - HTMLDocument *This = HLINKTRG_THIS(iface); + HTMLDocument *This = impl_from_IHlinkTarget(iface); FIXME("(%p)->(%s %08x %p)\n", This, debugstr_w(pwzLocation), dwAssign, ppimkLocation); return E_NOTIMPL; } @@ -95,7 +98,7 @@ static HRESULT WINAPI HlinkTarget_GetMoniker(IHlinkTarget *iface, LPCWSTR pwzLoc static HRESULT WINAPI HlinkTarget_GetFriendlyName(IHlinkTarget *iface, LPCWSTR pwzLocation, LPWSTR *ppwzFriendlyName) { - HTMLDocument *This = HLINKTRG_THIS(iface); + HTMLDocument *This = impl_from_IHlinkTarget(iface); FIXME("(%p)->(%s %p)\n", This, debugstr_w(pwzLocation), ppwzFriendlyName); return E_NOTIMPL; } @@ -113,5 +116,5 @@ static const IHlinkTargetVtbl HlinkTargetVtbl = { void HTMLDocument_Hlink_Init(HTMLDocument *This) { - This->lpHlinkTargetVtbl = &HlinkTargetVtbl; + This->IHlinkTarget_iface.lpVtbl = &HlinkTargetVtbl; } diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index ff07d0d..c25f7f3 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1782,7 +1782,7 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IOleControl_iface; }else if(IsEqualGUID(&IID_IHlinkTarget, riid)) { TRACE("(%p)->(IID_IHlinkTarget, %p)\n", This, ppv); - *ppv = HLNKTARGET(This); + *ppv = &This->IHlinkTarget_iface; }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv); *ppv = CONPTCONT(&This->cp_container); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b44dce4..97940e2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -360,7 +360,7 @@ struct HTMLDocument { IServiceProvider IServiceProvider_iface; IOleCommandTarget IOleCommandTarget_iface; IOleControl IOleControl_iface; - const IHlinkTargetVtbl *lpHlinkTargetVtbl; + IHlinkTarget IHlinkTarget_iface; IPersistStreamInit IPersistStreamInit_iface; const IDispatchExVtbl *lpIDispatchExVtbl; const ISupportErrorInfoVtbl *lpSupportErrorInfoVtbl; @@ -625,7 +625,6 @@ struct HTMLDocumentNode { #define HTMLWINDOW2(x) ((IHTMLWindow2*) &(x)->lpHTMLWindow2Vtbl) #define HTMLWINDOW3(x) ((IHTMLWindow3*) &(x)->lpHTMLWindow3Vtbl) #define HTMLWINDOW4(x) ((IHTMLWindow4*) &(x)->lpHTMLWindow4Vtbl) -#define HLNKTARGET(x) ((IHlinkTarget*) &(x)->lpHlinkTargetVtbl) #define CONPTCONT(x) ((IConnectionPointContainer*) &(x)->lpConnectionPointContainerVtbl) #define CUSTOMDOC(x) ((ICustomDoc*) &(x)->lpCustomDocVtbl) #define OBJSITE(x) ((IObjectWithSite*) &(x)->lpObjectWithSiteVtbl)

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 December 2010