January 2006 - Wine-Commits

Alexandre Julliard : Set refcount to -1 on implicitly loaded dlls to avoid unloading them
by Alexandre Julliard Jan. 4, 2006

Jan. 4, 2006

Module: wine Branch: refs/heads/master Commit: 45a4e5439b648b1b0620acd11f0a7926d9eaad61 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=45a4e5439b648b1b0620acd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 4 14:55:33 2006 +0100 Set refcount to -1 on implicitly loaded dlls to avoid unloading them (suggested by Michael Ost). --- dlls/ntdll/loader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 58da86f..47cc1da 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -934,6 +934,7 @@ static void attach_implicitly_loaded_dll if (mod->Flags & (LDR_LOAD_IN_PROGRESS | LDR_PROCESS_ATTACHED)) continue; TRACE( "found implicitly loaded %s, attaching to it\n", debugstr_w(mod->BaseDllName.Buffer)); + mod->LoadCount = -1; /* we can't unload it anyway */ process_attach( CONTAINING_RECORD(mod, WINE_MODREF, ldr), reserved ); break; /* restart the search from the start */ }

1 0

Marcus Meissner : shlwapi: Print PathCombine* strings arguments in relay debugging.
by Alexandre Julliard Jan. 4, 2006

Jan. 4, 2006

Module: wine Branch: refs/heads/master Commit: 64869596cff2e9288d0449f595e2a2c6e5a7d28a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=64869596cff2e9288d0449f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 4 14:52:55 2006 +0100 shlwapi: Print PathCombine* strings arguments in relay debugging. --- dlls/shlwapi/shlwapi.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 3d897e2..4a04e0f 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -574,8 +574,8 @@ @ stdcall PathBuildRootW (ptr long) @ stdcall PathCanonicalizeA (ptr str) @ stdcall PathCanonicalizeW (ptr wstr) -@ stdcall PathCombineA (ptr ptr ptr) -@ stdcall PathCombineW (ptr ptr ptr) +@ stdcall PathCombineA (ptr str str) +@ stdcall PathCombineW (ptr wstr wstr) @ stdcall PathCommonPrefixA(str str ptr) @ stdcall PathCommonPrefixW(wstr wstr ptr) @ stdcall PathCompactPathA(long str long)

1 0

Alexandre Julliard : Avoid DECLSPEC_NORETURN on function pointers for MSVC compatibility.
by Alexandre Julliard Jan. 4, 2006

Jan. 4, 2006

Module: wine Branch: refs/heads/master Commit: 3215c3ac9152ec9e1ed854fd28e1e96bc90c8d9e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3215c3ac9152ec9e1ed854f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 4 14:52:43 2006 +0100 Avoid DECLSPEC_NORETURN on function pointers for MSVC compatibility. --- include/wine/pthread.h | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 deletions(-) diff --git a/include/wine/pthread.h b/include/wine/pthread.h index 36381fe..8705a7f 100644 --- a/include/wine/pthread.h +++ b/include/wine/pthread.h @@ -71,15 +71,6 @@ struct wine_pthread_callbacks #endif /* HAVE_PTHREAD_H */ -/* we don't want to include winnt.h here */ -#ifndef DECLSPEC_NORETURN -# ifdef __GNUC__ -# define DECLSPEC_NORETURN __attribute__((noreturn)) -# else -# define DECLSPEC_NORETURN -# endif -#endif - /* thread information used to creating and exiting threads */ struct wine_pthread_thread_info { @@ -101,8 +92,13 @@ struct wine_pthread_functions int (*create_thread)( struct wine_pthread_thread_info *info ); void (*init_current_teb)( struct wine_pthread_thread_info *info ); void * (*get_current_teb)(void); - void (* DECLSPEC_NORETURN exit_thread)( struct wine_pthread_thread_info *info ); - void (* DECLSPEC_NORETURN abort_thread)( long status ); +#ifdef __GNUC__ + void (* __attribute__((noreturn)) exit_thread)( struct wine_pthread_thread_info *info ); + void (* __attribute__((noreturn)) abort_thread)( long status ); +#else + void (*exit_thread)( struct wine_pthread_thread_info *info ); + void (*abort_thread)( long status ); +#endif }; extern void wine_pthread_get_functions( struct wine_pthread_functions *functions, size_t size );

1 0

Mike McCormack : msiexec: Ignore the TRANSFORMS variable.
by Alexandre Julliard Jan. 4, 2006

Jan. 4, 2006

