March 2007 - Wine-Commits - list.winehq.org

Alexandre Julliard : server: Expose areas revealed by changes to the window region.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 1767b4558a02e59757553b8ae183c3690879be95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1767b4558a02e59757553b8ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 5 16:43:09 2007 +0100 server: Expose areas revealed by changes to the window region. --- dlls/user32/winpos.c | 2 ++ include/wine/server_protocol.h | 3 ++- server/protocol.def | 1 + server/trace.c | 1 + server/window.c | 30 ++++++++++++++++++++++++++++-- 5 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 46f9a26..635e968 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -250,6 +250,7 @@ int WINAPI SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL bRedraw ) SERVER_START_REQ( set_window_region ) { req->window = hwnd; + req->redraw = (bRedraw != 0); if (data->rdh.nCount) wine_server_add_data( req, data->Buffer, data->rdh.nCount * sizeof(RECT) ); else @@ -263,6 +264,7 @@ int WINAPI SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL bRedraw ) SERVER_START_REQ( set_window_region ) { req->window = hwnd; + req->redraw = (bRedraw != 0); ret = !wine_server_call_err( req ); } SERVER_END_REQ; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index db13e0c..02851dc 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3060,6 +3060,7 @@ struct set_window_region_request { struct request_header __header; user_handle_t window; + int redraw; /* VARARG(region,rectangles); */ }; struct set_window_region_reply @@ -4671,6 +4672,6 @@ union generic_reply struct get_token_impersonation_level_reply get_token_impersonation_level_reply; }; -#define SERVER_PROTOCOL_VERSION 278 +#define SERVER_PROTOCOL_VERSION 279 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 69daab3..d88bbe8 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2233,6 +2233,7 @@ enum message_type /* Set the window region */ @REQ(set_window_region) user_handle_t window; /* handle to the window */ + int redraw; /* redraw the window? */ VARARG(region,rectangles); /* list of rectangles for the region */ @END diff --git a/server/trace.c b/server/trace.c index d4bcf08..56cc7f6 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2708,6 +2708,7 @@ static void dump_get_window_region_reply( const struct get_window_region_reply * static void dump_set_window_region_request( const struct set_window_region_request *req ) { fprintf( stderr, " window=%p,", req->window ); + fprintf( stderr, " redraw=%d,", req->redraw ); fprintf( stderr, " region=" ); dump_varargs_rectangles( cur_size ); } diff --git a/server/window.c b/server/window.c index c526185..03ed61e 100644 --- a/server/window.c +++ b/server/window.c @@ -1443,6 +1443,33 @@ done: } +/* set the window region, updating the update region if necessary */ +static void set_window_region( struct window *win, struct region *region, int redraw ) +{ + struct region *old_vis_rgn = NULL, *new_vis_rgn; + struct window *top = get_top_clipping_window( win ); + + /* no need to redraw if window is not visible */ + if (redraw && !is_visible( win )) redraw = 0; + + if (redraw) old_vis_rgn = get_visible_region( win, top, DCX_WINDOW ); + + if (win->win_region) free_region( win->win_region ); + win->win_region = region; + + if (old_vis_rgn && (new_vis_rgn = get_visible_region( win, top, DCX_WINDOW ))) + { + /* expose anything revealed by the change */ + if (xor_region( new_vis_rgn, old_vis_rgn, new_vis_rgn )) + expose_window( win, top, new_vis_rgn ); + free_region( new_vis_rgn ); + } + + if (old_vis_rgn) free_region( old_vis_rgn ); + clear_error(); /* we ignore out of memory errors since the region has been set */ +} + + /* create a window */ DECL_HANDLER(create_window) { @@ -1900,8 +1927,7 @@ DECL_HANDLER(set_window_region) if (!(region = create_region_from_req_data( get_req_data(), get_req_data_size() ))) return; } - if (win->win_region) free_region( win->win_region ); - win->win_region = region; + set_window_region( win, region, req->redraw ); }

1 0

