November 2005 - Wine-Commits

wine/dlls/msi tests/package.c install.c
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21042 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 05:43:05 Modified files: dlls/msi/tests : package.c dlls/msi : install.c Log message: Mike McCormack <mike(a)codeweavers.com> Fix parameter handling in MsiSetTargetPath, and add a test for it. Patch: http://cvs.winehq.org/patch.py?id=21042 Old revision New revision Changes Path 1.7 1.8 +24 -0 wine/dlls/msi/tests/package.c 1.18 1.19 +17 -26 wine/dlls/msi/install.c Index: wine/dlls/msi/tests/package.c diff -u -p wine/dlls/msi/tests/package.c:1.7 wine/dlls/msi/tests/package.c:1.8 --- wine/dlls/msi/tests/package.c:1.7 2 Nov 2005 11:43: 5 -0000 +++ wine/dlls/msi/tests/package.c 2 Nov 2005 11:43: 5 -0000 @@ -326,6 +326,29 @@ static void test_gettargetpath_bad(void) MsiCloseHandle( hpkg ); } +void test_settargetpath_bad(void) +{ + MSIHANDLE hpkg; + UINT r; + + hpkg = package_from_db(create_package_db()); + ok( hpkg, "failed to create package\n"); + + r = MsiSetTargetPath( 0, NULL, NULL ); + ok( r == ERROR_INVALID_PARAMETER, "wrong return val\n"); + + r = MsiSetTargetPath( 0, "boo", "C:\\bogusx" ); + ok( r == ERROR_INVALID_HANDLE, "wrong return val\n"); + + r = MsiSetTargetPath( hpkg, "boo", NULL ); + ok( r == ERROR_INVALID_PARAMETER, "wrong return val\n"); + + r = MsiSetTargetPath( hpkg, "boo", "c:\\bogusx" ); + ok( r == ERROR_DIRECTORY, "wrong return val\n"); + + MsiCloseHandle( hpkg ); +} + void test_condition(void) { MSICONDITION r; @@ -696,5 +719,6 @@ START_TEST(package) test_getsourcepath(); test_doaction(); test_gettargetpath_bad(); + test_settargetpath_bad(); test_props(); } Index: wine/dlls/msi/install.c diff -u -p wine/dlls/msi/install.c:1.18 wine/dlls/msi/install.c:1.19 --- wine/dlls/msi/install.c:1.18 2 Nov 2005 11:43: 5 -0000 +++ wine/dlls/msi/install.c 2 Nov 2005 11:43: 5 -0000 @@ -296,31 +296,23 @@ UINT WINAPI MsiGetSourcePathW( MSIHANDLE /*********************************************************************** * MsiSetTargetPathA (MSI.@) */ -UINT WINAPI MsiSetTargetPathA(MSIHANDLE hInstall, LPCSTR szFolder, - LPCSTR szFolderPath) +UINT WINAPI MsiSetTargetPathA( MSIHANDLE hInstall, LPCSTR szFolder, + LPCSTR szFolderPath ) { - LPWSTR szwFolder; - LPWSTR szwFolderPath; - UINT rc; + LPWSTR szwFolder = NULL, szwFolderPath = NULL; + UINT rc = ERROR_OUTOFMEMORY; - if (!szFolder) - return ERROR_FUNCTION_FAILED; - if (hInstall == 0) - return ERROR_FUNCTION_FAILED; + if ( !szFolder || !szFolderPath ) + return ERROR_INVALID_PARAMETER; szwFolder = strdupAtoW(szFolder); - if (!szwFolder) - return ERROR_FUNCTION_FAILED; - szwFolderPath = strdupAtoW(szFolderPath); - if (!szwFolderPath) - { - msi_free(szwFolder); - return ERROR_FUNCTION_FAILED; - } + if (!szwFolder || !szwFolderPath) + goto end; - rc = MsiSetTargetPathW(hInstall, szwFolder, szwFolderPath); + rc = MsiSetTargetPathW( hInstall, szwFolder, szwFolderPath ); +end: msi_free(szwFolder); msi_free(szwFolderPath); @@ -342,12 +334,6 @@ UINT MSI_SetTargetPathW(MSIPACKAGE *pack TRACE("(%p %s %s)\n",package, debugstr_w(szFolder),debugstr_w(szFolderPath)); - if (package==NULL) - return ERROR_INVALID_HANDLE; - - if (szFolderPath[0]==0) - return ERROR_FUNCTION_FAILED; - attrib = GetFileAttributesW(szFolderPath); if ( attrib != INVALID_FILE_ATTRIBUTES && (!(attrib & FILE_ATTRIBUTE_DIRECTORY) || @@ -356,9 +342,8 @@ UINT MSI_SetTargetPathW(MSIPACKAGE *pack return ERROR_FUNCTION_FAILED; path = resolve_folder(package,szFolder,FALSE,FALSE,&folder); - if (!path) - return ERROR_INVALID_PARAMETER; + return ERROR_DIRECTORY; if (attrib == INVALID_FILE_ATTRIBUTES) { @@ -416,7 +401,13 @@ UINT WINAPI MsiSetTargetPathW(MSIHANDLE TRACE("(%s %s)\n",debugstr_w(szFolder),debugstr_w(szFolderPath)); + if ( !szFolder || !szFolderPath ) + return ERROR_INVALID_PARAMETER; + package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE); + if (!package) + return ERROR_INVALID_HANDLE; + ret = MSI_SetTargetPathW( package, szFolder, szFolderPath ); msiobj_release( &package->hdr ); return ret;

