April 2008 - wine-commits

Alexandre Julliard : wineprefixcreate: Use wineboot --update to run wine. inf.
by Alexandre Julliard 22 Apr '08

22 Apr '08

Module: wine Branch: master Commit: bab67d39482b473031a483b7847b8b7bac312aab URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab67d39482b473031a483b78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 21 15:47:47 2008 +0200 wineprefixcreate: Use wineboot --update to run wine.inf. --- tools/wineprefixcreate.in | 35 ++--------------------------------- 1 files changed, 2 insertions(+), 33 deletions(-) diff --git a/tools/wineprefixcreate.in b/tools/wineprefixcreate.in index 7eed546..e06f8b6 100644 --- a/tools/wineprefixcreate.in +++ b/tools/wineprefixcreate.in @@ -59,7 +59,6 @@ esac bindir=`cd "$bindir" && pwd` dlldir="$bindir/@bintodlldir@" -datadir="$bindir/@bintodatadir@" do_wait=0 quiet=0 @@ -79,7 +78,6 @@ then LD_LIBRARY_PATH="$topdir/libs/wine" fi export LD_LIBRARY_PATH - datadir="$topdir/tools" fi while [ $# -gt 0 ] @@ -122,33 +120,9 @@ else fi WINEPREFIX=`cd "$WINEPREFIX" && pwd` - -# Create the drive symlinks - -if [ ! -d "$WINEPREFIX/dosdevices" ] -then - mkdir "$WINEPREFIX/dosdevices" - [ -d "$WINEPREFIX/drive_c" ] || mkdir "$WINEPREFIX/drive_c" - ln -s "../drive_c" "$WINEPREFIX/dosdevices/c:" - ln -s "/" "$WINEPREFIX/dosdevices/z:" -fi - -CROOT="$WINEPREFIX/dosdevices/c:" - -# Create the directory tree - -for i in \ - "$CROOT/windows" \ - "$CROOT/windows/inf" -do - [ -d "$i" ] || mkdir "$i" -done - -# Copy the .inf script and run it - -cp "$datadir/wine.inf" "$CROOT/windows/inf/wine.inf" export WINEPREFIX -"${WINELOADER:-$bindir/wine}" rundll32.exe setupapi.dll,InstallHinfSection DefaultInstall 128 wine.inf + +"${WINELOADER:-$bindir/wine}" wineboot.exe --update # Wait for the wineserver to finish @@ -156,8 +130,3 @@ if [ $do_wait = 1 ] then "${WINESERVER:-$bindir/wineserver}" -w fi - -if [ $quiet = 0 ] -then - echo "$WINEPREFIX updated successfully." -fi

1 0

Alexandre Julliard : wineboot: Automatically update the prefix directory if wine.inf changes.
by Alexandre Julliard 22 Apr '08

22 Apr '08

Module: wine Branch: master Commit: e44dd0f8f2bdcbb113036339479ef3a66364972e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e44dd0f8f2bdcbb1130363394… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 21 15:39:55 2008 +0200 wineboot: Automatically update the prefix directory if wine.inf changes. --- dlls/ntdll/server.c | 31 +----------------------- programs/wineboot/wineboot.c | 54 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 33 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index c38a023..3d8beee 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -737,7 +737,6 @@ static void start_server(void) static void setup_config_dir(void) { const char *p, *config_dir = wine_get_config_dir(); - pid_t pid, wret; if (chdir( config_dir ) == -1) { @@ -759,7 +758,7 @@ static void setup_config_dir(void) mkdir( config_dir, 0777 ); if (chdir( config_dir ) == -1) fatal_perror( "chdir to %s\n", config_dir ); - MESSAGE( "wine: creating configuration directory '%s'...\n", config_dir ); + MESSAGE( "wine: created the configuration directory '%s'\n", config_dir ); } if (mkdir( "dosdevices", 0777 ) == -1) @@ -773,34 +772,6 @@ static void setup_config_dir(void) mkdir( "drive_c", 0777 ); symlink( "../drive_c", "dosdevices/c:" ); symlink( "/", "dosdevices/z:" ); - - pid = fork(); - if (pid == -1) fatal_perror( "fork" ); - - if (!pid) - { - char *argv[3]; - static char argv0[] = "tools/wineprefixcreate", - argv1[] = "--quiet"; - - argv[0] = argv0; - argv[1] = argv1; - argv[2] = NULL; - wine_exec_wine_binary( argv[0], argv, NULL ); - fatal_perror( "could not exec wineprefixcreate" ); - } - else - { - int status; - - while ((wret = waitpid( pid, &status, 0 )) != pid) - { - if (wret == -1 && errno != EINTR) fatal_perror( "wait4" ); - } - if (!WIFEXITED(status) || WEXITSTATUS(status)) - fatal_error( "wineprefixcreate failed while creating '%s'.\n", config_dir ); - } - MESSAGE( "wine: '%s' created successfully.\n", config_dir ); } diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index bf1632b..a682e65 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -58,6 +58,7 @@ #define WIN32_LEAN_AND_MEAN #include <errno.h> +#include <fcntl.h> #include <stdio.h> #include <stdlib.h> #ifdef HAVE_GETOPT_H @@ -113,6 +114,49 @@ static char *get_wine_inf_path(void) return name; } +/* update the timestamp if different from the reference time */ +static BOOL update_timestamp( const char *config_dir, unsigned long timestamp, int force ) +{ + BOOL ret = FALSE; + int fd, count; + char buffer[100]; + char *file = HeapAlloc( GetProcessHeap(), 0, strlen(config_dir) + sizeof("/.update-timestamp") ); + + if (!file) return FALSE; + strcpy( file, config_dir ); + strcat( file, "/.update-timestamp" ); + + if ((fd = open( file, O_RDWR )) != -1) + { + if ((count = read( fd, buffer, sizeof(buffer) - 1 )) >= 0) + { + buffer[count] = 0; + if (!strncmp( buffer, "disable", sizeof("disable")-1 )) goto done; + if (!force && timestamp == strtoul( buffer, NULL, 10 )) goto done; + } + lseek( fd, 0, SEEK_SET ); + ftruncate( fd, 0 ); + } + else + { + if (errno != ENOENT) goto done; + if ((fd = open( file, O_WRONLY | O_CREAT | O_TRUNC, 0666 )) == -1) goto done; + } + + count = sprintf( buffer, "%lu\n", timestamp ); + if (write( fd, buffer, count ) != count) + { + WINE_WARN( "failed to update timestamp in %s\n", file ); + ftruncate( fd, 0 ); + } + else ret = TRUE; + +done: + if (fd != -1) close( fd ); + HeapFree( GetProcessHeap(), 0, file ); + return ret; +} + /* Performs the rename operations dictated in %SystemRoot%\Wininit.ini. * Returns FALSE if there was an error, or otherwise if all is ok. */ @@ -617,7 +661,7 @@ static BOOL start_services_process(void) } /* execute rundll32 on the wine.inf file if necessary */ -static void update_wineprefix(void) +static void update_wineprefix( int force ) { static const WCHAR cmdlineW[] = {'D','e','f','a','u','l','t','I','n','s','t','a','l','l',' ', '1','2','8',' ','\\','\\','?','\\','u','n','i','x' }; @@ -632,8 +676,12 @@ static void update_wineprefix(void) return; } if (stat( inf_path, &st ) == -1) + { WINE_WARN( "cannot stat wine.inf file: %s\n", strerror(errno) ); - else + goto done; + } + + if (update_timestamp( config_dir, st.st_mtime, force )) { WCHAR *buffer; DWORD len = MultiByteToWideChar( CP_UNIXCP, 0, inf_path, -1, NULL, 0 ); @@ -823,7 +871,7 @@ int main( int argc, char *argv[] ) ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICES], FALSE, FALSE ); start_services_process(); } - if (update) update_wineprefix(); + if (init || update) update_wineprefix( update ); ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNONCE], TRUE, TRUE );

1 0

Alexandre Julliard : wineboot: Add an option to update the prefix directory by re-executing wine.inf.
by Alexandre Julliard 22 Apr '08

22 Apr '08

Module: wine Branch: master Commit: 935313abe3c41b6f383257ee7eafd059325c58b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=935313abe3c41b6f383257ee7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 17 21:07:10 2008 +0200 wineboot: Add an option to update the prefix directory by re-executing wine.inf. --- programs/wineboot/Makefile.in | 2 +- programs/wineboot/wineboot.c | 78 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 75 insertions(+), 5 deletions(-) diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index a9db582..adee3a4 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = wineboot.exe APPMODE = -mconsole IMPORTS = advapi32 kernel32 ntdll -DELAYIMPORTS = shell32 shlwapi version user32 +DELAYIMPORTS = setupapi shell32 shlwapi version user32 EXTRALIBS = -luuid C_SRCS = \ diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 360169c..bf1632b 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -57,19 +57,29 @@ #define COBJMACROS #define WIN32_LEAN_AND_MEAN +#include <errno.h> #include <stdio.h> +#include <stdlib.h> #ifdef HAVE_GETOPT_H # include <getopt.h> #endif +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif #include <windows.h> #include <wine/svcctl.h> #include <wine/unicode.h> +#include <wine/library.h> #include <wine/debug.h> #include <shlobj.h> #include <shobjidl.h> #include <shlwapi.h> #include <shellapi.h> +#include <setupapi.h> WINE_DEFAULT_DEBUG_CHANNEL(wineboot); @@ -80,6 +90,29 @@ extern void kill_processes( BOOL kill_desktop ); static WCHAR windowsdir[MAX_PATH]; +/* retrieve the (unix) path to the wine.inf file */ +static char *get_wine_inf_path(void) +{ + const char *build_dir, *data_dir; + char *name = NULL; + + if ((data_dir = wine_get_data_dir())) + { + if (!(name = HeapAlloc( GetProcessHeap(), 0, strlen(data_dir) + sizeof("/wine.inf") ))) + return NULL; + strcpy( name, data_dir ); + strcat( name, "/wine.inf" ); + } + else if ((build_dir = wine_get_build_dir())) + { + if (!(name = HeapAlloc( GetProcessHeap(), 0, strlen(build_dir) + sizeof("/tools/wine.inf") ))) + return NULL; + strcpy( name, build_dir ); + strcat( name, "/tools/wine.inf" ); + } + return name; +} + /* Performs the rename operations dictated in %SystemRoot%\Wininit.ini. * Returns FALSE if there was an error, or otherwise if all is ok. */ @@ -583,6 +616,40 @@ static BOOL start_services_process(void) return TRUE; } +/* execute rundll32 on the wine.inf file if necessary */ +static void update_wineprefix(void) +{ + static const WCHAR cmdlineW[] = {'D','e','f','a','u','l','t','I','n','s','t','a','l','l',' ', + '1','2','8',' ','\\','\\','?','\\','u','n','i','x' }; + + const char *config_dir = wine_get_config_dir(); + char *inf_path = get_wine_inf_path(); + struct stat st; + + if (!inf_path) + { + WINE_WARN( "cannot find path to wine.inf file\n" ); + return; + } + if (stat( inf_path, &st ) == -1) + WINE_WARN( "cannot stat wine.inf file: %s\n", strerror(errno) ); + else + { + WCHAR *buffer; + DWORD len = MultiByteToWideChar( CP_UNIXCP, 0, inf_path, -1, NULL, 0 ); + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, sizeof(cmdlineW) + len*sizeof(WCHAR) ))) goto done; + memcpy( buffer, cmdlineW, sizeof(cmdlineW) ); + MultiByteToWideChar( CP_UNIXCP, 0, inf_path, -1, buffer + sizeof(cmdlineW)/sizeof(WCHAR), len ); + + InstallHinfSectionW( 0, 0, buffer, 0 ); + HeapFree( GetProcessHeap(), 0, buffer ); + WINE_MESSAGE( "wine: configuration in '%s' has been updated.\n", config_dir ); + } + +done: + HeapFree( GetProcessHeap(), 0, inf_path ); +} + /* Process items in the StartUp group of the user's Programs under the Start Menu. Some installers put * shell links here to restart themselves after boot. */ static BOOL ProcessStartupItems(void) @@ -680,6 +747,7 @@ static void usage(void) WINE_MESSAGE( " -k,--kill Kill running processes without any cleanup\n" ); WINE_MESSAGE( " -r,--restart Restart only, don't do normal startup operations\n" ); WINE_MESSAGE( " -s,--shutdown Shutdown only, don't reboot\n" ); + WINE_MESSAGE( " -u,--update Update the wineprefix directory\n" ); } static const char short_options[] = "efhikrs"; @@ -693,6 +761,7 @@ static const struct option long_options[] = { "kill", 0, 0, 'k' }, { "restart", 0, 0, 'r' }, { "shutdown", 0, 0, 's' }, + { "update", 0, 0, 'u' }, { NULL, 0, 0, 0 } }; @@ -703,16 +772,13 @@ int main( int argc, char *argv[] ) /* First, set the current directory to SystemRoot */ int optc; - int end_session = 0, force = 0, init = 0, kill = 0, restart = 0, shutdown = 0; + int end_session = 0, force = 0, init = 0, kill = 0, restart = 0, shutdown = 0, update = 0; HANDLE event; SECURITY_ATTRIBUTES sa; GetWindowsDirectoryW( windowsdir, MAX_PATH ); if( !SetCurrentDirectoryW( windowsdir ) ) - { WINE_ERR("Cannot set the dir to %s (%d)\n", wine_dbgstr_w(windowsdir), GetLastError() ); - return 100; - } while ((optc = getopt_long(argc, argv, short_options, long_options, NULL )) != -1) { @@ -724,6 +790,7 @@ int main( int argc, char *argv[] ) case 'k': kill = 1; break; case 'r': restart = 1; break; case 's': shutdown = 1; break; + case 'u': update = 1; break; case 'h': usage(); return 0; case '?': usage(); return 1; } @@ -750,11 +817,14 @@ int main( int argc, char *argv[] ) ProcessWindowsFileProtection(); ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICESONCE], TRUE, FALSE ); + if (init || (kill && !restart)) { ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICES], FALSE, FALSE ); start_services_process(); } + if (update) update_wineprefix(); + ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNONCE], TRUE, TRUE ); if (!init && !restart)

1 0

Alexandre Julliard : ntdll: Automatically setup the dosdevices directory if it doesn't exist.
by Alexandre Julliard 22 Apr '08

22 Apr '08

Module: wine Branch: master Commit: 870bba3ee17e9f1a65fc4e97197adf5948d7b9cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=870bba3ee17e9f1a65fc4e971… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 21 14:55:32 2008 +0200 ntdll: Automatically setup the dosdevices directory if it doesn't exist. --- dlls/ntdll/server.c | 152 +++++++++++++++++++++++++++------------------------ 1 files changed, 81 insertions(+), 71 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index c5146e2..c38a023 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -730,6 +730,81 @@ static void start_server(void) /*********************************************************************** + * setup_config_dir + * + * Setup the wine configuration dir. + */ +static void setup_config_dir(void) +{ + const char *p, *config_dir = wine_get_config_dir(); + pid_t pid, wret; + + if (chdir( config_dir ) == -1) + { + if (errno != ENOENT) fatal_perror( "chdir to %s\n", config_dir ); + + if ((p = strrchr( config_dir, '/' )) && p != config_dir) + { + struct stat st; + char *tmp_dir; + + if (!(tmp_dir = malloc( p + 1 - config_dir ))) fatal_error( "out of memory\n" ); + memcpy( tmp_dir, config_dir, p - config_dir ); + tmp_dir[p - config_dir] = 0; + if (!stat( tmp_dir, &st ) && st.st_uid != getuid()) + fatal_error( "'%s' is not owned by you, refusing to create a configuration directory there\n", + tmp_dir ); + free( tmp_dir ); + } + + mkdir( config_dir, 0777 ); + if (chdir( config_dir ) == -1) fatal_perror( "chdir to %s\n", config_dir ); + MESSAGE( "wine: creating configuration directory '%s'...\n", config_dir ); + } + + if (mkdir( "dosdevices", 0777 ) == -1) + { + if (errno == EEXIST) return; + fatal_perror( "cannot create %s/dosdevices\n", config_dir ); + } + + /* create the drive symlinks */ + + mkdir( "drive_c", 0777 ); + symlink( "../drive_c", "dosdevices/c:" ); + symlink( "/", "dosdevices/z:" ); + + pid = fork(); + if (pid == -1) fatal_perror( "fork" ); + + if (!pid) + { + char *argv[3]; + static char argv0[] = "tools/wineprefixcreate", + argv1[] = "--quiet"; + + argv[0] = argv0; + argv[1] = argv1; + argv[2] = NULL; + wine_exec_wine_binary( argv[0], argv, NULL ); + fatal_perror( "could not exec wineprefixcreate" ); + } + else + { + int status; + + while ((wret = waitpid( pid, &status, 0 )) != pid) + { + if (wret == -1 && errno != EINTR) fatal_perror( "wait4" ); + } + if (!WIFEXITED(status) || WEXITSTATUS(status)) + fatal_error( "wineprefixcreate failed while creating '%s'.\n", config_dir ); + } + MESSAGE( "wine: '%s' created successfully.\n", config_dir ); +} + + +/*********************************************************************** * server_connect_error * * Try to display a meaningful explanation of why we couldn't connect @@ -768,8 +843,9 @@ static void server_connect_error( const char *serverdir ) * Attempt to connect to an existing server socket. * We need to be in the server directory already. */ -static int server_connect( const char *serverdir ) +static int server_connect(void) { + const char *serverdir; struct sockaddr_un addr; struct stat st; int s, slen, retry, fd_cwd; @@ -778,6 +854,9 @@ static int server_connect( const char *serverdir ) fd_cwd = open( ".", O_RDONLY ); if (fd_cwd != -1) fcntl( fd_cwd, F_SETFD, 1 ); /* set close on exec flag */ + setup_config_dir(); + serverdir = wine_get_server_dir(); + /* chdir to the server directory */ if (chdir( serverdir ) == -1) { @@ -838,63 +917,6 @@ static int server_connect( const char *serverdir ) } -/*********************************************************************** - * create_config_dir - * - * Create the wine configuration dir (~/.wine). - */ -static void create_config_dir(void) -{ - const char *p, *config_dir = wine_get_config_dir(); - pid_t pid, wret; - - if ((p = strrchr( config_dir, '/' )) && p != config_dir) - { - struct stat st; - char *tmp_dir; - - if (!(tmp_dir = malloc( p + 1 - config_dir ))) fatal_error( "out of memory\n" ); - memcpy( tmp_dir, config_dir, p - config_dir ); - tmp_dir[p - config_dir] = 0; - if (!stat( tmp_dir, &st ) && st.st_uid != getuid()) - fatal_error( "'%s' is not owned by you, refusing to create a configuration directory there\n", - tmp_dir ); - free( tmp_dir ); - } - if (mkdir( config_dir, 0777 ) == -1 && errno != EEXIST) - fatal_perror( "cannot create directory %s", config_dir ); - - MESSAGE( "wine: creating configuration directory '%s'...\n", config_dir ); - pid = fork(); - if (pid == -1) fatal_perror( "fork" ); - - if (!pid) - { - char *argv[3]; - static char argv0[] = "tools/wineprefixcreate", - argv1[] = "--quiet"; - - argv[0] = argv0; - argv[1] = argv1; - argv[2] = NULL; - wine_exec_wine_binary( argv[0], argv, NULL ); - fatal_perror( "could not exec wineprefixcreate" ); - } - else - { - int status; - - while ((wret = waitpid( pid, &status, 0 )) != pid) - { - if (wret == -1 && errno != EINTR) fatal_perror( "wait4" ); - } - if (!WIFEXITED(status) || WEXITSTATUS(status)) - fatal_error( "wineprefixcreate failed while creating '%s'.\n", config_dir ); - } - MESSAGE( "wine: '%s' created successfully.\n", config_dir ); -} - - #ifdef __APPLE__ #include <mach/mach.h> #include <mach/mach_error.h> @@ -955,19 +977,7 @@ void server_init_process(void) fatal_perror( "Bad server socket %d", fd_socket ); unsetenv( "WINESERVERSOCKET" ); } - else - { - const char *server_dir = wine_get_server_dir(); - - if (!server_dir) /* this means the config dir doesn't exist */ - { - create_config_dir(); - server_dir = wine_get_server_dir(); - } - - /* connect to the server */ - fd_socket = server_connect( server_dir ); - } + else fd_socket = server_connect(); /* setup the signal mask */ sigemptyset( &server_block_set );

1 0

Alexander Dorofeyev : wined3d: Prevent console spamming in drawPrimitive.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 35979b920a4ba395cea52fe4c4bac581b0b10f97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35979b920a4ba395cea52fe4c… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sat Apr 19 00:42:03 2008 +0300 wined3d: Prevent console spamming in drawPrimitive. --- dlls/wined3d/drawprim.c | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 77b396a..559159d 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1062,14 +1062,26 @@ void drawPrimitive(IWineD3DDevice *iface, if(!use_vs(This)) { if(!This->strided_streams.u.s.position_transformed && This->activeContext->num_untracked_materials && This->stateBlock->renderState[WINED3DRS_LIGHTING]) { - FIXME("Using software emulation because not all material properties could be tracked\n"); + static BOOL first = TRUE; + if(first) { + FIXME("Using software emulation because not all material properties could be tracked\n"); + first = FALSE; + } else { + TRACE("Using software emulation because not all material properties could be tracked\n"); + } emulation = TRUE; } else if(This->activeContext->fog_coord && This->stateBlock->renderState[WINED3DRS_FOGENABLE]) { /* Either write a pipeline replacement shader or convert the specular alpha from unsigned byte * to a float in the vertex buffer */ - FIXME("Using software emulation because manual fog coordinates are provided\n"); + static BOOL first = TRUE; + if(first) { + FIXME("Using software emulation because manual fog coordinates are provided\n"); + first = FALSE; + } else { + TRACE("Using software emulation because manual fog coordinates are provided\n"); + } emulation = TRUE; } @@ -1083,7 +1095,13 @@ void drawPrimitive(IWineD3DDevice *iface, if (This->useDrawStridedSlow || emulation) { /* Immediate mode drawing */ if(use_vs(This)) { - FIXME("Using immediate mode with vertex shaders for half float emulation\n"); + static BOOL first = TRUE; + if(first) { + FIXME("Using immediate mode with vertex shaders for half float emulation\n"); + first = FALSE; + } else { + TRACE("Using immediate mode with vertex shaders for half float emulation\n"); + } drawStridedSlowVs(iface, strided, calculatedNumberOfindices, glPrimType, idxData, idxSize, minIndex, StartIdx, StartVertexIndex); } else {

1 0

Nikolay Sivov : gdiplus: Implemented GdipVectorTransformMatrixPointsI.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: f649c9d2244c5dafc5f0512ebeed12a8d38955bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f649c9d2244c5dafc5f0512eb… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Apr 19 01:28:47 2008 +0400 gdiplus: Implemented GdipVectorTransformMatrixPointsI. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/matrix.c | 27 +++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index f2426b1..d6971f9 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -620,7 +620,7 @@ @ stub GdipTranslateTextureTransform @ stdcall GdipTranslateWorldTransform(ptr long long long) @ stdcall GdipVectorTransformMatrixPoints(ptr ptr long) -@ stub GdipVectorTransformMatrixPointsI +@ stdcall GdipVectorTransformMatrixPointsI(ptr ptr long) @ stub GdipWarpPath @ stub GdipWidenPath @ stub GdipWindingModeOutline diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index a40f690..e80031f 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -301,3 +301,30 @@ GpStatus WINGDIPAPI GdipVectorTransformMatrixPoints(GpMatrix *matrix, GpPointF * return Ok; } + +GpStatus WINGDIPAPI GdipVectorTransformMatrixPointsI(GpMatrix *matrix, GpPoint *pts, INT count) +{ + GpPointF *ptsF; + GpStatus ret; + INT i; + + ptsF = GdipAlloc(sizeof(GpPointF) * count); + if(!ptsF) + return OutOfMemory; + + for(i = 0; i < count; i++){ + ptsF[i].X = (REAL)pts[i].X; + ptsF[i].Y = (REAL)pts[i].Y; + } + + ret = GdipVectorTransformMatrixPoints(matrix, ptsF, count); + /* store back */ + if(ret == Ok) + for(i = 0; i < count; i++){ + pts[i].X = roundr(ptsF[i].X); + pts[i].Y = roundr(ptsF[i].Y); + } + GdipFree(ptsF); + + return ret; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 215864a..a8f6568 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -230,6 +230,7 @@ GpStatus WINGDIPAPI GdipScaleMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSetMatrixElements(GpMatrix*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix*,GpPointF*,INT); GpStatus WINGDIPAPI GdipVectorTransformMatrixPoints(GpMatrix*,GpPointF*,INT); +GpStatus WINGDIPAPI GdipVectorTransformMatrixPointsI(GpMatrix*,GpPoint*,INT); GpStatus WINGDIPAPI GdipTranslateMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipCreatePathIter(GpPathIterator**,GpPath*);

1 0

Stefan Leichter : shell32: Implement SHGetFolderPathAndSubDirA/W.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: a629a4199e388dbab941a38914ff6106b02e420a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a629a4199e388dbab941a3891… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Apr 17 23:31:05 2008 +0200 shell32: Implement SHGetFolderPathAndSubDirA/W. --- dlls/shell32/shell32.spec | 2 + dlls/shell32/shellpath.c | 86 ++++++++++++++++++++++++++++++++++++++++++-- include/shlobj.h | 3 ++ 3 files changed, 87 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 6c0d7d8..e054db3 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -344,6 +344,8 @@ @ stdcall SHGetFileInfoW(ptr long ptr long long) @ stdcall SHGetFolderLocation(long long long long ptr) @ stdcall SHGetFolderPathA(long long long long ptr) +@ stdcall SHGetFolderPathAndSubDirA(long long long long str ptr) +@ stdcall SHGetFolderPathAndSubDirW(long long long long wstr ptr) @ stdcall SHGetFolderPathW(long long long long ptr) @ stub SHGetFreeDiskSpace @ stub SHGetIconOverlayIndexA diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index c4ae688..abbaf19 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -1675,21 +1675,88 @@ HRESULT WINAPI SHGetFolderPathW( DWORD dwFlags, /* [I] which path to return */ LPWSTR pszPath) /* [O] converted path */ { + HRESULT hr = SHGetFolderPathAndSubDirW(hwndOwner, nFolder, hToken, dwFlags, NULL, pszPath); + if(HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) == hr) + hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + return hr; +} + +HRESULT WINAPI SHGetFolderPathAndSubDirA( + HWND hwndOwner, /* [I] owner window */ + int nFolder, /* [I] CSIDL identifying the folder */ + HANDLE hToken, /* [I] access token */ + DWORD dwFlags, /* [I] which path to return */ + LPCSTR pszSubPath, /* [I] sub directory of the specified folder */ + LPSTR pszPath) /* [O] converted path */ +{ + int length; + HRESULT hr = S_OK; + LPWSTR pszSubPathW = NULL; + LPWSTR pszPathW = NULL; + TRACE("%08x,%08x,%s\n",nFolder, dwFlags, debugstr_w(pszSubPathW)); + + if(pszPath) { + pszPathW = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); + if(!pszPathW) { + hr = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY); + WARN("Failed to allocate %u bytes of memory\n", MAX_PATH * sizeof(WCHAR)); + goto cleanup; + } + } + TRACE("%08x,%08x,%s\n",nFolder, dwFlags, debugstr_w(pszSubPathW)); + + /* SHGetFolderPathAndSubDirW does not distinguish if pszSubPath isn't + * set (null), or an empty string.therefore call it without the parameter set + * if pszSubPath is an empty string + */ + if (pszSubPath && pszSubPath[0]) { + length = MultiByteToWideChar(CP_ACP, 0, pszSubPath, -1, NULL, 0); + pszSubPathW = HeapAlloc(GetProcessHeap(), 0, length * sizeof(WCHAR)); + if(!pszSubPathW) { + hr = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY); + WARN("Failed to allocate %u bytes of memory\n", length * sizeof(WCHAR)); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, pszSubPath, -1, pszSubPathW, length); + } + + hr = SHGetFolderPathAndSubDirW(hwndOwner, nFolder, hToken, dwFlags, pszSubPathW, pszPathW); + + if (SUCCEEDED(hr) && pszPath) + WideCharToMultiByte(CP_ACP, 0, pszPathW, -1, pszPath, MAX_PATH, NULL, NULL); + +cleanup: + HeapFree(GetProcessHeap(), 0, pszPathW); + HeapFree(GetProcessHeap(), 0, pszSubPathW); + return hr; +} + +HRESULT WINAPI SHGetFolderPathAndSubDirW( + HWND hwndOwner, /* [I] owner window */ + int nFolder, /* [I] CSIDL identifying the folder */ + HANDLE hToken, /* [I] access token */ + DWORD dwFlags, /* [I] which path to return */ + LPCWSTR pszSubPath,/* [I] sub directory of the specified folder */ + LPWSTR pszPath) /* [O] converted path */ +{ HRESULT hr; WCHAR szBuildPath[MAX_PATH], szTemp[MAX_PATH]; DWORD folder = nFolder & CSIDL_FOLDER_MASK; CSIDL_Type type; int ret; - TRACE("%p,%p,nFolder=0x%04x\n", hwndOwner,pszPath,nFolder); + TRACE("%p,%p,nFolder=0x%04x,%s\n", hwndOwner,pszPath,nFolder,debugstr_w(pszSubPath)); /* Windows always NULL-terminates the resulting path regardless of success * or failure, so do so first */ if (pszPath) *pszPath = '\0'; + if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0])) return E_INVALIDARG; + if ((SHGFP_TYPE_CURRENT != dwFlags) && (SHGFP_TYPE_DEFAULT != dwFlags)) + return E_INVALIDARG; szTemp[0] = 0; type = CSIDL_Data[folder].type; switch (type) @@ -1742,12 +1809,23 @@ HRESULT WINAPI SHGetFolderPathW( hr = _SHExpandEnvironmentStrings(szTemp, szBuildPath); else strcpyW(szBuildPath, szTemp); + + if (FAILED(hr)) goto end; + + if(pszSubPath) { + /* make sure the new path does not exceed th bufferlength + * rememebr to backslash and the termination */ + if(MAX_PATH < (lstrlenW(szBuildPath) + lstrlenW(pszSubPath) + 2)) { + hr = HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE); + goto end; + } + PathAppendW(szBuildPath, pszSubPath); + PathRemoveBackslashW(szBuildPath); + } /* Copy the path if it's available before we might return */ if (SUCCEEDED(hr) && pszPath) strcpyW(pszPath, szBuildPath); - if (FAILED(hr)) goto end; - /* if we don't care about existing directories we are ready */ if(nFolder & CSIDL_FLAG_DONT_VERIFY) goto end; @@ -1758,7 +1836,7 @@ HRESULT WINAPI SHGetFolderPathW( */ if (!(nFolder & CSIDL_FLAG_CREATE)) { - hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + hr = HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND); goto end; } diff --git a/include/shlobj.h b/include/shlobj.h index 8dbccb7..159e85a 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -54,6 +54,9 @@ DWORD WINAPI SHFormatDrive(HWND,UINT,UINT,UINT); void WINAPI SHFree(LPVOID); BOOL WINAPI GetFileNameFromBrowse(HWND,LPSTR,DWORD,LPCSTR,LPCSTR,LPCSTR,LPCSTR); HRESULT WINAPI SHGetInstanceExplorer(IUnknown**); +HRESULT WINAPI SHGetFolderPathAndSubDirA(HWND,int,HANDLE,DWORD,LPCSTR,LPSTR); +HRESULT WINAPI SHGetFolderPathAndSubDirW(HWND,int,HANDLE,DWORD,LPCWSTR,LPWSTR); +#define SHGetFolderPathAndSubDir WINELIB_NAME_AW(SHGetFolderPathAndSubDir); BOOL WINAPI SHGetPathFromIDListA(LPCITEMIDLIST,LPSTR); BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST,LPWSTR); #define SHGetPathFromIDList WINELIB_NAME_AW(SHGetPathFromIDList)

1 0

Maarten Lankhorst : quartz: Change longlong printfs.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 810a933f68fe458b19f7734794206151e4c3b38e URL: http://source.winehq.org/git/wine.git/?a=commit;h=810a933f68fe458b19f773479… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 18 22:23:19 2008 -0700 quartz: Change longlong printfs. --- dlls/quartz/dsoundrender.c | 4 +++- dlls/quartz/filtergraph.c | 3 ++- dlls/quartz/waveparser.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 9bcb417..4a90bb3 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -263,7 +263,9 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) ERR("Cannot get sample time (%x)\n", hr); if (This->rtLastStop != tStart && (IMediaSample_IsDiscontinuity(pSample) == S_FALSE)) - FIXME("Unexpected discontinuity: Last: %lld, tStart: %lld\n", This->rtLastStop, tStart); + FIXME("Unexpected discontinuity: Last: %u.%03u, tStart: %u.%03u\n", + (DWORD)(This->rtLastStop / 10000000), (DWORD)((This->rtLastStop / 10000)%1000), + (DWORD)(tStart / 10000000), (DWORD)((tStart / 10000)%1000)); This->rtLastStop = tStop; if (IMediaSample_IsPreroll(pSample) == S_OK) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index ee31068..c4b31f7 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2079,7 +2079,8 @@ static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, else *pCurrent = This->position; LeaveCriticalSection(&This->cs); - TRACE("Time: %lld.%03lld\n", *pCurrent / 10000000, (*pCurrent / 10000)%1000); + + TRACE("Time: %u.%03u\n", (DWORD)(*pCurrent / 10000000), (DWORD)((*pCurrent / 10000)%1000)); return S_OK; } diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 5aef9ef..8f51c8f 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -393,7 +393,7 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin) pWAVEParser->Parser.mediaSeeking.llCurrent = 0; pWAVEParser->Parser.mediaSeeking.llStop = pWAVEParser->Parser.mediaSeeking.llDuration = bytepos_to_duration(pWAVEParser, pWAVEParser->EndOfFile); - TRACE("Duration: %lld seconds\n", pWAVEParser->Parser.mediaSeeking.llDuration / (LONGLONG)10000000); + TRACE("Duration: %u seconds\n", (DWORD)(pWAVEParser->Parser.mediaSeeking.llDuration / (LONGLONG)10000000)); This->rtStop = pWAVEParser->EndOfFile; This->rtStart = pWAVEParser->StartOfFile;

1 0

Maarten Lankhorst : quartz: Only drop Preroll samples after obtaining its time.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 9d9bf6f158cd8e9a734fddb311f3aee30ba4d486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9bf6f158cd8e9a734fddb31… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 18 22:04:55 2008 -0700 quartz: Only drop Preroll samples after obtaining its time. --- dlls/quartz/dsoundrender.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 963ec16..9bcb417 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -245,12 +245,6 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) * pause completion here, but for sound playing a single frame doesn't make sense */ - if (IMediaSample_IsPreroll(pSample) == S_OK) - { - TRACE("Preroll!\n"); - return S_OK; - } - if (This->state == State_Paused) return S_FALSE; @@ -272,6 +266,12 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) FIXME("Unexpected discontinuity: Last: %lld, tStart: %lld\n", This->rtLastStop, tStart); This->rtLastStop = tStop; + if (IMediaSample_IsPreroll(pSample) == S_OK) + { + TRACE("Preroll!\n"); + return S_OK; + } + cbSrcStream = IMediaSample_GetActualDataLength(pSample); TRACE("Sample data ptr = %p, size = %ld\n", pbSrcStream, cbSrcStream);

1 0

Maarten Lankhorst : quartz: Add more seek entries and fix a time continuity bug.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: c1a4acde0153626095685ff1c97287cf25004087 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1a4acde0153626095685ff1c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 18 22:21:59 2008 -0700 quartz: Add more seek entries and fix a time continuity bug. --- dlls/quartz/mpegsplit.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 9af8973..008dcca 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -53,7 +53,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); #define MPEG_AUDIO_HEADER 1 #define MPEG_NO_HEADER 0 -#define SEEK_INTERVAL (ULONGLONG)(30 * 10000000) /* Add an entry every 30 seconds */ +#define SEEK_INTERVAL (ULONGLONG)(10 * 10000000) /* Add an entry every 10 seconds */ struct seek_entry { ULONGLONG bytepos; @@ -216,6 +216,7 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, BYTE** fbuf, DWORD *flen, IMed if (This->remaining_bytes) { DWORD towrite = min(This->remaining_bytes, *flen); + LONGLONG foo; hr = copy_data(pCurrentSample, fbuf, flen, towrite); if (FAILED(hr)) @@ -228,6 +229,11 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, BYTE** fbuf, DWORD *flen, IMed if (This->remaining_bytes) return hr; + /* Restore the time in the time variable. This->position now points + * to the NEW timestamp which is slightly off + */ + IMediaSample_GetTime(pCurrentSample, &time, &foo); + /* Optimize: Try appending more samples to the stream */ goto out_append; }

