February 2007 - Wine-commits

H. Verbeet : wined3d: Add WINED3DDECLUSAGE, use it.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: 8f0884066f1d61c0268fc62269d2f3cbc4e35ff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f0884066f1d61c0268fc6226… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Feb 13 23:12:14 2007 +0100 wined3d: Add WINED3DDECLUSAGE, use it. --- dlls/wined3d/baseshader.c | 28 ++++++++++++++-------------- dlls/wined3d/drawprim.c | 36 ++++++++++++++++++------------------ dlls/wined3d/glsl_shader.c | 18 +++++++++--------- dlls/wined3d/utils.c | 28 ++++++++++++++-------------- dlls/wined3d/vertexdeclaration.c | 34 +++++++++++++++++----------------- include/wine/wined3d_types.h | 17 +++++++++++++++++ 6 files changed, 89 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8f0884066f1d61c0268fc…

1 0

Alexandre Julliard : cabinet: Fixed fd leak in case of error.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: a71a22c579282dfc2e95dff07428c22f6891e774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a71a22c579282dfc2e95dff07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 14 13:12:32 2007 +0100 cabinet: Fixed fd leak in case of error. --- dlls/cabinet/fdi.c | 5 ++++- dlls/msi/tests/install.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 8e8120d..93b0ad2 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2446,7 +2446,7 @@ BOOL __cdecl FDICopy( { FDICABINETINFO fdici; FDINOTIFICATION fdin; - int cabhf, filehf, idx; + int cabhf, filehf = 0, idx; unsigned int i; char fullpath[MAX_PATH]; size_t pathlen, filenamelen; @@ -2826,6 +2826,7 @@ BOOL __cdecl FDICopy( fdin.time = file->time; fdin.attribs = file->attribs; /* FIXME: filter _A_EXEC? */ ((*pfnfdin)(fdintCLOSE_FILE_INFO, &fdin)); + filehf = 0; switch (err) { case DECR_OK: @@ -2914,6 +2915,8 @@ BOOL __cdecl FDICopy( break; } + if (filehf) PFDI_CLOSE(hfdi, filehf); + while (decomp_state) { fdi_decomp_state *prev_fds; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index d460c40..3bea451 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1111,10 +1111,10 @@ static void test_uiLevelFlags(void) todo_wine { ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); } - delete_pf("msitest", FALSE); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); delete_cab_files(); DeleteFile(msifile);

1 0

H. Verbeet : wined3d: Don't use WINED3DSHADERDECLUSAGE_PSIZE / WINED3DSHADERDECLUSAGE_FOG.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: 2d9540cab765833e3c8ef258191bc3ee565f5189 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d9540cab765833e3c8ef2581… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Feb 13 23:12:05 2007 +0100 wined3d: Don't use WINED3DSHADERDECLUSAGE_PSIZE / WINED3DSHADERDECLUSAGE_FOG. --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d95391e..87894d9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1962,11 +1962,11 @@ void vshader_glsl_output_unpack( usage_idx, reg_mask, i, reg_mask); break; - case WINED3DSHADERDECLUSAGE_PSIZE: + case D3DDECLUSAGE_PSIZE: shader_addline(buffer, "gl_PointSize = OUT%u.x;\n", i); break; - case WINED3DSHADERDECLUSAGE_FOG: + case D3DDECLUSAGE_FOG: shader_addline(buffer, "gl_FogFragCoord%s = OUT%u%s;\n", reg_mask, i, reg_mask); break;

1 0

Damjan Jovanovic : msvcrt: Added declarations for functions and structures related to stat64.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: cbb6da2d70fa41eee3af65aef151935bb218c19d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbb6da2d70fa41eee3af65aef… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Feb 14 12:24:27 2007 +0200 msvcrt: Added declarations for functions and structures related to stat64. --- dlls/msvcrt/msvcrt.h | 15 +++++++++++++++ include/msvcrt/sys/stat.h | 17 +++++++++++++++++ include/msvcrt/sys/types.h | 5 +++++ include/msvcrt/wchar.h | 20 ++++++++++++++++++++ 4 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 83a27fd..c0bebba 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -59,6 +59,7 @@ typedef unsigned int MSVCRT__dev_t; typedef int MSVCRT__off_t; typedef long MSVCRT_clock_t; typedef long MSVCRT_time_t; +typedef __int64 MSVCRT___time64_t; typedef __int64 MSVCRT_fpos_t; typedef void (*MSVCRT_terminate_handler)(void); @@ -372,6 +373,20 @@ struct MSVCRT__stati64 { MSVCRT_time_t st_ctime; }; +struct MSVCRT__stat64 { + MSVCRT__dev_t st_dev; + MSVCRT__ino_t st_ino; + unsigned short st_mode; + short st_nlink; + short st_uid; + short st_gid; + MSVCRT__dev_t st_rdev; + __int64 DECLSPEC_ALIGN(8) st_size; + MSVCRT___time64_t st_atime; + MSVCRT___time64_t st_mtime; + MSVCRT___time64_t st_ctime; +}; + #define MSVCRT_WEOF (MSVCRT_wint_t)(0xFFFF) #define MSVCRT_EOF (-1) #define MSVCRT_TMP_MAX 0x7fff diff --git a/include/msvcrt/sys/stat.h b/include/msvcrt/sys/stat.h index c8b1888..dcedcd5 100644 --- a/include/msvcrt/sys/stat.h +++ b/include/msvcrt/sys/stat.h @@ -114,6 +114,20 @@ struct _stati64 { time_t st_mtime; time_t st_ctime; }; + +struct _stat64 { + _dev_t st_dev; + _ino_t st_ino; + unsigned short st_mode; + short st_nlink; + short st_uid; + short st_gid; + _dev_t st_rdev; + __int64 DECLSPEC_ALIGN(8) st_size; + __time64_t st_atime; + __time64_t st_mtime; + __time64_t st_ctime; +}; #endif /* _STAT_DEFINED */ #ifdef __cplusplus @@ -124,12 +138,15 @@ int _fstat(int,struct _stat*); int _stat(const char*,struct _stat*); int _fstati64(int,struct _stati64*); int _stati64(const char*,struct _stati64*); +int _fstat64(int,struct _stat64*); +int _stat64(const char*,struct _stat64*); int _umask(int); #ifndef _WSTAT_DEFINED #define _WSTAT_DEFINED int _wstat(const wchar_t*,struct _stat*); int _wstati64(const wchar_t*,struct _stati64*); +int _wstat64(const wchar_t*,struct _stat64*); #endif /* _WSTAT_DEFINED */ #ifdef __cplusplus diff --git a/include/msvcrt/sys/types.h b/include/msvcrt/sys/types.h index 53d5c6b..05a5ef1 100644 --- a/include/msvcrt/sys/types.h +++ b/include/msvcrt/sys/types.h @@ -56,6 +56,11 @@ typedef long time_t; #define _TIME_T_DEFINED #endif +#ifndef _TIME64_T_DEFINED +#define _TIME64_T_DEFINED +typedef __int64 __time64_t; +#endif + #ifndef _BSDTYPES_DEFINED typedef unsigned char u_char; typedef unsigned short u_short; diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 03bf7cc..48aa311 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -99,6 +99,11 @@ typedef long time_t; #define _TIME_T_DEFINED #endif +#ifndef _TIME64_T_DEFINED +#define _TIME64_T_DEFINED +typedef __int64 __time64_t; +#endif + #ifndef _TM_DEFINED #define _TM_DEFINED struct tm { @@ -196,6 +201,20 @@ struct _stati64 { time_t st_mtime; time_t st_ctime; }; + +struct _stat64 { + _dev_t st_dev; + _ino_t st_ino; + unsigned short st_mode; + short st_nlink; + short st_uid; + short st_gid; + _dev_t st_rdev; + __int64 DECLSPEC_ALIGN(8) st_size; + __time64_t st_atime; + __time64_t st_mtime; + __time64_t st_ctime; +}; #endif /* _STAT_DEFINED */ /* ASCII char classification table - binary compatible */ @@ -286,6 +305,7 @@ int _wsystem(const wchar_t*); #define _WSTAT_DEFINED int _wstat(const wchar_t*,struct _stat*); int _wstati64(const wchar_t*,struct _stati64*); +int _wstat64(const wchar_t*,struct _stat64*); #endif /* _WSTAT_DEFINED */ #ifndef _WSTDIO_DEFINED

1 0

Damjan Jovanovic : msvcrt: Implemented stat64, wstat64 and fstat64.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: 7ecc283bd9b6713e84f2d5b314d1173b841ddbd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ecc283bd9b6713e84f2d5b31… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Feb 14 12:26:42 2007 +0200 msvcrt: Implemented stat64, wstat64 and fstat64. Change all other variations of stat use the stat64 family, since it is the most general. --- dlls/msvcrt/file.c | 123 +++++++++++++++++++++++++++++++------------ dlls/msvcrt/msvcrt.spec | 5 +- dlls/msvcrt/tests/headers.c | 13 +++++ 3 files changed, 106 insertions(+), 35 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 952f64c..b55d600 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -111,19 +111,34 @@ static CRITICAL_SECTION MSVCRT_file_cs; #define LOCK_FILES() do { EnterCriticalSection(&MSVCRT_file_cs); } while (0) #define UNLOCK_FILES() do { LeaveCriticalSection(&MSVCRT_file_cs); } while (0) -static void msvcrt_cp_from_stati64(const struct MSVCRT__stati64 *bufi64, struct MSVCRT__stat *buf) -{ - buf->st_dev = bufi64->st_dev; - buf->st_ino = bufi64->st_ino; - buf->st_mode = bufi64->st_mode; - buf->st_nlink = bufi64->st_nlink; - buf->st_uid = bufi64->st_uid; - buf->st_gid = bufi64->st_gid; - buf->st_rdev = bufi64->st_rdev; - buf->st_size = bufi64->st_size; - buf->st_atime = bufi64->st_atime; - buf->st_mtime = bufi64->st_mtime; - buf->st_ctime = bufi64->st_ctime; +static void msvcrt_stat64_to_stat(const struct MSVCRT__stat64 *buf64, struct MSVCRT__stat *buf) +{ + buf->st_dev = buf64->st_dev; + buf->st_ino = buf64->st_ino; + buf->st_mode = buf64->st_mode; + buf->st_nlink = buf64->st_nlink; + buf->st_uid = buf64->st_uid; + buf->st_gid = buf64->st_gid; + buf->st_rdev = buf64->st_rdev; + buf->st_size = buf64->st_size; + buf->st_atime = buf64->st_atime; + buf->st_mtime = buf64->st_mtime; + buf->st_ctime = buf64->st_ctime; +} + +static void msvcrt_stat64_to_stati64(const struct MSVCRT__stat64 *buf64, struct MSVCRT__stati64 *buf) +{ + buf->st_dev = buf64->st_dev; + buf->st_ino = buf64->st_ino; + buf->st_mode = buf64->st_mode; + buf->st_nlink = buf64->st_nlink; + buf->st_uid = buf64->st_uid; + buf->st_gid = buf64->st_gid; + buf->st_rdev = buf64->st_rdev; + buf->st_size = buf64->st_size; + buf->st_atime = buf64->st_atime; + buf->st_mtime = buf64->st_mtime; + buf->st_ctime = buf64->st_ctime; } static inline BOOL msvcrt_is_valid_fd(int fd) @@ -1106,9 +1121,9 @@ int CDECL MSVCRT__fileno(MSVCRT_FILE* file) } /********************************************************************* - * _fstati64 (MSVCRT.@) + * _fstat64 (MSVCRT.@) */ -int CDECL MSVCRT__fstati64(int fd, struct MSVCRT__stati64* buf) +int CDECL MSVCRT__fstat64(int fd, struct MSVCRT__stat64* buf) { DWORD dw; BY_HANDLE_FILE_INFORMATION hfi; @@ -1126,7 +1141,7 @@ int CDECL MSVCRT__fstati64(int fd, struct MSVCRT__stati64* buf) } memset(&hfi, 0, sizeof(hfi)); - memset(buf, 0, sizeof(struct MSVCRT__stati64)); + memset(buf, 0, sizeof(struct MSVCRT__stat64)); if (!GetFileInformationByHandle(hand, &hfi)) { WARN(":failed-last error (%d)\n",GetLastError()); @@ -1156,15 +1171,29 @@ int CDECL MSVCRT__fstati64(int fd, struct MSVCRT__stati64* buf) } /********************************************************************* + * _fstati64 (MSVCRT.@) + */ +int CDECL MSVCRT__fstati64(int fd, struct MSVCRT__stati64* buf) +{ + int ret; + struct MSVCRT__stat64 buf64; + + ret = MSVCRT__fstat64(fd, &buf64); + if (!ret) + msvcrt_stat64_to_stati64(&buf64, buf); + return ret; +} + +/********************************************************************* * _fstat (MSVCRT.@) */ int CDECL MSVCRT__fstat(int fd, struct MSVCRT__stat* buf) { int ret; - struct MSVCRT__stati64 bufi64; + struct MSVCRT__stat64 buf64; - ret = MSVCRT__fstati64(fd, &bufi64); + ret = MSVCRT__fstat64(fd, &buf64); if (!ret) - msvcrt_cp_from_stati64(&bufi64, buf); + msvcrt_stat64_to_stat(&buf64, buf); return ret; } @@ -1692,9 +1721,9 @@ int CDECL _setmode(int fd,int mode) } /********************************************************************* - * _stati64 (MSVCRT.@) + * _stat64 (MSVCRT.@) */ -int CDECL MSVCRT__stati64(const char* path, struct MSVCRT__stati64 * buf) +int CDECL MSVCRT__stat64(const char* path, struct MSVCRT__stat64 * buf) { DWORD dw; WIN32_FILE_ATTRIBUTE_DATA hfi; @@ -1710,7 +1739,7 @@ int CDECL MSVCRT__stati64(const char* path, struct MSVCRT__stati64 * buf) return -1; } - memset(buf,0,sizeof(struct MSVCRT__stati64)); + memset(buf,0,sizeof(struct MSVCRT__stat64)); /* FIXME: rdev isn't drive num, despite what the docs say-what is it? Bon 011120: This FIXME seems incorrect @@ -1753,27 +1782,41 @@ int CDECL MSVCRT__stati64(const char* path, struct MSVCRT__stati64 * buf) buf->st_mtime = buf->st_ctime = dw; TRACE("%d %d 0x%08lx%08lx %ld %ld %ld\n", buf->st_mode,buf->st_nlink, (long)(buf->st_size >> 32),(long)buf->st_size, - buf->st_atime,buf->st_mtime, buf->st_ctime); + (long)buf->st_atime,(long)buf->st_mtime,(long)buf->st_ctime); return 0; } /********************************************************************* + * _stati64 (MSVCRT.@) + */ +int CDECL MSVCRT__stati64(const char* path, struct MSVCRT__stati64 * buf) +{ + int ret; + struct MSVCRT__stat64 buf64; + + ret = MSVCRT__stat64(path, &buf64); + if (!ret) + msvcrt_stat64_to_stati64(&buf64, buf); + return ret; +} + +/********************************************************************* * _stat (MSVCRT.@) */ int CDECL MSVCRT__stat(const char* path, struct MSVCRT__stat * buf) { int ret; - struct MSVCRT__stati64 bufi64; + struct MSVCRT__stat64 buf64; - ret = MSVCRT__stati64( path, &bufi64); + ret = MSVCRT__stat64( path, &buf64); if (!ret) - msvcrt_cp_from_stati64(&bufi64, buf); + msvcrt_stat64_to_stat(&buf64, buf); return ret; } /********************************************************************* - * _wstati64 (MSVCRT.@) + * _wstat64 (MSVCRT.@) */ -int CDECL MSVCRT__wstati64(const MSVCRT_wchar_t* path, struct MSVCRT__stati64 * buf) +int CDECL MSVCRT__wstat64(const MSVCRT_wchar_t* path, struct MSVCRT__stat64 * buf) { DWORD dw; WIN32_FILE_ATTRIBUTE_DATA hfi; @@ -1789,7 +1832,7 @@ int CDECL MSVCRT__wstati64(const MSVCRT_wchar_t* path, struct MSVCRT__stati64 * return -1; } - memset(buf,0,sizeof(struct MSVCRT__stat)); + memset(buf,0,sizeof(struct MSVCRT__stat64)); /* FIXME: rdev isn't drive num, despite what the docs says-what is it? */ if (MSVCRT_iswalpha(*path)) @@ -1828,20 +1871,34 @@ int CDECL MSVCRT__wstati64(const MSVCRT_wchar_t* path, struct MSVCRT__stati64 * buf->st_mtime = buf->st_ctime = dw; TRACE("%d %d 0x%08lx%08lx %ld %ld %ld\n", buf->st_mode,buf->st_nlink, (long)(buf->st_size >> 32),(long)buf->st_size, - buf->st_atime,buf->st_mtime, buf->st_ctime); + (long)buf->st_atime,(long)buf->st_mtime,(long)buf->st_ctime); return 0; } /********************************************************************* + * _wstati64 (MSVCRT.@) + */ +int CDECL MSVCRT__wstati64(const MSVCRT_wchar_t* path, struct MSVCRT__stati64 * buf) +{ + int ret; + struct MSVCRT__stat64 buf64; + + ret = MSVCRT__wstat64(path, &buf64); + if (!ret) + msvcrt_stat64_to_stati64(&buf64, buf); + return ret; +} + +/********************************************************************* * _wstat (MSVCRT.@) */ int CDECL MSVCRT__wstat(const MSVCRT_wchar_t* path, struct MSVCRT__stat * buf) { int ret; - struct MSVCRT__stati64 bufi64; + struct MSVCRT__stat64 buf64; - ret = MSVCRT__wstati64( path, &bufi64 ); - if (!ret) msvcrt_cp_from_stati64(&bufi64, buf); + ret = MSVCRT__wstat64( path, &buf64 ); + if (!ret) msvcrt_stat64_to_stat(&buf64, buf); return ret; } diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 8c5b88e..3ea7803 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -243,7 +243,7 @@ @ cdecl _fputwchar(long) @ cdecl _fsopen(str str long) MSVCRT__fsopen @ cdecl _fstat(long ptr) MSVCRT__fstat -@ stub _fstat64 +@ cdecl _fstat64(long ptr) MSVCRT__fstat64 @ cdecl _fstati64(long ptr) MSVCRT__fstati64 @ cdecl _ftime(ptr) @ cdecl -ret64 _ftol() ntdll._ftol @@ -451,7 +451,7 @@ @ cdecl _spawnvpe(long str ptr ptr) @ cdecl _splitpath(str ptr ptr ptr ptr) ntdll._splitpath @ cdecl _stat(str ptr) MSVCRT__stat -@ stub _stat64 +@ cdecl _stat64(str ptr) MSVCRT__stat64 @ cdecl _stati64(str ptr) MSVCRT__stati64 @ cdecl _statusfp() @ cdecl _strcmpi(str str) ntdll._strcmpi @@ -560,6 +560,7 @@ @ cdecl _wsplitpath(wstr wstr wstr wstr wstr) @ cdecl _wstat(wstr ptr) MSVCRT__wstat @ cdecl _wstati64(wstr ptr) MSVCRT__wstati64 +@ cdecl _wstat64(wstr ptr) MSVCRT__wstat64 @ cdecl _wstrdate(ptr) @ cdecl _wstrtime(ptr) @ stub _wsystem #(wstr) diff --git a/dlls/msvcrt/tests/headers.c b/dlls/msvcrt/tests/headers.c index d5efa86..d7c7cd7 100644 --- a/dlls/msvcrt/tests/headers.c +++ b/dlls/msvcrt/tests/headers.c @@ -88,6 +88,7 @@ static void test_types(void) CHECK_TYPE(_off_t); CHECK_TYPE(clock_t); CHECK_TYPE(time_t); + CHECK_TYPE(__time64_t); CHECK_TYPE(fpos_t); CHECK_SIZE(FILE); CHECK_TYPE(terminate_handler); @@ -295,6 +296,18 @@ static void test_structs(void) CHECK_FIELD(_stati64, st_atime); CHECK_FIELD(_stati64, st_mtime); CHECK_FIELD(_stati64, st_ctime); + CHECK_STRUCT(_stat64); + CHECK_FIELD(_stat64, st_dev); + CHECK_FIELD(_stat64, st_ino); + CHECK_FIELD(_stat64, st_mode); + CHECK_FIELD(_stat64, st_nlink); + CHECK_FIELD(_stat64, st_uid); + CHECK_FIELD(_stat64, st_gid); + CHECK_FIELD(_stat64, st_rdev); + CHECK_FIELD(_stat64, st_size); + CHECK_FIELD(_stat64, st_atime); + CHECK_FIELD(_stat64, st_mtime); + CHECK_FIELD(_stat64, st_ctime); } /************* Checking defines ***************/

1 0

Chris Robinson : quartz: Loop through the rest of the possible filters even when a connection fails .
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: 2250c2898f2ee392fdeb58342ccbe12f8fec3b6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2250c2898f2ee392fdeb58342… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Feb 13 14:32:34 2007 -0800 quartz: Loop through the rest of the possible filters even when a connection fails. --- dlls/quartz/filtergraph.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index ab31cd4..ebda643 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1061,7 +1061,7 @@ static HRESULT WINAPI GraphBuilder_RenderFile(IGraphBuilder *iface, IBaseFilter_Release(ppinsplitter); ppinsplitter = NULL; TRACE("Cannot connect to filter (%x), trying next one\n", hr); - break; + continue; } TRACE("Successfully connected to filter\n"); break;

1 0

Alexandre Julliard : gdi32: Fixed typo in AngleArc.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: 6f7f2bf882444cf829c3617a17dd17d3600a4770 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f7f2bf882444cf829c3617a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 14 12:30:43 2007 +0100 gdi32: Fixed typo in AngleArc. --- dlls/gdi32/painting.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 09b1432..ba7f451 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -805,7 +805,7 @@ BOOL WINAPI AngleArc(HDC hdc, INT x, INT y, DWORD dwRadius, FLOAT eStartAngle, F x1 = x + cos(eStartAngle*M_PI/180) * dwRadius; y1 = y - sin(eStartAngle*M_PI/180) * dwRadius; x2 = x + cos((eStartAngle+eSweepAngle)*M_PI/180) * dwRadius; - y2 = x - sin((eStartAngle+eSweepAngle)*M_PI/180) * dwRadius; + y2 = y - sin((eStartAngle+eSweepAngle)*M_PI/180) * dwRadius; LineTo( hdc, x1, y1 ); if( eSweepAngle >= 0 )

1 0

Chris Robinson : quartz: Properly handle input parameters in FileSource_GetCurFile.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: 0885141c64529759a30b15de8934d88739a362e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0885141c64529759a30b15de8… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Feb 13 14:28:02 2007 -0800 quartz: Properly handle input parameters in FileSource_GetCurFile. --- dlls/quartz/filesource.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 786252f..691413d 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -637,6 +637,9 @@ static HRESULT WINAPI FileSource_GetCurFile(IFileSourceFilter * iface, LPOLESTR TRACE("(%p, %p)\n", ppszFileName, pmt); + if (!ppszFileName) + return E_POINTER; + /* copy file name & media type if available, otherwise clear the outputs */ if (This->pszFileName) { @@ -646,12 +649,13 @@ static HRESULT WINAPI FileSource_GetCurFile(IFileSourceFilter * iface, LPOLESTR else *ppszFileName = NULL; - if (This->pmt) + if (pmt) { - CopyMediaType(pmt, This->pmt); + if (This->pmt) + CopyMediaType(pmt, This->pmt); + else + ZeroMemory(pmt, sizeof(*pmt)); } - else - ZeroMemory(pmt, sizeof(*pmt)); return S_OK; }

1 0

Chris Robinson : quartz: Remove 1GB AVI size limitation.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: 134d8a026a3b7d05f92223009ab95023c73101f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=134d8a026a3b7d05f92223009… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Feb 13 14:37:52 2007 -0800 quartz: Remove 1GB AVI size limitation. --- dlls/quartz/avisplit.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 68a91ff..e90035d 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -482,11 +482,6 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin) ERR("Input stream not a RIFF file\n"); return E_FAIL; } - if (list.cb > 1 * 1024 * 1024 * 1024) /* cannot be more than 1Gb in size */ - { - ERR("Input stream violates RIFF spec\n"); - return E_FAIL; - } if (list.fccListType != ckidAVI) { ERR("Input stream not an AVI RIFF file\n");

1 0

Chris Robinson : wine.inf: Add quartz. dll to the list of installed fake DLLs.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: 2d592427e5263e8b0364a5c999a036f42f8b4188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d592427e5263e8b0364a5c99… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Feb 13 14:34:45 2007 -0800 wine.inf: Add quartz.dll to the list of installed fake DLLs. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 5e68a2a..4e92356 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2186,6 +2186,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,olepro32.dll 11,,opengl32.dll 11,,progman.exe +11,,quartz.dll 11,,regsvr32.exe 11,,riched20.dll 11,,riched32.dll

1 0