May 2011 - Wine-commits - list.winehq.org

Piotr Caban : msvcrt: Make FILE position related functions thread safe.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: f2d425b7fc5d8d467db3439f751d7a951dcb847a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2d425b7fc5d8d467db3439f7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 20 13:22:39 2011 +0200 msvcrt: Make FILE position related functions thread safe. --- dlls/msvcrt/file.c | 35 +++++++++++++++++++++++++++++++---- 1 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 16aa10c..f11c23d 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1118,6 +1118,9 @@ int CDECL MSVCRT__locking(int fd, int mode, LONG nbytes) */ int CDECL MSVCRT__fseeki64(MSVCRT_FILE* file, __int64 offset, int whence) { + int ret; + + MSVCRT__lock_file(file); /* Flush output if needed */ if(file->_flag & MSVCRT__IOWRT) msvcrt_flush_buffer(file); @@ -1145,7 +1148,10 @@ int CDECL MSVCRT__fseeki64(MSVCRT_FILE* file, __int64 offset, int whence) } /* Clear end of file flag */ file->_flag &= ~MSVCRT__IOEOF; - return (MSVCRT__lseeki64(file->_file,offset,whence) == -1)?-1:0; + ret = (MSVCRT__lseeki64(file->_file,offset,whence) == -1)?-1:0; + + MSVCRT__unlock_file(file); + return ret; } /********************************************************************* @@ -1210,8 +1216,11 @@ void CDECL MSVCRT_clearerr(MSVCRT_FILE* file) void CDECL MSVCRT_rewind(MSVCRT_FILE* file) { TRACE(":file (%p) fd (%d)\n",file,file->_file); + + MSVCRT__lock_file(file); MSVCRT_fseek(file, 0L, SEEK_SET); MSVCRT_clearerr(file); + MSVCRT__unlock_file(file); } static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* stream_flags) @@ -3228,6 +3237,9 @@ MSVCRT_FILE* CDECL MSVCRT_freopen(const char *path, const char *mode, MSVCRT_FIL */ int CDECL MSVCRT_fsetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) { + int ret; + + MSVCRT__lock_file(file); /* Note that all this has been lifted 'as is' from fseek */ if(file->_flag & MSVCRT__IOWRT) msvcrt_flush_buffer(file); @@ -3241,7 +3253,9 @@ int CDECL MSVCRT_fsetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) file->_flag &= ~(MSVCRT__IOREAD|MSVCRT__IOWRT); } - return (MSVCRT__lseeki64(file->_file,*pos,SEEK_SET) == -1) ? -1 : 0; + ret = (MSVCRT__lseeki64(file->_file,*pos,SEEK_SET) == -1) ? -1 : 0; + MSVCRT__unlock_file(file); + return ret; } /********************************************************************* @@ -3252,8 +3266,13 @@ __int64 CDECL MSVCRT__ftelli64(MSVCRT_FILE* file) /* TODO: just call fgetpos and return lower half of result */ int off=0; __int64 pos; + + MSVCRT__lock_file(file); pos = _telli64(file->_file); - if(pos == -1) return -1; + if(pos == -1) { + MSVCRT__unlock_file(file); + return -1; + } if(file->_bufsiz) { if( file->_flag & MSVCRT__IOWRT ) { off = file->_ptr - file->_base; @@ -3272,6 +3291,8 @@ __int64 CDECL MSVCRT__ftelli64(MSVCRT_FILE* file) } } } + + MSVCRT__unlock_file(file); return off + pos; } @@ -3289,8 +3310,13 @@ LONG CDECL MSVCRT_ftell(MSVCRT_FILE* file) int CDECL MSVCRT_fgetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) { int off=0; + + MSVCRT__lock_file(file); *pos = MSVCRT__lseeki64(file->_file,0,SEEK_CUR); - if(*pos == -1) return -1; + if(*pos == -1) { + MSVCRT__unlock_file(file); + return -1; + } if(file->_bufsiz) { if( file->_flag & MSVCRT__IOWRT ) { off = file->_ptr - file->_base; @@ -3310,6 +3336,7 @@ int CDECL MSVCRT_fgetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) } } *pos += off; + MSVCRT__unlock_file(file); return 0; }

1 0