1 0

Maarten Lankhorst : quartz: Add some more tests and fix wine to pass them.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: f9c2d8e2f418fe901de82e3181491e4dd52af7ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c2d8e2f418fe901de82e318… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Apr 19 15:19:32 2008 -0700 quartz: Add some more tests and fix wine to pass them. --- dlls/quartz/dsoundrender.c | 3 +- dlls/quartz/enumpins.c | 13 +++++++- dlls/quartz/nullrenderer.c | 3 +- dlls/quartz/tests/filtergraph.c | 15 +++++++- dlls/quartz/tests/videorenderer.c | 64 +++++++++++++++++++++++++++++++++++++ dlls/quartz/transform.c | 3 +- dlls/quartz/videorenderer.c | 3 +- 7 files changed, 97 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 4a90bb3..c20c5e8 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -599,7 +599,8 @@ static HRESULT WINAPI DSoundRender_GetSyncSource(IBaseFilter * iface, IReference EnterCriticalSection(&This->csFilter); { *ppClock = This->pClock; - IReferenceClock_AddRef(This->pClock); + if (This->pClock) + IReferenceClock_AddRef(This->pClock); } LeaveCriticalSection(&This->csFilter); diff --git a/dlls/quartz/enumpins.c b/dlls/quartz/enumpins.c index 61e42b0..675ef5c 100644 --- a/dlls/quartz/enumpins.c +++ b/dlls/quartz/enumpins.c @@ -36,7 +36,12 @@ static const struct IEnumPinsVtbl IEnumPinsImpl_Vtbl; HRESULT IEnumPinsImpl_Construct(const ENUMPINDETAILS * pDetails, IEnumPins ** ppEnum) { - IEnumPinsImpl * pEnumPins = CoTaskMemAlloc(sizeof(IEnumPinsImpl)); + IEnumPinsImpl * pEnumPins; + + if (!ppEnum) + return E_POINTER; + + pEnumPins = CoTaskMemAlloc(sizeof(IEnumPinsImpl)); if (!pEnumPins) { *ppEnum = NULL; @@ -109,6 +114,12 @@ static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** TRACE("(%u, %p, %p)\n", cPins, ppPins, pcFetched); + if (!ppPins) + return E_POINTER; + + if (cPins > 1 && !pcFetched) + return E_INVALIDARG; + if (cFetched > 0) { ULONG i; diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index d871e67..f511a7b 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -463,7 +463,8 @@ static HRESULT WINAPI NullRenderer_GetSyncSource(IBaseFilter * iface, IReference EnterCriticalSection(&This->csFilter); { *ppClock = This->pClock; - IReferenceClock_AddRef(This->pClock); + if (This->pClock) + IReferenceClock_AddRef(This->pClock); } LeaveCriticalSection(&This->csFilter); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index d72b7b3..98be4b5 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -50,11 +50,21 @@ static void rungraph(void) HRESULT hr; IMediaControl* pmc; IMediaEvent* pme; + IMediaFilter* pmf; HANDLE hEvent; hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaControl, (LPVOID*)&pmc); ok(hr==S_OK, "Cannot get IMediaControl interface returned: %x\n", hr); + hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaFilter, (LPVOID*)&pmf); + ok(hr==S_OK, "Cannot get IMediaFilter interface returned: %x\n", hr); + + IMediaControl_Stop(pmc); + + IMediaFilter_SetSyncSource(pmf, NULL); + + IMediaFilter_Release(pmf); + hr = IMediaControl_Run(pmc); ok(hr==S_FALSE, "Cannot run the graph returned: %x\n", hr); @@ -64,6 +74,8 @@ static void rungraph(void) hr = IMediaControl_Stop(pmc); ok(hr==S_OK || hr == S_FALSE, "Cannot stop the graph returned: %x\n", hr); + IGraphBuilder_SetDefaultSyncSource(pgraph); + Sleep(10); trace("stop -> pause\n"); hr = IMediaControl_Pause(pmc); @@ -97,7 +109,6 @@ static void rungraph(void) hr = IMediaControl_Run(pmc); ok(hr==S_OK || hr == S_FALSE, "Cannot start the graph returned: %x\n", hr); - hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaEvent, (LPVOID*)&pme); ok(hr==S_OK, "Cannot get IMediaEvent interface returned: %x\n", hr); @@ -107,7 +118,7 @@ static void rungraph(void) /* WaitForSingleObject(hEvent, INFINITE); */ Sleep(20000); - hr = IMediaControl_Release(pme); + hr = IMediaEvent_Release(pme); ok(hr==2, "Releasing mediaevent returned: %x\n", hr); hr = IMediaControl_Stop(pmc); diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index ca119e7..378e019 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -86,6 +86,69 @@ static void test_query_interface(void) RELEASE_EXPECT(pVideoWindow, 1); } +static void test_pin(IPin *pin) +{ + IMemInputPin *mpin = NULL; + + IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&mpin); + + ok(mpin != NULL, "No IMemInputPin found!\n"); + if (mpin) + { + ok(IMemInputPin_ReceiveCanBlock(mpin) == S_OK, "Receive can't block for pin!\n"); + IMemInputPin_Release(mpin); + } + /* TODO */ +} + +static void test_basefilter(void) +{ + IEnumPins *pin_enum = NULL; + IBaseFilter *base = NULL; + IPin *pins[2]; + ULONG ref; + HRESULT hr; + + IUnknown_QueryInterface(pVideoRenderer, &IID_IBaseFilter, (void *)&base); + if (base == NULL) + { + /* test_query_interface handles this case */ + skip("No IBaseFilter\n"); + return; + } + + hr = IBaseFilter_EnumPins(base, NULL); + ok(hr == E_POINTER, "hr = %08x and not E_POINTER\n", hr); + + hr= IBaseFilter_EnumPins(base, &pin_enum); + ok(hr == S_OK, "hr = %08x and not S_OK\n", hr); + + hr = IEnumPins_Next(pin_enum, 1, NULL, NULL); + ok(hr == E_POINTER, "hr = %08x and not E_POINTER\n", hr); + + hr = IEnumPins_Next(pin_enum, 2, pins, NULL); + ok(hr == E_INVALIDARG, "hr = %08x and not E_INVALIDARG\n", hr); + + pins[0] = (void *)0xdead; + pins[1] = (void *)0xdeed; + + hr = IEnumPins_Next(pin_enum, 2, pins, &ref); + ok(hr == S_FALSE, "hr = %08x instead of S_FALSE\n", hr); + ok(pins[0] != (void *)0xdead && pins[0] != NULL, "pins[0] = %p\n", pins[0]); + if (pins[0] != (void *)0xdead && pins[0] != NULL) + { + test_pin(pins[0]); + IPin_Release(pins[0]); + } + + ok(pins[1] == (void *)0xdeed, "pins[1] = %p\n", pins[1]); + + ref = IEnumPins_Release(pin_enum); + ok(ref == 0, "ref is %u and not 0!\n", ref); + + IBaseFilter_Release(base); +} + START_TEST(videorenderer) { CoInitialize(NULL); @@ -93,6 +156,7 @@ START_TEST(videorenderer) return; test_query_interface(); + test_basefilter(); release_video_renderer(); } diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index b090e5b..2596f63 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -424,7 +424,8 @@ static HRESULT WINAPI TransformFilter_GetSyncSource(IBaseFilter * iface, IRefere EnterCriticalSection(&This->csFilter); { *ppClock = This->pClock; - IReferenceClock_AddRef(This->pClock); + if (This->pClock) + IReferenceClock_AddRef(This->pClock); } LeaveCriticalSection(&This->csFilter); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 5179bd0..f49f8fb 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -754,7 +754,8 @@ static HRESULT WINAPI VideoRenderer_GetSyncSource(IBaseFilter * iface, IReferenc EnterCriticalSection(&This->csFilter); { *ppClock = This->pClock; - IReferenceClock_AddRef(This->pClock); + if (This->pClock) + IReferenceClock_AddRef(This->pClock); } LeaveCriticalSection(&This->csFilter);

1 0

Kusanagi Kouichi : winex11.drv: Generate WM_IME_ENDCOMPOSITION when preedit ends.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 9462190b992cf7637749978892a8bca00973cd90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9462190b992cf763774997889… Author: Kusanagi Kouichi <slash(a)ma.neweb.ne.jp> Date: Fri Apr 18 21:52:20 2008 +0900 winex11.drv: Generate WM_IME_ENDCOMPOSITION when preedit ends. --- dlls/winex11.drv/ime.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index e4a2dd7..c3e5ccf 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -687,16 +687,22 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) TRACE("IMC_SETOPENSTATUS\n"); myPrivate = (LPIMEPRIVATE)ImmLockIMCC(lpIMC->hPrivate); - if (lpIMC->fOpen != myPrivate->bInternalState) + if (lpIMC->fOpen != myPrivate->bInternalState && + myPrivate->bInComposition) { if(lpIMC->fOpen == FALSE) { X11DRV_ForceXIMReset(lpIMC->hWnd); GenerateIMEMessage(hIMC,WM_IME_ENDCOMPOSITION,0,0); + myPrivate->bInComposition = FALSE; } else + { GenerateIMEMessage(hIMC,WM_IME_STARTCOMPOSITION,0,0); + GenerateIMEMessage(hIMC, WM_IME_COMPOSITION, 0, 0); + } } + myPrivate->bInternalState = lpIMC->fOpen; bRet = TRUE; } break; @@ -963,12 +969,18 @@ void IME_SetOpenStatus(BOOL fOpen) ImmDestroyIMCC(lpIMC->hCompStr); lpIMC->hCompStr = ImeCreateBlankCompStr(); } - myPrivate->bInternalState = fOpen; ImmUnlockIMCC(lpIMC->hPrivate); UnlockRealIMC(FROM_X11); - ImmSetOpenStatus(RealIMC(FROM_X11), fOpen); + if (myPrivate->bInComposition && fOpen == FALSE) + { + GenerateIMEMessage(FROM_X11, WM_IME_ENDCOMPOSITION, 0, 0); + myPrivate->bInComposition = FALSE; + } + + if (!myPrivate->bInternalState && fOpen == TRUE) + ImmSetOpenStatus(RealIMC(FROM_X11), fOpen); } void IME_XIMPresent(BOOL present)

