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

Piotr Caban : msvcrt: Make _flsbuf thread safe.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: c989c4980bf25d9cf87e6c2fa42fb264b56fcd38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c989c4980bf25d9cf87e6c2fa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 20 13:22:00 2011 +0200 msvcrt: Make _flsbuf thread safe. --- dlls/msvcrt/file.c | 46 ++++++++++++++++++++++++++++------------------ 1 files changed, 28 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index baaabf0..89f1267 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3025,30 +3025,40 @@ int CDECL MSVCRT_fputc(int c, MSVCRT_FILE* file) */ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) { - /* Flush output buffer */ - if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF)) { - msvcrt_alloc_buffer(file); - } - if(!(file->_flag & MSVCRT__IOWRT)) { - if(file->_flag & MSVCRT__IORW) { - file->_flag |= MSVCRT__IOWRT; - } else { - return MSVCRT_EOF; - } - } - if(file->_bufsiz) { + MSVCRT__lock_file(file); + + /* Flush output buffer */ + if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF)) { + msvcrt_alloc_buffer(file); + } + if(!(file->_flag & MSVCRT__IOWRT)) { + if(file->_flag & MSVCRT__IORW) { + file->_flag |= MSVCRT__IOWRT; + } else { + MSVCRT__unlock_file(file); + return MSVCRT_EOF; + } + } + if(file->_bufsiz) { int res=msvcrt_flush_buffer(file); - return res?res : MSVCRT_fputc(c, file); - } else { - unsigned char cc=c; + if(!res) + res = MSVCRT_fputc(c, file); + MSVCRT__unlock_file(file); + return res; + } else { + unsigned char cc=c; int len; /* set _cnt to 0 for unbuffered FILEs */ file->_cnt = 0; - len = MSVCRT__write(file->_file, &cc, 1); - if (len == 1) return c & 0xff; + len = MSVCRT__write(file->_file, &cc, 1); + if (len == 1) { + MSVCRT__unlock_file(file); + return c & 0xff; + } file->_flag |= MSVCRT__IOERR; + MSVCRT__unlock_file(file); return MSVCRT_EOF; - } + } } /*********************************************************************

1 0

Piotr Caban : msvcrt: Make _filbuf thread safe.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: f773ad838817fcc2da42c4c86e30958e7ed02053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f773ad838817fcc2da42c4c86… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 20 13:21:50 2011 +0200 msvcrt: Make _filbuf thread safe. --- dlls/msvcrt/file.c | 59 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 35 insertions(+), 24 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c8d488c..baaabf0 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2605,36 +2605,47 @@ int CDECL MSVCRT_ferror(MSVCRT_FILE* file) */ int CDECL MSVCRT__filbuf(MSVCRT_FILE* file) { - /* Allocate buffer if needed */ - if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF) ) { - msvcrt_alloc_buffer(file); - } - if(!(file->_flag & MSVCRT__IOREAD)) { - if(file->_flag & MSVCRT__IORW) { - file->_flag |= MSVCRT__IOREAD; - } else { - return MSVCRT_EOF; - } - } - if(file->_flag & MSVCRT__IONBF) { - unsigned char c; + unsigned char c; + MSVCRT__lock_file(file); + + /* Allocate buffer if needed */ + if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF)) + msvcrt_alloc_buffer(file); + + if(!(file->_flag & MSVCRT__IOREAD)) { + if(file->_flag & MSVCRT__IORW) + file->_flag |= MSVCRT__IOREAD; + else { + MSVCRT__unlock_file(file); + return MSVCRT_EOF; + } + } + + if(file->_flag & MSVCRT__IONBF) { int r; - if ((r = read_i(file->_file,&c,1)) != 1) { + if ((r = read_i(file->_file,&c,1)) != 1) { file->_flag |= (r == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR; + MSVCRT__unlock_file(file); return MSVCRT_EOF; - } - return c; - } else { - file->_cnt = read_i(file->_file, file->_base, file->_bufsiz); - if(file->_cnt<=0) { + } + + MSVCRT__unlock_file(file); + return c; + } else { + file->_cnt = read_i(file->_file, file->_base, file->_bufsiz); + if(file->_cnt<=0) { file->_flag |= (file->_cnt == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR; file->_cnt = 0; + MSVCRT__unlock_file(file); return MSVCRT_EOF; - } - file->_cnt--; - file->_ptr = file->_base+1; - return *(unsigned char *)file->_base; - } + } + + file->_cnt--; + file->_ptr = file->_base+1; + c = *(unsigned char *)file->_base; + MSVCRT__unlock_file(file); + return c; + } } /*********************************************************************

1 0

Piotr Caban : msvcrt: Make FILE->_flag reading functions thread safe.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: ae15a4b6bcc6163255ffb01e820ba5b4532febf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae15a4b6bcc6163255ffb01e8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 20 13:22:29 2011 +0200 msvcrt: Make FILE->_flag reading functions thread safe. --- dlls/msvcrt/file.c | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 444a8d8..16aa10c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1198,7 +1198,10 @@ int CDECL MSVCRT__chsize(int fd, MSVCRT_long size) void CDECL MSVCRT_clearerr(MSVCRT_FILE* file) { TRACE(":file (%p) fd (%d)\n",file,file->_file); + + MSVCRT__lock_file(file); file->_flag &= ~(MSVCRT__IOERR | MSVCRT__IOEOF); + MSVCRT__unlock_file(file); } /********************************************************************* @@ -1338,8 +1341,15 @@ __int64 CDECL MSVCRT__filelengthi64(int fd) */ int CDECL MSVCRT__fileno(MSVCRT_FILE* file) { + int ret; + TRACE(":FILE* (%p) fd (%d)\n",file,file->_file); - return file->_file; + + MSVCRT__lock_file(file); + ret = file->_file; + MSVCRT__unlock_file(file); + + return ret; } /********************************************************************* @@ -2589,7 +2599,13 @@ int CDECL MSVCRT_fclose(MSVCRT_FILE* file) */ int CDECL MSVCRT_feof(MSVCRT_FILE* file) { - return file->_flag & MSVCRT__IOEOF; + int ret; + + MSVCRT__lock_file(file); + ret = file->_flag & MSVCRT__IOEOF; + MSVCRT__unlock_file(file); + + return ret; } /********************************************************************* @@ -2597,7 +2613,13 @@ int CDECL MSVCRT_feof(MSVCRT_FILE* file) */ int CDECL MSVCRT_ferror(MSVCRT_FILE* file) { - return file->_flag & MSVCRT__IOERR; + int ret; + + MSVCRT__lock_file(file); + ret = file->_flag & MSVCRT__IOERR; + MSVCRT__unlock_file(file); + + return ret; } /*********************************************************************

1 0

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

May 20, 2011

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

Piotr Caban : msvcrt: Free locks after freeing io data.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: 23a0d0f04a1a7731a0c8fb93b7e4467c4fc0b83c URL: http://source.winehq.org/git/wine.git/?a=commit;h=23a0d0f04a1a7731a0c8fb93b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 20 13:21:14 2011 +0200 msvcrt: Free locks after freeing io data. --- dlls/msvcrt/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index 10fb6fc..cca6189 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -110,8 +110,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_THREAD_ATTACH: break; case DLL_PROCESS_DETACH: - msvcrt_free_mt_locks(); msvcrt_free_io(); + msvcrt_free_mt_locks(); msvcrt_free_console(); msvcrt_free_args(); msvcrt_free_signals();

1 0

Hans Leidekker : msi: Avoid a double free.
by Alexandre Julliard May 20, 2011

May 20, 2011

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: Recursively create the destination directory in the MoveFiles action.
by Alexandre Julliard May 20, 2011

May 20, 2011

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

Piotr Caban : msvcrt: Make fclose thread safe.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: 1b26496270cae9807ffe6dfe6cd5fadd2fa8e102 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b26496270cae9807ffe6dfe6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 20 13:21:41 2011 +0200 msvcrt: Make fclose thread safe. --- dlls/msvcrt/file.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index e6ad5d0..c8d488c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2557,6 +2557,7 @@ int CDECL MSVCRT_fclose(MSVCRT_FILE* file) { int r, flag; + MSVCRT__lock_file(file); flag = file->_flag; MSVCRT_free(file->_tmpfname); file->_tmpfname = NULL; @@ -2569,6 +2570,7 @@ int CDECL MSVCRT_fclose(MSVCRT_FILE* file) r=MSVCRT__close(file->_file); file->_flag = 0; + MSVCRT__unlock_file(file); if(file<MSVCRT__iob || file>=MSVCRT__iob+_IOB_ENTRIES) DeleteCriticalSection(&((file_crit*)file)->crit);

1 0

Piotr Caban : msvcrt: Make fflush function thread safe.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: d18f0766f72b669eb630371cf4fe4de267dcbc99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d18f0766f72b669eb630371cf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 20 13:21:29 2011 +0200 msvcrt: Make fflush function thread safe. --- dlls/msvcrt/file.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b9c7e90..e6ad5d0 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -774,13 +774,18 @@ int CDECL _flushall(void) */ int CDECL MSVCRT_fflush(MSVCRT_FILE* file) { - if(!file) { - _flushall(); - } else if(file->_flag & MSVCRT__IOWRT) { - int res=msvcrt_flush_buffer(file); - return res; - } - return 0; + if(!file) { + _flushall(); + } else if(file->_flag & MSVCRT__IOWRT) { + int res; + + MSVCRT__lock_file(file); + res = msvcrt_flush_buffer(file); + MSVCRT__unlock_file(file); + + return res; + } + return 0; } /*********************************************************************

1 0

Alexandre Julliard : ole32: Don' t continue to wait for a local server if the process has terminated.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: 5a559f181a81d5418d47415661e8e358d98bfaae URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a559f181a81d5418d4741566… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 20 13:41:18 2011 +0200 ole32: Don't continue to wait for a local server if the process has terminated. --- dlls/ole32/rpc.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 75b6b1f..431f5bc 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1637,7 +1637,7 @@ void RPC_StartRemoting(struct apartment *apt) } -static HRESULT create_server(REFCLSID rclsid) +static HRESULT create_server(REFCLSID rclsid, HANDLE *process) { static const WCHAR wszLocalServer32[] = { 'L','o','c','a','l','S','e','r','v','e','r','3','2',0 }; static const WCHAR embedding[] = { ' ', '-','E','m','b','e','d','d','i','n','g',0 }; @@ -1676,7 +1676,7 @@ static HRESULT create_server(REFCLSID rclsid) WARN("failed to run local server %s\n", debugstr_w(command)); return HRESULT_FROM_WIN32(GetLastError()); } - CloseHandle(pinfo.hProcess); + *process = pinfo.hProcess; CloseHandle(pinfo.hThread); return S_OK; @@ -1813,9 +1813,10 @@ HRESULT RPC_GetLocalClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) if (hPipe == INVALID_HANDLE_VALUE) { DWORD index; DWORD start_ticks; + HANDLE process = 0; if (tries == 1) { if ( (hres = create_local_service(rclsid)) && - (hres = create_server(rclsid)) ) + (hres = create_server(rclsid, &process)) ) return hres; } else { WARN("Connecting to %s, no response yet, retrying: le is %u\n", debugstr_w(pipefn), GetLastError()); @@ -1823,8 +1824,16 @@ HRESULT RPC_GetLocalClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) /* wait for one second, even if messages arrive */ start_ticks = GetTickCount(); do { - CoWaitForMultipleHandles(0, 1000, 0, NULL, &index); + if (SUCCEEDED(CoWaitForMultipleHandles(0, 1000, (process != 0), + &process, &index)) && process && !index) + { + WARN( "server for %s failed to start\n", debugstr_guid(rclsid) ); + CloseHandle( hPipe ); + CloseHandle( process ); + return E_NOINTERFACE; + } } while (GetTickCount() - start_ticks < 1000); + if (process) CloseHandle( process ); continue; } bufferlen = 0;

1 0