1 0

wine/dlls/msi files.c action.h action.c
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21041 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 05:42:56 Modified files: dlls/msi : files.c action.h action.c Log message: Mike McCormack <mike(a)codeweavers.com> Implement the RemoveFiles action. Patch: http://cvs.winehq.org/patch.py?id=21041 Old revision New revision Changes Path 1.28 1.29 +26 -0 wine/dlls/msi/files.c 1.47 1.48 +1 -0 wine/dlls/msi/action.h 1.226 1.227 +1 -1 wine/dlls/msi/action.c Index: wine/dlls/msi/files.c diff -u -p wine/dlls/msi/files.c:1.28 wine/dlls/msi/files.c:1.29 --- wine/dlls/msi/files.c:1.28 2 Nov 2005 11:42:56 -0000 +++ wine/dlls/msi/files.c 2 Nov 2005 11:42:56 -0000 @@ -868,3 +868,29 @@ UINT ACTION_DuplicateFiles(MSIPACKAGE *p return rc; } + +UINT ACTION_RemoveFiles( MSIPACKAGE *package ) +{ + MSIFILE *file; + + LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) + { + if ( !file->Component ) + continue; + if ( file->Component->Installed == INSTALLSTATE_LOCAL ) + continue; + + if ( file->state == msifs_installed ) + ERR("removing installed file %s\n", debugstr_w(file->TargetPath)); + + if ( file->state != msifs_present ) + continue; + + TRACE("removing %s\n", debugstr_w(file->File) ); + if ( !DeleteFileW( file->TargetPath ) ) + ERR("failed to delete %s\n", debugstr_w(file->TargetPath) ); + file->state = msifs_missing; + } + + return ERROR_SUCCESS; +} Index: wine/dlls/msi/action.h diff -u -p wine/dlls/msi/action.h:1.47 wine/dlls/msi/action.h:1.48 --- wine/dlls/msi/action.h:1.47 2 Nov 2005 11:42:56 -0000 +++ wine/dlls/msi/action.h 2 Nov 2005 11:42:56 -0000 @@ -243,6 +243,7 @@ extern UINT ACTION_CustomAction(MSIPACKA extern UINT ACTION_AppSearch(MSIPACKAGE *package); extern UINT ACTION_FindRelatedProducts(MSIPACKAGE *package); extern UINT ACTION_InstallFiles(MSIPACKAGE *package); +extern UINT ACTION_RemoveFiles(MSIPACKAGE *package); extern UINT ACTION_DuplicateFiles(MSIPACKAGE *package); extern UINT ACTION_RegisterClassInfo(MSIPACKAGE *package); extern UINT ACTION_RegisterProgIdInfo(MSIPACKAGE *package); Index: wine/dlls/msi/action.c diff -u -p wine/dlls/msi/action.c:1.226 wine/dlls/msi/action.c:1.227 --- wine/dlls/msi/action.c:1.226 2 Nov 2005 11:42:56 -0000 +++ wine/dlls/msi/action.c 2 Nov 2005 11:42:56 -0000 @@ -4285,7 +4285,7 @@ static struct _actions StandardActions[] { szRemoveDuplicateFiles, NULL}, { szRemoveEnvironmentStrings, ACTION_RemoveEnvironmentStrings }, { szRemoveExistingProducts, NULL}, - { szRemoveFiles, NULL}, + { szRemoveFiles, ACTION_RemoveFiles}, { szRemoveFolders, NULL}, { szRemoveIniValues, ACTION_RemoveIniValues }, { szRemoveODBC, NULL},

