wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Alexandre Julliard : gdi32: Fix parameter type in the ModifyWorldTransform driver entry point.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: e6d9486453868f491d8226215c48291a2ccfa322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6d9486453868f491d8226215… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 8 15:21:52 2011 +0100 gdi32: Fix parameter type in the ModifyWorldTransform driver entry point. --- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 +- dlls/gdi32/enhmfdrv/mapping.c | 2 +- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 55d9b75..9a0f556 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -90,7 +90,7 @@ extern INT CDECL EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT bottom ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, INT mode ) DECLSPEC_HIDDEN; +extern BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD mode ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_MoveTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern INT CDECL EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern INT CDECL EMFDRV_OffsetViewportOrg( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/mapping.c b/dlls/gdi32/enhmfdrv/mapping.c index b72e0fc..5e3e971 100644 --- a/dlls/gdi32/enhmfdrv/mapping.c +++ b/dlls/gdi32/enhmfdrv/mapping.c @@ -119,7 +119,7 @@ BOOL CDECL EMFDRV_SetWorldTransform( PHYSDEV dev, const XFORM *xform) return EMFDRV_WriteRecord( dev, &emr.emr ); } -BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, INT mode) +BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD mode) { EMRMODIFYWORLDTRANSFORM emr; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index f6c971d..504b120 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -128,7 +128,7 @@ typedef struct tagDC_FUNCS INT (CDECL *pIntersectClipRect)(PHYSDEV,INT,INT,INT,INT); BOOL (CDECL *pInvertRgn)(PHYSDEV,HRGN); BOOL (CDECL *pLineTo)(PHYSDEV,INT,INT); - BOOL (CDECL *pModifyWorldTransform)(PHYSDEV,const XFORM*,INT); + BOOL (CDECL *pModifyWorldTransform)(PHYSDEV,const XFORM*,DWORD); BOOL (CDECL *pMoveTo)(PHYSDEV,INT,INT); INT (CDECL *pOffsetClipRgn)(PHYSDEV,INT,INT); INT (CDECL *pOffsetViewportOrg)(PHYSDEV,INT,INT);

1 0

Alexandre Julliard : user32: No longer export HOOK_CallHooks.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 383bda91cfb920171b3a0082bbb59551f00cf5ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=383bda91cfb920171b3a0082b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 8 14:50:47 2011 +0100 user32: No longer export HOOK_CallHooks. --- dlls/user32/user32.spec | 5 ----- dlls/winex11.drv/x11drv.h | 3 --- 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index be54f77..c89b710 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -780,8 +780,3 @@ # or 'wine_' (for user-visible functions) to avoid namespace conflicts. # @ cdecl __wine_send_input(long ptr) - -################################################################ -# Wine dll separation hacks, these will go away, don't use them -# -@ cdecl HOOK_CallHooks(long long long long long) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 6f0c8db..c973675 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -858,9 +858,6 @@ extern void X11DRV_XIMLookupChars( const char *str, DWORD count ) DECLSPEC_HIDDE extern void X11DRV_ForceXIMReset(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen); -/* FIXME: private functions imported from user32 */ -extern LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode ); - #define XEMBED_MAPPED (1 << 0) #endif /* __WINE_X11DRV_H */

1 0

Alexandre Julliard : user.exe: Call the 16-bit hook directly in SendMessage16.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: eda60796817fcda152d9988966ef2b91cb7dd012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda60796817fcda152d998896… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 8 14:50:18 2011 +0100 user.exe: Call the 16-bit hook directly in SendMessage16. --- dlls/user.exe16/hook.c | 17 +++++++++++++++++ dlls/user.exe16/message.c | 15 +-------------- dlls/user.exe16/user_private.h | 2 +- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/user.exe16/hook.c b/dlls/user.exe16/hook.c index 640899e..105254e 100644 --- a/dlls/user.exe16/hook.c +++ b/dlls/user.exe16/hook.c @@ -186,6 +186,23 @@ static LRESULT wndproc_hook_callback16( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LP return ret; } +/* helper for SendMessage16 */ +void call_WH_CALLWNDPROC_hook( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPARAM lp ) +{ + CWPSTRUCT16 cwp; + struct hook16_queue_info *info = get_hook_info( FALSE ); + + if (!info->proc[WH_CALLWNDPROC - WH_MINHOOK]) return; + + cwp.hwnd = hwnd; + cwp.message = msg; + cwp.wParam = wp; + cwp.lParam = lp; + + lp = MapLS( &cwp ); + call_hook_16( WH_CALLWNDPROC, HC_ACTION, 1, lp ); + UnMapLS( lp ); +} /*********************************************************************** * call_WH_MSGFILTER diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index b10b761..bc81d45 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -39,19 +39,6 @@ DWORD USER16_AlertableWait = 0; struct wow_handlers32 wow_handlers32; -static LRESULT cwp_hook_callback( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, - LRESULT *result, void *arg ) -{ - CWPSTRUCT cwp; - - cwp.hwnd = hwnd; - cwp.message = msg; - cwp.wParam = wp; - cwp.lParam = lp; - *result = 0; - return HOOK_CallHooks( WH_CALLWNDPROC, HC_ACTION, 1, (LPARAM)&cwp, FALSE ); -} - static LRESULT send_message_callback( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRESULT *result, void *arg ) { @@ -1498,7 +1485,7 @@ LRESULT WINAPI SendMessage16( HWND16 hwnd16, UINT16 msg, WPARAM16 wparam, LPARAM WNDPROC16 winproc; /* first the WH_CALLWNDPROC hook */ - WINPROC_CallProc16To32A( cwp_hook_callback, hwnd16, msg, wparam, lparam, &result, NULL ); + call_WH_CALLWNDPROC_hook( hwnd16, msg, wparam, lparam ); if (!(winproc = (WNDPROC16)GetWindowLong16( hwnd16, GWLP_WNDPROC ))) return 0; diff --git a/dlls/user.exe16/user_private.h b/dlls/user.exe16/user_private.h index d202bfe..7c91afb 100644 --- a/dlls/user.exe16/user_private.h +++ b/dlls/user.exe16/user_private.h @@ -93,7 +93,7 @@ extern LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd extern LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ) DECLSPEC_HIDDEN; -extern LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode ) DECLSPEC_HIDDEN; +extern void call_WH_CALLWNDPROC_hook( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPARAM lp ) DECLSPEC_HIDDEN; #define GET_WORD(ptr) (*(const WORD *)(ptr)) #define GET_DWORD(ptr) (*(const DWORD *)(ptr))