1 0

Alexander Dorofeyev : wined3d: Add missing check for p8 primary in surface_download_data.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: db36665be5adaf7cbf99819ccead13437fd520b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db36665be5adaf7cbf99819cc… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sat Apr 19 00:41:58 2008 +0300 wined3d: Add missing check for p8 primary in surface_download_data. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7da9d92..e024b8d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -117,7 +117,7 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { int dst_pitch = 0; /* In case of P8 the index is stored in the alpha component if the primary render target uses P8 */ - if(This->resource.format == WINED3DFMT_P8) { + if(This->resource.format == WINED3DFMT_P8 && primary_render_target_is_p8(This->resource.wineD3DDevice)) { format = GL_ALPHA; type = GL_UNSIGNED_BYTE; }

1 0

Austin English : Spelling fixes.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: aab8fae59a208efb23db5affcae6778713dcc8be URL: http://source.winehq.org/git/wine.git/?a=commit;h=aab8fae59a208efb23db5affc… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Apr 21 00:17:27 2008 -0500 Spelling fixes. --- dlls/mciwave/mciwave.c | 8 ++++---- dlls/msvcrt/dir.c | 2 +- dlls/ntdll/tests/rtl.c | 4 ++-- dlls/ntdll/tests/string.c | 2 +- dlls/odbccp32/tests/misc.c | 2 +- dlls/oleaut32/variant.c | 16 ++++++++-------- dlls/oleaut32/vartype.c | 2 +- dlls/quartz/avisplit.c | 4 ++-- dlls/quartz/dsoundrender.c | 2 +- dlls/riched20/style.c | 2 +- dlls/rpcrt4/ndr_marshall.c | 4 ++-- dlls/serialui/confdlg.c | 2 +- dlls/setupapi/devinst.c | 2 +- dlls/setupapi/tests/stringtable.c | 2 +- dlls/setupapi/virtcopy.c | 2 +- dlls/shell32/shell.c | 2 +- dlls/shell32/shlfileop.c | 10 +++++----- dlls/shell32/tests/shlfileop.c | 8 ++++---- dlls/shlwapi/ordinal.c | 10 +++++----- dlls/shlwapi/path.c | 8 ++++---- dlls/shlwapi/reg.c | 2 +- dlls/shlwapi/resource.h | 2 +- dlls/shlwapi/string.c | 4 ++-- dlls/shlwapi/url.c | 4 ++-- dlls/spoolss/tests/spoolss.c | 2 +- 25 files changed, 54 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aab8fae59a208efb23db5…

1 0

Maarten Lankhorst : quartz: Drop preroll frames in directsound renderer too .
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: d7fbc7ef8cb92c1c7811ea70dd4c68ff21002929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7fbc7ef8cb92c1c7811ea70d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 18 16:14:41 2008 -0700 quartz: Drop preroll frames in directsound renderer too. --- dlls/quartz/dsoundrender.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 50892c0..963ec16 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -242,8 +242,15 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) TRACE("%p %p\n", iface, pSample); /* Slightly incorrect, Pause completes when a frame is received so we should signal - * pause completion here, but for sound receiving a single frame doesn't make sense + * pause completion here, but for sound playing a single frame doesn't make sense */ + + if (IMediaSample_IsPreroll(pSample) == S_OK) + { + TRACE("Preroll!\n"); + return S_OK; + } + if (This->state == State_Paused) return S_FALSE;

1 0

Maarten Lankhorst : quartz: No longer drop packets on discontinuities.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: fb2c975a8f5b54f9e7a667ee3638f340d80f2af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb2c975a8f5b54f9e7a667ee3… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 18 16:13:25 2008 -0700 quartz: No longer drop packets on discontinuities. --- dlls/quartz/acmwrapper.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 4d42980..8df37ef 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -118,11 +118,14 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte unprepare_header = TRUE; if (IMediaSample_IsDiscontinuity(pSample) == S_OK) + { res = acmStreamConvert(This->has, &ash, ACM_STREAMCONVERTF_START); + /* One sample could be converted to multiple packets */ + IMediaSample_SetDiscontinuity(pSample, FALSE); + } else res = acmStreamConvert(This->has, &ash, 0); - if (res) { if(res != MMSYSERR_MOREDATA) @@ -162,10 +165,7 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte } TRACE("Sample stop time: %u.%03u\n", (DWORD)(tStart/10000000), (DWORD)((tStart/10000)%1000)); - if (IMediaSample_IsDiscontinuity(pSample) == S_FALSE) - hr = OutputPin_SendSample((OutputPin*)This->tf.ppPins[1], pOutSample); - else - TRACE("Skipping first sample: Discontinuity\n"); + hr = OutputPin_SendSample((OutputPin*)This->tf.ppPins[1], pOutSample); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) { if (FAILED(hr))

1 0

Maarten Lankhorst : quartz: Set media time in the file source.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 0458c08b95d368cba6daf1f216c0e930c6387dd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0458c08b95d368cba6daf1f21… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 18 16:07:40 2008 -0700 quartz: Set media time in the file source. --- dlls/quartz/filesource.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 8704b50..930ebfc 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -1127,6 +1127,9 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw if (SUCCEEDED(hr)) { + REFERENCE_TIME rtStart, rtStop; + REFERENCE_TIME rtSampleStart, rtSampleStop; + /* get any errors */ if (!This->bFlushing && !GetOverlappedResult(This->hFile, &pDataRq->ovl, &dwBytes, FALSE)) hr = HRESULT_FROM_WIN32(GetLastError()); @@ -1141,7 +1144,18 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw dwBytes = 0; } + /* Set the time on the sample */ IMediaSample_SetActualDataLength(pDataRq->pSample, dwBytes); + + rtStart = (DWORD64)pDataRq->ovl.u.s.Offset + ((DWORD64)pDataRq->ovl.u.s.OffsetHigh << 32); + rtStart = MEDIATIME_FROM_BYTES(rtStart); + rtStop = rtStart + MEDIATIME_FROM_BYTES(dwBytes); + + IMediaSample_GetTime(pDataRq->pSample, &rtSampleStart, &rtSampleStop); + assert(rtStart == rtSampleStart); + assert(rtStop <= rtSampleStop); + + IMediaSample_SetTime(pDataRq->pSample, &rtStart, &rtStop); } /* no need to close event handle since we will close it when the pin is destroyed */