1 0

wine/dlls/ntdll rtlstr.c
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21040 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 05:42:31 Modified files: dlls/ntdll : rtlstr.c Log message: Ivan Leo Puoti <ivanleo(a)gmail.com> Minor fixes to rtl string functions. Patch: http://cvs.winehq.org/patch.py?id=21040 Old revision New revision Changes Path 1.54 1.55 +11 -2 wine/dlls/ntdll/rtlstr.c Index: wine/dlls/ntdll/rtlstr.c diff -u -p wine/dlls/ntdll/rtlstr.c:1.54 wine/dlls/ntdll/rtlstr.c:1.55 --- wine/dlls/ntdll/rtlstr.c:1.54 2 Nov 2005 11:42:31 -0000 +++ wine/dlls/ntdll/rtlstr.c 2 Nov 2005 11:42:31 -0000 @@ -28,6 +28,7 @@ #include <string.h> #include "windef.h" +#include "winnt.h" #include "winternl.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -128,7 +129,11 @@ void WINAPI RtlInitString( */ void WINAPI RtlFreeAnsiString( PSTRING str ) { - if (str->Buffer) RtlFreeHeap( GetProcessHeap(), 0, str->Buffer ); + if (str->Buffer) + { + RtlFreeHeap( GetProcessHeap(), 0, str->Buffer ); + RtlZeroMemory( str, sizeof(*str) ); + } } @@ -267,7 +272,11 @@ BOOLEAN WINAPI RtlCreateUnicodeStringFro */ void WINAPI RtlFreeUnicodeString( PUNICODE_STRING str ) { - if (str->Buffer) RtlFreeHeap( GetProcessHeap(), 0, str->Buffer ); + if (str->Buffer) + { + RtlFreeHeap( GetProcessHeap(), 0, str->Buffer ); + RtlZeroMemory( str, sizeof(*str) ); + } }

1 0

wine/dlls mpr/mpr_Cs.rc hhctrl.ocx/hhctrl.rc d ...
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21039 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 05:01:07 Modified files: dlls/mpr : mpr_Cs.rc dlls/hhctrl.ocx: hhctrl.rc dlls/devenum : devenum.rc dlls/commdlg : cdlg_Cs.rc Added files: dlls/hhctrl.ocx: Cs.rc Log message: David Kredba <kredba(a)math.cas.cz> Czech resources update. Patch: http://cvs.winehq.org/patch.py?id=21039 Old revision New revision Changes Path 1.1 1.2 +21 -1 wine/dlls/mpr/mpr_Cs.rc 1.5 1.6 +1 -0 wine/dlls/hhctrl.ocx/hhctrl.rc Added 1.1 +0 -0 wine/dlls/hhctrl.ocx/Cs.rc 1.11 1.12 +9 -0 wine/dlls/devenum/devenum.rc 1.9 1.10 +336 -70 wine/dlls/commdlg/cdlg_Cs.rc

1 0