Module: wine Branch: refs/heads/master Commit: 3d2de3d5622f76b122ea132994c80a658731db77 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3d2de3d5622f76b122ea132… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jan 4 14:51:42 2006 +0100 msiexec: Ignore the TRANSFORMS variable. Ignore the TRANSFORMS variable when building a list of transforms for advertising. The variable is used to apply transforms when installing. --- programs/msiexec/msiexec.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 661b0f9..cff4dda 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -452,7 +452,6 @@ int main(int argc, char **argv) DWORD RepairMode = 0; DWORD AdvertiseMode = 0; - LPWSTR Transforms = NULL; struct string_list *transform_list = NULL; LANGID Language = 0; @@ -658,10 +657,6 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); StringListAppend(&transform_list, argvW[i]); } - else if(!msi_strprefix(argvW[i], "TRANSFORMS=")) - { - StringListAppend(&transform_list, argvW[i]+11); - } else if(!msi_strequal(argvW[i], "/g")) { i++; @@ -858,7 +853,6 @@ int main(int argc, char **argv) MsiSetInternalUI(InstallUILevel, NULL); Properties = build_properties( property_list ); - Transforms = build_transforms( transform_list ); if(FunctionInstallAdmin && FunctionPatch) FunctionInstall = FALSE; @@ -880,6 +874,7 @@ int main(int argc, char **argv) } else if(FunctionAdvertise) { + LPWSTR Transforms = build_transforms( property_list ); ReturnCode = MsiAdvertiseProductW(PackageName, (LPWSTR) AdvertiseMode, Transforms, Language); } else if(FunctionPatch)

1 0

Mike McCormack : msi: Apply any MSI transforms specified by the TRANSFORMS property.
by Alexandre Julliard Jan. 4, 2006

Jan. 4, 2006

