January 2006 - Wine-commits

Alexandre Julliard : msvcrt: Added _sys_errlist (based on a patch by Uwe Bonnes).
by Alexandre Julliard 23 Jan '06

23 Jan '06

Module: wine Branch: refs/heads/master Commit: 401ead5c8ff854c296ac02771356472190b7d2f3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=401ead5c8ff854c296ac027… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 23 19:30:21 2006 +0100 msvcrt: Added _sys_errlist (based on a patch by Uwe Bonnes). --- dlls/msvcrt/data.c | 3 -- dlls/msvcrt/errno.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 67f9625..a01757b 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -43,8 +43,6 @@ unsigned int MSVCRT_osversion; /* FIXME: unsigned int MSVCRT__winmajor; unsigned int MSVCRT__winminor; unsigned int MSVCRT__winver; -unsigned int MSVCRT__sys_nerr; /* FIXME: not accessible from Winelib apps */ -char** MSVCRT__sys_errlist; /* FIXME: not accessible from Winelib apps */ unsigned int MSVCRT___setlc_active; unsigned int MSVCRT___unguarded_readlc_active; double MSVCRT__HUGE; @@ -270,7 +268,6 @@ void msvcrt_init_args(void) MSVCRT_osversion = version & 0xFFFF; MSVCRT_osminor = version & 0xFF; MSVCRT_osmajor = (version>>8) & 0xFF; - MSVCRT__sys_nerr = 43; MSVCRT__HUGE = HUGE_VAL; MSVCRT___setlc_active = 0; MSVCRT___unguarded_readlc_active = 0; diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 5d014a6..cca743d 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -26,6 +26,97 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); +/* error strings generated with glibc strerror */ +char str_success[] = "Success"; +char str_EPERM[] = "Operation not permitted"; +char str_ENOENT[] = "No such file or directory"; +char str_ESRCH[] = "No such process"; +char str_EINTR[] = "Interrupted system call"; +char str_EIO[] = "Input/output error"; +char str_ENXIO[] = "No such device or address"; +char str_E2BIG[] = "Argument list too long"; +char str_ENOEXEC[] = "Exec format error"; +char str_EBADF[] = "Bad file descriptor"; +char str_ECHILD[] = "No child processes"; +char str_EAGAIN[] = "Resource temporarily unavailable"; +char str_ENOMEM[] = "Cannot allocate memory"; +char str_EACCES[] = "Permission denied"; +char str_EFAULT[] = "Bad address"; +char str_EBUSY[] = "Device or resource busy"; +char str_EEXIST[] = "File exists"; +char str_EXDEV[] = "Invalid cross-device link"; +char str_ENODEV[] = "No such device"; +char str_ENOTDIR[] = "Not a directory"; +char str_EISDIR[] = "Is a directory"; +char str_EINVAL[] = "Invalid argument"; +char str_ENFILE[] = "Too many open files in system"; +char str_EMFILE[] = "Too many open files"; +char str_ENOTTY[] = "Inappropriate ioctl for device"; +char str_EFBIG[] = "File too large"; +char str_ENOSPC[] = "No space left on device"; +char str_ESPIPE[] = "Illegal seek"; +char str_EROFS[] = "Read-only file system"; +char str_EMLINK[] = "Too many links"; +char str_EPIPE[] = "Broken pipe"; +char str_EDOM[] = "Numerical argument out of domain"; +char str_ERANGE[] = "Numerical result out of range"; +char str_EDEADLK[] = "Resource deadlock avoided"; +char str_ENAMETOOLONG[] = "File name too long"; +char str_ENOLCK[] = "No locks available"; +char str_ENOSYS[] = "Function not implemented"; +char str_ENOTEMPTY[] = "Directory not empty"; +char str_EILSEQ[] = "Invalid or incomplete multibyte or wide character"; +char str_generic_error[] = "Unknown error"; + +char *MSVCRT__sys_errlist[] = +{ + str_success, + str_EPERM, + str_ENOENT, + str_ESRCH, + str_EINTR, + str_EIO, + str_ENXIO, + str_E2BIG, + str_ENOEXEC, + str_EBADF, + str_ECHILD, + str_EAGAIN, + str_ENOMEM, + str_EACCES, + str_EFAULT, + str_generic_error, + str_EBUSY, + str_EEXIST, + str_EXDEV, + str_ENODEV, + str_ENOTDIR, + str_EISDIR, + str_EINVAL, + str_ENFILE, + str_EMFILE, + str_ENOTTY, + str_generic_error, + str_EFBIG, + str_ENOSPC, + str_ESPIPE, + str_EROFS, + str_EMLINK, + str_EPIPE, + str_EDOM, + str_ERANGE, + str_generic_error, + str_EDEADLK, + str_generic_error, + str_ENAMETOOLONG, + str_ENOLCK, + str_ENOSYS, + str_ENOTEMPTY, + str_EILSEQ, + str_generic_error +}; + +unsigned int MSVCRT__sys_nerr = sizeof(MSVCRT__sys_errlist)/sizeof(MSVCRT__sys_errlist[0]) - 1; /* INTERNAL: Set the crt and dos errno's from the OS error given. */ void msvcrt_set_errno(int err)

