wine-commits May 2011

wine-commits@winehq.org

2 participants
945 discussions

Piotr Caban : msvcrt: Make ungetc and ungetwc thread safe.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: dd303022680d2c631586f9c868140257ebdc82e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd303022680d2c631586f9c86… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 20 13:22:20 2011 +0200 msvcrt: Make ungetc and ungetwc thread safe. --- dlls/msvcrt/file.c | 55 +++++++++++++++++++++++++++++++-------------------- 1 files changed, 33 insertions(+), 22 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index ad70bce..444a8d8 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3768,20 +3768,25 @@ int CDECL MSVCRT_printf_s(const char *format, ...) */ int CDECL MSVCRT_ungetc(int c, MSVCRT_FILE * file) { - if (c == MSVCRT_EOF) - return MSVCRT_EOF; - if(file->_bufsiz == 0) { - msvcrt_alloc_buffer(file); - file->_ptr++; - } - if(file->_ptr>file->_base) { - file->_ptr--; - *file->_ptr=c; - file->_cnt++; - MSVCRT_clearerr(file); - return c; - } - return MSVCRT_EOF; + if (c == MSVCRT_EOF) + return MSVCRT_EOF; + + MSVCRT__lock_file(file); + if(file->_bufsiz == 0) { + msvcrt_alloc_buffer(file); + file->_ptr++; + } + if(file->_ptr>file->_base) { + file->_ptr--; + *file->_ptr=c; + file->_cnt++; + MSVCRT_clearerr(file); + MSVCRT__unlock_file(file); + return c; + } + + MSVCRT__unlock_file(file); + return MSVCRT_EOF; } /********************************************************************* @@ -3789,14 +3794,20 @@ int CDECL MSVCRT_ungetc(int c, MSVCRT_FILE * file) */ MSVCRT_wint_t CDECL MSVCRT_ungetwc(MSVCRT_wint_t wc, MSVCRT_FILE * file) { - MSVCRT_wchar_t mwc = wc; - char * pp = (char *)&mwc; - int i; - for(i=sizeof(MSVCRT_wchar_t)-1;i>=0;i--) { - if(pp[i] != MSVCRT_ungetc(pp[i],file)) - return MSVCRT_WEOF; - } - return mwc; + MSVCRT_wchar_t mwc = wc; + char * pp = (char *)&mwc; + int i; + + MSVCRT__lock_file(file); + for(i=sizeof(MSVCRT_wchar_t)-1;i>=0;i--) { + if(pp[i] != MSVCRT_ungetc(pp[i],file)) { + MSVCRT__unlock_file(file); + return MSVCRT_WEOF; + } + } + + MSVCRT__unlock_file(file); + return mwc; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Make setvbuf thread safe.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: eb01bc1efa9f0ebd66f214f652fe187ee3958a0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb01bc1efa9f0ebd66f214f65… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 20 13:22:10 2011 +0200 msvcrt: Make setvbuf thread safe. --- dlls/msvcrt/file.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 89f1267..ad70bce 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3479,7 +3479,7 @@ int CDECL _wrename(const MSVCRT_wchar_t *oldpath,const MSVCRT_wchar_t *newpath) */ int CDECL MSVCRT_setvbuf(MSVCRT_FILE* file, char *buf, int mode, MSVCRT_size_t size) { - /* TODO: Check if file busy */ + MSVCRT__lock_file(file); if(file->_bufsiz) { MSVCRT_free(file->_base); file->_bufsiz = 0; @@ -3494,6 +3494,7 @@ int CDECL MSVCRT_setvbuf(MSVCRT_FILE* file, char *buf, int mode, MSVCRT_size_t s } else { file->_flag |= MSVCRT__IONBF; } + MSVCRT__unlock_file(file); return 0; }

1 0

Piotr Caban : msvcrt: Make _flsbuf thread safe.
by Alexandre Julliard 20 May '11

20 May '11

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 20 May '11

20 May '11

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 fclose thread safe.
by Alexandre Julliard 20 May '11

20 May '11

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 20 May '11

20 May '11

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

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

20 May '11

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

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

20 May '11

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

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

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

← Newer
1
...
31
32
33
34
35
36
37
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2011