1 0

Juan Lang : wininet: Fully initialize time variable (valgrind).
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: b9673bcc4d5ed07fb8461726b7ee1750e75e0a16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9673bcc4d5ed07fb8461726b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Mar 7 13:13:11 2011 -0800 wininet: Fully initialize time variable (valgrind). --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 841a83f..2fb2a2e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3769,7 +3769,7 @@ static BOOL HTTP_ParseRfc1123Date(LPCWSTR value, FILETIME *ft) WCHAR *nextPtr, day[4], month[4], *monthPtr; LPCWSTR ptr; unsigned long num; - SYSTEMTIME st; + SYSTEMTIME st = { 0 }; ptr = strchrW(value, ','); if (!ptr)

1 0

Juan Lang : wininet: Decrement file use count when deleting a cache entry.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 601b4fa589edb1c290432a1153c8b93f1978ce32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=601b4fa589edb1c290432a115… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Mar 6 10:05:45 2011 -0800 wininet: Decrement file use count when deleting a cache entry. --- dlls/wininet/urlcache.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index de31ff6..ca7f880 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2924,6 +2924,7 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) LPURLCACHE_HEADER pHeader; struct _HASH_ENTRY * pHashEntry; CACHEFILE_ENTRY * pEntry; + const URL_CACHEFILE_ENTRY * pUrlEntry; DWORD error; TRACE("(%s)\n", debugstr_a(lpszUrlName)); @@ -2954,6 +2955,21 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) } pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); + if (pEntry->dwSignature != URL_SIGNATURE) + { + URLCacheContainer_UnlockIndex(pContainer, pHeader); + FIXME("Trying to delete entry of unknown format %s\n", + debugstr_an((LPCSTR)&pEntry->dwSignature, sizeof(DWORD))); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + pUrlEntry = (const URL_CACHEFILE_ENTRY *)pEntry; + if (pUrlEntry->CacheDir < pHeader->DirectoryCount) + { + if (pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles) + pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles--; + } + URLCache_DeleteEntry(pHeader, pEntry); URLCache_DeleteEntryFromHash(pHashEntry); @@ -2973,6 +2989,7 @@ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName) LPURLCACHE_HEADER pHeader; struct _HASH_ENTRY * pHashEntry; CACHEFILE_ENTRY * pEntry; + const URL_CACHEFILE_ENTRY * pUrlEntry; LPSTR urlA; DWORD error; @@ -3017,6 +3034,21 @@ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName) } pEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + pHashEntry->dwOffsetEntry); + if (pEntry->dwSignature != URL_SIGNATURE) + { + URLCacheContainer_UnlockIndex(pContainer, pHeader); + FIXME("Trying to delete entry of unknown format %s\n", + debugstr_an((LPCSTR)&pEntry->dwSignature, sizeof(DWORD))); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + pUrlEntry = (const URL_CACHEFILE_ENTRY *)pEntry; + if (pUrlEntry->CacheDir < pHeader->DirectoryCount) + { + if (pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles) + pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles--; + } + URLCache_DeleteEntry(pHeader, pEntry); URLCache_DeleteEntryFromHash(pHashEntry);

1 0

Juan Lang : wininet: Increment file use count when committing a URL cache entry.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 6e713b3946b292f5da42a966b3aa65a78afae034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e713b3946b292f5da42a966b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Mar 6 10:07:17 2011 -0800 wininet: Increment file use count when committing a URL cache entry. --- dlls/wininet/urlcache.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index ad439dd..de31ff6 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2633,6 +2633,11 @@ static BOOL CommitUrlCacheEntryInternal( (DWORD)((LPBYTE)pUrlEntry - (LPBYTE)pHeader)); if (error != ERROR_SUCCESS) URLCache_DeleteEntry(pHeader, &pUrlEntry->CacheFileEntry); + else + { + if (pUrlEntry->CacheDir < pHeader->DirectoryCount) + pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles++; + } cleanup: URLCacheContainer_UnlockIndex(pContainer, pHeader);

1 0

Hans Leidekker : msi: Assume a file is present if the target exists with the same size and there 's no file version or hash to verify.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 429407cfb6418d64592326d21aa19a25656f2ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=429407cfb6418d64592326d21… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 8 10:09:01 2011 +0100 msi: Assume a file is present if the target exists with the same size and there's no file version or hash to verify. --- dlls/msi/files.c | 31 +++++++++++++++++++---------- dlls/msi/msipriv.h | 1 + dlls/msi/tests/install.c | 47 ++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 62 insertions(+), 17 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 493baed..4736fce 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -119,12 +119,21 @@ static msi_file_state calculate_install_state( MSIFILE *file ) { return msifs_overwrite; } - if (file->hash.dwFileHashInfoSize && msi_file_hash_matches( file )) + if (file->hash.dwFileHashInfoSize) { - TRACE("file hashes match, not overwriting\n"); - return msifs_present; + if (msi_file_hash_matches( file )) + { + TRACE("file hashes match, not overwriting\n"); + return msifs_hashmatch; + } + else + { + TRACE("file hashes do not match, overwriting\n"); + return msifs_overwrite; + } } - return msifs_overwrite; + /* assume present */ + return msifs_present; } static void schedule_install_files(MSIPACKAGE *package) @@ -299,6 +308,13 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) ERR("Unable to load media info for %s (%u)\n", debugstr_w(file->File), rc); return ERROR_FUNCTION_FAILED; } + if (!file->Component->Enabled) continue; + + if (file->state != msifs_hashmatch && (rc = ready_media( package, file, mi ))) + { + ERR("Failed to ready media for %s\n", debugstr_w(file->File)); + goto done; + } if (file->state != msifs_missing && !mi->is_continuous && file->state != msifs_overwrite) continue; @@ -308,13 +324,6 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) { MSICABDATA data; - rc = ready_media(package, file, mi); - if (rc != ERROR_SUCCESS) - { - ERR("Failed to ready media for %s\n", debugstr_w(file->File)); - goto done; - } - data.mi = mi; data.package = package; data.cb = installfiles_cb; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 10f51de..096678c 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -499,6 +499,7 @@ typedef enum _msi_file_state { msifs_present, msifs_installed, msifs_skipped, + msifs_hashmatch } msi_file_state; typedef struct tagMSIFILE diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index ae6be76..deff5f7 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -713,7 +713,8 @@ static const CHAR mc_component_dat[] = "Component\tComponentId\tDirectory_\tAttr "maximus\t\tMSITESTDIR\t0\t1\tmaximus\n" "augustus\t\tMSITESTDIR\t0\t1\taugustus\n" "caesar\t\tMSITESTDIR\t0\t1\tcaesar\n" - "gaius\t\tMSITESTDIR\t0\tGAIUS=1\tgaius\n"; + "gaius\t\tMSITESTDIR\t0\tGAIUS=1\tgaius\n" + "tiberius\t\tMSITESTDIR\t0\t\ttiberius\n"; static const CHAR mc_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -721,7 +722,8 @@ static const CHAR mc_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion "maximus\tmaximus\tmaximus\t500\t\t\t16384\t1\n" "augustus\taugustus\taugustus\t500\t\t\t0\t2\n" "caesar\tcaesar\tcaesar\t500\t\t\t16384\t3\n" - "gaius\tgaius\tgaius\t500\t\t\t16384\t4"; + "gaius\tgaius\tgaius\t500\t\t\t16384\t4\n" + "tiberius\ttiberius\ttiberius\t500\t\t\t0\t5\n"; static const CHAR mc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" "i2\ti4\tL64\tS255\tS32\tS72\n" @@ -729,7 +731,8 @@ static const CHAR mc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tV "1\t1\t\ttest1.cab\tDISK1\t\n" "2\t2\t\ttest2.cab\tDISK2\t\n" "3\t3\t\ttest3.cab\tDISK3\t\n" - "4\t4\t\ttest3.cab\tDISK3\t\n"; + "4\t4\t\ttest3.cab\tDISK3\t\n" + "5\t5\t\ttest4.cab\tDISK4\t\n"; static const CHAR mc_file_hash_dat[] = "File_\tOptions\tHashPart1\tHashPart2\tHashPart3\tHashPart4\n" "s72\ti2\ti4\ti4\ti4\ti4\n" @@ -2295,6 +2298,29 @@ static BOOL delete_cf(const CHAR *rel_path, BOOL is_file) return RemoveDirectoryA(path); } +static BOOL compare_pf_data(const char *filename, const char *data, DWORD size) +{ + DWORD read; + HANDLE handle; + BOOL ret = FALSE; + char *buffer, path[MAX_PATH]; + + lstrcpyA(path, PROG_FILES_DIR); + lstrcatA(path, "\\"); + lstrcatA(path, filename); + + handle = CreateFileA(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + buffer = HeapAlloc(GetProcessHeap(), 0, size); + if (buffer) + { + ReadFile(handle, buffer, size, &read, NULL); + if (read == size && !memcmp(data, buffer, size)) ret = TRUE; + HeapFree(GetProcessHeap(), 0, buffer); + } + CloseHandle(handle); + return ret; +} + static void delete_test_files(void) { DeleteFileA("msitest.msi"); @@ -4068,15 +4094,18 @@ static void test_missingcab(void) CreateDirectoryA("msitest", NULL); create_file("msitest\\augustus", 500); create_file("maximus", 500); + create_file("tiberius", 500); create_database(msifile, mc_tables, sizeof(mc_tables) / sizeof(msi_table)); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); create_cab_file("test1.cab", MEDIA_SIZE, "maximus\0"); + create_cab_file("test4.cab", MEDIA_SIZE, "tiberius\0"); create_pf("msitest", FALSE); create_pf_data("msitest\\caesar", "abcdefgh", TRUE); + create_pf_data("msitest\\tiberius", "abcdefgh", TRUE); r = MsiInstallProductA(msifile, NULL); if (r == ERROR_INSTALL_PACKAGE_REJECTED) @@ -4093,11 +4122,14 @@ static void test_missingcab(void) ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); } ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + ok(compare_pf_data("msitest\\tiberius", "abcdefgh", sizeof("abcdefgh")), "Wrong file contents\n"); + ok(delete_pf("msitest\\tiberius", TRUE), "File not installed\n"); ok(!delete_pf("msitest\\gaius", TRUE), "File installed\n"); - ok(delete_pf("msitest", FALSE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); create_pf("msitest", FALSE); create_pf_data("msitest\\caesar", "abcdefgh", TRUE); + create_pf_data("msitest\\tiberius", "abcdefgh", TRUE); create_pf("msitest\\gaius", TRUE); r = MsiInstallProductA(msifile, "GAIUS=1"); @@ -4108,16 +4140,19 @@ static void test_missingcab(void) ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); } ok(delete_pf("msitest\\caesar", TRUE), "File removed\n"); + ok(compare_pf_data("msitest\\tiberius", "abcdefgh", sizeof("abcdefgh")), "Wrong file contents\n"); + ok(delete_pf("msitest\\tiberius", TRUE), "File removed\n"); ok(delete_pf("msitest\\gaius", TRUE), "File removed\n"); - ok(delete_pf("msitest", FALSE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); error: - delete_pf("msitest\\caesar", TRUE); delete_pf("msitest", FALSE); DeleteFile("msitest\\augustus"); RemoveDirectory("msitest"); DeleteFile("maximus"); + DeleteFile("tiberius"); DeleteFile("test1.cab"); + DeleteFile("test4.cab"); DeleteFile(msifile); }