Piotr Caban : msvcrt: Make FILE reading functions thread safe.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: 11c6c5324f47c4cd7adc65748a0740032f093562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11c6c5324f47c4cd7adc65748… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 20 13:22:48 2011 +0200 msvcrt: Make FILE reading functions thread safe. --- dlls/msvcrt/file.c | 40 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index f11c23d..27b9ef5 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2686,12 +2686,16 @@ int CDECL MSVCRT_fgetc(MSVCRT_FILE* file) { unsigned char *i; unsigned int j; + + MSVCRT__lock_file(file); if (file->_cnt>0) { file->_cnt--; i = (unsigned char *)file->_ptr++; j = *i; } else j = MSVCRT__filbuf(file); + + MSVCRT__unlock_file(file); return j; } @@ -2714,6 +2718,8 @@ char * CDECL MSVCRT_fgets(char *s, int size, MSVCRT_FILE* file) TRACE(":file(%p) fd (%d) str (%p) len (%d)\n", file,file->_file,s,size); + MSVCRT__lock_file(file); + while ((size >1) && (cc = MSVCRT_fgetc(file)) != MSVCRT_EOF && cc != '\n') { *s++ = (char)cc; @@ -2722,12 +2728,14 @@ char * CDECL MSVCRT_fgets(char *s, int size, MSVCRT_FILE* file) if ((cc == MSVCRT_EOF) && (s == buf_start)) /* If nothing read, return 0*/ { TRACE(":nothing read\n"); + MSVCRT__unlock_file(file); return NULL; } if ((cc != MSVCRT_EOF) && (size > 1)) *s++ = cc; *s = '\0'; TRACE(":got %s\n", debugstr_a(buf_start)); + MSVCRT__unlock_file(file); return buf_start; } @@ -2741,6 +2749,7 @@ MSVCRT_wint_t CDECL MSVCRT_fgetwc(MSVCRT_FILE* file) { int c; + MSVCRT__lock_file(file); if (!(msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT)) { MSVCRT_wchar_t wc; @@ -2763,11 +2772,15 @@ MSVCRT_wint_t CDECL MSVCRT_fgetwc(MSVCRT_FILE* file) { file->_flag |= (file->_cnt == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR; file->_cnt = 0; + + MSVCRT__unlock_file(file); return MSVCRT_WEOF; } wcp[i] = j; } } + + MSVCRT__unlock_file(file); return wc; } @@ -2776,6 +2789,8 @@ MSVCRT_wint_t CDECL MSVCRT_fgetwc(MSVCRT_FILE* file) { FIXME("Treat Multibyte characters\n"); } + + MSVCRT__unlock_file(file); if (c == MSVCRT_EOF) return MSVCRT_WEOF; else @@ -2791,14 +2806,19 @@ int CDECL MSVCRT__getw(MSVCRT_FILE* file) int i, k; unsigned int j; ch = (char *)&i; + + MSVCRT__lock_file(file); for (j=0; j<sizeof(int); j++) { k = MSVCRT_fgetc(file); if (k == MSVCRT_EOF) { file->_flag |= MSVCRT__IOEOF; + MSVCRT__unlock_file(file); return EOF; } ch[j] = k; } + + MSVCRT__unlock_file(file); return i; } @@ -2837,6 +2857,8 @@ MSVCRT_wchar_t * CDECL MSVCRT_fgetws(MSVCRT_wchar_t *s, int size, MSVCRT_FILE* f TRACE(":file(%p) fd (%d) str (%p) len (%d)\n", file,file->_file,s,size); + MSVCRT__lock_file(file); + while ((size >1) && (cc = MSVCRT_fgetwc(file)) != MSVCRT_WEOF && cc != '\n') { *s++ = (char)cc; @@ -2845,12 +2867,14 @@ MSVCRT_wchar_t * CDECL MSVCRT_fgetws(MSVCRT_wchar_t *s, int size, MSVCRT_FILE* f if ((cc == MSVCRT_WEOF) && (s == buf_start)) /* If nothing read, return 0*/ { TRACE(":nothing read\n"); + MSVCRT__unlock_file(file); return NULL; } if ((cc != MSVCRT_WEOF) && (size > 1)) *s++ = cc; *s = 0; TRACE(":got %s\n", debugstr_w(buf_start)); + MSVCRT__unlock_file(file); return buf_start; } @@ -3104,13 +3128,16 @@ int CDECL _fputchar(int c) * fread (MSVCRT.@) */ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nmemb, MSVCRT_FILE* file) -{ MSVCRT_size_t rcnt=size * nmemb; +{ + MSVCRT_size_t rcnt=size * nmemb; MSVCRT_size_t read=0; int pread=0; if(!rcnt) return 0; + MSVCRT__lock_file(file); + /* first buffered data */ if(file->_cnt>0) { int pcnt= (rcnt>file->_cnt)? file->_cnt:rcnt; @@ -3123,8 +3150,10 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm } else if(!(file->_flag & MSVCRT__IOREAD )) { if(file->_flag & MSVCRT__IORW) { file->_flag |= MSVCRT__IOREAD; - } else - return 0; + } else { + MSVCRT__unlock_file(file); + return 0; + } } while(rcnt>0) { @@ -3169,6 +3198,7 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm if (i < 1) break; } read+=pread; + MSVCRT__unlock_file(file); return read / size; } @@ -3396,6 +3426,7 @@ char * CDECL MSVCRT_gets(char *buf) int cc; char * buf_start = buf; + MSVCRT__lock_file(MSVCRT_stdin); for(cc = MSVCRT_fgetc(MSVCRT_stdin); cc != MSVCRT_EOF && cc != '\n'; cc = MSVCRT_fgetc(MSVCRT_stdin)) if(cc != '\r') *buf++ = (char)cc; @@ -3403,6 +3434,7 @@ char * CDECL MSVCRT_gets(char *buf) *buf = '\0'; TRACE("got '%s'\n", buf_start); + MSVCRT__unlock_file(MSVCRT_stdin); return buf_start; } @@ -3414,6 +3446,7 @@ MSVCRT_wchar_t* CDECL MSVCRT__getws(MSVCRT_wchar_t* buf) MSVCRT_wint_t cc; MSVCRT_wchar_t* ws = buf; + MSVCRT__lock_file(MSVCRT_stdin); for (cc = MSVCRT_fgetwc(MSVCRT_stdin); cc != MSVCRT_WEOF && cc != '\n'; cc = MSVCRT_fgetwc(MSVCRT_stdin)) { @@ -3423,6 +3456,7 @@ MSVCRT_wchar_t* CDECL MSVCRT__getws(MSVCRT_wchar_t* buf) *buf = '\0'; TRACE("got %s\n", debugstr_w(ws)); + MSVCRT__unlock_file(MSVCRT_stdin); return ws; }