1 0

Maarten Lankhorst : quartz: Make acmwrapper respect preroll samples.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 172347341ae4b9e23704b7cb3f6888b9f84452cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=172347341ae4b9e23704b7cb3… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 18 16:07:05 2008 -0700 quartz: Make acmwrapper respect preroll samples. --- dlls/quartz/acmwrapper.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 35e154c..4d42980 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -58,7 +58,7 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte LPBYTE pbDstStream; LPBYTE pbSrcStream = NULL; ACMSTREAMHEADER ash; - BOOL unprepare_header = FALSE; + BOOL unprepare_header = FALSE, preroll; MMRESULT res; HRESULT hr; LONGLONG tStart = -1, tStop = -1, tMed; @@ -70,6 +70,8 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte return hr; } + preroll = (IMediaSample_IsPreroll(pSample) == S_OK); + IMediaSample_GetTime(pSample, &tStart, &tStop); cbSrcStream = IMediaSample_GetActualDataLength(pSample); @@ -91,6 +93,7 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte ERR("Unable to get delivery buffer (%x)\n", hr); return hr; } + IMediaSample_SetPreroll(pOutSample, preroll); hr = IMediaSample_SetActualDataLength(pOutSample, 0); assert(hr == S_OK);

1 0

Maarten Lankhorst : quartz: Flux AsyncReader in PullPin_BeginFlush.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: d16639d1fad14ff2b7afa43acc57d78122478432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d16639d1fad14ff2b7afa43ac… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Apr 17 13:24:51 2008 -0700 quartz: Flux AsyncReader in PullPin_BeginFlush. --- dlls/quartz/pin.c | 44 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 0c333f7..b641ff2 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1357,6 +1357,8 @@ ULONG WINAPI PullPin_Release(IPin * iface) static DWORD WINAPI PullPin_Thread_Main(LPVOID pv) { + CoInitializeEx(NULL, COINIT_MULTITHREADED); + for (;;) SleepEx(INFINITE, TRUE); } @@ -1368,7 +1370,6 @@ static void CALLBACK PullPin_Thread_Process(ULONG_PTR iface) ALLOCATOR_PROPERTIES allocProps; - CoInitializeEx(NULL, COINIT_MULTITHREADED); EnterCriticalSection(This->pin.pCritSec); SetEvent(This->hEventStateChanged); @@ -1433,13 +1434,37 @@ static void CALLBACK PullPin_Thread_Process(ULONG_PTR iface) IMediaSample_Release(pSample); } while (This->rtCurrent < This->rtStop && hr == S_OK && !This->stop_playback); - CoUninitialize(); EnterCriticalSection(This->pin.pCritSec); This->state = State_Paused; LeaveCriticalSection(This->pin.pCritSec); TRACE("End\n"); } +static void CALLBACK PullPin_Thread_Flush(ULONG_PTR iface) +{ + PullPin *This = (PullPin *)iface; + IMediaSample *pSample; + + EnterCriticalSection(This->pin.pCritSec); + if (This->pReader) + { + /* Flush outstanding samples */ + IAsyncReader_BeginFlush(This->pReader); + + for (;;) + { + IMemAllocator_GetBuffer(This->pAlloc, &pSample, NULL, NULL, 0); + + if (!pSample) + break; + IMediaSample_Release(pSample); + } + + IAsyncReader_EndFlush(This->pReader); + } + LeaveCriticalSection(This->pin.pCritSec); +} + static void CALLBACK PullPin_Thread_Pause(ULONG_PTR iface) { PullPin *This = (PullPin *)iface; @@ -1454,7 +1479,6 @@ static void CALLBACK PullPin_Thread_Pause(ULONG_PTR iface) LeaveCriticalSection(This->pin.pCritSec); } - static void CALLBACK PullPin_Thread_Stop(ULONG_PTR iface) { PullPin *This = (PullPin *)iface; @@ -1477,6 +1501,7 @@ static void CALLBACK PullPin_Thread_Stop(ULONG_PTR iface) IBaseFilter_Release(This->pin.pinInfo.pFilter); + CoUninitialize(); ExitThread(0); } @@ -1567,8 +1592,8 @@ HRESULT PullPin_StopProcessing(PullPin * This) { TRACE("(%p)->()\n", This); - /* if we are connected */ - if (This->pAlloc && This->hThread) + /* if we are alive */ + if (This->hThread) { PullPin_WaitForStateChange(This, INFINITE); @@ -1613,6 +1638,15 @@ HRESULT WINAPI PullPin_BeginFlush(IPin * iface) PullPin_PauseProcessing(This); PullPin_WaitForStateChange(This, INFINITE); + + /* Workaround: The file async reader only cancels io on current thread + * only vista and newer have CancelIoEx, so try the thread context if available + * Anyone has some documentation on NtCancelFileIoEx? + */ + if (This->hThread) + QueueUserAPC(PullPin_Thread_Flush, This->hThread, (ULONG_PTR)This); + else + PullPin_Thread_Flush((ULONG_PTR)This); } LeaveCriticalSection(&This->thread_lock);

1 0

Maarten Lankhorst : quartz: Fix sample leak in file source on failure path.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 33b2f69c9fef56107665bb4ae0e915b2dcd8df13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33b2f69c9fef56107665bb4ae… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Apr 17 13:11:05 2008 -0700 quartz: Fix sample leak in file source on failure path. --- dlls/quartz/filesource.c | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index d31e150..8704b50 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -1125,30 +1125,28 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw LeaveCriticalSection(&This->csList); } - if (SUCCEEDED(hr) && !This->bFlushing) + if (SUCCEEDED(hr)) { /* get any errors */ - if (!GetOverlappedResult(This->hFile, &pDataRq->ovl, &dwBytes, FALSE)) + if (!This->bFlushing && !GetOverlappedResult(This->hFile, &pDataRq->ovl, &dwBytes, FALSE)) hr = HRESULT_FROM_WIN32(GetLastError()); - } - if (SUCCEEDED(hr)) - { - IMediaSample_SetActualDataLength(pDataRq->pSample, dwBytes); + /* Return the sample no matter what so it can be destroyed */ *ppSample = pDataRq->pSample; *pdwUser = pDataRq->dwUserData; + + if (This->bFlushing) + { + hr = VFW_E_WRONG_STATE; + dwBytes = 0; + } + + IMediaSample_SetActualDataLength(pDataRq->pSample, dwBytes); } /* no need to close event handle since we will close it when the pin is destroyed */ CoTaskMemFree(pDataRq); - /* Return the sample if flushing so it can be destroyed */ - if (This->bFlushing && SUCCEEDED(hr)) - { - hr = VFW_E_WRONG_STATE; - IMediaSample_SetActualDataLength(pDataRq->pSample, 0); - } - TRACE("-- %x\n", hr); return hr; }

1 0

Maarten Lankhorst : quartz: Fix theoretical memory leak.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 119d7caf79674988df6b57f6e0ee766031270ab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=119d7caf79674988df6b57f6e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Apr 17 11:33:35 2008 -0700 quartz: Fix theoretical memory leak. --- dlls/quartz/avisplit.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 89c02d4..a619dcf 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -525,13 +525,14 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE stream->streamheader = *pStrHdr; fSamplesPerSec = (float)pStrHdr->dwRate / (float)pStrHdr->dwScale; + CoTaskMemFree(amt.pbFormat); + amt.pbFormat = NULL; + amt.cbFormat = 0; switch (pStrHdr->fccType) { case streamtypeVIDEO: amt.formattype = FORMAT_VideoInfo; - amt.pbFormat = NULL; - amt.cbFormat = 0; break; case streamtypeAUDIO: amt.formattype = FORMAT_WaveFormatEx;

1 0

Maarten Lankhorst : quartz: Make the video renderer drop preroll samples.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 458b09a84dc168ca4a1cde927226b93ba4afff2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=458b09a84dc168ca4a1cde927… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Apr 17 11:16:13 2008 -0700 quartz: Make the video renderer drop preroll samples. --- dlls/quartz/videorenderer.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 48faf55..5179bd0 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -362,6 +362,10 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample) TRACE("%p %p\n", iface, pSample); + /* Preroll means the sample isn't shown, this is used for key frames and things like that */ + if (IMediaSample_IsPreroll(pSample) == S_OK) + return S_OK; + hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) {

1 0

Eric Pouech : winhelp: Silencing the copyright system record entry while parsing help files.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 7ca4a034280bb98f5d41f1f6758389a857cb9d68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ca4a034280bb98f5d41f1f67… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Apr 18 21:34:48 2008 +0200 winhelp: Silencing the copyright system record entry while parsing help files. --- programs/winhelp/hlpfile.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 2dd0822..7e6a0f1 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -1572,6 +1572,9 @@ static BOOL HLPFILE_SystemCommands(HLPFILE* hlpfile) wi->size.cx, wi->size.cy); } break; + case 8: + WINE_WARN("Citation: '%s'\n", ptr + 4); + break; default: WINE_WARN("Unsupported SystemRecord[%d]\n", GET_USHORT(ptr, 0)); }

1 0

Eric Pouech : winhelp: When no help file is passed on command line, we should open then file pickup dialog.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: f3730ccc006267a7e0d472ec3776d54d9afa003f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3730ccc006267a7e0d472ec3… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Apr 18 21:34:42 2008 +0200 winhelp: When no help file is passed on command line, we should open then file pickup dialog. --- programs/winhelp/winhelp.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index dfae0b4..7c8aa28 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -742,6 +742,8 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, case WM_NCCREATE: win = (WINHELP_WINDOW*) ((LPCREATESTRUCT) lParam)->lpCreateParams; SetWindowLongPtr(hWnd, 0, (ULONG_PTR) win); + if (!win->page && Globals.isBook) + PostMessage(hWnd, WM_COMMAND, MNID_FILE_OPEN, 0); win->hMainWnd = hWnd; break;

1 0

Eric Pouech : winhelp: Instead of loading all pages at once, allow to browse them one by one.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 84f0968acdbb005e559b17a158f97db24d28bdc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84f0968acdbb005e559b17a15… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Apr 18 21:34:36 2008 +0200 winhelp: Instead of loading all pages at once, allow to browse them one by one. --- programs/winhelp/hlpfile.c | 128 ++++++++++++++++++++++++++++++++++++-------- programs/winhelp/hlpfile.h | 3 + programs/winhelp/winhelp.c | 2 + 3 files changed, 110 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84f0968acdbb005e559b1…

1 0