Rob Shearman : kernel32: Implement CallNamedPipeW.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 5267e36ad0abf1d5eb12d2a83ea4ec6af97b7b61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5267e36ad0abf1d5eb12d2a83… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 5 12:06:02 2007 +0000 kernel32: Implement CallNamedPipeW. --- dlls/kernel32/sync.c | 37 +++++++++++++++++++++++++++++++++---- 1 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index eaa0f70..d3f2f4b 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1515,10 +1515,39 @@ BOOL WINAPI CallNamedPipeW( LPVOID lpOutput, DWORD lpOutputSize, LPDWORD lpBytesRead, DWORD nTimeout) { - FIXME("%s %p %d %p %d %p %d\n", - debugstr_w(lpNamedPipeName), lpInput, lpInputSize, - lpOutput, lpOutputSize, lpBytesRead, nTimeout); - return FALSE; + HANDLE pipe; + BOOL ret; + DWORD mode; + + TRACE("%s %p %d %p %d %p %d\n", + debugstr_w(lpNamedPipeName), lpInput, lpInputSize, + lpOutput, lpOutputSize, lpBytesRead, nTimeout); + + pipe = CreateFileW(lpNamedPipeName, GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + if (pipe == INVALID_HANDLE_VALUE) + { + ret = WaitNamedPipeW(lpNamedPipeName, nTimeout); + if (!ret) + return FALSE; + pipe = CreateFileW(lpNamedPipeName, GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + if (pipe == INVALID_HANDLE_VALUE) + return FALSE; + } + + mode = PIPE_READMODE_MESSAGE; + ret = SetNamedPipeHandleState(pipe, &mode, NULL, NULL); + if (!ret) + { + CloseHandle(pipe); + return FALSE; + } + + ret = TransactNamedPipe(pipe, lpInput, lpInputSize, lpOutput, lpOutputSize, lpBytesRead, NULL); + CloseHandle(pipe); + if (!ret) + return FALSE; + + return TRUE; } /******************************************************************

1 0

Michael Stefaniuc : hhctrl.ocx: Fix a format warning.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: eff5b130436bace975dbe7c5b70664a1bf7f93e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eff5b130436bace975dbe7c5b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 5 13:48:23 2007 +0100 hhctrl.ocx: Fix a format warning. --- dlls/hhctrl.ocx/help.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index f43cc0b..3bc9e8e 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -77,7 +77,7 @@ static HRESULT navigate_url(HHInfo *info, LPCWSTR surl) VariantClear(&url); if(FAILED(hres)) - TRACE("Navigation failed: %08lx\n", hres); + TRACE("Navigation failed: %08x\n", hres); return hres; }

1 0

Rob Shearman : wininet: Always make copies of strings passed to INTERNET_SendCallback.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 07daeff8f463d364deeff17a6a03439e9bfc9193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07daeff8f463d364deeff17a6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 5 12:06:47 2007 +0000 wininet: Always make copies of strings passed to INTERNET_SendCallback. This ensures that applications that change the strings received in status callbacks don't affect the data needed to successfully connect to the correct server. --- dlls/wininet/tests/http.c | 5 +++++ dlls/wininet/utility.c | 12 ++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 91438c6..8926968 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -56,21 +56,25 @@ static VOID WINAPI callback( trace("%04x:Callback %p 0x%lx INTERNET_STATUS_RESOLVING_NAME \"%s\" %d\n", GetCurrentThreadId(), hInternet, dwContext, (LPCSTR)lpvStatusInformation,dwStatusInformationLength); + *(LPSTR)lpvStatusInformation = '\0'; break; case INTERNET_STATUS_NAME_RESOLVED: trace("%04x:Callback %p 0x%lx INTERNET_STATUS_NAME_RESOLVED \"%s\" %d\n", GetCurrentThreadId(), hInternet, dwContext, (LPCSTR)lpvStatusInformation,dwStatusInformationLength); + *(LPSTR)lpvStatusInformation = '\0'; break; case INTERNET_STATUS_CONNECTING_TO_SERVER: trace("%04x:Callback %p 0x%lx INTERNET_STATUS_CONNECTING_TO_SERVER \"%s\" %d\n", GetCurrentThreadId(), hInternet, dwContext, (LPCSTR)lpvStatusInformation,dwStatusInformationLength); + *(LPSTR)lpvStatusInformation = '\0'; break; case INTERNET_STATUS_CONNECTED_TO_SERVER: trace("%04x:Callback %p 0x%lx INTERNET_STATUS_CONNECTED_TO_SERVER \"%s\" %d\n", GetCurrentThreadId(), hInternet, dwContext, (LPCSTR)lpvStatusInformation,dwStatusInformationLength); + *(LPSTR)lpvStatusInformation = '\0'; break; case INTERNET_STATUS_SENDING_REQUEST: trace("%04x:Callback %p 0x%lx INTERNET_STATUS_SENDING_REQUEST %p %d\n", @@ -150,6 +154,7 @@ static VOID WINAPI callback( trace("%04x:Callback %p 0x%lx INTERNET_STATUS_REDIRECT \"%s\" %d\n", GetCurrentThreadId(), hInternet, dwContext, (LPCSTR)lpvStatusInformation, dwStatusInformationLength); + *(LPSTR)lpvStatusInformation = '\0'; break; case INTERNET_STATUS_INTERMEDIATE_RESPONSE: trace("%04x:Callback %p 0x%lx INTERNET_STATUS_INTERMEDIATE_RESPONSE %p %d\n", diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 273177d..34e72d0 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -231,13 +231,25 @@ VOID INTERNET_SendCallback(LPWININETHANDLEHEADER hdr, DWORD dwContext, case INTERNET_STATUS_CONNECTING_TO_SERVER: case INTERNET_STATUS_CONNECTED_TO_SERVER: lpvNewInfo = WININET_strdup_AtoW(lpvStatusInfo); + break; + case INTERNET_STATUS_RESOLVING_NAME: + case INTERNET_STATUS_REDIRECT: + lpvNewInfo = WININET_strdupW(lpvStatusInfo); + break; } }else { switch(dwInternetStatus) { + case INTERNET_STATUS_NAME_RESOLVED: + case INTERNET_STATUS_CONNECTING_TO_SERVER: + case INTERNET_STATUS_CONNECTED_TO_SERVER: + lpvNewInfo = HeapAlloc(GetProcessHeap(), 0, strlen(lpvStatusInfo) + 1); + if (lpvNewInfo) strcpy(lpvNewInfo, lpvStatusInfo); + break; case INTERNET_STATUS_RESOLVING_NAME: case INTERNET_STATUS_REDIRECT: lpvNewInfo = WININET_strdup_WtoA(lpvStatusInfo); + break; } }

1 0

Rob Shearman : credui: The pfSave parameter of CredUIPromptForCredentials is optional.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: d72f741a33e25e50d85fff4e6ef201ed8a070a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d72f741a33e25e50d85fff4e6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 5 12:05:19 2007 +0000 credui: The pfSave parameter of CredUIPromptForCredentials is optional. --- dlls/credui/credui_main.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 714ec93..1d646f3 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -167,7 +167,7 @@ DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW pUIInfo, params.ulUsernameMaxChars = ulUsernameMaxChars; params.pszPassword = pszPassword; params.ulPasswordMaxChars = ulPasswordMaxChars; - params.fSave = *pfSave; + params.fSave = pfSave ? *pfSave : FALSE; ret = DialogBoxParamW(hinstCredUI, MAKEINTRESOURCEW(IDD_CREDDIALOG), pUIInfo->hwndParent, CredDialogProc, (LPARAM)&params); @@ -180,7 +180,8 @@ DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW pUIInfo, return ERROR_CANCELLED; } - *pfSave = params.fSave; + if (pfSave) + *pfSave = params.fSave; return ERROR_SUCCESS; }

1 0

Rob Shearman : msi: Set the PackageCode property based on the " revision number" data in the summary information.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 77f6bc4f8d46950ffcd9eb0d7ddd4b36fa16f9d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77f6bc4f8d46950ffcd9eb0d7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 5 12:04:41 2007 +0000 msi: Set the PackageCode property based on the "revision number" data in the summary information. Add a test to show that PackageCode is set by MSI. --- dlls/msi/package.c | 41 ++++++++++++++++++++++++++++++++--------- dlls/msi/tests/package.c | 5 +++++ 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 74d18cb..73298af 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -459,12 +459,16 @@ static VOID set_installer_properties(MSIPACKAGE *package) CloseHandle( hkey ); } -static UINT msi_get_word_count( MSIPACKAGE *package ) +static UINT msi_load_summary_properties( MSIPACKAGE *package ) { UINT rc; - INT word_count; MSIHANDLE suminfo; MSIHANDLE hdb = alloc_msihandle( &package->db->hdr ); + INT word_count; + DWORD len; + LPWSTR package_code; + static const WCHAR szPackageCode[] = { + 'P','a','c','k','a','g','e','C','o','d','e',0}; if (!hdb) { ERR("Unable to allocate handle\n"); @@ -475,20 +479,38 @@ static UINT msi_get_word_count( MSIPACKAGE *package ) if (rc != ERROR_SUCCESS) { ERR("Unable to open Summary Information\n"); - return 0; + return rc; } + /* load package attributes */ rc = MsiSummaryInfoGetPropertyW( suminfo, PID_WORDCOUNT, NULL, &word_count, NULL, NULL, NULL ); - if (rc != ERROR_SUCCESS) + if (rc == ERROR_SUCCESS) + package->WordCount = word_count; + else + WARN("Unable to query word count\n"); + + /* load package code property */ + len = 0; + rc = MsiSummaryInfoGetPropertyW( suminfo, PID_REVNUMBER, NULL, + NULL, NULL, NULL, &len ); + if (rc == ERROR_MORE_DATA) { - ERR("Unable to query word count\n"); - MsiCloseHandle(suminfo); - return 0; + len++; + package_code = msi_alloc( len * sizeof(WCHAR) ); + rc = MsiSummaryInfoGetPropertyW( suminfo, PID_REVNUMBER, NULL, + NULL, NULL, package_code, &len ); + if (rc == ERROR_SUCCESS) + MSI_SetPropertyW( package, szPackageCode, package_code ); + else + WARN("Unable to query rev number, %d\n", rc); + msi_free( package_code ); } + else + WARN("Unable to query rev number, %d\n", rc); MsiCloseHandle(suminfo); - return word_count; + return ERROR_SUCCESS; } static MSIPACKAGE *msi_alloc_package( void ) @@ -542,7 +564,7 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPWSTR base_url ) msiobj_addref( &db->hdr ); package->db = db; - package->WordCount = msi_get_word_count( package ); + package->WordCount = 0; package->PackagePath = strdupW( db->path ); package->BaseURL = strdupW( base_url ); @@ -553,6 +575,7 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPWSTR base_url ) package->ProductCode = msi_dup_property( package, szProductCode ); set_installed_prop( package ); + msi_load_summary_properties( package ); } return package; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 536fa1e..f461cb6 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -3018,6 +3018,11 @@ static void test_installprops(void) ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); trace("Time = %s\n", buf); + size = MAX_PATH; + r = MsiGetProperty(hpkg, "PackageCode", buf, &size); + ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); + trace("PackageCode = %s\n", buf); + CloseHandle(hkey); MsiCloseHandle(hpkg); DeleteFile(msifile);