wine/ include/msi.h dlls/msi/msi.spec dlls/msi ...
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21038 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 04:56:55 Modified files: include : msi.h dlls/msi : msi.spec msi.c Log message: Mike McCormack <mike(a)codeweavers.com> Stub implementation for MsiGetFileHashA/W. Patch: http://cvs.winehq.org/patch.py?id=21038 Old revision New revision Changes Path 1.33 1.34 +9 -0 wine/include/msi.h 1.48 1.49 +2 -2 wine/dlls/msi/msi.spec 1.111 1.112 +20 -0 wine/dlls/msi/msi.c Index: wine/include/msi.h diff -u -p wine/include/msi.h:1.33 wine/include/msi.h:1.34 --- wine/include/msi.h:1.33 2 Nov 2005 10:56:55 -0000 +++ wine/include/msi.h 2 Nov 2005 10:56:55 -0000 @@ -183,6 +183,11 @@ typedef enum tagMSICODE MSICODE_PATCH = 0x40000000L } MSICODE; +typedef struct _MSIFILEHASHINFO { + ULONG dwFileHashInfoSize; + ULONG dwData[4]; +} MSIFILEHASHINFO, *PMSIFILEHASHINFO; + #define MAX_FEATURE_CHARS 38 /* Strings defined in msi.h */ @@ -531,6 +536,10 @@ UINT WINAPI MsiEnumPatchesA(LPCSTR, DWOR UINT WINAPI MsiEnumPatchesW(LPCWSTR, DWORD, LPWSTR, LPWSTR, DWORD*); #define MsiEnumPatches WINELIB_NAME_AW(MsiEnumPatches) +UINT WINAPI MsiGetFileHashA(LPCSTR, DWORD, PMSIFILEHASHINFO); +UINT WINAPI MsiGetFileHashW(LPCWSTR, DWORD, PMSIFILEHASHINFO); +#define MsiGetFileHash WINELIB_NAME_AW(MsiGetFileHash) + /* Non Unicode */ UINT WINAPI MsiCloseHandle(MSIHANDLE); UINT WINAPI MsiCloseAllHandles(void); Index: wine/dlls/msi/msi.spec diff -u -p wine/dlls/msi/msi.spec:1.48 wine/dlls/msi/msi.spec:1.49 --- wine/dlls/msi/msi.spec:1.48 2 Nov 2005 10:56:55 -0000 +++ wine/dlls/msi/msi.spec 2 Nov 2005 10:56:55 -0000 @@ -211,8 +211,8 @@ 215 stub MsiIsProductElevatedW 216 stdcall MsiGetShortcutTargetA(str ptr ptr ptr) 217 stdcall MsiGetShortcutTargetW(wstr ptr ptr ptr) -218 stub MsiGetFileHashA -219 stub MsiGetFileHashW +218 stdcall MsiGetFileHashA(str long ptr) +219 stdcall MsiGetFileHashW(wstr long ptr) 220 stub MsiEnumComponentCostsA 221 stub MsiEnumComponentCostsW 222 stdcall MsiCreateAndVerifyInstallerDirectory(long) Index: wine/dlls/msi/msi.c diff -u -p wine/dlls/msi/msi.c:1.111 wine/dlls/msi/msi.c:1.112 --- wine/dlls/msi/msi.c:1.111 2 Nov 2005 10:56:55 -0000 +++ wine/dlls/msi/msi.c 2 Nov 2005 10:56:55 -0000 @@ -1988,3 +1988,23 @@ UINT WINAPI MsiEnumPatchesW( LPCWSTR szP iPatchIndex, lpPatchBuf, lpTransformsBuf, pcchTransformsBuf); return ERROR_NO_MORE_ITEMS; } + +/*********************************************************************** + * MsiGetFileHashW [MSI.@] + */ +UINT WINAPI MsiGetFileHashW( LPCWSTR szFilePath, DWORD dwOptions, + PMSIFILEHASHINFO pHash ) +{ + FIXME("%s %08lx %p\n", debugstr_w(szFilePath), dwOptions, pHash ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * MsiGetFileHashA [MSI.@] + */ +UINT WINAPI MsiGetFileHashA( LPCSTR szFilePath, DWORD dwOptions, + PMSIFILEHASHINFO pHash ) +{ + FIXME("%s %08lx %p\n", debugstr_a(szFilePath), dwOptions, pHash ); + return ERROR_CALL_NOT_IMPLEMENTED; +}