Eric Pouech : winhelp: Removed a couple of internal windows' handle and replaced them with control IDs.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 7eba95de27a413a57590e2a9fdf987c7bfe13a17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eba95de27a413a57590e2a9f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Apr 18 21:34:29 2008 +0200 winhelp: Removed a couple of internal windows' handle and replaced them with control IDs. --- programs/winhelp/winhelp.c | 44 +++++++++++++++++++++++--------------------- programs/winhelp/winhelp.h | 2 -- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 003e6a3..fe23e18 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -457,19 +457,21 @@ void WINHELP_LayoutMainWindow(WINHELP_WINDOW* win) { RECT rect, button_box_rect; INT text_top = 0; + HWND hButtonBoxWnd = GetDlgItem(win->hMainWnd, CTL_ID_BUTTON); + HWND hTextWnd = GetDlgItem(win->hMainWnd, CTL_ID_TEXT); GetClientRect(win->hMainWnd, &rect); /* Update button box and text Window */ - SetWindowPos(win->hButtonBoxWnd, HWND_TOP, + SetWindowPos(hButtonBoxWnd, HWND_TOP, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, 0); - if (GetWindowRect(win->hButtonBoxWnd, &button_box_rect)) + if (GetWindowRect(hButtonBoxWnd, &button_box_rect)) text_top = rect.top + button_box_rect.bottom - button_box_rect.top; - SetWindowPos(win->hTextWnd, HWND_TOP, + SetWindowPos(hTextWnd, HWND_TOP, rect.left, text_top, rect.right - rect.left, rect.bottom - text_top, 0); @@ -484,17 +486,16 @@ void WINHELP_LayoutMainWindow(WINHELP_WINDOW* win) static BOOL WINHELP_ReuseWindow(WINHELP_WINDOW* win, WINHELP_WINDOW* oldwin, HLPFILE_PAGE* page, int nCmdShow) { + HWND hTextWnd = GetDlgItem(oldwin->hMainWnd, CTL_ID_TEXT); unsigned int i; win->hMainWnd = oldwin->hMainWnd; - win->hButtonBoxWnd = oldwin->hButtonBoxWnd; - win->hTextWnd = oldwin->hTextWnd; win->hHistoryWnd = oldwin->hHistoryWnd; - oldwin->hMainWnd = oldwin->hButtonBoxWnd = oldwin->hTextWnd = oldwin->hHistoryWnd = 0; + oldwin->hMainWnd = oldwin->hHistoryWnd = 0; win->hBrush = CreateSolidBrush(win->info->sr_color); SetWindowLongPtr(win->hMainWnd, 0, (ULONG_PTR)win); - SetWindowLongPtr(win->hTextWnd, 0, (ULONG_PTR)win); + SetWindowLongPtr(hTextWnd, 0, (ULONG_PTR)win); SetWindowLongPtr(win->hHistoryWnd, 0, (ULONG_PTR)win); WINHELP_InitFonts(win->hMainWnd); @@ -502,11 +503,11 @@ static BOOL WINHELP_ReuseWindow(WINHELP_WINDOW* win, WINHELP_WINDOW* oldwin, if (page) SetWindowText(win->hMainWnd, page->file->lpszTitle); - WINHELP_SetupText(win->hTextWnd); - InvalidateRect(win->hTextWnd, NULL, TRUE); + WINHELP_SetupText(hTextWnd); + InvalidateRect(hTextWnd, NULL, TRUE); WINHELP_LayoutMainWindow(win); ShowWindow(win->hMainWnd, nCmdShow); - UpdateWindow(win->hTextWnd); + UpdateWindow(hTextWnd); if (!(win->info->win_style & WS_POPUP)) { @@ -661,8 +662,8 @@ BOOL WINHELP_CreateHelpWindow(HLPFILE_PAGE* page, HLPFILE_WINDOWINFO* wi, Globals.hInstance, win); /* Create button box and text Window */ if (!bPopup) - win->hButtonBoxWnd = CreateWindow(BUTTON_BOX_WIN_CLASS_NAME, "", WS_CHILD | WS_VISIBLE, - 0, 0, 0, 0, hWnd, (HMENU)CTL_ID_BUTTON, Globals.hInstance, NULL); + CreateWindow(BUTTON_BOX_WIN_CLASS_NAME, "", WS_CHILD | WS_VISIBLE, + 0, 0, 0, 0, hWnd, (HMENU)CTL_ID_BUTTON, Globals.hInstance, NULL); CreateWindow(TEXT_WIN_CLASS_NAME, "", WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hWnd, (HMENU)CTL_ID_TEXT, Globals.hInstance, win); @@ -730,6 +731,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, WINHELP_BUTTON *button; RECT rect; INT curPos, min, max, dy, keyDelta; + HWND hTextWnd; WINHELP_CheckPopup(msg); @@ -799,12 +801,13 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, case VK_PRIOR: case VK_NEXT: win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); - curPos = GetScrollPos(win->hTextWnd, SB_VERT); - GetScrollRange(win->hTextWnd, SB_VERT, &min, &max); + hTextWnd = GetDlgItem(win->hMainWnd, CTL_ID_TEXT); + curPos = GetScrollPos(hTextWnd, SB_VERT); + GetScrollRange(hTextWnd, SB_VERT, &min, &max); if (keyDelta == 0) { - GetClientRect(win->hTextWnd, &rect); + GetClientRect(hTextWnd, &rect); keyDelta = (rect.bottom - rect.top) / 2; if (wParam == VK_PRIOR) keyDelta = -keyDelta; @@ -816,10 +819,10 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, else if (curPos < min) curPos = min; - dy = GetScrollPos(win->hTextWnd, SB_VERT) - curPos; - SetScrollPos(win->hTextWnd, SB_VERT, curPos, TRUE); - ScrollWindow(win->hTextWnd, 0, dy, NULL, NULL); - UpdateWindow(win->hTextWnd); + dy = GetScrollPos(hTextWnd, SB_VERT) - curPos; + SetScrollPos(hTextWnd, SB_VERT, curPos, TRUE); + ScrollWindow(hTextWnd, 0, dy, NULL, NULL); + UpdateWindow(hTextWnd); return 0; case VK_ESCAPE: @@ -973,7 +976,6 @@ static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam, case WM_NCCREATE: win = (WINHELP_WINDOW*) ((LPCREATESTRUCT) lParam)->lpCreateParams; SetWindowLongPtr(hWnd, 0, (ULONG_PTR) win); - win->hTextWnd = hWnd; win->hBrush = CreateSolidBrush(win->info->sr_color); WINHELP_InitFonts(hWnd); break; @@ -1926,7 +1928,7 @@ WINHELP_LINE_PART* WINHELP_IsOverLink(WINHELP_WINDOW* win, WPARAM wParam, LPARAM POINT mouse; WINHELP_LINE *line; WINHELP_LINE_PART *part; - int scroll_pos = GetScrollPos(win->hTextWnd, SB_VERT); + int scroll_pos = GetScrollPos(GetDlgItem(win->hMainWnd, CTL_ID_TEXT), SB_VERT); mouse.x = LOWORD(lParam); mouse.y = HIWORD(lParam); diff --git a/programs/winhelp/winhelp.h b/programs/winhelp/winhelp.h index b07044c..551b880 100644 --- a/programs/winhelp/winhelp.h +++ b/programs/winhelp/winhelp.h @@ -100,8 +100,6 @@ typedef struct tagWinHelp WINHELP_LINE* first_line; HWND hMainWnd; - HWND hButtonBoxWnd; - HWND hTextWnd; HWND hShadowWnd; HWND hHistoryWnd;

1 0

Eric Pouech : winhelp: No longer store the WINHELP_WINDOW* inside the button box.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 8169f0ff9d1d76627e7fe29a94ff670a1bcbeb92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8169f0ff9d1d76627e7fe29a9… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Apr 18 21:34:23 2008 +0200 winhelp: No longer store the WINHELP_WINDOW* inside the button box. --- programs/winhelp/winhelp.c | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 27c2ead..003e6a3 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -334,20 +334,22 @@ static BOOL WINHELP_RegisterWinClasses(void) class_button_box = class_main; class_button_box.lpfnWndProc = WINHELP_ButtonBoxWndProc; + class_button_box.cbWndExtra = 0; class_button_box.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1); class_button_box.lpszClassName = BUTTON_BOX_WIN_CLASS_NAME; - class_text = class_main; + class_text = class_main; class_text.lpfnWndProc = WINHELP_TextWndProc; class_text.hbrBackground = 0; class_text.lpszClassName = TEXT_WIN_CLASS_NAME; - class_shadow = class_main; + class_shadow = class_main; class_shadow.lpfnWndProc = WINHELP_ShadowWndProc; + class_shadow.cbWndExtra = 0; class_shadow.hbrBackground = (HBRUSH)(COLOR_3DDKSHADOW+1); class_shadow.lpszClassName = SHADOW_WIN_CLASS_NAME; - class_history = class_main; + class_history = class_main; class_history.lpfnWndProc = WINHELP_HistoryWndProc; class_history.lpszClassName = HISTORY_WIN_CLASS_NAME; @@ -492,7 +494,6 @@ static BOOL WINHELP_ReuseWindow(WINHELP_WINDOW* win, WINHELP_WINDOW* oldwin, win->hBrush = CreateSolidBrush(win->info->sr_color); SetWindowLongPtr(win->hMainWnd, 0, (ULONG_PTR)win); - SetWindowLongPtr(win->hButtonBoxWnd, 0, (ULONG_PTR)win); SetWindowLongPtr(win->hTextWnd, 0, (ULONG_PTR)win); SetWindowLongPtr(win->hHistoryWnd, 0, (ULONG_PTR)win); @@ -660,8 +661,8 @@ BOOL WINHELP_CreateHelpWindow(HLPFILE_PAGE* page, HLPFILE_WINDOWINFO* wi, Globals.hInstance, win); /* Create button box and text Window */ if (!bPopup) - CreateWindow(BUTTON_BOX_WIN_CLASS_NAME, "", WS_CHILD | WS_VISIBLE, - 0, 0, 0, 0, hWnd, (HMENU)CTL_ID_BUTTON, Globals.hInstance, win); + win->hButtonBoxWnd = CreateWindow(BUTTON_BOX_WIN_CLASS_NAME, "", WS_CHILD | WS_VISIBLE, + 0, 0, 0, 0, hWnd, (HMENU)CTL_ID_BUTTON, Globals.hInstance, NULL); CreateWindow(TEXT_WIN_CLASS_NAME, "", WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hWnd, (HMENU)CTL_ID_TEXT, Globals.hInstance, win); @@ -859,15 +860,9 @@ static LRESULT CALLBACK WINHELP_ButtonBoxWndProc(HWND hWnd, UINT msg, WPARAM wPa switch (msg) { - case WM_NCCREATE: - win = (WINHELP_WINDOW*) ((LPCREATESTRUCT) lParam)->lpCreateParams; - SetWindowLongPtr(hWnd, 0, (ULONG_PTR) win); - win->hButtonBoxWnd = hWnd; - break; - case WM_WINDOWPOSCHANGING: winpos = (WINDOWPOS*) lParam; - win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); + win = (WINHELP_WINDOW*) GetWindowLongPtr(GetParent(hWnd), 0); /* Update buttons */ button_size.cx = 0;

1 0

Eric Pouech : winhelp: Always create a main window, even for popups.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: b9862369040384c42959a41206d9344830f306d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9862369040384c42959a4120… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Apr 18 21:34:17 2008 +0200 winhelp: Always create a main window, even for popups. --- programs/winhelp/winhelp.c | 83 +++++++++++++++++++++---------------------- 1 files changed, 41 insertions(+), 42 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 75559b2..27c2ead 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -3,7 +3,7 @@ * * Copyright 1996 Ulrich Schmid <uschmid(a)mail.hh.provi.de> * 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * 2002 Eric Pouech <eric.pouech(a)wanadoo.fr> + * 2002, 2008 Eric Pouech <eric.pouech(a)wanadoo.fr> * 2004 Ken Belleau <jamez(a)ivic.qc.ca> * * This library is free software; you can redistribute it and/or @@ -57,6 +57,8 @@ static WINHELP_LINE_PART* WINHELP_IsOverLink(WINHELP_WINDOW*, WPARAM, LPARAM); WINHELP_GLOBALS Globals = {3, NULL, NULL, TRUE, NULL, NULL, NULL, NULL}; +#define CTL_ID_BUTTON 0x700 +#define CTL_ID_TEXT 0x701 /*********************************************************************** * @@ -452,7 +454,7 @@ static LRESULT WINHELP_HandleCommand(HWND hSrcWnd, LPARAM lParam) void WINHELP_LayoutMainWindow(WINHELP_WINDOW* win) { RECT rect, button_box_rect; - INT text_top; + INT text_top = 0; GetClientRect(win->hMainWnd, &rect); @@ -462,8 +464,8 @@ void WINHELP_LayoutMainWindow(WINHELP_WINDOW* win) rect.right - rect.left, rect.bottom - rect.top, 0); - GetWindowRect(win->hButtonBoxWnd, &button_box_rect); - text_top = rect.top + button_box_rect.bottom - button_box_rect.top; + if (GetWindowRect(win->hButtonBoxWnd, &button_box_rect)) + text_top = rect.top + button_box_rect.bottom - button_box_rect.top; SetWindowPos(win->hTextWnd, HWND_TOP, rect.left, text_top, @@ -578,7 +580,7 @@ BOOL WINHELP_CreateHelpWindow(HLPFILE_PAGE* page, HLPFILE_WINDOWINFO* wi, DWORD ex_style; bPrimary = !lstrcmpi(wi->name, "main"); - bPopup = wi->win_style & WS_POPUP; + bPopup = !bPrimary && (wi->win_style & WS_POPUP); /* Initialize WINHELP_WINDOW struct */ win = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -650,12 +652,22 @@ BOOL WINHELP_CreateHelpWindow(HLPFILE_PAGE* page, HLPFILE_WINDOWINFO* wi, ex_style = 0; if (bPopup) ex_style = WS_EX_TOOLWINDOW; - hWnd = CreateWindowEx(ex_style, bPopup ? TEXT_WIN_CLASS_NAME : MAIN_WIN_CLASS_NAME, - wi->caption, - bPrimary ? WS_OVERLAPPEDWINDOW : wi->win_style, - wi->origin.x, wi->origin.y, wi->size.cx, wi->size.cy, - NULL, bPrimary ? LoadMenu(Globals.hInstance, MAKEINTRESOURCE(MAIN_MENU)) : 0, - Globals.hInstance, win); + hWnd = CreateWindowEx(ex_style, MAIN_WIN_CLASS_NAME, + wi->caption, + bPrimary ? WS_OVERLAPPEDWINDOW : wi->win_style, + wi->origin.x, wi->origin.y, wi->size.cx, wi->size.cy, + NULL, bPrimary ? LoadMenu(Globals.hInstance, MAKEINTRESOURCE(MAIN_MENU)) : 0, + Globals.hInstance, win); + /* Create button box and text Window */ + if (!bPopup) + CreateWindow(BUTTON_BOX_WIN_CLASS_NAME, "", WS_CHILD | WS_VISIBLE, + 0, 0, 0, 0, hWnd, (HMENU)CTL_ID_BUTTON, Globals.hInstance, win); + + CreateWindow(TEXT_WIN_CLASS_NAME, "", WS_CHILD | WS_VISIBLE, + 0, 0, 0, 0, hWnd, (HMENU)CTL_ID_TEXT, Globals.hInstance, win); + + WINHELP_LayoutMainWindow(win); + if (bPopup) Globals.hPopupWnd = hWnd; ShowWindow(hWnd, nCmdShow); UpdateWindow(hWnd); @@ -728,23 +740,12 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, win->hMainWnd = hWnd; break; - case WM_CREATE: - win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); - - /* Create button box and text Window */ - CreateWindow(BUTTON_BOX_WIN_CLASS_NAME, "", WS_CHILD | WS_VISIBLE, - 0, 0, 0, 0, hWnd, 0, Globals.hInstance, win); - - CreateWindow(TEXT_WIN_CLASS_NAME, "", WS_CHILD | WS_VISIBLE, - 0, 0, 0, 0, hWnd, 0, Globals.hInstance, win); - - /* Fall through */ case WM_WINDOWPOSCHANGED: WINHELP_LayoutMainWindow((WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0)); break; case WM_COMMAND: - Globals.active_win = win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); + win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); switch (wParam) { /* Menu FILE */ @@ -772,7 +773,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, if (wParam == button->wParam) break; if (button) MACRO_ExecuteMacro(button->lpszMacro); - else + else if (!HIWORD(wParam)) WINHELP_MessageBoxIDS(STID_NOT_IMPLEMENTED, 0x121, MB_OK); break; } @@ -825,6 +826,19 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, return 0; } break; + case WM_NCDESTROY: + { + BOOL bExit; + win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); + if (hWnd == Globals.hPopupWnd) Globals.hPopupWnd = 0; + bExit = (Globals.wVersion >= 4 && !lstrcmpi(win->lpszName, "main")); + WINHELP_DeleteWindow(win); + + if (bExit) MACRO_Exit(); + if (!Globals.win_list) + PostQuitMessage(0); + } + break; } return DefWindowProc(hWnd, msg, wParam, lParam); } @@ -955,7 +969,6 @@ static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam, POINT mouse; INT scroll_pos; HWND hPopupWnd; - BOOL bExit; if (msg != WM_LBUTTONDOWN) WINHELP_CheckPopup(msg); @@ -967,7 +980,6 @@ static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam, SetWindowLongPtr(hWnd, 0, (ULONG_PTR) win); win->hTextWnd = hWnd; win->hBrush = CreateSolidBrush(win->info->sr_color); - if (win->info->win_style & WS_POPUP) Globals.hPopupWnd = win->hMainWnd = hWnd; WINHELP_InitFonts(hWnd); break; @@ -985,12 +997,13 @@ static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam, SIZE new_client_size; SIZE new_window_size; - GetWindowRect(hWnd, &old_window_rect); + GetWindowRect(GetParent(hWnd), &old_window_rect); origin.x = old_window_rect.left; origin.y = old_window_rect.top; old_window_size.cx = old_window_rect.right - old_window_rect.left; old_window_size.cy = old_window_rect.bottom - old_window_rect.top; + WINHELP_LayoutMainWindow(win); GetClientRect(hWnd, &old_client_rect); old_client_size.cx = old_client_rect.right - old_client_rect.left; old_client_size.cy = old_client_rect.bottom - old_client_rect.top; @@ -1012,7 +1025,7 @@ static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam, new_window_size.cx, new_window_size.cy, 0, 0, Globals.hInstance, 0); - SetWindowPos(hWnd, HWND_TOP, origin.x, origin.y, + SetWindowPos(GetParent(hWnd), HWND_TOP, origin.x, origin.y, new_window_size.cx, new_window_size.cy, 0); SetWindowPos(win->hShadowWnd, hWnd, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE); @@ -1253,20 +1266,6 @@ static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam, DestroyWindow(hPopupWnd); break; - case WM_NCDESTROY: - win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); - - if (hWnd == Globals.hPopupWnd) Globals.hPopupWnd = 0; - - bExit = (Globals.wVersion >= 4 && !lstrcmpi(win->lpszName, "main")); - - WINHELP_DeleteWindow(win); - - if (bExit) MACRO_Exit(); - - if (!Globals.win_list) - PostQuitMessage(0); - break; } return DefWindowProc(hWnd, msg, wParam, lParam);

1 0

Eric Pouech : winhelp: Fixed the parsing of a link containing both a . hlp file and a window name.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 7ceb62f90a308632539d1a76fd7483b2a91b5864 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ceb62f90a308632539d1a76f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Apr 18 21:34:11 2008 +0200 winhelp: Fixed the parsing of a link containing both a .hlp file and a window name. --- programs/winhelp/hlpfile.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 80bf7b8..96542fd 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -1143,28 +1143,33 @@ static BOOL HLPFILE_AddParagraph(HLPFILE *hlpfile, BYTE *buf, BYTE *end, unsigne char* ptr = (char*) format + 8; BYTE type = format[3]; int wnd = -1; - char* str; - if (type == 1) wnd = *ptr++; - if (type == 4 || type == 6) - { - str = ptr; - ptr += strlen(ptr) + 1; - } - else - str = hlpfile->lpszPath; - if (type == 6) + switch (type) { + case 1: + wnd = *ptr; + /* fall through */ + case 0: + ptr = hlpfile->lpszPath; + break; + case 6: for (wnd = hlpfile->numWindows - 1; wnd >= 0; wnd--) { if (!strcmp(ptr, hlpfile->windows[wnd].name)) break; } if (wnd == -1) WINE_WARN("Couldn't find window info for %s\n", ptr); + ptr += strlen(ptr) + 1; + /* fall through */ + case 4: + break; + default: + WINE_WARN("Unknown link type %d\n", type); + break; } HLPFILE_FreeLink(attributes.link); attributes.link = HLPFILE_AllocLink((*format & 4) ? hlp_link_link : hlp_link_popup, - str, GET_UINT(format, 4), + ptr, GET_UINT(format, 4), !(*format & 1), wnd); } format += 3 + GET_USHORT(format, 1);

1 0

Eric Pouech : winhelp: Removed no longer needed field (wStringTableOffset) in Globals.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 4c236530efab5cb49f96fae512646c59115bf125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c236530efab5cb49f96fae51… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Apr 18 21:34:05 2008 +0200 winhelp: Removed no longer needed field (wStringTableOffset) in Globals. --- programs/winhelp/winhelp.c | 2 +- programs/winhelp/winhelp.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 92c1e79..75559b2 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -55,7 +55,7 @@ static void WINHELP_DeleteWindow(WINHELP_WINDOW*); static void WINHELP_SetupText(HWND hWnd); static WINHELP_LINE_PART* WINHELP_IsOverLink(WINHELP_WINDOW*, WPARAM, LPARAM); -WINHELP_GLOBALS Globals = {3, NULL, NULL, 0, TRUE, NULL, NULL, NULL, NULL}; +WINHELP_GLOBALS Globals = {3, NULL, NULL, TRUE, NULL, NULL, NULL, NULL}; /*********************************************************************** diff --git a/programs/winhelp/winhelp.h b/programs/winhelp/winhelp.h index 0628c7d..b07044c 100644 --- a/programs/winhelp/winhelp.h +++ b/programs/winhelp/winhelp.h @@ -159,7 +159,6 @@ typedef struct UINT wVersion; HANDLE hInstance; HWND hPopupWnd; - UINT wStringTableOffset; BOOL isBook; WINHELP_WINDOW* active_win; WINHELP_WINDOW* win_list;

1 0

Eric Pouech : winhelp: Moved all static data used when parsing HLP files into the internal structures .
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: a1072794107e54927df6f56f7e94b737bc8dc0aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1072794107e54927df6f56f7… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Apr 18 21:33:57 2008 +0200 winhelp: Moved all static data used when parsing HLP files into the internal structures. --- programs/winhelp/hlpfile.c | 209 ++++++++++++++++++++------------------------ programs/winhelp/hlpfile.h | 11 ++- 2 files changed, 104 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1072794107e54927df6f…

1 0

Eric Pouech : winhelp: Add an (ugly) icon.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 077964a8d4dd9c695196f43cdef32437f2468087 URL: http://source.winehq.org/git/wine.git/?a=commit;h=077964a8d4dd9c695196f43cd… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Apr 18 21:33:45 2008 +0200 winhelp: Add an (ugly) icon. --- programs/winhelp/rsrc.rc | 3 +++ programs/winhelp/winhelp.c | 2 +- programs/winhelp/winhelp.ico | Bin 0 -> 766 bytes programs/winhelp/winhelp_res.h | 2 ++ 4 files changed, 6 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/rsrc.rc b/programs/winhelp/rsrc.rc index c8a6417..4dc7d23 100644 --- a/programs/winhelp/rsrc.rc +++ b/programs/winhelp/rsrc.rc @@ -25,6 +25,9 @@ #include "winhelp.h" #include "winhelp_res.h" +/* @makedep: winhelp.ico */ +IDI_WINHELP ICON DISCARDABLE winhelp.ico + #include "Bg.rc" #include "Cs.rc" #include "Da.rc" diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index b9c435f..65c7e20 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -324,7 +324,7 @@ static BOOL WINHELP_RegisterWinClasses(void) class_main.cbClsExtra = 0; class_main.cbWndExtra = sizeof(LONG); class_main.hInstance = Globals.hInstance; - class_main.hIcon = LoadIcon(0, IDI_APPLICATION); + class_main.hIcon = LoadIcon(Globals.hInstance, MAKEINTRESOURCE(IDI_WINHELP)); class_main.hCursor = LoadCursor(0, IDC_ARROW); class_main.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); class_main.lpszMenuName = 0; diff --git a/programs/winhelp/winhelp.ico b/programs/winhelp/winhelp.ico new file mode 100644 index 0000000..7e5c6d6 Binary files /dev/null and b/programs/winhelp/winhelp.ico differ diff --git a/programs/winhelp/winhelp_res.h b/programs/winhelp/winhelp_res.h index 14ec13f..d58de61 100644 --- a/programs/winhelp/winhelp_res.h +++ b/programs/winhelp/winhelp_res.h @@ -33,3 +33,5 @@ #define IDD_INDEX 0x150 #define IDC_INDEXLIST 0x151 + +#define IDI_WINHELP 0xF00

1 0

Eric Pouech : winhelp: Get rid of the WM_USER message.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: d58ab515dfef1406fbf746665101b3a1d9a6370d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d58ab515dfef1406fbf746665… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Apr 18 21:33:51 2008 +0200 winhelp: Get rid of the WM_USER message. --- programs/winhelp/macro.c | 4 +- programs/winhelp/winhelp.c | 48 ++++++++++++++++++++++++------------------- programs/winhelp/winhelp.h | 1 + 3 files changed, 30 insertions(+), 23 deletions(-) diff --git a/programs/winhelp/macro.c b/programs/winhelp/macro.c index 68863bf..1f824f8 100644 --- a/programs/winhelp/macro.c +++ b/programs/winhelp/macro.c @@ -300,7 +300,7 @@ void CALLBACK MACRO_ChangeButtonBinding(LPCSTR id, LPCSTR macro) *b = button; - SendMessage(win->hMainWnd, WM_USER, 0, 0); + WINHELP_LayoutMainWindow(win); } void CALLBACK MACRO_ChangeEnable(LPCSTR id, LPCSTR macro) @@ -407,7 +407,7 @@ void CALLBACK MACRO_CreateButton(LPCSTR id, LPCSTR name, LPCSTR macro) button->wParam = max(button->wParam, (*b)->wParam + 1); *b = button; - SendMessage(win->hMainWnd, WM_USER, 0, 0); + WINHELP_LayoutMainWindow(win); } void CALLBACK MACRO_DeleteItem(LPCSTR str) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 65c7e20..92c1e79 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -449,6 +449,29 @@ static LRESULT WINHELP_HandleCommand(HWND hSrcWnd, LPARAM lParam) return 1; } +void WINHELP_LayoutMainWindow(WINHELP_WINDOW* win) +{ + RECT rect, button_box_rect; + INT text_top; + + GetClientRect(win->hMainWnd, &rect); + + /* Update button box and text Window */ + SetWindowPos(win->hButtonBoxWnd, HWND_TOP, + rect.left, rect.top, + rect.right - rect.left, + rect.bottom - rect.top, 0); + + GetWindowRect(win->hButtonBoxWnd, &button_box_rect); + text_top = rect.top + button_box_rect.bottom - button_box_rect.top; + + SetWindowPos(win->hTextWnd, HWND_TOP, + rect.left, text_top, + rect.right - rect.left, + rect.bottom - text_top, 0); + +} + /****************************************************************** * WINHELP_ReuseWindow * @@ -478,7 +501,7 @@ static BOOL WINHELP_ReuseWindow(WINHELP_WINDOW* win, WINHELP_WINDOW* oldwin, WINHELP_SetupText(win->hTextWnd); InvalidateRect(win->hTextWnd, NULL, TRUE); - SendMessage(win->hMainWnd, WM_USER, 0, 0); + WINHELP_LayoutMainWindow(win); ShowWindow(win->hMainWnd, nCmdShow); UpdateWindow(win->hTextWnd); @@ -692,8 +715,8 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, { WINHELP_WINDOW *win; WINHELP_BUTTON *button; - RECT rect, button_box_rect; - INT text_top, curPos, min, max, dy, keyDelta; + RECT rect; + INT curPos, min, max, dy, keyDelta; WINHELP_CheckPopup(msg); @@ -716,25 +739,8 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, 0, 0, 0, 0, hWnd, 0, Globals.hInstance, win); /* Fall through */ - case WM_USER: case WM_WINDOWPOSCHANGED: - win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); - GetClientRect(hWnd, &rect); - - /* Update button box and text Window */ - SetWindowPos(win->hButtonBoxWnd, HWND_TOP, - rect.left, rect.top, - rect.right - rect.left, - rect.bottom - rect.top, 0); - - GetWindowRect(win->hButtonBoxWnd, &button_box_rect); - text_top = rect.top + button_box_rect.bottom - button_box_rect.top; - - SetWindowPos(win->hTextWnd, HWND_TOP, - rect.left, text_top, - rect.right - rect.left, - rect.bottom - text_top, 0); - + WINHELP_LayoutMainWindow((WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0)); break; case WM_COMMAND: diff --git a/programs/winhelp/winhelp.h b/programs/winhelp/winhelp.h index abe68ea..0628c7d 100644 --- a/programs/winhelp/winhelp.h +++ b/programs/winhelp/winhelp.h @@ -180,6 +180,7 @@ INT WINHELP_MessageBoxIDS(UINT, UINT, WORD); INT WINHELP_MessageBoxIDS_s(UINT, LPCSTR, UINT, WORD); HLPFILE* WINHELP_LookupHelpFile(LPCSTR lpszFile); HLPFILE_WINDOWINFO* WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name); +void WINHELP_LayoutMainWindow(WINHELP_WINDOW* win); extern const char MAIN_WIN_CLASS_NAME[]; extern const char BUTTON_BOX_WIN_CLASS_NAME[];

1 0

Rob Shearman : widl: Add support for '%' operator in expressions.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: ea9932557af5d30dc652d27edc3548664cb879c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea9932557af5d30dc652d27ed… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 20 22:16:10 2008 +0100 widl: Add support for '%' operator in expressions. --- tools/widl/header.c | 2 ++ tools/widl/parser.y | 10 +++++++++- tools/widl/typegen.c | 3 +++ tools/widl/widltypes.h | 1 + 4 files changed, 15 insertions(+), 1 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 6989149..e1dccce 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -520,6 +520,7 @@ void write_expr(FILE *h, const expr_t *e, int brackets) break; case EXPR_SHL: case EXPR_SHR: + case EXPR_MOD: case EXPR_MUL: case EXPR_DIV: case EXPR_ADD: @@ -533,6 +534,7 @@ void write_expr(FILE *h, const expr_t *e, int brackets) switch (e->type) { case EXPR_SHL: fprintf(h, " << "); break; case EXPR_SHR: fprintf(h, " >> "); break; + case EXPR_MOD: fprintf(h, " %% "); break; case EXPR_MUL: fprintf(h, " * "); break; case EXPR_DIV: fprintf(h, " / "); break; case EXPR_ADD: fprintf(h, " + "); break; diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 32752bf..31f631f 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -293,7 +293,7 @@ static void add_explicit_handle_if_necessary(func_t *func); %left '|' %left '&' %left '-' '+' -%left '*' '/' +%left '*' '/' '%' %left SHL SHR %left '.' MEMBERPTR '[' ']' %right '~' @@ -632,6 +632,7 @@ expr: aNUM { $$ = make_exprl(EXPR_NUM, $1); } | expr '&' expr { $$ = make_expr2(EXPR_AND, $1, $3); } | expr '+' expr { $$ = make_expr2(EXPR_ADD, $1, $3); } | expr '-' expr { $$ = make_expr2(EXPR_SUB, $1, $3); } + | expr '%' expr { $$ = make_expr2(EXPR_MOD, $1, $3); } | expr '*' expr { $$ = make_expr2(EXPR_MUL, $1, $3); } | expr '/' expr { $$ = make_expr2(EXPR_DIV, $1, $3); } | expr SHL expr { $$ = make_expr2(EXPR_SHL, $1, $3); } @@ -1238,6 +1239,13 @@ static expr_t *make_expr2(enum expr_type type, expr_t *expr1, expr_t *expr2) case EXPR_SUB: e->cval = expr1->cval - expr2->cval; break; + case EXPR_MOD: + if (expr2->cval == 0) { + error_loc("divide by zero in expression\n"); + e->cval = 0; + } else + e->cval = expr1->cval % expr2->cval; + break; case EXPR_MUL: e->cval = expr1->cval * expr2->cval; break; diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index da5c95a..575f06c 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -352,6 +352,7 @@ static int compare_expr(const expr_t *a, const expr_t *b) case EXPR_AND: case EXPR_ADD: case EXPR_SUB: + case EXPR_MOD: case EXPR_MUL: case EXPR_DIV: case EXPR_SHL: @@ -3148,6 +3149,7 @@ static void write_struct_expr(FILE *h, const expr_t *e, int brackets, break; case EXPR_SHL: case EXPR_SHR: + case EXPR_MOD: case EXPR_MUL: case EXPR_DIV: case EXPR_ADD: @@ -3161,6 +3163,7 @@ static void write_struct_expr(FILE *h, const expr_t *e, int brackets, switch (e->type) { case EXPR_SHL: fprintf(h, " << "); break; case EXPR_SHR: fprintf(h, " >> "); break; + case EXPR_MOD: fprintf(h, " %% "); break; case EXPR_MUL: fprintf(h, " * "); break; case EXPR_DIV: fprintf(h, " / "); break; case EXPR_ADD: fprintf(h, " + "); break; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 31c7599..879c7a9 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -164,6 +164,7 @@ enum expr_type EXPR_MEMBERPTR, EXPR_MEMBER, EXPR_ARRAY, + EXPR_MOD, }; enum type_kind

1 0

Roderick Colenbrander : wined3d: Add palette re-upload support for cards with hardware palette support.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: f2753d71898547dbca6d12429e4de552b7edd666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2753d71898547dbca6d12429… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Apr 20 14:50:00 2008 +0000 wined3d: Add palette re-upload support for cards with hardware palette support. Before it was broken and when it worked it was slow due to unneeded gpu -> cpu -> gpu copying. --- dlls/wined3d/surface.c | 51 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 44 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 31c8e4f..7da9d92 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -35,6 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *surf); static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL colorkey); +static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES convert); static inline void clear_unused_channels(IWineD3DSurfaceImpl *This); static void surface_remove_pbo(IWineD3DSurfaceImpl *This); @@ -3638,12 +3639,49 @@ HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) { if(This->resource.format == WINED3DFMT_P8 || This->resource.format == WINED3DFMT_A8P8) { - if(!(This->Flags & SFLAG_INSYSMEM)) { - TRACE("Palette changed with surface that does not have an up to date system memory copy\n"); - IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL); + int bpp; + GLenum format, internal, type; + CONVERT_TYPES convert; + + /* Check if we are using a RTL mode which uses texturing for uploads */ + BOOL use_texture = (wined3d_settings.rendertargetlock_mode == RTL_READTEX || wined3d_settings.rendertargetlock_mode == RTL_TEXTEX); + + /* Check if we have hardware palette conversion if we have convert is set to NO_CONVERSION */ + d3dfmt_get_conv(This, TRUE, use_texture, &format, &internal, &type, &convert, &bpp, This->srgb); + + if((This->resource.usage & WINED3DUSAGE_RENDERTARGET) && (convert == NO_CONVERSION)) + { + ENTER_GL(); + if (This->glDescription.textureName == 0) { + glGenTextures(1, &This->glDescription.textureName); + checkGLcall("glGenTextures"); + } + glBindTexture(This->glDescription.target, This->glDescription.textureName); + checkGLcall("glBindTexture(This->glDescription.target, This->glDescription.textureName)"); + LEAVE_GL(); + + /* Make sure the texture is up to date. This call doesn't do anything if the texture is already up to date. */ + IWineD3DSurface_LoadLocation(iface, SFLAG_INTEXTURE, NULL); + + /* We want to force a palette refresh, so mark the drawable as not being up to date */ + IWineD3DSurface_ModifyLocation(iface, SFLAG_INDRAWABLE, FALSE); + + /* Re-upload the palette */ + d3dfmt_p8_upload_palette(iface, convert); + + /* Without this some palette updates are missed. This at least happens on Nvidia drivers but + * it works fine using Mesa. */ + ENTER_GL(); + glFlush(); + LEAVE_GL(); + } else { + if(!(This->Flags & SFLAG_INSYSMEM)) { + TRACE("Palette changed with surface that does not have an up to date system memory copy\n"); + IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL); + } + TRACE("Dirtifying surface\n"); + IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, TRUE); } - TRACE("Dirtifying surface\n"); - IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, TRUE); } if(This->Flags & SFLAG_DIBSECTION) { @@ -3657,8 +3695,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) { SetDIBColorTable(This->hDC, 0, 256, col); } - /* Propagate the changes to the drawable when we have a palette. - * TODO: in case of hardware p8 palettes we should only upload the palette. */ + /* Propagate the changes to the drawable when we have a palette. */ if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) IWineD3DSurface_LoadLocation(iface, SFLAG_INDRAWABLE, NULL);