1 0

Rob Shearman : msi: Rewrite the second loop in ACTION_FinishCustomActions so that it always terminates .
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: e2972af43637d5e803d93b1cc89c8d0432bf8cb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2972af43637d5e803d93b1cc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 5 12:03:59 2007 +0000 msi: Rewrite the second loop in ACTION_FinishCustomActions so that it always terminates. Create an array of handles to wait on so that we can wait without holding a critical section. --- dlls/msi/custom.c | 33 +++++++++++++++++---------------- 1 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index c6c07cf..fc86691 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -859,6 +859,9 @@ static UINT HANDLE_CustomType34(MSIPACKAGE *package, LPCWSTR source, void ACTION_FinishCustomActions(MSIPACKAGE* package) { struct list *item; + HANDLE *wait_handles; + unsigned int handle_count, i; + msi_custom_action_info *info, *cursor; while ((item = list_head( &package->RunningActions ))) { @@ -874,27 +877,25 @@ void ACTION_FinishCustomActions(MSIPACKAGE* package) msi_free( action ); } - while (1) - { - HANDLE handle; - msi_custom_action_info *info; + EnterCriticalSection( &msi_custom_action_cs ); - EnterCriticalSection( &msi_custom_action_cs ); - item = list_head( &msi_pending_custom_actions ); - info = LIST_ENTRY( item, msi_custom_action_info, entry ); + handle_count = list_count( &msi_pending_custom_actions ); + wait_handles = HeapAlloc( GetProcessHeap(), 0, handle_count * sizeof(HANDLE) ); - if (item && info->package == package ) + handle_count = 0; + LIST_FOR_EACH_ENTRY_SAFE( info, cursor, &msi_pending_custom_actions, msi_custom_action_info, entry ) + { + if (info->package == package ) { - handle = info->handle; + wait_handles[handle_count++] = info->handle; free_custom_action_data( info ); } - else - handle = NULL; - LeaveCriticalSection( &msi_custom_action_cs ); + } - if (!item) - break; + LeaveCriticalSection( &msi_custom_action_cs ); - msi_dialog_check_messages( handle ); - } + for (i = 0; i < handle_count; i++) + msi_dialog_check_messages( wait_handles[i] ); + + HeapFree( GetProcessHeap(), 0, wait_handles ); }

1 0

Rob Shearman : msi: Set the Date, Time and VersionDatabase properties.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 95f38b75fbf7f25c317d1b18762aa982904d7ef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95f38b75fbf7f25c317d1b187… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 5 12:03:20 2007 +0000 msi: Set the Date, Time and VersionDatabase properties. Add tests for these properties. Update the todo list of properties to set. --- dlls/msi/package.c | 28 +++++++++++++++++++++++++--- dlls/msi/tests/package.c | 20 ++++++++++++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index b78910d..74d18cb 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -182,6 +182,8 @@ static VOID set_installer_properties(MSIPACKAGE *package) LPWSTR check; HKEY hkey; LONG res; + SYSTEM_INFO sys_info; + SYSTEMTIME systemtime; static const WCHAR cszbs[]={'\\',0}; static const WCHAR CFF[] = @@ -242,6 +244,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) static const WCHAR szSix[] = {'6',0 }; static const WCHAR szVersionMsi[] = { 'V','e','r','s','i','o','n','M','s','i',0 }; + static const WCHAR szVersionDatabase[] = { 'V','e','r','s','i','o','n','D','a','t','a','b','a','s','e',0 }; static const WCHAR szPhysicalMemory[] = { 'P','h','y','s','i','c','a','l','M','e','m','o','r','y',0 }; static const WCHAR szFormat2[] = {'%','l','i','.','%','l','i',0}; /* Screen properties */ @@ -263,15 +266,16 @@ static VOID set_installer_properties(MSIPACKAGE *package) }; static const WCHAR szUSERNAME[] = {'U','S','E','R','N','A','M','E',0}; static const WCHAR szCOMPANYNAME[] = {'C','O','M','P','A','N','Y','N','A','M','E',0}; - SYSTEM_INFO sys_info; + static const WCHAR szDate[] = {'D','a','t','e',0}; + static const WCHAR szTime[] = {'T','i','m','e',0}; /* * Other things that probably should be set: * * SystemLanguageID ComputerName UserLanguageID LogonUser VirtualMemory - * Intel ShellAdvSupport DefaultUIFont VersionDatabase PackagecodeChanging + * ShellAdvSupport DefaultUIFont PackagecodeChanging * ProductState CaptionHeight BorderTop BorderSide TextHeight - * RedirectedDllSupport Time Date Privileged + * RedirectedDllSupport */ SHGetFolderPathW(NULL,CSIDL_PROGRAM_FILES_COMMON,NULL,0,pth); @@ -389,6 +393,8 @@ static VOID set_installer_properties(MSIPACKAGE *package) sprintfW( bufstr, szFormat2, MSI_MAJORVERSION, MSI_MINORVERSION); MSI_SetPropertyW( package, szVersionMsi, bufstr ); + sprintfW( bufstr, szFormat, MSI_MAJORVERSION * 100); + MSI_SetPropertyW( package, szVersionDatabase, bufstr ); GetSystemInfo( &sys_info ); if (sys_info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) @@ -433,6 +439,22 @@ static VOID set_installer_properties(MSIPACKAGE *package) if ( set_user_sid_prop( package ) != ERROR_SUCCESS) ERR("Failed to set the UserSID property\n"); + /* Date and time properties */ + GetSystemTime( &systemtime ); + if (GetDateFormatW( LOCALE_USER_DEFAULT, DATE_SHORTDATE, &systemtime, + NULL, bufstr, sizeof(bufstr)/sizeof(bufstr[0]) )) + MSI_SetPropertyW( package, szDate, bufstr ); + else + ERR("Couldn't set Date property: GetDateFormat failed with error %d\n", GetLastError()); + + if (GetTimeFormatW( LOCALE_USER_DEFAULT, + TIME_FORCE24HOURFORMAT | TIME_NOTIMEMARKER, + &systemtime, NULL, bufstr, + sizeof(bufstr)/sizeof(bufstr[0]) )) + MSI_SetPropertyW( package, szTime, bufstr ); + else + ERR("Couldn't set Time property: GetTimeFormat failed with error %d\n", GetLastError()); + msi_free( check ); CloseHandle( hkey ); } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 233b472..536fa1e 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2998,6 +2998,26 @@ static void test_installprops(void) ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); ok( !lstrcmp(buf, path), "Expected %s, got %s\n", path, buf); + size = MAX_PATH; + r = MsiGetProperty(hpkg, "VersionDatabase", buf, &size); + ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); + trace("VersionDatabase = %s\n", buf); + + size = MAX_PATH; + r = MsiGetProperty(hpkg, "VersionMsi", buf, &size); + ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); + trace("VersionMsi = %s\n", buf); + + size = MAX_PATH; + r = MsiGetProperty(hpkg, "Date", buf, &size); + ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); + trace("Date = %s\n", buf); + + size = MAX_PATH; + r = MsiGetProperty(hpkg, "Time", buf, &size); + ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); + trace("Time = %s\n", buf); + CloseHandle(hkey); MsiCloseHandle(hpkg); DeleteFile(msifile);