1 0

Hans Leidekker : msi: Load media info even if there's no file to install.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: be790cb0adec3a41297d2a51bdcee4e46544341c URL: http://source.winehq.org/git/wine.git/?a=commit;h=be790cb0adec3a41297d2a51b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 8 10:08:39 2011 +0100 msi: Load media info even if there's no file to install. --- dlls/msi/files.c | 7 +++++++ dlls/msi/media.c | 9 +-------- dlls/msi/msipriv.h | 1 + dlls/msi/tests/install.c | 9 --------- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index e88a0c6..493baed 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -293,6 +293,13 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { + rc = msi_load_media_info( package, file, mi ); + if (rc != ERROR_SUCCESS) + { + ERR("Unable to load media info for %s (%u)\n", debugstr_w(file->File), rc); + return ERROR_FUNCTION_FAILED; + } + if (file->state != msifs_missing && !mi->is_continuous && file->state != msifs_overwrite) continue; diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 8b5a8c6..8c4b0f7 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -656,7 +656,7 @@ static UINT get_drive_type(const WCHAR *path) return GetDriveTypeW(root); } -static UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) +UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) { MSIRECORD *row; LPWSTR source_dir; @@ -803,13 +803,6 @@ UINT ready_media(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) if (mi->is_continuous) return ERROR_SUCCESS; - rc = msi_load_media_info(package, file, mi); - if (rc != ERROR_SUCCESS) - { - ERR("Unable to load media info %u\n", rc); - return ERROR_FUNCTION_FAILED; - } - /* cabinet is internal, no checks needed */ if (!mi->cabinet || mi->cabinet[0] == '#') return ERROR_SUCCESS; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 9ddcaeb..10f51de 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -987,6 +987,7 @@ typedef struct } MSICABDATA; extern UINT ready_media(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi); +extern UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi); extern void msi_free_media_info(MSIMEDIAINFO *mi); extern BOOL msi_cabextract(MSIPACKAGE* package, MSIMEDIAINFO *mi, LPVOID data); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index ea5431a..ae6be76 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3339,11 +3339,8 @@ static void test_lastusedsource(void) r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - todo_wine - { ok(!lstrcmpA(value, path), "Expected \"%s\", got \"%s\"\n", path, value); ok(size == lstrlenA(path), "Expected %d, got %d\n", lstrlenA(path), size); - } r = MsiInstallProductA("msifile0.msi", "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -3368,11 +3365,8 @@ static void test_lastusedsource(void) r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - todo_wine - { ok(!lstrcmpA(value, path), "Expected \"%s\", got \"%s\"\n", path, value); ok(size == lstrlenA(path), "Expected %d, got %d\n", lstrlenA(path), size); - } r = MsiInstallProductA("msifile1.msi", "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -3396,11 +3390,8 @@ static void test_lastusedsource(void) r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - todo_wine - { ok(!lstrcmpA(value, path), "Expected \"%s\", got \"%s\"\n", path, value); ok(size == lstrlenA(path), "Expected %d, got %d\n", lstrlenA(path), size); - } r = MsiInstallProductA("msifile2.msi", "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);

1 0

Hans Leidekker : msi: Make a second pass to determine which files to install in the InstallFiles action .
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 4a6c63e24a5a9ab22dc4e2145db16d86fe8f1895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a6c63e24a5a9ab22dc4e2145… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 8 10:08:16 2011 +0100 msi: Make a second pass to determine which files to install in the InstallFiles action. This is needed because the target path can still change after CostFinalize is executed. This happens in the .NET 1.1 Service Pack 1 installer where a custom action calls SetTargetPath. --- dlls/msi/action.c | 52 +++++++-------------------------- dlls/msi/files.c | 81 ++++++++++++++++++++++++++++++++++++++++++++------- dlls/msi/msipriv.h | 4 ++- 3 files changed, 84 insertions(+), 53 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 86aa33f..a003f5e 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2178,7 +2178,7 @@ int msi_compare_file_versions( VS_FIXEDFILEINFO *fi, const WCHAR *version ) return 0; } -static int msi_compare_font_versions( const WCHAR *ver1, const WCHAR *ver2 ) +int msi_compare_font_versions( const WCHAR *ver1, const WCHAR *ver2 ) { DWORD ms1, ms2; @@ -2190,7 +2190,7 @@ static int msi_compare_font_versions( const WCHAR *ver1, const WCHAR *ver2 ) return 0; } -static DWORD get_disk_file_size( LPCWSTR filename ) +DWORD msi_get_disk_file_size( LPCWSTR filename ) { HANDLE file; DWORD size; @@ -2206,7 +2206,7 @@ static DWORD get_disk_file_size( LPCWSTR filename ) return size; } -static BOOL hash_matches( MSIFILE *file ) +BOOL msi_file_hash_matches( MSIFILE *file ) { UINT r; MSIFILEHASHINFO hash; @@ -2256,7 +2256,7 @@ static void set_target_path( MSIPACKAGE *package, MSIFILE *file ) TRACE("resolves to %s\n", debugstr_w(file->TargetPath)); } -static UINT set_file_install_states( MSIPACKAGE *package ) +static UINT calculate_file_cost( MSIPACKAGE *package ) { VS_FIXEDFILEINFO *file_version; WCHAR *font_version; @@ -2277,67 +2277,37 @@ static UINT set_file_install_states( MSIPACKAGE *package ) if ((comp->assembly && !comp->assembly->installed) || GetFileAttributesW(file->TargetPath) == INVALID_FILE_ATTRIBUTES) { - file->state = msifs_missing; comp->Cost += file->FileSize; continue; } + file_size = msi_get_disk_file_size( file->TargetPath ); + if (file->Version) { if ((file_version = msi_get_disk_file_version( file->TargetPath ))) { - TRACE("new %s old %u.%u.%u.%u\n", debugstr_w(file->Version), - HIWORD(file_version->dwFileVersionMS), - LOWORD(file_version->dwFileVersionMS), - HIWORD(file_version->dwFileVersionLS), - LOWORD(file_version->dwFileVersionLS)); - if (msi_compare_file_versions( file_version, file->Version ) < 0) { - file->state = msifs_overwrite; - comp->Cost += file->FileSize; - } - else - { - TRACE("Destination file version equal or greater, not overwriting\n"); - file->state = msifs_present; + comp->Cost += file->FileSize - file_size; } msi_free( file_version ); continue; } else if ((font_version = font_version_from_file( file->TargetPath ))) { - TRACE("new %s old %s\n", debugstr_w(file->Version), debugstr_w(font_version)); - if (msi_compare_font_versions( font_version, file->Version ) < 0) { - file->state = msifs_overwrite; - comp->Cost += file->FileSize; - } - else - { - TRACE("Destination file version equal or greater, not overwriting\n"); - file->state = msifs_present; + comp->Cost += file->FileSize - file_size; } msi_free( font_version ); continue; } } - if ((file_size = get_disk_file_size( file->TargetPath )) != file->FileSize) + if (file_size != file->FileSize) { - file->state = msifs_overwrite; comp->Cost += file->FileSize - file_size; - continue; } - if (file->hash.dwFileHashInfoSize && hash_matches( file )) - { - TRACE("File hashes match, not overwriting\n"); - file->state = msifs_present; - continue; - } - file->state = msifs_overwrite; - comp->Cost += file->FileSize - file_size; } - return ERROR_SUCCESS; } @@ -2404,8 +2374,8 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) } } - TRACE("Calculating file install states\n"); - set_file_install_states( package ); + TRACE("Calculating file cost\n"); + calculate_file_cost( package ); msi_set_property( package->db, szCosting, szOne ); /* set default run level if not set */ diff --git a/dlls/msi/files.c b/dlls/msi/files.c index df765e5..e88a0c6 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -60,6 +60,73 @@ static void msi_file_update_ui( MSIPACKAGE *package, MSIFILE *f, const WCHAR *ac ui_progress( package, 2, f->FileSize, 0, 0 ); } +static msi_file_state calculate_install_state( MSIFILE *file ) +{ + MSICOMPONENT *comp = file->Component; + VS_FIXEDFILEINFO *file_version; + WCHAR *font_version; + msi_file_state state; + DWORD file_size; + + if (comp->ActionRequest != INSTALLSTATE_LOCAL || !comp->Enabled || + (comp->assembly && comp->assembly->installed)) + { + TRACE("file %s is not scheduled for install\n", debugstr_w(file->File)); + return msifs_skipped; + } + if ((comp->assembly && !comp->assembly->installed) || + GetFileAttributesW( file->TargetPath ) == INVALID_FILE_ATTRIBUTES) + { + TRACE("file %s is missing\n", debugstr_w(file->File)); + return msifs_missing; + } + if (file->Version) + { + if ((file_version = msi_get_disk_file_version( file->TargetPath ))) + { + TRACE("new %s old %u.%u.%u.%u\n", debugstr_w(file->Version), + HIWORD(file_version->dwFileVersionMS), + LOWORD(file_version->dwFileVersionMS), + HIWORD(file_version->dwFileVersionLS), + LOWORD(file_version->dwFileVersionLS)); + + if (msi_compare_file_versions( file_version, file->Version ) < 0) + state = msifs_overwrite; + else + { + TRACE("destination file version equal or greater, not overwriting\n"); + state = msifs_present; + } + msi_free( file_version ); + return state; + } + else if ((font_version = font_version_from_file( file->TargetPath ))) + { + TRACE("new %s old %s\n", debugstr_w(file->Version), debugstr_w(font_version)); + + if (msi_compare_font_versions( font_version, file->Version ) < 0) + state = msifs_overwrite; + else + { + TRACE("destination file version equal or greater, not overwriting\n"); + state = msifs_present; + } + msi_free( font_version ); + return state; + } + } + if ((file_size = msi_get_disk_file_size( file->TargetPath )) != file->FileSize) + { + return msifs_overwrite; + } + if (file->hash.dwFileHashInfoSize && msi_file_hash_matches( file )) + { + TRACE("file hashes match, not overwriting\n"); + return msifs_present; + } + return msifs_overwrite; +} + static void schedule_install_files(MSIPACKAGE *package) { MSIFILE *file; @@ -68,22 +135,14 @@ static void schedule_install_files(MSIPACKAGE *package) { MSICOMPONENT *comp = file->Component; - if (comp->ActionRequest != INSTALLSTATE_LOCAL || !comp->Enabled || - (comp->assembly && comp->assembly->installed)) + file->state = calculate_install_state( file ); + if (file->state == msifs_overwrite && (comp->Attributes & msidbComponentAttributesNeverOverwrite)) { - TRACE("File %s is not scheduled for install\n", debugstr_w(file->File)); + TRACE("not overwriting %s\n", debugstr_w(file->TargetPath)); file->state = msifs_skipped; - continue; } comp->Action = INSTALLSTATE_LOCAL; ui_progress( package, 2, file->FileSize, 0, 0 ); - - if (file->state == msifs_overwrite && - (comp->Attributes & msidbComponentAttributesNeverOverwrite)) - { - TRACE("not overwriting %s\n", debugstr_w(file->TargetPath)); - file->state = msifs_skipped; - } } } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 7c25ec9..9ddcaeb 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -856,7 +856,9 @@ extern DWORD msi_version_str_to_dword(LPCWSTR p); extern void msi_parse_version_string(LPCWSTR, PDWORD, PDWORD); extern VS_FIXEDFILEINFO *msi_get_disk_file_version(LPCWSTR); extern int msi_compare_file_versions(VS_FIXEDFILEINFO *, const WCHAR *); - +extern int msi_compare_font_versions(const WCHAR *, const WCHAR *); +extern DWORD msi_get_disk_file_size(LPCWSTR); +extern BOOL msi_file_hash_matches(MSIFILE *); extern LONG msi_reg_set_val_str( HKEY hkey, LPCWSTR name, LPCWSTR value ); extern LONG msi_reg_set_val_multi_str( HKEY hkey, LPCWSTR name, LPCWSTR value );