1 0

Alexandre Julliard : msvcrt: Properly implemented strerror and perror (based on a patch by
by Alexandre Julliard 23 Jan '06

23 Jan '06

Module: wine Branch: refs/heads/master Commit: 2dacd3c54e66c155303475dfe31056d0c5381c95 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2dacd3c54e66c155303475d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 23 19:58:10 2006 +0100 msvcrt: Properly implemented strerror and perror (based on a patch by Uwe Bonnes). --- dlls/msvcrt/errno.c | 40 ++++++++++++++++++++++++++++++++++------ dlls/msvcrt/main.c | 1 + dlls/msvcrt/msvcrt.h | 1 + 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index cca743d..656e5ba 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -199,17 +199,36 @@ unsigned long* MSVCRT___doserrno(void) */ char* MSVCRT_strerror(int err) { - return strerror(err); /* FIXME */ + thread_data_t *data = msvcrt_get_thread_data(); + + if (!data->strerror_buffer) + if (!(data->strerror_buffer = MSVCRT_malloc(256))) return NULL; + + if (err < 0 || err > MSVCRT__sys_nerr) err = MSVCRT__sys_nerr; + strcpy( data->strerror_buffer, MSVCRT__sys_errlist[err] ); + return data->strerror_buffer; } /********************************************************************** * _strerror (MSVCRT.@) */ -char* _strerror(const char* err) +char* _strerror(const char* str) { - static char strerrbuff[256]; /* FIXME: Per thread, nprintf */ - sprintf(strerrbuff,"%s: %s\n",err,MSVCRT_strerror(msvcrt_get_thread_data()->thread_errno)); - return strerrbuff; + thread_data_t *data = msvcrt_get_thread_data(); + int err; + + if (!data->strerror_buffer) + if (!(data->strerror_buffer = MSVCRT_malloc(256))) return NULL; + + err = data->thread_errno; + if (err < 0 || err > MSVCRT__sys_nerr) err = MSVCRT__sys_nerr; + + if (str && *str) + sprintf( data->strerror_buffer, "%s: %s\n", str, MSVCRT__sys_errlist[err] ); + else + sprintf( data->strerror_buffer, "%s\n", MSVCRT__sys_errlist[err] ); + + return data->strerror_buffer; } /********************************************************************* @@ -217,7 +236,16 @@ char* _strerror(const char* err) */ void MSVCRT_perror(const char* str) { - _cprintf("%s: %s\n",str,MSVCRT_strerror(msvcrt_get_thread_data()->thread_errno)); + int err = *MSVCRT__errno(); + if (err < 0 || err > MSVCRT__sys_nerr) err = MSVCRT__sys_nerr; + + if (str && *str) + { + _write( 2, str, strlen(str) ); + _write( 2, ": ", 2 ); + } + _write( 2, MSVCRT__sys_errlist[err], strlen(MSVCRT__sys_errlist[err]) ); + _write( 2, "\n", 1 ); } /****************************************************************************** diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index 6697c1c..c43b88c 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -75,6 +75,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, HeapFree(GetProcessHeap(),0,tls->efcvt_buffer); HeapFree(GetProcessHeap(),0,tls->asctime_buffer); HeapFree(GetProcessHeap(),0,tls->wasctime_buffer); + HeapFree(GetProcessHeap(),0,tls->strerror_buffer); } HeapFree(GetProcessHeap(), 0, tls); TRACE("finished thread free\n"); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index e3b82de..0ac0758 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -101,6 +101,7 @@ struct __thread_data { char *asctime_buffer; /* buffer for asctime */ MSVCRT_wchar_t *wasctime_buffer; /* buffer for wasctime */ struct MSVCRT_tm time_buffer; /* buffer for localtime/gmtime */ + char *strerror_buffer; /* buffer for strerror */ int fpecode; MSVCRT_terminate_function terminate_handler; MSVCRT_unexpected_function unexpected_handler;

1 0

Louis Lenders : user32: Added stub for UpdateLayeredWindow.
by Alexandre Julliard 23 Jan '06

23 Jan '06

Module: wine Branch: refs/heads/master Commit: d782abff6bab83f3e68d1f8078e1d5edf1c1bc37 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d782abff6bab83f3e68d1f8… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Jan 23 20:12:52 2006 +0100 user32: Added stub for UpdateLayeredWindow. --- dlls/user/user32.spec | 2 +- dlls/user/win.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/user/user32.spec b/dlls/user/user32.spec index 450d057..e373712 100644 --- a/dlls/user/user32.spec +++ b/dlls/user/user32.spec @@ -717,7 +717,7 @@ @ stdcall UnregisterHotKey(long long) # @ stub UnregisterMessagePumpHook # @ stub UnregisterUserApiHook -# @ stub UpdateLayeredWindow +@ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) @ stub UpdatePerUserSystemParameters @ stdcall UpdateWindow(long) @ stdcall User32InitializeImmEntryTable(ptr) diff --git a/dlls/user/win.c b/dlls/user/win.c index 4dd37eb..2f26cd7 100644 --- a/dlls/user/win.c +++ b/dlls/user/win.c @@ -3077,3 +3077,15 @@ BOOL WINAPI SetLayeredWindowAttributes( FIXME("(%p,0x%.8lx,%d,%ld): stub!\n", hWnd, rgbKey, bAlpha, dwFlags); return TRUE; } + +/***************************************************************************** + * UpdateLayeredWindow (USER32.@) + */ +BOOL WINAPI UpdateLayeredWindow( HWND hwnd, HDC hdcDst, POINT *pptDst, SIZE *psize, + HDC hdcSrc, POINT *pptSrc, COLORREF crKey, BLENDFUNCTION *pblend, + DWORD dwFlags) +{ + FIXME("(%p,%p,%p,%p,%p,%p,0x%08lx,%p,%ld): stub!\n", + hwnd, hdcDst, pptDst, psize, hdcSrc, pptSrc, crKey, pblend, dwFlags); + return 0; +}

1 0

Hans Leidekker : msvcrt: Stub implementation for wcsftime.
by Alexandre Julliard 23 Jan '06

23 Jan '06

Module: wine Branch: refs/heads/master Commit: 1b69f035e121e9512da1ea538b171f83e7a90d16 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1b69f035e121e9512da1ea5… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jan 23 19:29:15 2006 +0100 msvcrt: Stub implementation for wcsftime. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/time.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e582e1a..6169e82 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -744,7 +744,7 @@ @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll @ cdecl wcscpy(ptr wstr) ntdll.wcscpy @ cdecl wcscspn(wstr wstr) ntdll.wcscspn -@ stub wcsftime #(ptr long wstr ptr) MSVCRT_wcsftime +@ cdecl wcsftime(ptr long wstr ptr) MSVCRT_wcsftime @ cdecl wcslen(wstr) ntdll.wcslen @ cdecl wcsncat(wstr wstr long) ntdll.wcsncat @ cdecl wcsncmp(wstr wstr long) ntdll.wcsncmp diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 3c1b0ba..b2b67f1 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -438,6 +438,18 @@ MSVCRT_size_t MSVCRT_strftime( char *str } /********************************************************************* + * wcsftime (MSVCRT.@) + */ +MSVCRT_size_t MSVCRT_wcsftime( MSVCRT_wchar_t *str, MSVCRT_size_t max, + const MSVCRT_wchar_t *format, const struct MSVCRT_tm *mstm ) +{ + FIXME( "%p, %d, %s, %p - stub\n", str, max, debugstr_w(format), mstm ); + + *str = '\0'; + return 0; +} + +/********************************************************************* * asctime (MSVCRT.@) */ char *MSVCRT_asctime(const struct MSVCRT_tm *mstm)

1 0

Alexandre Julliard : msvcrt: Added EILSEQ definition.
by Alexandre Julliard 23 Jan '06

23 Jan '06

Module: wine Branch: refs/heads/master Commit: 4755f8acec30f7ebe8ca5f25414b041de56f8d03 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4755f8acec30f7ebe8ca5f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 23 19:29:36 2006 +0100 msvcrt: Added EILSEQ definition. --- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/tests/headers.c | 1 + include/msvcrt/errno.h | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 2502d4b..e3b82de 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -437,6 +437,7 @@ struct MSVCRT__stati64 { #define MSVCRT_ENOLCK 39 #define MSVCRT_ENOSYS 40 #define MSVCRT_ENOTEMPTY 41 +#define MSVCRT_EILSEQ 42 #define MSVCRT_LC_ALL 0 #define MSVCRT_LC_COLLATE 1 diff --git a/dlls/msvcrt/tests/headers.c b/dlls/msvcrt/tests/headers.c index 840212a..1aa517e 100644 --- a/dlls/msvcrt/tests/headers.c +++ b/dlls/msvcrt/tests/headers.c @@ -355,6 +355,7 @@ static void test_defines(void) CHECK_DEF(ENOLCK); CHECK_DEF(ENOSYS); CHECK_DEF(ENOTEMPTY); + CHECK_DEF(EILSEQ); CHECK_DEF(LC_ALL); CHECK_DEF(LC_COLLATE); CHECK_DEF(LC_CTYPE); diff --git a/include/msvcrt/errno.h b/include/msvcrt/errno.h index 9d88eeb..ab40244 100644 --- a/include/msvcrt/errno.h +++ b/include/msvcrt/errno.h @@ -60,6 +60,7 @@ # define ENOLCK 39 # define ENOSYS 40 # define ENOTEMPTY 41 +# define EILSEQ 42 #ifdef __cplusplus extern "C" {

1 0

Alexandre Julliard : Remove useless BUGS file.
by Alexandre Julliard 23 Jan '06

23 Jan '06

Module: wine Branch: refs/heads/master Commit: 48d7c0bd763845a679613b0d3d1eabbc7da29aaa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=48d7c0bd763845a679613b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 23 17:32:25 2006 +0100 Remove useless BUGS file. --- BUGS | 28 ---------------------------- 1 files changed, 0 insertions(+), 28 deletions(-) delete mode 100644 BUGS diff --git a/BUGS b/BUGS deleted file mode 100644 index b9a96b6..0000000 --- a/BUGS +++ /dev/null @@ -1,28 +0,0 @@ -For information on how to post a useful bug report, please -read documentation/bugs.sgml. - -This is intended to be a place where you should look first if -you want to contribute to the development of Wine. - -Wine is still considered alpha software and is still incomplete. - -If you want to help the Wine project you can: - - * visit Bugzilla (http://bugs.winehq.org/) for - a list of existing bugs. You are also welcome to - help with Bugzilla - add new bugs, confirm, - remove duplicates, test fixes, etc. - - * create unit tests for Windows API - - * contribute to the Wine documentation - - * subscribe to wine-devel, wine-user mailing lists, participate - in the discussions - - * run Windows applications, port open-source Windows applications - to Wine, fix bugs you found, enter bugs you can't fix to Bugzilla. - Enter information you discovered to the - Wine Application Database (http://appdb.codeweavers.com/) - - * grep for FIXME in the source files

1 0

Robert Shearman : msi: Call ui_actiondata for more actions.
by Alexandre Julliard 23 Jan '06

23 Jan '06

Module: wine Branch: refs/heads/master Commit: d2e48e01ac91678e0b5b7c5f68691aaf3543eeec URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d2e48e01ac91678e0b5b7c5… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jan 23 17:29:50 2006 +0100 msi: Call ui_actiondata for more actions. --- dlls/msi/action.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++-- dlls/msi/files.c | 56 ++++++++++++++++++++++++++++------------------- 2 files changed, 94 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=d2e48e01ac91678e0b5…

1 0

Robert Shearman : msi: Move the firing of control events to MSI_ProcessMessage.
by Alexandre Julliard 23 Jan '06

23 Jan '06

Module: wine Branch: refs/heads/master Commit: d679bc5ab31b7d7181bf386e8200dc99667d2e3f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d679bc5ab31b7d7181bf386… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jan 23 17:30:31 2006 +0100 msi: Move the firing of control events to MSI_ProcessMessage. Move the firing of control events from internal helper functions to MSI_ProcessMessage so that custom actions can all cause control events to be fired. Added the firing of progress events. --- dlls/msi/action.c | 37 ---------------- dlls/msi/helpers.c | 4 -- dlls/msi/package.c | 119 ++++++++++++++++++++++++++++++++++++++++------------ 3 files changed, 92 insertions(+), 68 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 01c57d4..636f01c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -247,55 +247,20 @@ static struct _actions StandardActions[] * helper functions ********************************************************/ -static void ce_actiontext(MSIPACKAGE* package, LPCWSTR action) -{ - static const WCHAR szActionText[] = - {'A','c','t','i','o','n','T','e','x','t',0}; - MSIRECORD *row; - - row = MSI_CreateRecord(1); - MSI_RecordSetStringW(row,1,action); - ControlEvent_FireSubscribedEvent(package,szActionText, row); - msiobj_release(&row->hdr); -} - static void ui_actionstart(MSIPACKAGE *package, LPCWSTR action) { - static const WCHAR template_s[]= - {'A','c','t','i','o','n',' ','%','s',':',' ','%','s','.',' ', '%','s', - '.',0}; - static const WCHAR format[] = - {'H','H','\'',':','\'','m','m','\'',':','\'','s','s',0}; static const WCHAR Query_t[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', '`','A','c','t','i','o', 'n','T','e','x','t','`',' ', 'W','H','E','R','E', ' ','`','A','c','t','i','o','n','`',' ','=', ' ','\'','%','s','\'',0}; - WCHAR message[1024]; - WCHAR timet[0x100]; - MSIRECORD * row = 0; - LPCWSTR ActionText; - LPWSTR deformated; - - GetTimeFormatW(LOCALE_USER_DEFAULT, 0, NULL, format, timet, 0x100); + MSIRECORD * row; row = MSI_QueryGetRecord( package->db, Query_t, action ); if (!row) return; - - ActionText = MSI_RecordGetString(row,2); - deformat_string(package, ActionText, &deformated); - - sprintfW(message,template_s,timet,action,deformated); - ce_actiontext(package, deformated); - msiobj_release(&row->hdr); - - row = MSI_CreateRecord(1); - MSI_RecordSetStringW(row,1,message); - MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONSTART, row); msiobj_release(&row->hdr); - msi_free(deformated); } static void ui_actioninfo(MSIPACKAGE *package, LPCWSTR action, BOOL start, diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index ffdf3be..fbe451c 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -760,8 +760,6 @@ void ui_actiondata(MSIPACKAGE *package, WCHAR message[1024]; MSIRECORD * row = 0; DWORD size; - static const WCHAR szActionData[] = - {'A','c','t','i','o','n','D','a','t','a',0}; if (!package->LastAction || strcmpW(package->LastAction,action)) { @@ -794,8 +792,6 @@ void ui_actiondata(MSIPACKAGE *package, MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, row); - ControlEvent_FireSubscribedEvent(package,szActionData, row); - msiobj_release(&row->hdr); } diff --git a/dlls/msi/package.c b/dlls/msi/package.c index cb022bd..eb486ac 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -576,11 +576,16 @@ MSIHANDLE WINAPI MsiGetActiveDatabase(MS INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIRECORD *record) { + static const WCHAR szActionData[] = + {'A','c','t','i','o','n','D','a','t','a',0}; + static const WCHAR szSetProgress[] = + {'S','e','t','P','r','o','g','r','e','s','s',0}; + static const WCHAR szActionText[] = + {'A','c','t','i','o','n','T','e','x','t',0}; DWORD log_type = 0; LPWSTR message; DWORD sz; DWORD total_size = 0; - INT msg_field=1; INT i; INT rc; char *msg; @@ -607,34 +612,62 @@ INT MSI_ProcessMessage( MSIPACKAGE *pack if ((eMessageType & 0xff000000) == INSTALLMESSAGE_PROGRESS) log_type |= 0x800; - message = msi_alloc(1*sizeof (WCHAR)); - message[0]=0; - msg_field = MSI_RecordGetFieldCount(record); - for (i = 1; i <= msg_field; i++) - { - LPWSTR tmp; - WCHAR number[3]; - static const WCHAR format[] = { '%','i',':',' ',0}; - static const WCHAR space[] = { ' ',0}; - sz = 0; - MSI_RecordGetStringW(record,i,NULL,&sz); - sz+=4; - total_size+=sz*sizeof(WCHAR); - tmp = msi_alloc(sz*sizeof(WCHAR)); - message = msi_realloc(message,total_size*sizeof (WCHAR)); - - MSI_RecordGetStringW(record,i,tmp,&sz); - - if (msg_field > 1) + if ((eMessageType & 0xff000000) == INSTALLMESSAGE_ACTIONSTART) + { + static const WCHAR template_s[]= + {'A','c','t','i','o','n',' ','%','s',':',' ','%','s','.',' ', '%','s', + '.',0}; + static const WCHAR format[] = + {'H','H','\'',':','\'','m','m','\'',':','\'','s','s',0}; + WCHAR timet[0x100]; + LPCWSTR action_text; + LPCWSTR action; + LPWSTR deformated; + + GetTimeFormatW(LOCALE_USER_DEFAULT, 0, NULL, format, timet, 0x100); + + action = MSI_RecordGetString(record, 1); + action_text = MSI_RecordGetString(record, 2); + deformat_string(package, action_text, &deformated); + + len = strlenW(timet) + strlenW(action) + strlenW(deformated) + + strlenW(template_s) - 6 /* 6 characters of format specifier */; + message = msi_alloc((len + 1)*sizeof(WCHAR)); + sprintfW(message,template_s,timet,action,deformated); + msi_free(deformated); + } + else + { + INT msg_field=1; + message = msi_alloc(1*sizeof (WCHAR)); + message[0]=0; + msg_field = MSI_RecordGetFieldCount(record); + for (i = 1; i <= msg_field; i++) { - sprintfW(number,format,i); - strcatW(message,number); - } - strcatW(message,tmp); - if (msg_field > 1) - strcatW(message,space); + LPWSTR tmp; + WCHAR number[3]; + static const WCHAR format[] = { '%','i',':',' ',0}; + static const WCHAR space[] = { ' ',0}; + sz = 0; + MSI_RecordGetStringW(record,i,NULL,&sz); + sz+=4; + total_size+=sz*sizeof(WCHAR); + tmp = msi_alloc(sz*sizeof(WCHAR)); + message = msi_realloc(message,total_size*sizeof (WCHAR)); + + MSI_RecordGetStringW(record,i,tmp,&sz); + + if (msg_field > 1) + { + sprintfW(number,format,i); + strcatW(message,number); + } + strcatW(message,tmp); + if (msg_field > 1) + strcatW(message,space); - msi_free(tmp); + msi_free(tmp); + } } TRACE("(%p %lx %lx %s)\n",gUIHandlerA, gUIFilter, log_type, @@ -668,8 +701,38 @@ INT MSI_ProcessMessage( MSIPACKAGE *pack } } msi_free( msg ); - + msi_free( message); + + switch (eMessageType & 0xff000000) + { + case INSTALLMESSAGE_ACTIONDATA: + /* FIXME: format record here instead of in ui_actiondata to get the + * correct action data for external scripts */ + ControlEvent_FireSubscribedEvent(package, szActionData, record); + break; + case INSTALLMESSAGE_ACTIONSTART: + { + MSIRECORD *uirow; + LPWSTR deformated; + LPCWSTR action_text = MSI_RecordGetString(record, 2); + + deformat_string(package, action_text, &deformated); + uirow = MSI_CreateRecord(1); + MSI_RecordSetStringW(uirow, 1, deformated); + TRACE("INSTALLMESSAGE_ACTIONSTART: %s\n", debugstr_w(deformated)); + msi_free(deformated); + + ControlEvent_FireSubscribedEvent(package, szActionText, uirow); + + msiobj_release(&uirow->hdr); + break; + } + case INSTALLMESSAGE_PROGRESS: + ControlEvent_FireSubscribedEvent(package, szSetProgress, record); + break; + } + return ERROR_SUCCESS; }

1 0

Robert Reif : winearts: Try to keep winecfg from crashing by recovering from an arts
by Alexandre Julliard 23 Jan '06

23 Jan '06

Module: wine Branch: refs/heads/master Commit: 2ba20dd78b7b3f08260bdb602be046eaa1c4e7bf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2ba20dd78b7b3f08260bdb6… Author: Robert Reif <reif(a)earthlink.net> Date: Mon Jan 23 16:48:45 2006 +0100 winearts: Try to keep winecfg from crashing by recovering from an arts library crash. --- dlls/winmm/winearts/Makefile.in | 2 +- dlls/winmm/winearts/audio.c | 20 +++++++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/winearts/Makefile.in b/dlls/winmm/winearts/Makefile.in index dba0062..f277c83 100644 --- a/dlls/winmm/winearts/Makefile.in +++ b/dlls/winmm/winearts/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winearts.drv -IMPORTS = winmm user32 kernel32 +IMPORTS = winmm user32 kernel32 ntdll EXTRAINCL = @ARTSINCL@ EXTRALIBS = @ARTSLIBS@ -ldxguid -luuid diff --git a/dlls/winmm/winearts/audio.c b/dlls/winmm/winearts/audio.c index ea5c5ca..9b5c10b 100644 --- a/dlls/winmm/winearts/audio.c +++ b/dlls/winmm/winearts/audio.c @@ -57,6 +57,7 @@ #include "dsdriver.h" #include "arts.h" #include "wine/unicode.h" +#include "wine/exception.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wave); @@ -392,14 +393,27 @@ LONG ARTS_WaveInit(void) { int i; int errorcode; + LONG ret = 0; TRACE("called\n"); - if ((errorcode = ARTS_Init()) < 0) + __TRY { - WARN("arts_init() failed (%d)\n", errorcode); - return -1; + if ((errorcode = ARTS_Init()) < 0) + { + WARN("arts_init() failed (%d)\n", errorcode); + ret = -1; + } } + __EXCEPT_PAGE_FAULT + { + ERR("arts_init() crashed\n"); + ret = -1; + } + __ENDTRY + + if (ret) + return ret; /* initialize all device handles to -1 */ for (i = 0; i < MAX_WAVEOUTDRV; ++i)

1 0

Detlef Riekenberg : advpack/tests: Fixed failure when ProgramFilesDir is != C:Program
by Alexandre Julliard 23 Jan '06

23 Jan '06

Module: wine Branch: refs/heads/master Commit: c824e8bc5b5c2bfcf56a04fe92f7f7bfe8ac1379 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c824e8bc5b5c2bfcf56a04f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jan 23 17:29:41 2006 +0100 advpack/tests: Fixed failure when "ProgramFilesDir" is != "C:\Program Files". --- dlls/advpack/tests/Makefile.in | 2 +- dlls/advpack/tests/advpack.c | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/advpack/tests/Makefile.in b/dlls/advpack/tests/Makefile.in index dd5e41b..00c0e26 100644 --- a/dlls/advpack/tests/Makefile.in +++ b/dlls/advpack/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = advpack.dll -IMPORTS = cabinet user32 kernel32 +IMPORTS = cabinet user32 advapi32 kernel32 CTESTS = \ advpack.c \ diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index c5972cd..2d82964 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -25,7 +25,7 @@ #include <assert.h> #include "wine/test.h" -#define TEST_STRING1 "C:\\Program Files\\Application Name" +#define TEST_STRING1 "\\Application Name" #define TEST_STRING2 "%49001%\\Application Name" static HRESULT (WINAPI *pGetVersionFromFile)(LPSTR,LPDWORD,LPDWORD,BOOL); @@ -224,8 +224,20 @@ static void translateinfstring_test() if(hr == ERROR_SUCCESS) todo_wine { - ok(!strcmp(buffer, TEST_STRING1), "Expected %s, got %s\n", TEST_STRING1, buffer); - ok(dwSize == 34, "Expected size 34, got %ld\n", dwSize); + HKEY key; + DWORD len = MAX_PATH; + char cmpbuffer[MAX_PATH]; + LONG res = RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", &key); + if(res == ERROR_SUCCESS) { + res = RegQueryValueExA(key, "ProgramFilesDir", NULL, NULL, (LPBYTE)cmpbuffer, &len); + if(res == ERROR_SUCCESS) { + strcat(cmpbuffer, TEST_STRING1); + ok(!strcmp(buffer, cmpbuffer), "Expected '%s', got '%s'\n", cmpbuffer, buffer); + ok(dwSize == (strlen(cmpbuffer)+1), "Expected size %d, got %ld\n", + strlen(cmpbuffer)+1, dwSize); + } + RegCloseKey(key); + } } buffer[0] = 0;

1 0