Module: wine Branch: refs/heads/master Commit: e534e7726b315f460cae62320eb7a393480d6af2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e534e7726b315f460cae623… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jan 4 14:51:25 2006 +0100 msi: Apply any MSI transforms specified by the TRANSFORMS property. --- dlls/msi/action.c | 25 +++++++++++++++++++++++++ dlls/msi/msipriv.h | 2 ++ dlls/msi/msiquery.c | 2 +- 3 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 0a062ba..9ccb716 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -569,6 +569,30 @@ static UINT msi_apply_patches( MSIPACKAG return r; } +static UINT msi_apply_transforms( MSIPACKAGE *package ) +{ + static const WCHAR szTransforms[] = { + 'T','R','A','N','S','F','O','R','M','S',0 }; + LPWSTR xform_list, *xforms; + UINT i, r = ERROR_SUCCESS; + + xform_list = msi_dup_property( package, szTransforms ); + xforms = msi_split_string( xform_list, ';' ); + + for( i=0; xforms && xforms[i] && r == ERROR_SUCCESS; i++ ) + { + if (xforms[i][0] == ':') + r = msi_apply_substorage_transform( package, package->db, &xforms[i][1] ); + else + r = MSI_DatabaseApplyTransformW( package->db, xforms[i], 0 ); + } + + msi_free( xforms ); + msi_free( xform_list ); + + return r; +} + /**************************************************** * TOP level entry points *****************************************************/ @@ -618,6 +642,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *pac msi_parse_command_line( package, szCommandLine ); + msi_apply_transforms( package ); msi_apply_patches( package ); if ( msi_get_property_int(package, szUILevel, 0) >= INSTALLUILEVEL_REDUCED ) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index cb64897..575d121 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -317,6 +317,8 @@ extern UINT read_raw_stream_data( MSIDAT /* transform functions */ extern UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg ); +extern UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, + LPCWSTR szTransformFile, int iErrorCond ); /* action internals */ extern UINT MSI_InstallPackage( MSIPACKAGE *, LPCWSTR, LPCWSTR ); diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index d023ae4..4824d87 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -647,7 +647,7 @@ MSIHANDLE WINAPI MsiGetLastErrorRecord( DEFINE_GUID( CLSID_MsiTransform, 0x000c1082, 0x0000, 0x0000, 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -static UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, +UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, LPCWSTR szTransformFile, int iErrorCond ) { UINT r;

1 0

Mike McCormack : msi: Add a stub for MsiGetLastErrorRecord.
by Alexandre Julliard Jan. 4, 2006

Jan. 4, 2006

Module: wine Branch: refs/heads/master Commit: 40a76a58e3e3dd9e1f3673bf1ba223ff14c00721 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=40a76a58e3e3dd9e1f3673b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jan 4 14:51:05 2006 +0100 msi: Add a stub for MsiGetLastErrorRecord. --- dlls/msi/msi.spec | 2 +- dlls/msi/msiquery.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index ee28694..802adef 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -41,7 +41,7 @@ 45 stdcall MsiEnumProductsW(long ptr) 46 stdcall MsiEvaluateConditionA(long str) 47 stdcall MsiEvaluateConditionW(long wstr) -48 stub MsiGetLastErrorRecord +48 stdcall MsiGetLastErrorRecord() 49 stdcall MsiGetActiveDatabase(long) 50 stdcall MsiGetComponentStateA(long str ptr ptr) 51 stdcall MsiGetComponentStateW(long wstr ptr ptr) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 2cbfbed..d023ae4 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -639,6 +639,12 @@ MSIDBERROR WINAPI MsiViewGetErrorA( MSIH return r; } +MSIHANDLE WINAPI MsiGetLastErrorRecord( void ) +{ + FIXME("\n"); + return 0; +} + DEFINE_GUID( CLSID_MsiTransform, 0x000c1082, 0x0000, 0x0000, 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); static UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db,

1 0

Mike McCormack : msi: Fixes for the MaskedEdit control.
by Alexandre Julliard Jan. 4, 2006

Jan. 4, 2006

Module: wine Branch: refs/heads/master Commit: 576b8a59201c336f06eb8a7034cd37c1ef2ab2b9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=576b8a59201c336f06eb8a7… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jan 4 14:49:50 2006 +0100 msi: Fixes for the MaskedEdit control. Allow MaskedEdit masks that aren't enclosed with <>. Allow the MaskedEdit's edit controls to scroll a bit in case things don't line up. --- dlls/msi/dialog.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index d7b3fdd..1384e22 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1129,15 +1129,16 @@ static struct msi_maskedit_info * msi_di if( !mask ) return info; - p = strchrW(mask, '<'); - if( !p ) - return info; - info = msi_alloc_zero( sizeof *info ); if( !info ) return info; - p++; + p = strchrW(mask, '<'); + if( p ) + p++; + else + p = mask; + for( i=0; i<MASK_MAX_GROUPS; i++ ) { /* stop at the end of the string */ @@ -1177,7 +1178,7 @@ msi_maskedit_create_children( struct msi HWND hwnd; UINT i; - style = WS_CHILD | WS_BORDER | WS_VISIBLE | WS_TABSTOP; + style = WS_CHILD | WS_BORDER | WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL; GetClientRect( info->hwnd, &rect );

1 0

Robert Reif : dsound: Capture cleanup.
by Alexandre Julliard Jan. 4, 2006

Jan. 4, 2006

Module: wine Branch: refs/heads/master Commit: 7643df49d7564a74438a1e3050779793aaacaff5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7643df49d7564a74438a1e3… Author: Robert Reif <reif(a)earthlink.net> Date: Wed Jan 4 14:49:34 2006 +0100 dsound: Capture cleanup. Move code and function prototypes around to eliminate forward declarations. No code is changed. --- dlls/dsound/capture.c | 498 +++++++++++++++++++++--------------------- dlls/dsound/dsound_private.h | 27 ++ 2 files changed, 264 insertions(+), 261 deletions(-)

1 0

Hans Leidekker : winapi: Remove some exceptions now that DLL separation is complete.
by Alexandre Julliard Jan. 4, 2006

Jan. 4, 2006

Module: wine Branch: refs/heads/master Commit: 578e86a68355ba14bb9a4027f7acbe0ae24932e6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=578e86a68355ba14bb9a402… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Jan 4 14:49:22 2006 +0100 winapi: Remove some exceptions now that DLL separation is complete. --- tools/winapi/winapi_global.pm | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/tools/winapi/winapi_global.pm b/tools/winapi/winapi_global.pm index 1986063..63464b2 100644 --- a/tools/winapi/winapi_global.pm +++ b/tools/winapi/winapi_global.pm @@ -40,11 +40,7 @@ sub check_modules($$) { foreach my $internal_name ($winapi->all_internal_functions_in_module($module)) { next if $internal_name =~ /\./; my $function = $functions->{$internal_name}; - if(!defined($function) && !$nativeapi->is_function($internal_name) && - # FIXME: remove these when DLL separation is complete - !($module eq "user32" || $module eq "gdi32" || $module eq "kernel32" || - $module eq "user.exe" || $module eq "keyboard.drv" || $module eq "ddeml" || - $module eq "gdi.exe" || $module eq "dispdib" || $module eq "krnl386.exe")) + if(!defined($function) && !$nativeapi->is_function($internal_name)) { $output->write("*.c: $module: $internal_name: " . "function declared but not implemented or declared external\n");

1 0

Hans Leidekker : Subdirectory tools/winapi_check no longer exists.
by Alexandre Julliard Jan. 4, 2006

Jan. 4, 2006

Module: wine Branch: refs/heads/master Commit: f98e3a33d4265278a553fa7a9f0992d8342ebf4b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f98e3a33d4265278a553fa7… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Jan 4 14:49:12 2006 +0100 Subdirectory tools/winapi_check no longer exists. --- DEVELOPERS-HINTS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/DEVELOPERS-HINTS b/DEVELOPERS-HINTS index 6cc8fbb..8528191 100644 --- a/DEVELOPERS-HINTS +++ b/DEVELOPERS-HINTS @@ -238,7 +238,7 @@ Support programs, libraries, etc: server/ - the Wine server tools/ - various tools used to build/check Wine tools/widl/ - the IDL compiler - tools/winapi{,_check}/ - A Win32 API checker + tools/winapi/ - A Win32 API checker tools/winebuild/ - Wine build tool tools/winedump/ - a .DLL dump utility tools/winegcc/ - a MinGW command line compatible gcc wrapper

1 0