1 0

Dmitry Timoshkov : gdi32: Add some additional tests for negative axes extents.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: afcfb51055751882f6b854b4b5c40a1aad3823da URL: http://source.winehq.org/git/wine.git/?a=commit;h=afcfb51055751882f6b854b4b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 8 16:55:24 2011 +0800 gdi32: Add some additional tests for negative axes extents. --- dlls/gdi32/tests/mapping.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index fba0abf..b0688a7 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -210,15 +210,43 @@ static void test_world_transform(void) expect_world_transform(hdc, 20.0, 20.0); expect_LPtoDP(hdc, 20000, 20000); + size.cx = 0xdeadbeef; + size.cy = 0xdeadbeef; + ret = SetViewportExtEx(hdc, -1, -1, &size); + ok(ret, "SetViewportExtEx(-1, -1) failed\n"); + ok(size.cx == 1 && size.cy == 1, "expected 1,1 got %d,%d\n", size.cx, size.cy); + expect_viewport_ext(hdc, 1, 1); + expect_window_ext(hdc, 1, 1); + expect_world_transform(hdc, 20.0, 20.0); + expect_LPtoDP(hdc, 20000, 20000); + + ret = SetMapMode(hdc, MM_ANISOTROPIC); + ok(ret == MM_TEXT, "expected MM_TEXT, got %d\n", ret); + + expect_viewport_ext(hdc, 1, 1); + expect_window_ext(hdc, 1, 1); + expect_world_transform(hdc, 20.0, 20.0); + expect_LPtoDP(hdc, 20000, 20000); + + size.cx = 0xdeadbeef; + size.cy = 0xdeadbeef; + ret = SetViewportExtEx(hdc, -1, -1, &size); + ok(ret, "SetViewportExtEx(-1, -1) failed\n"); + ok(size.cx == 1 && size.cy == 1, "expected 1,1 got %d,%d\n", size.cx, size.cy); + expect_viewport_ext(hdc, -1, -1); + expect_window_ext(hdc, 1, 1); + expect_world_transform(hdc, 20.0, 20.0); + expect_LPtoDP(hdc, -20000, -20000); + ret = SetGraphicsMode(hdc, GM_COMPATIBLE); ok(ret, "SetGraphicsMode(GM_COMPATIBLE) should not fail if DC has't an identity transform\n"); ret = GetGraphicsMode(hdc); ok(ret == GM_COMPATIBLE, "expected GM_COMPATIBLE, got %d\n", ret); - expect_viewport_ext(hdc, 1, 1); + expect_viewport_ext(hdc, -1, -1); expect_window_ext(hdc, 1, 1); expect_world_transform(hdc, 20.0, 20.0); - expect_LPtoDP(hdc, 20000, 20000); + expect_LPtoDP(hdc, -20000, -20000); DeleteDC(hdc); }

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
85
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 March 2011