1 0

ByeongSik Jeon : winecfg: Update Korean translation.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 69e525022f04cee47b0c8ea6e2d7bf01279bfe87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69e525022f04cee47b0c8ea6e… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Mon Apr 21 10:58:15 2008 +0900 winecfg: Update Korean translation. --- programs/winecfg/Ko.rc | 82 ++++++++++++++++++++++++------------------------ 1 files changed, 41 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69e525022f04cee47b0c8…

1 0

Rob Shearman : widl: Issue an error instead of crashing for dividing by zero in a constant expression .
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: efd10742ec02ec14fe080f8b69244ecbae920798 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efd10742ec02ec14fe080f8b6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 20 22:15:36 2008 +0100 widl: Issue an error instead of crashing for dividing by zero in a constant expression. --- tools/widl/parser.y | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 6f5dbdd..c7fbe42 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1237,7 +1237,11 @@ static expr_t *make_expr2(enum expr_type type, expr_t *expr1, expr_t *expr2) e->cval = expr1->cval * expr2->cval; break; case EXPR_DIV: - e->cval = expr1->cval / expr2->cval; + if (expr2->cval == 0) { + error_loc("divide by zero in expression\n"); + e->cval = 0; + } else + e->cval = expr1->cval / expr2->cval; break; case EXPR_OR: e->cval = expr1->cval | expr2->cval;

1 0