1 0

Piotr Caban : msvcrt: Make FILE writing functions thread safe.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: 716a69c6db577fd1015fba70b0877ca73682ca21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=716a69c6db577fd1015fba70b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 20 13:22:59 2011 +0200 msvcrt: Make FILE writing functions thread safe. --- dlls/msvcrt/file.c | 161 +++++++++++++++++++++++++++++++++++----------------- 1 files changed, 109 insertions(+), 52 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 27b9ef5..90f8a45 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2563,9 +2563,16 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) int CDECL MSVCRT__putw(int val, MSVCRT_FILE* file) { int len; + + MSVCRT__lock_file(file); len = MSVCRT__write(file->_file, &val, sizeof(val)); - if (len == sizeof(val)) return val; + if (len == sizeof(val)) { + MSVCRT__unlock_file(file); + return val; + } + file->_flag |= MSVCRT__IOERR; + MSVCRT__unlock_file(file); return MSVCRT_EOF; } @@ -2883,38 +2890,44 @@ MSVCRT_wchar_t * CDECL MSVCRT_fgetws(MSVCRT_wchar_t *s, int size, MSVCRT_FILE* f */ MSVCRT_size_t CDECL MSVCRT_fwrite(const void *ptr, MSVCRT_size_t size, MSVCRT_size_t nmemb, MSVCRT_FILE* file) { - MSVCRT_size_t wrcnt=size * nmemb; - int written = 0; - if (size == 0) - return 0; - if(file->_cnt) { - int pcnt=(file->_cnt>wrcnt)? wrcnt: file->_cnt; - memcpy(file->_ptr, ptr, pcnt); - file->_cnt -= pcnt; - file->_ptr += pcnt; - written = pcnt; - wrcnt -= pcnt; + MSVCRT_size_t wrcnt=size * nmemb; + int written = 0; + if (size == 0) + return 0; + + MSVCRT__lock_file(file); + if(file->_cnt) { + int pcnt=(file->_cnt>wrcnt)? wrcnt: file->_cnt; + memcpy(file->_ptr, ptr, pcnt); + file->_cnt -= pcnt; + file->_ptr += pcnt; + written = pcnt; + wrcnt -= pcnt; ptr = (const char*)ptr + pcnt; - } else if(!(file->_flag & MSVCRT__IOWRT)) { - if(file->_flag & MSVCRT__IORW) { - file->_flag |= MSVCRT__IOWRT; - } else - return 0; - } - if(wrcnt) { - /* Flush buffer */ - int res=msvcrt_flush_buffer(file); - if(!res) { - int pwritten = MSVCRT__write(file->_file, ptr, wrcnt); - if (pwritten <= 0) - { - file->_flag |= MSVCRT__IOERR; - pwritten=0; - } - written += pwritten; - } - } - return written / size; + } else if(!(file->_flag & MSVCRT__IOWRT)) { + if(file->_flag & MSVCRT__IORW) { + file->_flag |= MSVCRT__IOWRT; + } else { + MSVCRT__unlock_file(file); + return 0; + } + } + if(wrcnt) { + /* Flush buffer */ + int res=msvcrt_flush_buffer(file); + if(!res) { + int pwritten = MSVCRT__write(file->_file, ptr, wrcnt); + if (pwritten <= 0) + { + file->_flag |= MSVCRT__IOERR; + pwritten=0; + } + written += pwritten; + } + } + + MSVCRT__unlock_file(file); + return written / size; } /********************************************************************* @@ -3060,18 +3073,26 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file); */ int CDECL MSVCRT_fputc(int c, MSVCRT_FILE* file) { + int res; + + MSVCRT__lock_file(file); if(file->_cnt>0) { *file->_ptr++=c; file->_cnt--; if (c == '\n') { - int res = msvcrt_flush_buffer(file); + res = msvcrt_flush_buffer(file); + MSVCRT__unlock_file(file); return res ? res : c; } - else + else { + MSVCRT__unlock_file(file); return c & 0xff; + } } else { - return MSVCRT__flsbuf(c, file); + res = MSVCRT__flsbuf(c, file); + MSVCRT__unlock_file(file); + return res; } } @@ -3376,11 +3397,21 @@ int CDECL MSVCRT_fgetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) int CDECL MSVCRT_fputs(const char *s, MSVCRT_FILE* file) { MSVCRT_size_t i, len = strlen(s); - if (!(msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT)) - return MSVCRT_fwrite(s,sizeof(*s),len,file) == len ? 0 : MSVCRT_EOF; + int ret; + + MSVCRT__lock_file(file); + if (!(msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT)) { + ret = MSVCRT_fwrite(s,sizeof(*s),len,file) == len ? 0 : MSVCRT_EOF; + MSVCRT__unlock_file(file); + return ret; + } for (i=0; i<len; i++) - if (MSVCRT_fputc(s[i], file) == MSVCRT_EOF) - return MSVCRT_EOF; + if (MSVCRT_fputc(s[i], file) == MSVCRT_EOF) { + MSVCRT__unlock_file(file); + return MSVCRT_EOF; + } + + MSVCRT__unlock_file(file); return 0; } @@ -3390,15 +3421,23 @@ int CDECL MSVCRT_fputs(const char *s, MSVCRT_FILE* file) int CDECL MSVCRT_fputws(const MSVCRT_wchar_t *s, MSVCRT_FILE* file) { MSVCRT_size_t i, len = strlenW(s); - if (!(msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT)) - return MSVCRT_fwrite(s,sizeof(*s),len,file) == len ? 0 : MSVCRT_EOF; - for (i=0; i<len; i++) - { - if ((s[i] == '\n') && (MSVCRT_fputc('\r', file) == MSVCRT_EOF)) - return MSVCRT_WEOF; - if (MSVCRT_fputwc(s[i], file) == MSVCRT_WEOF) - return MSVCRT_WEOF; - } + int ret; + + MSVCRT__lock_file(file); + if (!(msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT)) { + ret = MSVCRT_fwrite(s,sizeof(*s),len,file) == len ? 0 : MSVCRT_EOF; + MSVCRT__unlock_file(file); + return ret; + } + for (i=0; i<len; i++) { + if (((s[i] == '\n') && (MSVCRT_fputc('\r', file) == MSVCRT_EOF)) + || MSVCRT_fputwc(s[i], file) == MSVCRT_WEOF) { + MSVCRT__unlock_file(file); + return MSVCRT_WEOF; + } + } + + MSVCRT__unlock_file(file); return 0; } @@ -3490,8 +3529,17 @@ int CDECL MSVCRT__putwch(int c) int CDECL MSVCRT_puts(const char *s) { MSVCRT_size_t len = strlen(s); - if (MSVCRT_fwrite(s,sizeof(*s),len,MSVCRT_stdout) != len) return MSVCRT_EOF; - return MSVCRT_fwrite("\n",1,1,MSVCRT_stdout) == 1 ? 0 : MSVCRT_EOF; + int ret; + + MSVCRT__lock_file(MSVCRT_stdout); + if(MSVCRT_fwrite(s, sizeof(*s), len, MSVCRT_stdout) != len) { + MSVCRT__unlock_file(MSVCRT_stdout); + return MSVCRT_EOF; + } + + ret = MSVCRT_fwrite("\n",1,1,MSVCRT_stdout) == 1 ? 0 : MSVCRT_EOF; + MSVCRT__unlock_file(MSVCRT_stdout); + return ret; } /********************************************************************* @@ -3501,8 +3549,17 @@ int CDECL _putws(const MSVCRT_wchar_t *s) { static const MSVCRT_wchar_t nl = '\n'; MSVCRT_size_t len = strlenW(s); - if (MSVCRT_fwrite(s,sizeof(*s),len,MSVCRT_stdout) != len) return MSVCRT_EOF; - return MSVCRT_fwrite(&nl,sizeof(nl),1,MSVCRT_stdout) == 1 ? 0 : MSVCRT_EOF; + int ret; + + MSVCRT__lock_file(MSVCRT_stdout); + if(MSVCRT_fwrite(s, sizeof(*s), len, MSVCRT_stdout) != len) { + MSVCRT__unlock_file(MSVCRT_stdout); + return MSVCRT_EOF; + } + + ret = MSVCRT_fwrite(&nl,sizeof(nl),1,MSVCRT_stdout) == 1 ? 0 : MSVCRT_EOF; + MSVCRT__unlock_file(MSVCRT_stdout); + return ret; } /*********************************************************************

1 0

Alexandre Julliard : include: Declare gethostname for Windows builds.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: af2fee302ce491ec98735768be516819876308e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af2fee302ce491ec98735768b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 20 17:24:05 2011 +0200 include: Declare gethostname for Windows builds. --- include/winsock.h | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/include/winsock.h b/include/winsock.h index 2f5e480..0e409ec 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -1036,7 +1036,6 @@ int WINAPI WS(closesocket)(SOCKET); int WINAPI WS(connect)(SOCKET,const struct WS(sockaddr)*,int); struct WS(hostent)* WINAPI WS(gethostbyaddr)(const char*,int,int); struct WS(hostent)* WINAPI WS(gethostbyname)(const char*); -/* gethostname not defined because of conflicts with unistd.h */ int WINAPI WS(getpeername)(SOCKET,struct WS(sockaddr)*,int*); struct WS(protoent)* WINAPI WS(getprotobyname)(const char*); struct WS(protoent)* WINAPI WS(getprotobynumber)(int); @@ -1059,6 +1058,11 @@ int WINAPI WS(setsockopt)(SOCKET,int,int,const char*,int); int WINAPI WS(shutdown)(SOCKET,int); SOCKET WINAPI WS(socket)(int,int,int); +#if defined(__MINGW32__) || defined (_MSC_VER) +/* gethostname is not defined on Unix because of conflicts with unistd.h */ +int WINAPI WS(gethostname)(char*,int); +#endif + #endif /* !defined(__WINE_WINSOCK2__) || WS_API_PROTOTYPES */ #ifdef __cplusplus