1 0

wine/dlls/msi files.c action.h action.c
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21037 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 04:56:42 Modified files: dlls/msi : files.c action.h action.c Log message: Mike McCormack <mike(a)codeweavers.com> Use an enumeration for file states. Patch: http://cvs.winehq.org/patch.py?id=21037 Old revision New revision Changes Path 1.27 1.28 +14 -14 wine/dlls/msi/files.c 1.46 1.47 +10 -8 wine/dlls/msi/action.h 1.225 1.226 +6 -6 wine/dlls/msi/action.c Index: wine/dlls/msi/files.c diff -u -p wine/dlls/msi/files.c:1.27 wine/dlls/msi/files.c:1.28 --- wine/dlls/msi/files.c:1.27 2 Nov 2005 10:56:42 -0000 +++ wine/dlls/msi/files.c 2 Nov 2005 10:56:42 -0000 @@ -221,7 +221,7 @@ static INT_PTR cabinet_notify(FDINOTIFIC return 0; } - if (f->State != 1 && f->State != 2) + if (f->state != msifs_missing && f->state != msifs_overwrite) { TRACE("Skipping extraction of %s\n",debugstr_a(pfdin->psz1)); return 0; @@ -240,7 +240,7 @@ static INT_PTR cabinet_notify(FDINOTIFIC return 0; } - f->State = 4; + f->state = msifs_installed; return (INT_PTR) handle; } case fdintCLOSE_FILE_INFO: @@ -615,7 +615,7 @@ static UINT get_file_target(MSIPACKAGE * { if (lstrcmpW( file_key, file->File )==0) { - if (file->State >= 2) + if (file->state >= msifs_overwrite) { *file_source = strdupW( file->TargetPath ); return ERROR_SUCCESS; @@ -629,11 +629,11 @@ static UINT get_file_target(MSIPACKAGE * } /* - * In order to make this work more effeciencly I am going to do this in 2 - * passes. - * Pass 1) Correct all the TargetPaths and determin what files are to be - * installed. - * Pass 2) Extract Cabinents and copy files. + * ACTION_InstallFiles() + * + * For efficiency, this is done in two passes: + * 1) Correct all the TargetPaths and determine what files are to be installed. + * 2) Extract Cabinets and copy files. */ UINT ACTION_InstallFiles(MSIPACKAGE *package) { @@ -648,7 +648,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *pac /* increment progress bar each time action data is sent */ ui_progress(package,1,1,0,0); - /* handle the keys for the SouceList */ + /* handle the keys for the SourceList */ ptr = strrchrW(package->PackagePath,'\\'); if (ptr) { @@ -669,7 +669,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *pac TRACE("File %s is not scheduled for install\n", debugstr_w(file->File)); - file->State = 5; + file->state = msifs_skipped; } } @@ -686,7 +686,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *pac /* Pass 2 */ LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { - if (file->State != 1 && file->State != 2) + if (file->state != msifs_missing && file->state != msifs_overwrite) continue; TRACE("Pass 2: %s\n",debugstr_w(file->File)); @@ -702,7 +702,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *pac TRACE("file paths %s to %s\n",debugstr_w(file->SourcePath), debugstr_w(file->TargetPath)); - if (file->State != 1 && file->State != 2) + if (file->state != msifs_missing && file->state != msifs_overwrite) continue; /* compressed files are extracted in ready_media_for_file */ @@ -720,7 +720,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *pac rc = GetLastError(); ERR("Unable to copy file (%s -> %s) (error %d)\n", debugstr_w(file->SourcePath), debugstr_w(file->TargetPath), rc); - if (rc == ERROR_ALREADY_EXISTS && file->State == 2) + if (rc == ERROR_ALREADY_EXISTS && file->state == msifs_overwrite) { rc = 0; } @@ -737,7 +737,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *pac } else { - file->State = 4; + file->state = msifs_installed; rc = ERROR_SUCCESS; } } Index: wine/dlls/msi/action.h diff -u -p wine/dlls/msi/action.h:1.46 wine/dlls/msi/action.h:1.47 --- wine/dlls/msi/action.h:1.46 2 Nov 2005 10:56:42 -0000 +++ wine/dlls/msi/action.h 2 Nov 2005 10:56:42 -0000 @@ -93,6 +93,15 @@ typedef struct tagMSIFOLDER INT Space; } MSIFOLDER; +typedef enum _msi_file_state { + msifs_invalid, + msifs_missing, + msifs_overwrite, + msifs_present, + msifs_installed, + msifs_skipped, +} msi_file_state; + typedef struct tagMSIFILE { struct list entry; @@ -105,14 +114,7 @@ typedef struct tagMSIFILE LPWSTR Language; INT Attributes; INT Sequence; - - INT State; - /* 0 = uninitialize */ - /* 1 = not present */ - /* 2 = present but replace */ - /* 3 = present do not replace */ - /* 4 = Installed */ - /* 5 = Skipped */ + msi_file_state state; LPWSTR SourcePath; LPWSTR TargetPath; } MSIFILE; Index: wine/dlls/msi/action.c diff -u -p wine/dlls/msi/action.c:1.225 wine/dlls/msi/action.c:1.226 --- wine/dlls/msi/action.c:1.225 2 Nov 2005 10:56:42 -0000 +++ wine/dlls/msi/action.c 2 Nov 2005 10:56:42 -0000 @@ -1305,7 +1305,7 @@ static UINT load_file(MSIRECORD *row, LP file->Attributes = MSI_RecordGetInteger( row, 7 ); file->Sequence = MSI_RecordGetInteger( row, 8 ); - file->State = 0; + file->state = msifs_invalid; TRACE("File Loaded (%s)\n",debugstr_w(file->File)); @@ -1861,7 +1861,7 @@ static UINT ACTION_CostFinalize(MSIPACKA if (GetFileAttributesW(file->TargetPath) == INVALID_FILE_ATTRIBUTES) { - file->State = 1; + file->state = msifs_missing; comp->Cost += file->FileSize; continue; } @@ -1896,16 +1896,16 @@ static UINT ACTION_CostFinalize(MSIPACKA debugstr_w(filever)); if (strcmpiW(filever,file->Version)<0) { - file->State = 2; - FIXME("cost should be diff in size\n"); + file->state = msifs_overwrite; + /* FIXME: cost should be diff in size */ comp->Cost += file->FileSize; } else - file->State = 3; + file->state = msifs_present; msi_free(version); } else - file->State = 3; + file->state = msifs_present; } TRACE("Evaluating Condition Table\n");