Rob Shearman : widl: Add support for "->" and "." operators in expressions.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 03d5017416adfd47fe86d8ecf97af8a028ca7748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03d5017416adfd47fe86d8ecf… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 20 22:15:43 2008 +0100 widl: Add support for "->" and "." operators in expressions. --- tools/widl/header.c | 4 ++++ tools/widl/parser.l | 1 + tools/widl/parser.y | 6 +++++- tools/widl/typegen.c | 6 ++++++ tools/widl/widltypes.h | 2 ++ 5 files changed, 18 insertions(+), 1 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 3c89d61..d2f7ca7 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -526,6 +526,8 @@ void write_expr(FILE *h, const expr_t *e, int brackets) case EXPR_SUB: case EXPR_AND: case EXPR_OR: + case EXPR_MEMBERPTR: + case EXPR_MEMBER: if (brackets) fprintf(h, "("); write_expr(h, e->ref, 1); switch (e->type) { @@ -537,6 +539,8 @@ void write_expr(FILE *h, const expr_t *e, int brackets) case EXPR_SUB: fprintf(h, " - "); break; case EXPR_AND: fprintf(h, " & "); break; case EXPR_OR: fprintf(h, " | "); break; + case EXPR_MEMBERPTR: fprintf(h, "->"); break; + case EXPR_MEMBER: fprintf(h, "."); break; default: break; } write_expr(h, e->u.ext, 1); diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 5b24b26..3439ea6 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -162,6 +162,7 @@ SAFEARRAY{ws}*/\( return tSAFEARRAY; <INITIAL,ATTR>{ws} <INITIAL,ATTR>\<\< return SHL; <INITIAL,ATTR>\>\> return SHR; +<INITIAL,ATTR>\-\> return MEMBERPTR; <INITIAL,ATTR>. return yytext[0]; <<EOF>> { if (import_stack_ptr) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index c7fbe42..61a1252 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -180,6 +180,7 @@ static void add_explicit_handle_if_necessary(func_t *func); %token <uuid> aUUID %token aEOF %token SHL SHR +%token MEMBERPTR %token tAGGREGATABLE tALLOCATE tAPPOBJECT tASYNC tASYNCUUID %token tAUTOHANDLE tBINDABLE tBOOLEAN tBROADCAST tBYTE tBYTECOUNT %token tCALLAS tCALLBACK tCASE tCDECL tCHAR tCOCLASS tCODE tCOMMSTATUS @@ -294,6 +295,7 @@ static void add_explicit_handle_if_necessary(func_t *func); %left '-' '+' %left '*' '/' %left SHL SHR +%left '.' MEMBERPTR %right '~' %right CAST %right PPTR @@ -636,8 +638,10 @@ expr: aNUM { $$ = make_exprl(EXPR_NUM, $1); } | expr SHR expr { $$ = make_expr2(EXPR_SHR, $1, $3); } | '~' expr { $$ = make_expr1(EXPR_NOT, $2); } | '-' expr %prec NEG { $$ = make_expr1(EXPR_NEG, $2); } - | '&' expr %prec ADDRESSOF { $$ = make_expr1(EXPR_ADDRESSOF, $2); } + | '&' expr %prec ADDRESSOF { $$ = make_expr1(EXPR_ADDRESSOF, $2); } | '*' expr %prec PPTR { $$ = make_expr1(EXPR_PPTR, $2); } + | expr MEMBERPTR expr { $$ = make_expr2(EXPR_MEMBERPTR, $1, $3); } + | expr '.' expr { $$ = make_expr2(EXPR_MEMBER, $1, $3); } | '(' type ')' expr %prec CAST { $$ = make_exprt(EXPR_CAST, $2, $4); } | tSIZEOF '(' type ')' { $$ = make_exprt(EXPR_SIZEOF, $3, NULL); } | '(' expr ')' { $$ = $2; } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 32e557f..b298403 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -356,6 +356,8 @@ static int compare_expr(const expr_t *a, const expr_t *b) case EXPR_DIV: case EXPR_SHL: case EXPR_SHR: + case EXPR_MEMBERPTR: + case EXPR_MEMBER: ret = compare_expr(a->ref, b->ref); if (ret != 0) return ret; @@ -3151,6 +3153,8 @@ static void write_struct_expr(FILE *h, const expr_t *e, int brackets, case EXPR_SUB: case EXPR_AND: case EXPR_OR: + case EXPR_MEMBERPTR: + case EXPR_MEMBER: if (brackets) fprintf(h, "("); write_struct_expr(h, e->ref, 1, fields, structvar); switch (e->type) { @@ -3162,6 +3166,8 @@ static void write_struct_expr(FILE *h, const expr_t *e, int brackets, case EXPR_SUB: fprintf(h, " - "); break; case EXPR_AND: fprintf(h, " & "); break; case EXPR_OR: fprintf(h, " | "); break; + case EXPR_MEMBERPTR: fprintf(h, "->"); break; + case EXPR_MEMBER: fprintf(h, "."); break; default: break; } write_struct_expr(h, e->u.ext, 1, fields, structvar); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index dfae4dd..256a3ad 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -161,6 +161,8 @@ enum expr_type EXPR_COND, EXPR_TRUEFALSE, EXPR_ADDRESSOF, + EXPR_MEMBERPTR, + EXPR_MEMBER, }; enum type_kind

1 0

Rob Shearman : widl: Add support for arrays in expressions.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: d27c7601e5d1e4b6107aae11a0273a91235f6a98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d27c7601e5d1e4b6107aae11a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 20 22:16:00 2008 +0100 widl: Add support for arrays in expressions. --- tools/widl/header.c | 8 ++++++++ tools/widl/parser.y | 3 ++- tools/widl/typegen.c | 9 +++++++++ tools/widl/widltypes.h | 1 + 4 files changed, 20 insertions(+), 1 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index d2f7ca7..6989149 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -559,6 +559,14 @@ void write_expr(FILE *h, const expr_t *e, int brackets) fprintf(h, "&"); write_expr(h, e->ref, 1); break; + case EXPR_ARRAY: + if (brackets) fprintf(h, "("); + write_expr(h, e->ref, 1); + fprintf(h, "["); + write_expr(h, e->u.ext, 1); + fprintf(h, "]"); + if (brackets) fprintf(h, ")"); + break; } } diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 61a1252..32752bf 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -295,7 +295,7 @@ static void add_explicit_handle_if_necessary(func_t *func); %left '-' '+' %left '*' '/' %left SHL SHR -%left '.' MEMBERPTR +%left '.' MEMBERPTR '[' ']' %right '~' %right CAST %right PPTR @@ -644,6 +644,7 @@ expr: aNUM { $$ = make_exprl(EXPR_NUM, $1); } | expr '.' expr { $$ = make_expr2(EXPR_MEMBER, $1, $3); } | '(' type ')' expr %prec CAST { $$ = make_exprt(EXPR_CAST, $2, $4); } | tSIZEOF '(' type ')' { $$ = make_exprt(EXPR_SIZEOF, $3, NULL); } + | expr '[' expr ']' { $$ = make_expr2(EXPR_ARRAY, $1, $3); } | '(' expr ')' { $$ = $2; } ; diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b298403..da5c95a 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -358,6 +358,7 @@ static int compare_expr(const expr_t *a, const expr_t *b) case EXPR_SHR: case EXPR_MEMBERPTR: case EXPR_MEMBER: + case EXPR_ARRAY: ret = compare_expr(a->ref, b->ref); if (ret != 0) return ret; @@ -3186,6 +3187,14 @@ static void write_struct_expr(FILE *h, const expr_t *e, int brackets, fprintf(h, "&"); write_struct_expr(h, e->ref, 1, fields, structvar); break; + case EXPR_ARRAY: + if (brackets) fprintf(h, "("); + write_struct_expr(h, e->ref, 1, fields, structvar); + fprintf(h, "["); + write_struct_expr(h, e->u.ext, 1, fields, structvar); + fprintf(h, "]"); + if (brackets) fprintf(h, ")"); + break; } } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 256a3ad..31c7599 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -163,6 +163,7 @@ enum expr_type EXPR_ADDRESSOF, EXPR_MEMBERPTR, EXPR_MEMBER, + EXPR_ARRAY, }; enum type_kind

1 0