1 0

Hans Leidekker : msi: Recursively create the destination directory in the MoveFiles action.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: 7545fc1014363b40f6f9fa3b9e98f4c27b6b46a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7545fc1014363b40f6f9fa3b9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 20 12:32:41 2011 +0200 msi: Recursively create the destination directory in the MoveFiles action. --- dlls/msi/files.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 06854be..97dbfa0 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -865,10 +865,9 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param ) if (GetFileAttributesW(destdir) == INVALID_FILE_ATTRIBUTES) { - ret = CreateDirectoryW(destdir, NULL); - if (!ret) + if (!(ret = msi_create_full_path(destdir))) { - WARN("CreateDirectory failed: %d\n", GetLastError()); + WARN("failed to create directory %u\n", GetLastError()); goto done; } }

1 0

Hans Leidekker : msi: Avoid a double free.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: b817fb1aaa3ede132dff5932ba97e430558299cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b817fb1aaa3ede132dff5932b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 20 12:32:57 2011 +0200 msi: Avoid a double free. --- dlls/msi/media.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 608e84c..9de2566 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -238,10 +238,10 @@ static INT_PTR CDECL cabinet_open_stream( char *pszFile, int oflag, int pmode ) if (msi_clone_open_stream( package_disk.package->db, cab->storage, encoded, &stream ) != ERROR_SUCCESS) { hr = IStorage_OpenStream( cab->storage, encoded, NULL, STGM_READ|STGM_SHARE_EXCLUSIVE, 0, &stream ); - msi_free( encoded ); if (FAILED(hr)) { WARN("failed to open stream 0x%08x\n", hr); + msi_free( encoded ); return 0; } }