1 0

wine/dlls/msi dialog.c
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21036 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 04:56:22 Modified files: dlls/msi : dialog.c Log message: Mike McCormack <mike(a)codeweavers.com> Define NONAMELESSUNION and NONAMELESSSTRUCT for older compilers. Patch: http://cvs.winehq.org/patch.py?id=21036 Old revision New revision Changes Path 1.59 1.60 +5 -3 wine/dlls/msi/dialog.c Index: wine/dlls/msi/dialog.c diff -u -p wine/dlls/msi/dialog.c:1.59 wine/dlls/msi/dialog.c:1.60 --- wine/dlls/msi/dialog.c:1.59 2 Nov 2005 10:56:22 -0000 +++ wine/dlls/msi/dialog.c 2 Nov 2005 10:56:22 -0000 @@ -19,6 +19,8 @@ */ #define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include <stdarg.h> @@ -1343,10 +1345,10 @@ msi_dialog_tv_add_child_features( MSIPAC tvis.hInsertAfter = TVI_SORT; if (feature->Title) { - tvis.item.mask = TVIF_TEXT; - tvis.item.pszText = feature->Title; + tvis.u.item.mask = TVIF_TEXT; + tvis.u.item.pszText = feature->Title; } - tvis.item.lParam = (LPARAM) feature; + tvis.u.item.lParam = (LPARAM) feature; hitem = (HTREEITEM) SendMessageW( hwnd, TVM_INSERTITEMW, 0, (LPARAM) &tvis ); if (!hitem) continue;