Rob Shearman : widl: Automatically add "handle_t IDL_handle" parameter to functions with no explicit handle specified whose containing interface has the explicit_handle attribute .
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: c46fcfb356b31431cc34de1f9c6a7599db317abd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c46fcfb356b31431cc34de1f9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 20 22:15:29 2008 +0100 widl: Automatically add "handle_t IDL_handle" parameter to functions with no explicit handle specified whose containing interface has the explicit_handle attribute. --- tools/widl/client.c | 20 -------------------- tools/widl/header.c | 14 ++++++++++++++ tools/widl/header.h | 1 + tools/widl/parser.y | 41 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 56 insertions(+), 20 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index b3f89a7..d15dfdc 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -70,25 +70,10 @@ static void check_pointers(const func_t *func) } } -const var_t* get_context_handle_var(const func_t* func) -{ - const var_t* var; - - if (!func->args) - return NULL; - - LIST_FOR_EACH_ENTRY( var, func->args, const var_t, entry ) - if (is_attr(var->attrs, ATTR_IN) && is_context_handle(var->type)) - return var; - - return NULL; -} - static void write_function_stubs(type_t *iface, unsigned int *proc_offset) { const func_t *func; const char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); - int explicit_handle = is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE); const var_t *var; int method_count = 0; @@ -110,12 +95,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) { explicit_generic_handle_var = get_explicit_generic_handle_var(func); if (!explicit_generic_handle_var) - { context_handle_var = get_context_handle_var(func); - if (!context_handle_var && explicit_handle) - /* FIXME: should use automatically added IDL_handle parameter */ - error("explicit_handle attribute specified and %s() does not define an explicit binding handle - not implemented yet\n", def->name); - } } write_type_decl_left(client, get_func_return_type(func)); diff --git a/tools/widl/header.c b/tools/widl/header.c index 8668ce9..3c89d61 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -618,6 +618,20 @@ const var_t* get_explicit_generic_handle_var(const func_t* func) return NULL; } +const var_t* get_context_handle_var(const func_t* func) +{ + const var_t* var; + + if (!func->args) + return NULL; + + LIST_FOR_EACH_ENTRY( var, func->args, const var_t, entry ) + if (is_attr(var->attrs, ATTR_IN) && is_context_handle(var->type)) + return var; + + return NULL; +} + int has_out_arg_or_return(const func_t *func) { const var_t *var; diff --git a/tools/widl/header.h b/tools/widl/header.h index 3f4fee2..e8fdbc9 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -66,6 +66,7 @@ extern void write_generic_handle_routines(void); extern const var_t* get_explicit_handle_var(const func_t* func); extern const type_t* get_explicit_generic_handle_type(const var_t* var); extern const var_t* get_explicit_generic_handle_var(const func_t* func); +extern const var_t* get_context_handle_var(const func_t* func); extern int has_out_arg_or_return(const func_t *func); extern void write_guid(FILE *f, const char *guid_prefix, const char *name, const UUID *uuid); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 4d04546..6f5dbdd 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -142,6 +142,7 @@ static attr_list_t *check_dispiface_attrs(const char *name, attr_list_t *attrs); static const attr_list_t *check_module_attrs(const char *name, const attr_list_t *attrs); static const attr_list_t *check_coclass_attrs(const char *name, const attr_list_t *attrs); const char *get_attr_display_name(enum attr_type type); +static void add_explicit_handle_if_necessary(func_t *func); #define tsENUM 1 #define tsSTRUCT 2 @@ -2482,8 +2483,48 @@ static void check_remoting_args(const func_t *func) } } +static void add_explicit_handle_if_necessary(func_t *func) +{ + const var_t* explicit_handle_var; + const var_t* explicit_generic_handle_var = NULL; + const var_t* context_handle_var = NULL; + + /* check for a defined binding handle */ + explicit_handle_var = get_explicit_handle_var(func); + if (!explicit_handle_var) + { + explicit_generic_handle_var = get_explicit_generic_handle_var(func); + if (!explicit_generic_handle_var) + { + context_handle_var = get_context_handle_var(func); + if (!context_handle_var) + { + /* no explicit handle specified so add + * "[in] handle_t IDL_handle" as the first parameter to the + * function */ + var_t *idl_handle = make_var(xstrdup("IDL_handle")); + idl_handle->attrs = append_attr(NULL, make_attr(ATTR_IN)); + idl_handle->type = find_type("handle_t", 0); + if (!func->def->type->fields_or_args) + { + func->def->type->fields_or_args = xmalloc( sizeof(*func->def->type->fields_or_args) ); + list_init( func->def->type->fields_or_args ); + } + list_add_head( func->def->type->fields_or_args, &idl_handle->entry ); + func->args = func->def->type->fields_or_args; + } + } + } +} + static void check_functions(const type_t *iface) { + if (is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE) && iface->funcs) + { + func_t *func; + LIST_FOR_EACH_ENTRY( func, iface->funcs, func_t, entry ) + add_explicit_handle_if_necessary(func); + } if (!is_inside_library && !is_attr(iface->attrs, ATTR_LOCAL)) { const func_t *func;

1 0

Rob Shearman : widl: The implicit_handle attribute is allowed with a handle explicitly specified in the function parameters .
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: c4ca32bbdafb87a01ca6047ca033bde32859f8de URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4ca32bbdafb87a01ca6047ca… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 20 22:15:24 2008 +0100 widl: The implicit_handle attribute is allowed with a handle explicitly specified in the function parameters. In that case, that handle is used instead of the implicit handle. Fix the check for the explicit_handle attribute being specified without a handle being specified in the function parameters, even though issuing an error is wrong. (Thanks to Marcus Meissner & Coverity for spotting that the check didn't do what it was supposed to do.) --- tools/widl/client.c | 31 ++++++++++--------------------- tools/widl/header.c | 19 ------------------- tools/widl/server.c | 18 ------------------ 3 files changed, 10 insertions(+), 58 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index eb1ade2..b3f89a7 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -110,22 +110,11 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) { explicit_generic_handle_var = get_explicit_generic_handle_var(func); if (!explicit_generic_handle_var) - context_handle_var = get_context_handle_var(func); - } - if (explicit_handle) - { - if (!explicit_handle_var || !explicit_generic_handle_var || !context_handle_var) { - error("%s() does not define an explicit binding handle!\n", def->name); - return; - } - } - else if (implicit_handle) - { - if (explicit_handle_var) - { - error("%s() must not define a binding handle!\n", def->name); - return; + context_handle_var = get_context_handle_var(func); + if (!context_handle_var && explicit_handle) + /* FIXME: should use automatically added IDL_handle parameter */ + error("explicit_handle attribute specified and %s() does not define an explicit binding handle - not implemented yet\n", def->name); } } @@ -196,12 +185,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) fprintf(client, ");\n\n"); } - if (implicit_handle) - { - print_client("_Handle = %s;\n", implicit_handle); - fprintf(client, "\n"); - } - else if (explicit_handle_var) + if (explicit_handle_var) { print_client("_Handle = %s;\n", explicit_handle_var->name); fprintf(client, "\n"); @@ -225,6 +209,11 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) indent--; fprintf(client, "\n"); } + else if (implicit_handle) + { + print_client("_Handle = %s;\n", implicit_handle); + fprintf(client, "\n"); + } write_remoting_arguments(client, indent, func, PASS_IN, PHASE_BUFFERSIZE); diff --git a/tools/widl/header.c b/tools/widl/header.c index dcc3480..8668ce9 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -896,31 +896,12 @@ static void write_function_proto(const type_t *iface, const func_t *fun, const c static void write_function_protos(const type_t *iface) { - const char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); - int explicit_handle = is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE); - const var_t* explicit_handle_var; const func_t *cur; int prefixes_differ = strcmp(prefix_client, prefix_server); if (!iface->funcs) return; LIST_FOR_EACH_ENTRY( cur, iface->funcs, const func_t, entry ) { - var_t *def = cur->def; - - /* check for a defined binding handle */ - explicit_handle_var = get_explicit_handle_var(cur); - if (explicit_handle) { - if (!explicit_handle_var) { - error("%s() does not define an explicit binding handle!\n", def->name); - return; - } - } else if (implicit_handle) { - if (explicit_handle_var) { - error("%s() must not define a binding handle!\n", def->name); - return; - } - } - if (prefixes_differ) { fprintf(header, "/* client prototype */\n"); write_function_proto(iface, cur, prefix_client); diff --git a/tools/widl/server.c b/tools/widl/server.c index 2efb712..bb16c54 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -50,8 +50,6 @@ static void print_server(const char *format, ...) static void write_function_stubs(type_t *iface, unsigned int *proc_offset) { - char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); - int explicit_handle = is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE); const func_t *func; const var_t *var; const var_t* explicit_handle_var; @@ -64,22 +62,6 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) /* check for a defined binding handle */ explicit_handle_var = get_explicit_handle_var(func); - if (explicit_handle) - { - if (!explicit_handle_var) - { - error("%s() does not define an explicit binding handle!\n", def->name); - return; - } - } - else if (implicit_handle) - { - if (explicit_handle_var) - { - error("%s() must not define a binding handle!\n", def->name); - return; - } - } fprintf(server, "void __RPC_STUB\n"); fprintf(server, "%s_", iface->name);

1 0

Rob Shearman : widl: Check that fields in structures and unions referenced by non-local functions can be marshalled and that their attributes are consistent .
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 15612e60fd20138baa0fe20c24ff3f2c447ad40f URL: http://source.winehq.org/git/wine.git/?a=commit;h=15612e60fd20138baa0fe20c2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 20 22:15:16 2008 +0100 widl: Check that fields in structures and unions referenced by non-local functions can be marshalled and that their attributes are consistent. --- tools/widl/parser.y | 95 +++++++++++++++++++++++++++++++++++++++++------- tools/widl/widltypes.h | 1 + 2 files changed, 82 insertions(+), 14 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index d4ba87a..4d04546 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1352,6 +1352,7 @@ static type_t *make_type(unsigned char type, type_t *ref) t->written = FALSE; t->user_types_registered = FALSE; t->tfswrite = FALSE; + t->checked = FALSE; t->typelib_idx = -1; return t; } @@ -2359,6 +2360,83 @@ static const attr_list_t *check_coclass_attrs(const char *name, const attr_list_ return attrs; } +static void check_remoting_fields(type_t *type); + +/* checks that properties common to fields and arguments are consistent */ +static void check_field_common(const char *container_type, + const char *container_name, const var_t *arg) +{ + type_t *type = arg->type; + int is_wire_marshal = 0; + int is_context_handle = 0; + + if (is_attr(arg->attrs, ATTR_LENGTHIS) && + (is_attr(arg->attrs, ATTR_STRING) || is_aliaschain_attr(arg->type, ATTR_STRING))) + error_loc_info(&arg->loc_info, + "string and length_is specified for argument %s are mutually exclusive attributes\n", + arg->name); + + /* get fundamental type for the argument */ + for (;;) + { + if (is_attr(type->attrs, ATTR_WIREMARSHAL)) + { + is_wire_marshal = 1; + break; + } + if (is_attr(type->attrs, ATTR_CONTEXTHANDLE)) + { + is_context_handle = 1; + break; + } + if (type->kind == TKIND_ALIAS) + type = type->orig; + else if (is_ptr(type) || is_array(type)) + type = type->ref; + else + break; + } + + if (type->type == 0 && !is_attr(arg->attrs, ATTR_IIDIS) && !is_wire_marshal && !is_context_handle) + error_loc_info(&arg->loc_info, "parameter \'%s\' of %s \'%s\' cannot derive from void *\n", arg->name, container_type, container_name); + else if (type->type == RPC_FC_FUNCTION) + error_loc_info(&arg->loc_info, "parameter \'%s\' of %s \'%s\' cannot be a function pointer\n", arg->name, container_type, container_name); + else if (!is_wire_marshal && (is_struct(type->type) || is_union(type->type))) + check_remoting_fields(type); +} + +static void check_remoting_fields(type_t *type) +{ + const char *container_type = NULL; + const var_t *field; + const var_list_t *fields = NULL; + + if (type->checked) + return; + + type->checked = TRUE; + + if (is_struct(type->type)) + { + fields = type->fields_or_args; + container_type = "structure"; + } + else if (is_union(type->type)) + { + if (type->type == RPC_FC_ENCAPSULATED_UNION) + { + const var_t *uv = LIST_ENTRY(list_tail(type->fields_or_args), const var_t, entry); + fields = uv->type->fields_or_args; + } + else + fields = type->fields_or_args; + container_type = "union"; + } + + if (fields) LIST_FOR_EACH_ENTRY( field, type->fields_or_args, const var_t, entry ) + if (field->type) check_field_common(container_type, type->name, field); +} + /* checks that arguments for a function make sense for marshalling and unmarshalling */ static void check_remoting_args(const func_t *func) { @@ -2369,22 +2447,14 @@ static void check_remoting_args(const func_t *func) { int ptr_level = 0; const type_t *type = arg->type; - int is_wire_marshal = 0; - int is_context_handle = 0; /* get pointer level and fundamental type for the argument */ for (;;) { - if (!is_wire_marshal && is_attr(type->attrs, ATTR_WIREMARSHAL)) - { - is_wire_marshal = 1; + if (is_attr(type->attrs, ATTR_WIREMARSHAL)) break; - } - if (!is_context_handle && is_attr(type->attrs, ATTR_CONTEXTHANDLE)) - { - is_context_handle = 1; + if (is_attr(type->attrs, ATTR_CONTEXTHANDLE)) break; - } if (type->kind == TKIND_ALIAS) type = type->orig; else if (is_ptr(type)) @@ -2408,10 +2478,7 @@ static void check_remoting_args(const func_t *func) } } - if (type->type == 0 && !is_attr(arg->attrs, ATTR_IIDIS) && !is_wire_marshal && !is_context_handle) - error_loc_info(&arg->loc_info, "parameter \'%s\' of function \'%s\' cannot derive from void *\n", arg->name, funcname); - else if (type->type == RPC_FC_FUNCTION) - error_loc_info(&arg->loc_info, "parameter \'%s\' of function \'%s\' cannot be a function pointer\n", arg->name, funcname); + check_field_common("function", funcname, arg); } } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 89d593a..dfae4dd 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -239,6 +239,7 @@ struct _type_t { unsigned int written : 1; unsigned int user_types_registered : 1; unsigned int tfswrite : 1; /* if the type needs to be written to the TFS */ + unsigned int checked : 1; int sign : 2; };

1 0

Rob Shearman : widl: Stop looping in check_remoting_args when a context_handle or wire_marshal type is found as they are in effect fundamental types .
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 6e27e7840f49253f068fb175faf25e42a949ad77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e27e7840f49253f068fb175f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 20 22:15:06 2008 +0100 widl: Stop looping in check_remoting_args when a context_handle or wire_marshal type is found as they are in effect fundamental types. --- tools/widl/parser.y | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 45471bb..d4ba87a 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2376,9 +2376,15 @@ static void check_remoting_args(const func_t *func) for (;;) { if (!is_wire_marshal && is_attr(type->attrs, ATTR_WIREMARSHAL)) + { is_wire_marshal = 1; + break; + } if (!is_context_handle && is_attr(type->attrs, ATTR_CONTEXTHANDLE)) + { is_context_handle = 1; + break; + } if (type->kind == TKIND_ALIAS) type = type->orig; else if (is_ptr(type))

1 0

James Hawkins : shdocvw: Fix a test that fails on all platforms.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 03599dbab6e7ee8fc13a340cfa24bc0b25ed2091 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03599dbab6e7ee8fc13a340cf… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Apr 20 20:59:51 2008 -0500 shdocvw: Fix a test that fails on all platforms. --- dlls/shdocvw/tests/shortcut.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/tests/shortcut.c b/dlls/shdocvw/tests/shortcut.c index 202a331..5a740dc 100644 --- a/dlls/shdocvw/tests/shortcut.c +++ b/dlls/shdocvw/tests/shortcut.c @@ -179,12 +179,18 @@ static void test_ShortcutFolder(void) { /* Convert the wszWineTestFolder string to an ITEMIDLIST. */ hr = IShellFolder_ParseDisplayName(pDesktopFolder, NULL, NULL, wszWineTestFolder, NULL, &pidlWineTestFolder, NULL); - ok (SUCCEEDED(hr), "IShellFolder::ParseDisplayName failed! hr = %08x\n", hr); + todo_wine + { + ok (hr == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), + "Expected %08x, got %08x\n", HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER), hr); + } if (FAILED(hr)) { IShellFolder_Release(pDesktopFolder); goto cleanup; } + /* FIXME: these tests are never run */ + /* Bind to a WineTest folder object. There has to be some support for this in shdocvw.dll. * This isn't implemented in wine yet.*/ hr = IShellFolder_BindToObject(pDesktopFolder, pidlWineTestFolder, NULL, &IID_IShellFolder,

1 0

James Hawkins : msi: Fix a few tests that fail in win9x.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: a5d15b3b609625ba3b55573d256a6a0f31611b46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d15b3b609625ba3b55573d2… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Apr 20 03:07:15 2008 -0500 msi: Fix a few tests that fail in win9x. --- dlls/msi/tests/install.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index a85cdd4..fac57c3 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1956,8 +1956,9 @@ static void test_concurrentinstall(void) r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + if (!delete_pf("msitest\\augustus", TRUE)) + trace("concurrent installs not supported\n"); ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n"); DeleteFile(path); @@ -1978,6 +1979,10 @@ static void test_concurrentinstall(void) static void test_setpropertyfolder(void) { UINT r; + CHAR path[MAX_PATH]; + + lstrcpyA(path, PROG_FILES_DIR); + lstrcatA(path, "\\msitest\\added"); CreateDirectoryA("msitest", NULL); create_file("msitest\\maximus", 500); @@ -1988,9 +1993,18 @@ static void test_setpropertyfolder(void) r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\added\\maximus", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\added", FALSE), "File not installed\n"); - ok(delete_pf("msitest", FALSE), "File not installed\n"); + if (GetFileAttributesA(path) == FILE_ATTRIBUTE_DIRECTORY) + { + ok(delete_pf("msitest\\added\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\added", FALSE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + } + else + { + trace("changing folder property not supported\n"); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + } /* Delete the files in the temp (current) folder */ DeleteFile(msifile);

1 0

James Hawkins : advapi32: Fix a test that fails in win2k3.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: d3bbc0231a9a90fa0f29ca1569aaeab5de160555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3bbc0231a9a90fa0f29ca156… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Apr 20 03:00:42 2008 -0500 advapi32: Fix a test that fails in win2k3. --- dlls/advapi32/tests/registry.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 5d86d9b..e027a97 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -786,9 +786,13 @@ static void test_get_value(void) ret = pRegGetValueA(hkey_main, NULL, "TP1_ZB_SZ", RRF_RT_REG_SZ, &type, buf, &size); ok(ret == ERROR_SUCCESS, "ret=%d\n", ret); /* v5.2.3790.1830 (2003 SP1) returns sTestpath1 length + 2 here. */ - ok(size == 0, "size=%d\n", size); + ok(size == 0 || + size == 1, /* win2k3 */ + "size=%d\n", size); ok(type == REG_SZ, "type=%d\n", type); - ok(!strcmp(sTestpath1, buf), "sTestpath=\"%s\" buf=\"%s\"\n", sTestpath1, buf); + ok(!strcmp(sTestpath1, buf) || + !strcmp(buf, ""), + "Expected \"%s\" or \"\", got \"%s\"\n", sTestpath1, buf); /* Query REG_SZ using RRF_RT_REG_SZ|RRF_NOEXPAND (ok) */ buf[0] = 0; type = 0xdeadbeef; size = sizeof(buf);

1 0

James Hawkins : kernel32: Fix a test that fails in win9x.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 99949cb21a3c2ee413cfb6eb9002209fecb5e88c URL: http://source.winehq.org/git/wine.git/?a=commit;h=99949cb21a3c2ee413cfb6eb9… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Apr 20 15:33:27 2008 -0500 kernel32: Fix a test that fails in win9x. --- dlls/kernel32/tests/atom.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/atom.c b/dlls/kernel32/tests/atom.c index 2977416..fcf60e2 100644 --- a/dlls/kernel32/tests/atom.c +++ b/dlls/kernel32/tests/atom.c @@ -222,7 +222,9 @@ static void test_get_atom_name(void) memset( buf, '.', sizeof(buf) ); len = GlobalGetAtomNameA( atom, buf, 6 ); - ok( len == 0, "bad length %d\n", len ); + ok( len == 0 || + len == 5, /* win9x */ + "bad length %d\n", len ); ok( !memcmp( buf, "fooba\0....", 10 ), "bad buffer contents\n"); if (unicode_OS) {

1 0

James Hawkins : kernel32: Fix two tests that fail in win9x.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 603822ca8bacb75bf69caffce0ce375c4a0893a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=603822ca8bacb75bf69caffce… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Apr 20 15:40:25 2008 -0500 kernel32: Fix two tests that fail in win9x. --- dlls/kernel32/tests/change.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 7c90ccd..cdba120 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -98,7 +98,9 @@ static void test_FindFirstChangeNotification(void) /* pathetic checks */ change = FindFirstChangeNotificationA("not-a-file", FALSE, FILE_NOTIFY_CHANGE_FILE_NAME); - ok(change == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND, + ok(change == INVALID_HANDLE_VALUE, "Expected INVALID_HANDLE_VALUE, got %p\n", change); + ok(GetLastError() == ERROR_FILE_NOT_FOUND || + GetLastError() == ERROR_NO_MORE_FILES, /* win95 */ "FindFirstChangeNotification error: %d\n", GetLastError()); if (0) /* This documents win2k behavior. It crashes on win98. */ @@ -152,17 +154,15 @@ static void test_FindFirstChangeNotification(void) thread = StartNotificationThread(dirname1, FALSE, FILE_NOTIFY_CHANGE_DIR_NAME); ret = MoveFileA(dirname1, dirname2); ok(ret, "MoveFileA error: %d\n", GetLastError()); - ret = FinishNotificationThread(thread); - ok(!ret, "Unexpected notification\n"); + /* win9x and win2k behave differently here, don't check result */ + FinishNotificationThread(thread); /* What if we remove the directory we registered notification for? */ thread = StartNotificationThread(dirname2, FALSE, FILE_NOTIFY_CHANGE_DIR_NAME); ret = RemoveDirectoryA(dirname2); ok(ret, "RemoveDirectoryA error: %d\n", GetLastError()); - - /* win98 and win2k behave differently here */ - ret = FinishNotificationThread(thread); - ok(ret || !ret, "You'll never read this\n"); + /* win9x and win2k behave differently here, don't check result */ + FinishNotificationThread(thread); /* functional checks */

1 0

James Hawkins : imm32: Fix a test that fails on all systems.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 8422c98df76c6e1eff26037df69d28b4ae084b49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8422c98df76c6e1eff26037df… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Apr 20 20:49:44 2008 -0500 imm32: Fix a test that fails on all systems. --- dlls/imm32/tests/imm32.c | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index d948f54..a5d09ca 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -177,12 +177,16 @@ static int test_ImmNotifyIME(void) { static const char string[] = "wine"; char resstr[16] = ""; HIMC imc; + BOOL ret; imc = ImmGetContext(hwnd); msg_spy_flush_msgs(); - ok(ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0), "Canceling an " - "empty composition string succeeds.\n"); + todo_wine + { + ok(!ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0), "Canceling an " + "empty composition string should fail.\n"); + } ok(!msg_spy_find_msg(WM_IME_COMPOSITION), "Windows does not post " "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " "the composition string being canceled is empty.\n"); @@ -191,16 +195,24 @@ static int test_ImmNotifyIME(void) { ImmSetCompositionString(imc, SCS_SETSTR, string, sizeof(string), NULL, 0); ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0); - ok(msg_spy_find_msg(WM_IME_COMPOSITION) != NULL, "Windows does post " - "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " - "the composition string being canceled is non empty.\n"); - ok(!ImmGetCompositionString(imc, GCS_COMPSTR, resstr, sizeof(resstr)), - "After being canceled the composition string is empty.\n"); + todo_wine + { + ok(!msg_spy_find_msg(WM_IME_COMPOSITION), "Windows does not post " + "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " + "the composition string being canceled is non empty.\n"); + } + + /* behavior differs between win9x and NT */ + ret = ImmGetCompositionString(imc, GCS_COMPSTR, resstr, sizeof(resstr)); + ok(ret || !ret, "You'll never read this.\n"); msg_spy_flush_msgs(); - ok(ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0), "Canceling an " - "empty composition string succeeds.\n"); + todo_wine + { + ok(!ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0), "Canceling an " + "empty composition string should fail.\n"); + } ok(!msg_spy_find_msg(WM_IME_COMPOSITION), "Windows does not post " "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " "the composition string being canceled is empty.\n");

1 0

James Hawkins : inetcomm: Fix a test that fails on all systems.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: b8ffcbc35b30d320a4f096ba5c105f0cc0632e96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8ffcbc35b30d320a4f096ba5… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat Apr 19 22:06:10 2008 -0500 inetcomm: Fix a test that fails on all systems. --- dlls/inetcomm/tests/mimeole.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index d286b74..bfa721e 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -216,7 +216,6 @@ static void test_CreateMessage(void) ULONG count; FINDBODY find_struct; HCHARSET hcs; - INETCSETINFO csi; char text[] = "text"; HBODY *body_list; @@ -274,7 +273,10 @@ static void test_CreateMessage(void) hr = IMimeBody_GetCharset(body, &hcs); ok(hr == S_OK, "ret %08x\n", hr); - ok(hcs == NULL, "ret %p\n", hcs); + todo_wine + { + ok(hcs != NULL, "Expected non-NULL charset\n"); + } IMimeBody_Release(body); @@ -309,9 +311,10 @@ static void test_CreateMessage(void) hr = IMimeMessage_GetCharset(body, &hcs); ok(hr == S_OK, "ret %08x\n", hr); - ok(hcs == NULL, "ret %p\n", hcs); - hr = MimeOleGetCharsetInfo(hcs, &csi); - ok(hr == E_INVALIDARG, "ret %08x\n", hr); + todo_wine + { + ok(hcs != NULL, "Expected non-NULL charset\n"); + } IMimeMessage_Release(msg);

1 0

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 April 2008