1 0

Joris Huizer : winedump: sign-compare fixes.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 4bfd7059f2c2094f8f7fab0d4c7b079b9fbd09be URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bfd7059f2c2094f8f7fab0d4… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Sat Mar 3 05:30:32 2007 -0800 winedump: sign-compare fixes. --- tools/winedump/minidump.c | 2 +- tools/winedump/msc.c | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index 2c61a7c..07108b8 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -44,7 +44,7 @@ static void dump_mdmp_string(DWORD rva) printf("<<?>>"); } -static const MINIDUMP_DIRECTORY* get_mdmp_dir(const MINIDUMP_HEADER* hdr, int str_idx) +static const MINIDUMP_DIRECTORY* get_mdmp_dir(const MINIDUMP_HEADER* hdr, unsigned int str_idx) { const MINIDUMP_DIRECTORY* dir; unsigned int i; diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 4ef3387..e7e1100 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -511,6 +511,7 @@ static void codeview_dump_one_type(unsigned curr_type, const union codeview_type { const union codeview_reftype* reftype = (const union codeview_reftype*)type; int i, leaf_len, value; + unsigned int j; const char* str; switch (type->generic.id) @@ -663,9 +664,9 @@ static void codeview_dump_one_type(unsigned curr_type, const union codeview_type case LF_ARGLIST_V2: printf("\t%x => Arglist V2(#%u):", curr_type, reftype->arglist_v2.num); - for (i = 0; i < reftype->arglist_v2.num; i++) + for (j = 0; j < reftype->arglist_v2.num; j++) { - printf("\t %x", reftype->arglist_v2.args[i]); + printf("\t %x", reftype->arglist_v2.args[j]); } printf("\t\n"); break; @@ -786,9 +787,9 @@ static void codeview_dump_one_type(unsigned curr_type, const union codeview_type case LF_DERIVED_V2: printf("\t%x => Derived V2(#%u):", curr_type, reftype->derived_v2.num); - for (i = 0; i < reftype->derived_v2.num; i++) + for (j = 0; j < reftype->derived_v2.num; j++) { - printf(" %x", reftype->derived_v2.drvdcls[i]); + printf(" %x", reftype->derived_v2.drvdcls[j]); } printf("\n"); break; @@ -832,9 +833,10 @@ int codeview_dump_types_from_block(const void* table, unsigned long len) int codeview_dump_symbols(const void* root, unsigned long size) { - int i, length; - char* curr_func = NULL; - int nest_block = 0; + unsigned int i; + int length; + char* curr_func = NULL; + int nest_block = 0; /* * Loop over the different types of records and whenever we * find something we are interested in, record it and move on.

1 0

Joris Huizer : preloader: sign-compare fix.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: e1e54d1ee7892457e697aa5d78a202befb909c54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1e54d1ee7892457e697aa5d7… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Sat Mar 3 05:30:55 2007 -0800 preloader: sign-compare fix. --- loader/preloader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 5648158..0034e9a 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -1006,7 +1006,8 @@ static int is_in_preload_range( const ElfW(auxv_t) *av, int type ) /* set the process name if supported */ static void set_process_name( int argc, char *argv[] ) { - unsigned int i, off; + int i; + unsigned int off; char *p, *name, *end; /* set the process short name */

1 0