January 2008 - Wine-commits

Andrew Talbot : gphoto2.ds: Remove unneeded casts.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 35d3f81e69f0461a91701000815d166980b3a2bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=35d3f81e69f0461a917010008… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 5 16:44:12 2008 +0000 gphoto2.ds: Remove unneeded casts. --- dlls/gphoto2.ds/capability.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/gphoto2.ds/capability.c b/dlls/gphoto2.ds/capability.c index e9700cb..754e58d 100644 --- a/dlls/gphoto2.ds/capability.c +++ b/dlls/gphoto2.ds/capability.c @@ -193,17 +193,17 @@ TW_UINT16 GPHOTO2_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) static TW_BOOL GPHOTO2_OneValueSet32 (pTW_CAPABILITY pCapability, TW_UINT32 value) { - pCapability->hContainer = (TW_HANDLE)GlobalAlloc (0, sizeof(TW_ONEVALUE)); + pCapability->hContainer = GlobalAlloc (0, sizeof(TW_ONEVALUE)); TRACE("-> %ld\n", value); if (pCapability->hContainer) { - pTW_ONEVALUE pVal = GlobalLock ((HGLOBAL) pCapability->hContainer); + pTW_ONEVALUE pVal = GlobalLock (pCapability->hContainer); pVal->ItemType = TWTY_UINT32; pVal->Item = value; - GlobalUnlock ((HGLOBAL) pCapability->hContainer); - pCapability->ConType = TWON_ONEVALUE; + GlobalUnlock (pCapability->hContainer); + pCapability->ConType = TWON_ONEVALUE; return TRUE; } else @@ -212,17 +212,17 @@ static TW_BOOL GPHOTO2_OneValueSet32 (pTW_CAPABILITY pCapability, TW_UINT32 valu static TW_BOOL GPHOTO2_OneValueSet16 (pTW_CAPABILITY pCapability, TW_UINT16 value) { - pCapability->hContainer = (TW_HANDLE)GlobalAlloc (0, sizeof(TW_ONEVALUE)); + pCapability->hContainer = GlobalAlloc (0, sizeof(TW_ONEVALUE)); TRACE("-> %d\n", value); if (pCapability->hContainer) { - pTW_ONEVALUE pVal = GlobalLock ((HGLOBAL) pCapability->hContainer); + pTW_ONEVALUE pVal = GlobalLock (pCapability->hContainer); pVal->ItemType = TWTY_UINT16; pVal->Item = value; - GlobalUnlock ((HGLOBAL) pCapability->hContainer); - pCapability->ConType = TWON_ONEVALUE; + GlobalUnlock (pCapability->hContainer); + pCapability->ConType = TWON_ONEVALUE; return TRUE; } else @@ -233,25 +233,25 @@ static TW_BOOL GPHOTO2_EnumSet16 (pTW_CAPABILITY pCapability, int nrofvalues, const TW_UINT16 *values, int current, int def) { pTW_ENUMERATION pVal; - pCapability->hContainer = (TW_HANDLE)GlobalAlloc (0, sizeof(TW_ENUMERATION) + nrofvalues * sizeof(TW_UINT16)); + pCapability->hContainer = GlobalAlloc (0, sizeof(TW_ENUMERATION) + nrofvalues * sizeof(TW_UINT16)); if (!pCapability->hContainer) return FALSE; - pVal = GlobalLock ((HGLOBAL) pCapability->hContainer); + pVal = GlobalLock (pCapability->hContainer); pVal->ItemType = TWTY_UINT16; pVal->NumItems = nrofvalues; memcpy(pVal->ItemList, values, sizeof(TW_UINT16)*nrofvalues); pVal->CurrentIndex = current; pVal->DefaultIndex = def; pCapability->ConType = TWON_ENUMERATION; - GlobalUnlock ((HGLOBAL) pCapability->hContainer); + GlobalUnlock (pCapability->hContainer); return TRUE; } static TW_BOOL GPHOTO2_EnumGet16 (pTW_CAPABILITY pCapability, int *nrofvalues, TW_UINT16 **values) { - pTW_ENUMERATION pVal = GlobalLock ((HGLOBAL) pCapability->hContainer); + pTW_ENUMERATION pVal = GlobalLock (pCapability->hContainer); if (!pVal) return FALSE; @@ -259,18 +259,18 @@ static TW_BOOL GPHOTO2_EnumGet16 (pTW_CAPABILITY pCapability, int *nrofvalues, T *values = HeapAlloc( GetProcessHeap(), 0, sizeof(TW_UINT16)*pVal->NumItems); memcpy (*values, pVal->ItemList, sizeof(TW_UINT16)*(*nrofvalues)); FIXME("Current Index %ld, Default Index %ld\n", pVal->CurrentIndex, pVal->DefaultIndex); - GlobalUnlock ((HGLOBAL) pCapability->hContainer); + GlobalUnlock (pCapability->hContainer); return TRUE; } static TW_BOOL GPHOTO2_OneValueGet32 (pTW_CAPABILITY pCapability, TW_UINT32 *pValue) { - pTW_ONEVALUE pVal = GlobalLock ((HGLOBAL) pCapability->hContainer); + pTW_ONEVALUE pVal = GlobalLock (pCapability->hContainer); if (pVal) { *pValue = pVal->Item; - GlobalUnlock ((HGLOBAL) pCapability->hContainer); + GlobalUnlock (pCapability->hContainer); return TRUE; } else @@ -279,12 +279,12 @@ static TW_BOOL GPHOTO2_OneValueGet32 (pTW_CAPABILITY pCapability, TW_UINT32 *pVa static TW_BOOL GPHOTO2_OneValueGet16 (pTW_CAPABILITY pCapability, TW_UINT16 *pValue) { - pTW_ONEVALUE pVal = GlobalLock ((HGLOBAL) pCapability->hContainer); + pTW_ONEVALUE pVal = GlobalLock (pCapability->hContainer); if (pVal) { *pValue = pVal->Item; - GlobalUnlock ((HGLOBAL) pCapability->hContainer); + GlobalUnlock (pCapability->hContainer); return TRUE; } else

1 0

Andrew Talbot : comdlg32: Remove unneeded cast.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 595707dd6381e4e81ef8395eda0b075345851393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=595707dd6381e4e81ef8395ed… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 5 16:44:01 2008 +0000 comdlg32: Remove unneeded cast. --- dlls/comdlg32/finddlg32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/finddlg32.c b/dlls/comdlg32/finddlg32.c index 5485804..353da90 100644 --- a/dlls/comdlg32/finddlg32.c +++ b/dlls/comdlg32/finddlg32.c @@ -382,7 +382,7 @@ static HWND COMDLG32_FR_DoFindReplace( HRSRC htemplate; if(pdata->fr.Flags & FR_ENABLETEMPLATE) { - hmod = (HMODULE)pdata->fr.hInstance; + hmod = pdata->fr.hInstance; if(pdata->fr.Flags & FR_WINE_UNICODE) { htemplate = FindResourceW(hmod, (LPCWSTR)pdata->fr.lpTemplateName, (LPWSTR)RT_DIALOG);

1 0

Andrew Talbot : imm32: Remove unneeded cast.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: a36e14d9c930ee32dfc95044dc500cf2c10ea470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a36e14d9c930ee32dfc95044d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 5 16:44:19 2008 +0000 imm32: Remove unneeded cast. --- dlls/imm32/imm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 58d0e3e..da39261 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1082,7 +1082,7 @@ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) TRACE("Default created (%p)\n",hwndDefault); } - return (HWND)hwndDefault; + return hwndDefault; } /***********************************************************************

1 0

Alexandre Julliard : advapi32: Fix the length written to the pipe for the start message.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 781c3b9c6aebacd869a026993f8ae84be2159de1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=781c3b9c6aebacd869a026993… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 7 12:18:11 2008 +0100 advapi32: Fix the length written to the pipe for the start message. --- dlls/advapi32/service.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 594d607..4c03c1e 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -497,7 +497,7 @@ static BOOL service_send_start_message(HANDLE pipe, LPCWSTR *argv, DWORD argc) } *p=0; - r = WriteFile(pipe, ssi, sizeof *ssi + len*sizeof(WCHAR), &count, NULL); + r = WriteFile(pipe, ssi, sizeof *ssi + (len-1)*sizeof(WCHAR), &count, NULL); if (r) { r = ReadFile(pipe, &result, sizeof result, &count, NULL);

1 0

Detlef Riekenberg : spoolss: Add stubs for SpoolerHasInitialized and SpoolerInit.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 432de8a9b22dda72ed600808312fc46b04f0abbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=432de8a9b22dda72ed6008083… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Jan 5 09:03:07 2008 +0100 spoolss: Add stubs for SpoolerHasInitialized and SpoolerInit. --- dlls/spoolss/spoolss.spec | 4 ++-- dlls/spoolss/spoolss_main.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/spoolss/spoolss.spec b/dlls/spoolss/spoolss.spec index d873d75..240f155 100644 --- a/dlls/spoolss/spoolss.spec +++ b/dlls/spoolss/spoolss.spec @@ -132,8 +132,8 @@ @ stub SpoolerFindFirstPrinterChangeNotification @ stub SpoolerFindNextPrinterChangeNotification @ stub SpoolerFreePrinterNotifyInfo -@ stub SpoolerHasInitialized -@ stub SpoolerInit +@ stdcall SpoolerHasInitialized() +@ stdcall SpoolerInit() @ stub StartDocPrinterW @ stub StartPagePrinter @ stub UnloadDriver diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c index 2fee59e..4a4e3bc 100644 --- a/dlls/spoolss/spoolss_main.c +++ b/dlls/spoolss/spoolss_main.c @@ -230,3 +230,21 @@ BOOL WINAPI SplIsUpgrade(void) FIXME("() stub\n"); return FALSE; } + +/****************************************************************** + * SpoolerHasInitialized [SPOOLSS.@] + */ +BOOL WINAPI SpoolerHasInitialized(void) +{ + FIXME("() stub\n"); + return TRUE; +} + +/****************************************************************** + * SpoolerInit [SPOOLSS.@] + */ +BOOL WINAPI SpoolerInit(void) +{ + FIXME("() stub\n"); + return TRUE; +}

1 0

Alexandre Julliard : ntdll: Return a proper Information field also when opening a server file object.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 44dbb07441202aa0be0ca864984d428dc3d77492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44dbb07441202aa0be0ca8649… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 7 12:17:42 2008 +0100 ntdll: Return a proper Information field also when opening a server file object. --- dlls/ntdll/file.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index b9a763f..d4e80ab 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -179,6 +179,7 @@ NTSTATUS WINAPI NtCreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATTRIB *handle = reply->handle; } SERVER_END_REQ; + if (io->u.Status == STATUS_SUCCESS) io->Information = FILE_OPENED; return io->u.Status; }

1 0

James Hawkins : msi: Create parent directories when duplicating files if they don't exist, with tests.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 5352d099b4fdcdfba13edd3ac4865291f67e8cef URL: http://source.winehq.org/git/wine.git/?a=commit;h=5352d099b4fdcdfba13edd3ac… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Jan 6 12:25:22 2008 -0700 msi: Create parent directories when duplicating files if they don't exist, with tests. --- dlls/msi/files.c | 1 + dlls/msi/tests/install.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 4be78b3..b447461 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -901,6 +901,7 @@ static UINT ITERATE_DuplicateFiles(MSIRECORD *row, LPVOID param) } dest = build_directory_name(2, dest_path, dest_name); + create_full_pathW(dest); TRACE("Duplicating file %s to %s\n",debugstr_w(file->TargetPath), debugstr_w(dest)); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index bd86f73..4637fcb 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -112,6 +112,7 @@ static const CHAR install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "ResolveSource\t\t950\n" "MoveFiles\t\t1700\n" "InstallFiles\t\t4000\n" + "DuplicateFiles\t\t4500\n" "InstallServices\t\t5000\n" "InstallFinalize\t\t6600\n" "InstallInitialize\t\t1500\n" @@ -559,6 +560,22 @@ static const CHAR mc_file_hash_dat[] = "File_\tOptions\tHashPart1\tHashPart2\tHa "MsiFileHash\tFile_\n" "caesar\t0\t850433704\t-241429251\t675791761\t-1221108824"; +static const CHAR df_directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" + "s72\tS72\tl255\n" + "Directory\tDirectory\n" + "THIS\tMSITESTDIR\tthis\n" + "DOESNT\tTHIS\tdoesnt\n" + "NONEXISTENT\tDOESNT\texist\n" + "MSITESTDIR\tProgramFilesFolder\tmsitest\n" + "ProgramFilesFolder\tTARGETDIR\t.\n" + "TARGETDIR\t\tSourceDir"; + +static const CHAR df_duplicate_file_dat[] = "FileKey\tComponent_\tFile_\tDestName\tDestFolder\n" + "s72\ts72\ts72\tS255\tS72\n" + "DuplicateFile\tFileKey\n" + "maximus\tmaximus\tmaximus\taugustus\t\n" + "caesar\tmaximus\tmaximus\t\tNONEXISTENT\n"; + typedef struct _msi_table { const CHAR *filename; @@ -834,6 +851,19 @@ static const msi_table mc_tables[] = ADD_TABLE(mc_file_hash), }; +static const msi_table df_tables[] = +{ + ADD_TABLE(rof_component), + ADD_TABLE(df_directory), + ADD_TABLE(rof_feature), + ADD_TABLE(rof_feature_comp), + ADD_TABLE(rof_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(rof_media), + ADD_TABLE(property), + ADD_TABLE(df_duplicate_file), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -3568,6 +3598,33 @@ static void test_missingcab(void) DeleteFile(msifile); } +static void test_duplicatefiles(void) +{ + UINT r; + + CreateDirectoryA("msitest", NULL); + create_file("msitest\\maximus", 500); + create_database(msifile, df_tables, sizeof(df_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + /* fails if the destination folder is not a valid property */ + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\augustus", TRUE), "File not duplicated\n"); + ok(delete_pf("msitest\\this\\doesnt\\exist\\maximus", TRUE), "File not duplicated\n"); + ok(delete_pf("msitest\\this\\doesnt\\exist", FALSE), "File not duplicated\n"); + ok(delete_pf("msitest\\this\\doesnt", FALSE), "File not duplicated\n"); + ok(delete_pf("msitest\\this", FALSE), "File not duplicated\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + DeleteFile("msitest\\maximus"); + RemoveDirectory("msitest"); + DeleteFile(msifile); +} + START_TEST(install) { DWORD len; @@ -3609,6 +3666,7 @@ START_TEST(install) test_removefiles(); test_movefiles(); test_missingcab(); + test_duplicatefiles(); SetCurrentDirectoryA(prev_path); }

1 0

James Hawkins : msi: Pad the month and day to two digits.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 837588c6a393e3606fff0c238d8b1b17c8a46d80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=837588c6a393e3606fff0c238… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Jan 6 12:23:38 2008 -0700 msi: Pad the month and day to two digits. --- dlls/msi/action.c | 2 +- dlls/msi/tests/install.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 535f070..5b940c6 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3978,7 +3978,7 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) {'P','r','o','d','u','c','t','V','e','r','s','i','o','n',0}; SYSTEMTIME systime; - static const WCHAR date_fmt[] = {'%','i','%','i','%','i',0}; + static const WCHAR date_fmt[] = {'%','i','%','0','2','i','%','0','2','i',0}; LPWSTR upgrade_code; WCHAR szDate[9]; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index e4727b5..bd86f73 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1922,7 +1922,7 @@ static void get_date_str(LPSTR date) { SYSTEMTIME systime; - static const char date_fmt[] = "%d%d%d"; + static const char date_fmt[] = "%d%02d%02d"; GetLocalTime(&systime); sprintf(date, date_fmt, systime.wYear, systime.wMonth, systime.wDay); }

1 0

James Hawkins : msi: Copy the temporary package when storing the installer.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: c37849ad828d18436c69d19c588f071d01f8c46e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c37849ad828d18436c69d19c5… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Jan 5 13:50:59 2008 -0700 msi: Copy the temporary package when storing the installer. --- dlls/msi/action.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e116967..535f070 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -60,8 +60,6 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq, BOOL UI) * consts and values used */ static const WCHAR c_colon[] = {'C',':','\\',0}; -static const WCHAR szOriginalDatabase[] = - {'O','r','i','g','i','n','a','l','D','a','t','a','b','a','s','e',0}; static const WCHAR szCreateFolders[] = {'C','r','e','a','t','e','F','o','l','d','e','r','s',0}; @@ -616,6 +614,9 @@ static UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace) LPWSTR source, check; DWORD len; + static const WCHAR szOriginalDatabase[] = + {'O','r','i','g','i','n','a','l','D','a','t','a','b','a','s','e',0}; + db = msi_dup_property( package, szOriginalDatabase ); if (!db) return ERROR_OUTOFMEMORY; @@ -3887,7 +3888,6 @@ static UINT msi_get_local_package_name( LPWSTR path ) static UINT msi_make_package_local( MSIPACKAGE *package, HKEY hkey ) { WCHAR packagefile[MAX_PATH]; - LPWSTR msiFilePath; HKEY props; UINT r; @@ -3897,17 +3897,14 @@ static UINT msi_make_package_local( MSIPACKAGE *package, HKEY hkey ) TRACE("Copying to local package %s\n",debugstr_w(packagefile)); - msiFilePath = msi_dup_property( package, szOriginalDatabase ); - r = CopyFileW( msiFilePath, packagefile, FALSE); + r = CopyFileW( package->db->path, packagefile, FALSE); if (!r) { ERR("Unable to copy package (%s -> %s) (error %d)\n", - debugstr_w(msiFilePath), debugstr_w(packagefile), GetLastError()); - msi_free( msiFilePath ); + debugstr_w(package->db->path), debugstr_w(packagefile), GetLastError()); return ERROR_FUNCTION_FAILED; } - msi_free( msiFilePath ); msi_reg_set_val_str( hkey, INSTALLPROPERTY_LOCALPACKAGEW, packagefile );

1 0

James Hawkins : msi: Remove an erroneous table.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: d316a94ecbba8bba7a98c0191ce7b74a9bcd89f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d316a94ecbba8bba7a98c0191… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Jan 6 12:22:42 2008 -0700 msi: Remove an erroneous table. --- dlls/msi/tests/install.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 2c674bb..e4727b5 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -819,7 +819,6 @@ static const msi_table mov_tables[] = ADD_TABLE(rof_media), ADD_TABLE(property), ADD_TABLE(mov_move_file), - ADD_TABLE(registry), }; static const msi_table mc_tables[] =

1 0