1 0

Hans Leidekker : msi: Implement the DisableRollback standard action.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: 9c9e0981b44791728ee205cdc4e2fd548c600850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c9e0981b44791728ee205cdc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 20 12:33:16 2011 +0200 msi: Implement the DisableRollback standard action. --- dlls/msi/action.c | 12 ++++++++++-- dlls/msi/msipriv.h | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f41c921..2c38fb7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7719,7 +7719,9 @@ static UINT ACTION_AllocateRegistrySpace( MSIPACKAGE *package ) static UINT ACTION_DisableRollback( MSIPACKAGE *package ) { - FIXME("%p\n", package); + TRACE("%p\n", package); + + msi_set_property( package->db, szRollbackDisabled, szOne ); return ERROR_SUCCESS; } @@ -8146,7 +8148,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, { UINT rc; BOOL ui_exists; - + static const WCHAR szDisableRollback[] = {'D','I','S','A','B','L','E','R','O','L','L','B','A','C','K',0}; static const WCHAR szAction[] = {'A','C','T','I','O','N',0}; static const WCHAR szInstall[] = {'I','N','S','T','A','L','L',0}; @@ -8210,6 +8212,12 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, msi_adjust_privilege_properties( package ); msi_set_context( package ); + if (msi_get_property_int( package->db, szDisableRollback, 0 )) + { + TRACE("disabling rollback\n"); + msi_set_property( package->db, szRollbackDisabled, szOne ); + } + if (needs_ui_sequence( package)) { package->script->InWhatSequence |= SEQUENCE_UI; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 2cc7daf..733b316 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1143,6 +1143,7 @@ static const WCHAR szStringPool[] = {'_','S','t','r','i','n','g','P','o','o','l' static const WCHAR szInstallLevel[] = {'I','N','S','T','A','L','L','L','E','V','E','L',0}; static const WCHAR szCostInitialize[] = {'C','o','s','t','I','n','i','t','i','a','l','i','z','e',0}; static const WCHAR szAppDataFolder[] = {'A','p','p','D','a','t','a','F','o','l','d','e','r',0}; +static const WCHAR szRollbackDisabled[] = {'R','o','l','l','b','a','c','k','D','i','s','a','b','l','e','d',0}; /* memory allocation macro functions */ static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1);

1 0

Hans Leidekker : msi: Implement MsiGetMode(MSIRUNMODE_ROLLBACKENABLED).
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: 49f263558b2e1b454486a9d0b135e0babc56cafb URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f263558b2e1b454486a9d0b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 20 12:33:30 2011 +0200 msi: Implement MsiGetMode(MSIRUNMODE_ROLLBACKENABLED). --- dlls/msi/install.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index e90c3b1..0e57d6b 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -762,6 +762,10 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) r = msi_get_property_int( package->db, szInstalled, 0 ) != 0; break; + case MSIRUNMODE_ROLLBACKENABLED: + r = msi_get_property_int( package->db, szRollbackDisabled, 0 ) == 0; + break; + case MSIRUNMODE_REBOOTATEND: r = package->need_reboot; break;

1 0

Hans Leidekker : msi: Schedule rollback for standard actions.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: 0f5cb14a67b9747668ed0e148ca3779f9a8e1b5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f5cb14a67b9747668ed0e148… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 20 12:33:45 2011 +0200 msi: Schedule rollback for standard actions. --- dlls/msi/action.c | 162 +++++++++++++++++++++++++++------------------------- dlls/msi/custom.c | 10 ++-- dlls/msi/msipriv.h | 4 +- 3 files changed, 91 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f5cb14a67b9747668ed0…

1 0

Hans Leidekker : msi: Execute the rollback script if the installation failed.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: 1ab830188a5a823030db105e803e6a6d764bcd88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ab830188a5a823030db105e8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 20 12:34:00 2011 +0200 msi: Execute the rollback script if the installation failed. --- dlls/msi/action.c | 50 ++++++++++++++++++++++++++++++++++++-------------- dlls/msi/custom.c | 6 ------ 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 45b3d79..f0c05d6 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2316,28 +2316,40 @@ static UINT ACTION_CostInitialize(MSIPACKAGE *package) return ERROR_SUCCESS; } -static UINT execute_script(MSIPACKAGE *package, UINT script ) +static UINT execute_script_action( MSIPACKAGE *package, UINT script, UINT index ) { - UINT i; - UINT rc = ERROR_SUCCESS; + const WCHAR *action = package->script->Actions[script][index]; + ui_actionstart( package, action ); + TRACE("executing %s\n", debugstr_w(action)); + return ACTION_PerformAction( package, action, script ); +} + +static UINT execute_script( MSIPACKAGE *package, UINT script ) +{ + UINT i, rc = ERROR_SUCCESS; - TRACE("Executing Script %i\n",script); + TRACE("executing script %u\n", script); if (!package->script) { ERR("no script!\n"); return ERROR_FUNCTION_FAILED; } - - for (i = 0; i < package->script->ActionCount[script]; i++) + if (script == ROLLBACK_SCRIPT) { - LPWSTR action; - action = package->script->Actions[script][i]; - ui_actionstart(package, action); - TRACE("Executing Action (%s)\n",debugstr_w(action)); - rc = ACTION_PerformAction(package, action, script); - if (rc != ERROR_SUCCESS) - break; + for (i = package->script->ActionCount[script]; i > 0; i--) + { + rc = execute_script_action( package, script, i - 1 ); + if (rc != ERROR_SUCCESS) break; + } + } + else + { + for (i = 0; i < package->script->ActionCount[script]; i++) + { + rc = execute_script_action( package, script, i ); + if (rc != ERROR_SUCCESS) break; + } } msi_free_action_script(package, script); return rc; @@ -8153,7 +8165,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, LPCWSTR szCommandLine ) { UINT rc; - BOOL ui_exists; + BOOL ui_exists, needs_rollback = FALSE; static const WCHAR szDisableRollback[] = {'D','I','S','A','B','L','E','R','O','L','L','B','A','C','K',0}; static const WCHAR szAction[] = {'A','C','T','I','O','N',0}; static const WCHAR szInstall[] = {'I','N','S','T','A','L','L',0}; @@ -8248,11 +8260,21 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, else if (rc == ERROR_INSTALL_SUSPEND) ACTION_PerformActionSequence(package, -4); else /* failed */ + { ACTION_PerformActionSequence(package, -3); + needs_rollback = TRUE; + } /* finish up running custom actions */ ACTION_FinishCustomActions(package); + if (needs_rollback && !msi_get_property_int( package->db, szRollbackDisabled, 0 )) + { + WARN("installation failed, running rollback script\n"); + msi_set_property( package->db, szRollbackDisabled, NULL ); + execute_script( package, ROLLBACK_SCRIPT ); + } + if (rc == ERROR_SUCCESS && package->need_reboot) return ERROR_SUCCESS_REBOOT_REQUIRED; diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 2eb7bad..1a23175 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -328,12 +328,6 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL msi_free(actiondata); } - if (type & msidbCustomActionTypeRollback) - { - FIXME("Rollbacks not supported yet\n"); - rc = ERROR_SUCCESS; - goto end; - } } else if (!check_execution_scheduling_options(package,action,type)) {

1 0