1 0

wine/dlls/comctl32 listview.c
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21035 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 04:56:12 Modified files: dlls/comctl32 : listview.c Log message: Ulrich Czekalla <ulrich(a)codeweavers.com> Clear bLButtonDown flags if mouse is not down. Patch: http://cvs.winehq.org/patch.py?id=21035 Old revision New revision Changes Path 1.433 1.434 +3 -0 wine/dlls/comctl32/listview.c Index: wine/dlls/comctl32/listview.c diff -u -p wine/dlls/comctl32/listview.c:1.433 wine/dlls/comctl32/listview.c:1.434 --- wine/dlls/comctl32/listview.c:1.433 2 Nov 2005 10:56:12 -0000 +++ wine/dlls/comctl32/listview.c 2 Nov 2005 10:56:12 -0000 @@ -3272,6 +3272,9 @@ static LRESULT LISTVIEW_MouseMove(LISTVI { TRACKMOUSEEVENT trackinfo; + if (!(fwKeys & MK_LBUTTON)) + infoPtr->bLButtonDown = FALSE; + if (infoPtr->bLButtonDown && DragDetect(infoPtr->hwndSelf, infoPtr->ptClickPos)) { LVHITTESTINFO lvHitTestInfo;

1 0

wine/dlls/riched20 rtf.h reader.c
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21034 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 04:55:45 Modified files: dlls/riched20 : rtf.h reader.c Log message: Mike McCormack <mike(a)codeweavers.com> Convert all RTFPanic and RTFMsg calls to ERR calls. Patch: http://cvs.winehq.org/patch.py?id=21034 Old revision New revision Changes Path 1.11 1.12 +0 -14 wine/dlls/riched20/rtf.h 1.19 1.20 +31 -88 wine/dlls/riched20/reader.c

1 0

wine/include rpcndr.h
by Alexandre Julliard Nov. 2, 2005

Nov. 2, 2005

ChangeSet ID: 21033 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 04:55:27 Modified files: include : rpcndr.h Log message: Rob Shearman <rob(a)codeweavers.com> Add declarations for NdrAsyncClientCall, NdrAsyncStubCall and RpcMgmtEnableIdleCleanup. Patch: http://cvs.winehq.org/patch.py?id=21033 Old revision New revision Changes Path 1.30 1.31 +4 -0 wine/include/rpcndr.h Index: wine/include/rpcndr.h diff -u -p wine/include/rpcndr.h:1.30 wine/include/rpcndr.h:1.31 --- wine/include/rpcndr.h:1.30 2 Nov 2005 10:55:27 -0000 +++ wine/include/rpcndr.h 2 Nov 2005 10:55:27 -0000 @@ -524,6 +524,8 @@ LONG_PTR RPC_VAR_ENTRY NdrClientCall2( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); LONG_PTR RPC_VAR_ENTRY NdrClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); +LONG_PTR RPC_VAR_ENTRY + NdrAsyncClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); RPCRTAPI void RPC_ENTRY NdrServerCall2( PRPC_MESSAGE pRpcMsg ); @@ -534,6 +536,8 @@ RPCRTAPI long RPC_ENTRY NdrStubCall2( struct IRpcStubBuffer* pThis, struct IRpcChannelBuffer* pChannel, PRPC_MESSAGE pRpcMsg, unsigned long * pdwStubPhase ); RPCRTAPI long RPC_ENTRY NdrStubCall( struct IRpcStubBuffer* pThis, struct IRpcChannelBuffer* pChannel, PRPC_MESSAGE pRpcMsg, unsigned long * pdwStubPhase ); +RPCRTAPI long RPC_ENTRY + NdrAsyncStubCall( struct IRpcStubBuffer* pThis, struct IRpcChannelBuffer* pChannel, PRPC_MESSAGE pRpcMsg, unsigned long * pdwStubPhase ); RPCRTAPI void* RPC_ENTRY NdrAllocate( PMIDL_STUB_MESSAGE pStubMsg, size_t Len );

1 0