October 2006 - Wine-commits

Alexandre Julliard : user: Make sure the desktop window exists before calling monitor functions.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: 1dc38cf26b2ee0c1c2c37e9ac53dfd20a726dc6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dc38cf26b2ee0c1c2c37e9ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 24 12:22:43 2006 +0200 user: Make sure the desktop window exists before calling monitor functions. --- dlls/user/misc.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/user/misc.c b/dlls/user/misc.c index 4cc1105..842819b 100644 --- a/dlls/user/misc.c +++ b/dlls/user/misc.c @@ -396,6 +396,9 @@ HMONITOR WINAPI MonitorFromRect( LPRECT { struct monitor_enum_info info; + /* make sure the desktop window exists */ + GetDesktopWindow(); + info.rect = *rect; info.max_area = 0; info.min_distance = ~0u;

1 0

Alexandre Julliard : notepad: Fallback to default position if saved position if off-screen.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: cd5a04fd95f08282f93cfcbe4a4ceacc27f92d4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd5a04fd95f08282f93cfcbe4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 24 12:27:28 2006 +0200 notepad: Fallback to default position if saved position if off-screen. --- programs/notepad/main.c | 60 ++++++++++++++++++++++++++++------------------ programs/notepad/main.h | 5 ---- 2 files changed, 36 insertions(+), 29 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 3ffa14b..4012c84 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -34,6 +34,7 @@ #include "notepad_res.h" NOTEPAD_GLOBALS Globals; static ATOM aFINDMSGSTRING; +static RECT main_rect; static const WCHAR notepad_reg_key[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\','N','o','t','e','p','a','d','\0'}; @@ -111,20 +112,15 @@ static VOID NOTEPAD_SaveSettingToRegistr REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, &disp) == ERROR_SUCCESS) { DWORD data; - RECT rect; - - GetWindowRect(Globals.hMainWnd, &rect); - Globals.iWindowPosX = rect.left; - Globals.iWindowPosY = rect.top; - Globals.iWindowPosDX = rect.right - rect.left; - Globals.iWindowPosDY = rect.bottom - rect.top; -#define SET_NOTEPAD_REG(hkey, value_name, value_data) do { DWORD data = (DWORD)value_data; RegSetValueEx(hkey, value_name, 0, REG_DWORD, (LPBYTE)&data, sizeof(DWORD)); }while(0) + GetWindowRect(Globals.hMainWnd, &main_rect); + +#define SET_NOTEPAD_REG(hkey, value_name, value_data) do { DWORD data = (DWORD)(value_data); RegSetValueEx(hkey, value_name, 0, REG_DWORD, (LPBYTE)&data, sizeof(DWORD)); }while(0) SET_NOTEPAD_REG(hkey, value_fWrap, Globals.bWrapLongLines); - SET_NOTEPAD_REG(hkey, value_iWindowPosX, Globals.iWindowPosX); - SET_NOTEPAD_REG(hkey, value_iWindowPosY, Globals.iWindowPosY); - SET_NOTEPAD_REG(hkey, value_iWindowPosDX, Globals.iWindowPosDX); - SET_NOTEPAD_REG(hkey, value_iWindowPosDY, Globals.iWindowPosDY); + SET_NOTEPAD_REG(hkey, value_iWindowPosX, main_rect.left); + SET_NOTEPAD_REG(hkey, value_iWindowPosY, main_rect.top); + SET_NOTEPAD_REG(hkey, value_iWindowPosDX, main_rect.right - main_rect.left); + SET_NOTEPAD_REG(hkey, value_iWindowPosDY, main_rect.bottom - main_rect.top); SET_NOTEPAD_REG(hkey, value_lfCharSet, Globals.lfFont.lfCharSet); SET_NOTEPAD_REG(hkey, value_lfClipPrecision, Globals.lfFont.lfClipPrecision); SET_NOTEPAD_REG(hkey, value_lfEscapement, Globals.lfFont.lfEscapement); @@ -158,15 +154,14 @@ static VOID NOTEPAD_LoadSettingFromRegis { static const WCHAR systemW[] = { 'S','y','s','t','e','m','\0' }; HKEY hkey; - INT base_length; + INT base_length, dx, dy; base_length = (GetSystemMetrics(SM_CXSCREEN) > GetSystemMetrics(SM_CYSCREEN))? GetSystemMetrics(SM_CYSCREEN) : GetSystemMetrics(SM_CXSCREEN); - Globals.iWindowPosX = 0; - Globals.iWindowPosY = 0; - Globals.iWindowPosDX = base_length * .95; - Globals.iWindowPosDY = Globals.iWindowPosDX * 3 / 4; + dx = base_length * .95; + dy = dx * 3 / 4; + SetRect( &main_rect, 0, 0, dx, dy ); Globals.bWrapLongLines = TRUE; @@ -192,10 +187,10 @@ static VOID NOTEPAD_LoadSettingFromRegis #define QUERY_NOTEPAD_REG(hkey, value_name, ret) do { DWORD type, data; DWORD size = sizeof(DWORD); if(RegQueryValueEx(hkey, value_name, 0, &type, (LPBYTE)&data, &size) == ERROR_SUCCESS) if(type == REG_DWORD) ret = (typeof(ret))data; } while(0) QUERY_NOTEPAD_REG(hkey, value_fWrap, Globals.bWrapLongLines); - QUERY_NOTEPAD_REG(hkey, value_iWindowPosX, Globals.iWindowPosX); - QUERY_NOTEPAD_REG(hkey, value_iWindowPosY, Globals.iWindowPosY); - QUERY_NOTEPAD_REG(hkey, value_iWindowPosDX, Globals.iWindowPosDX); - QUERY_NOTEPAD_REG(hkey, value_iWindowPosDY, Globals.iWindowPosDY); + QUERY_NOTEPAD_REG(hkey, value_iWindowPosX, main_rect.left); + QUERY_NOTEPAD_REG(hkey, value_iWindowPosY, main_rect.top); + QUERY_NOTEPAD_REG(hkey, value_iWindowPosDX, dx); + QUERY_NOTEPAD_REG(hkey, value_iWindowPosDY, dy); QUERY_NOTEPAD_REG(hkey, value_lfCharSet, Globals.lfFont.lfCharSet); QUERY_NOTEPAD_REG(hkey, value_lfClipPrecision, Globals.lfFont.lfClipPrecision); QUERY_NOTEPAD_REG(hkey, value_lfEscapement, Globals.lfFont.lfEscapement); @@ -209,6 +204,9 @@ #define QUERY_NOTEPAD_REG(hkey, value_na QUERY_NOTEPAD_REG(hkey, value_lfWeight, Globals.lfFont.lfWeight); #undef QUERY_NOTEPAD_REG + main_rect.right = main_rect.left + dx; + main_rect.bottom = main_rect.top + dy; + size = sizeof(DWORD); if(RegQueryValueEx(hkey, value_iPointSize, 0, &type, (LPBYTE)&data, &size) == ERROR_SUCCESS) if(type == REG_DWORD) @@ -593,6 +591,9 @@ int PASCAL WinMain(HINSTANCE hInstance, MSG msg; HACCEL hAccel; WNDCLASSEX class; + HMONITOR monitor; + MONITORINFO info; + INT x, y; static const WCHAR className[] = {'N','o','t','e','p','a','d',0}; static const WCHAR winName[] = {'N','o','t','e','p','a','d',0}; @@ -616,10 +617,21 @@ int PASCAL WinMain(HINSTANCE hInstance, /* Setup windows */ + monitor = MonitorFromRect( &main_rect, MONITOR_DEFAULTTOPRIMARY ); + info.cbSize = sizeof(info); + GetMonitorInfoW( monitor, &info ); + + x = main_rect.left; + y = main_rect.top; + if (main_rect.left >= info.rcWork.right || + main_rect.top >= info.rcWork.bottom || + main_rect.right < info.rcWork.left || + main_rect.bottom < info.rcWork.top) + x = y = CW_USEDEFAULT; + Globals.hMainWnd = - CreateWindow(className, winName, WS_OVERLAPPEDWINDOW, - Globals.iWindowPosX, Globals.iWindowPosY, - Globals.iWindowPosDX, Globals.iWindowPosDY, + CreateWindow(className, winName, WS_OVERLAPPEDWINDOW, x, y, + main_rect.right - main_rect.left, main_rect.bottom - main_rect.top, NULL, NULL, Globals.hInstance, NULL); if (!Globals.hMainWnd) { diff --git a/programs/notepad/main.h b/programs/notepad/main.h index 075a248..a0c5e5e 100644 --- a/programs/notepad/main.h +++ b/programs/notepad/main.h @@ -45,11 +45,6 @@ typedef struct WCHAR szHeader[MAX_PATH]; WCHAR szFooter[MAX_PATH]; - INT iWindowPosX; - INT iWindowPosY; - INT iWindowPosDX; - INT iWindowPosDY; - FINDREPLACE find; FINDREPLACE lastFind; HGLOBAL hDevMode; /* printer mode */

1 0

Mikołaj Zalewski : resources: Change Dutch sublanguage code to SUBLANG_NEUTRAL.
by Alexandre Julliard 24 Oct '06

24 Oct '06

1 0

lostwages/templates/en git.template
by Jeremy Newman 24 Oct '06

24 Oct '06

ChangeSet ID: 29227 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/10/24 10:47:48 Modified files: templates/en : git.template Log message: fix broken horizonal line images, need to use the {$root} template var Patch: http://cvs.winehq.org/patch.py?id=29227 Old revision New revision Changes Path 1.1 1.2 +2 -2 lostwages/templates/en/git.template Index: lostwages/templates/en/git.template diff -u -p lostwages/templates/en/git.template:1.1 lostwages/templates/en/git.template:1.2 --- lostwages/templates/en/git.template:1.1 24 Oct 2006 15:47:48 -0000 +++ lostwages/templates/en/git.template 24 Oct 2006 15:47:48 -0000 @@ -22,7 +22,7 @@ such as the Linux Kernel source. <li><a href="#sourcetree">Source Tree Browsing via the Web</a> </ol> -<img src="./images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"> +<img src="{$root}/images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"> <a name="clone" class="hidden"></a> @@ -37,7 +37,7 @@ such as the Linux Kernel source. </td></tr> </table> -<img src="./images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"> +<img src="{$root}/images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"> <a name="uptodate" class="hidden"></a>

1 0

Hwang YunSong(황윤성) : oledlg: Updated Korean resource.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: 41951dc1246a49d21a48ec60cb74eb80b88ecb16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41951dc1246a49d21a48ec60c… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Tue Oct 24 16:14:52 2006 +0900 oledlg: Updated Korean resource. --- dlls/oledlg/oledlg_Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oledlg/oledlg_Ko.rc b/dlls/oledlg/oledlg_Ko.rc index 762e85f..fe5eaf9 100644 --- a/dlls/oledlg/oledlg_Ko.rc +++ b/dlls/oledlg/oledlg_Ko.rc @@ -91,5 +91,5 @@ STRINGTABLE DISCARDABLE IDS_PS_NON_OLE "�� Ŭ�� ϱ�." IDS_PS_UNKNOWN_TYPE "�˼� �� " IDS_PS_UNKNOWN_SRC "�˼� �� " - IDS_PS_UNKNOWN_APP "�� α׷�� ̰�� ϴ�" + IDS_PS_UNKNOWN_APP "�� α׷�� α׷�� ϴ�" }

1 0

Mike McCormack : msi: Split code to get a file' s verion into a separate comment.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: d1723de5661a502c847d6d05ef9512ec622ee113 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1723de5661a502c847d6d05e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Oct 24 17:37:26 2006 +0900 msi: Split code to get a file's verion into a separate comment. --- dlls/msi/action.c | 77 ++++++++++++++++++++++++++++++---------------------- 1 files changed, 44 insertions(+), 33 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 66504e8..84275f9 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1957,7 +1957,40 @@ static UINT ITERATE_CostFinalizeConditio return ERROR_SUCCESS; } -/* +LPWSTR msi_get_disk_file_version( LPCWSTR filename ) +{ + static const WCHAR name_fmt[] = + {'%','u','.','%','u','.','%','u','.','%','u',0}; + static WCHAR name[] = {'\\',0}; + VS_FIXEDFILEINFO *lpVer; + WCHAR filever[0x100]; + LPVOID version; + DWORD versize; + DWORD handle; + UINT sz; + + TRACE("%s\n", debugstr_w(filename)); + + versize = GetFileVersionInfoSizeW( filename, &handle ); + if (!versize) + return NULL; + + version = msi_alloc( versize ); + GetFileVersionInfoW( filename, 0, versize, version ); + + VerQueryValueW( version, name, (LPVOID*)&lpVer, &sz ); + msi_free( version ); + + sprintfW( filever, name_fmt, + HIWORD(lpVer->dwFileVersionMS), + LOWORD(lpVer->dwFileVersionMS), + HIWORD(lpVer->dwFileVersionLS), + LOWORD(lpVer->dwFileVersionLS)); + + return strdupW( filever ); +} + +/* * A lot is done in this function aside from just the costing. * The costing needs to be implemented at some point but for now I am going * to focus on the directory building @@ -1980,11 +2013,11 @@ static UINT ACTION_CostFinalize(MSIPACKA MSIFILE *file; UINT rc; MSIQUERY * view; - LPWSTR level; + LPWSTR level, file_version; if ( 1 == msi_get_property_int( package, szCosting, 0 ) ) return ERROR_SUCCESS; - + TRACE("Building Directory properties\n"); rc = MSI_DatabaseOpenViewW(package->db, ExecSeqQuery, &view); @@ -2014,14 +2047,14 @@ static UINT ACTION_CostFinalize(MSIPACKA msi_free(file->TargetPath); TRACE("file %s is named %s\n", - debugstr_w(file->File),debugstr_w(file->FileName)); + debugstr_w(file->File), debugstr_w(file->FileName)); file->TargetPath = build_directory_name(2, p, file->FileName); msi_free(p); TRACE("file %s resolves to %s\n", - debugstr_w(file->File),debugstr_w(file->TargetPath)); + debugstr_w(file->File), debugstr_w(file->TargetPath)); if (GetFileAttributesW(file->TargetPath) == INVALID_FILE_ATTRIBUTES) { @@ -2030,42 +2063,20 @@ static UINT ACTION_CostFinalize(MSIPACKA continue; } - if (file->Version) + if (file->Version && + (file_version = msi_get_disk_file_version( file->TargetPath ))) { - DWORD handle; - DWORD versize; - UINT sz; - LPVOID version; - static WCHAR name[] = {'\\',0}; - static const WCHAR name_fmt[] = - {'%','u','.','%','u','.','%','u','.','%','u',0}; - WCHAR filever[0x100]; - VS_FIXEDFILEINFO *lpVer; - - TRACE("Version comparison..\n"); - versize = GetFileVersionInfoSizeW(file->TargetPath,&handle); - version = msi_alloc(versize); - GetFileVersionInfoW(file->TargetPath, 0, versize, version); - - VerQueryValueW(version, name, (LPVOID*)&lpVer, &sz); - - sprintfW(filever,name_fmt, - HIWORD(lpVer->dwFileVersionMS), - LOWORD(lpVer->dwFileVersionMS), - HIWORD(lpVer->dwFileVersionLS), - LOWORD(lpVer->dwFileVersionLS)); - TRACE("new %s old %s\n", debugstr_w(file->Version), - debugstr_w(filever)); - if (strcmpiW(filever,file->Version)<0) + debugstr_w(file_version)); + /* FIXME: seems like a bad way to compare version numbers */ + if (lstrcmpiW(file_version, file->Version)<0) { file->state = msifs_overwrite; - /* FIXME: cost should be diff in size */ comp->Cost += file->FileSize; } else file->state = msifs_present; - msi_free(version); + msi_free( file_version ); } else file->state = msifs_present;

1 0

Mikołaj Zalewski : resources: Change German sublanguage code to SUBLANG_NEUTRAL.
by Alexandre Julliard 24 Oct '06

24 Oct '06

1 0

James Hawkins : msi: Remove two unnecessary install tables.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: a93763ae21ae73dd9bf252d769a8ce31ccd02833 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a93763ae21ae73dd9bf252d76… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Oct 23 18:07:42 2006 -0700 msi: Remove two unnecessary install tables. --- dlls/msi/tests/install.c | 31 ------------------------------- 1 files changed, 0 insertions(+), 31 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 83e68df..327b938 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -34,35 +34,6 @@ CHAR PROG_FILES_DIR[MAX_PATH]; /* msi database data */ -static const CHAR admin_exec_seq_dat[] = "Action\tCondition\tSequence\n" - "s72\tS255\tI2\n" - "AdminExecuteSequence\tAction\n" - "CostFinalize\t\t1000\n" - "CostInitialize\t\t800\n" - "FileCost\t\t900\n" - "InstallAdminPackage\t\t3900\n" - "InstallFiles\t\t4000\n" - "InstallFinalize\t\t6600\n" - "InstallInitialize\t\t1500\n" - "InstallValidate\t\t1400"; - -static const CHAR advt_exec_seq_dat[] = "Action\tCondition\tSequence\n" - "s72\tS255\tI2\n" - "AdvtExecuteSequence\tAction\n" - "CostFinalize\t\t1000\n" - "CostInitialize\t\t800\n" - "CreateShortcuts\t\t4500\n" - "InstallFinalize\t\t6600\n" - "InstallInitialize\t\t1500\n" - "InstallValidate\t\t1400\n" - "PublishComponents\t\t6200\n" - "PublishFeatures\t\t6300\n" - "PublishProduct\t\t6400\n" - "RegisterClassInfo\t\t4600\n" - "RegisterExtensionInfo\t\t4700\n" - "RegisterMIMEInfo\t\t4900\n" - "RegisterProgIdInfo\t\t4800"; - static const CHAR component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" "s72\tS38\ts72\ti2\tS255\tS72\n" "Component\tComponent\n" @@ -187,8 +158,6 @@ #define ADD_TABLE(x) {#x".idt", x##_dat, static const msi_table tables[] = { - ADD_TABLE(admin_exec_seq), - ADD_TABLE(advt_exec_seq), ADD_TABLE(component), ADD_TABLE(directory), ADD_TABLE(feature),

1 0

James Hawkins : msi: Remove unused function pointer and definitions.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: a3a3d6c2547b36892f7dbc9ffe7a2806b87edb0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3a3d6c2547b36892f7dbc9ff… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Oct 23 18:10:14 2006 -0700 msi: Remove unused function pointer and definitions. --- dlls/msi/tests/install.c | 45 --------------------------------------------- 1 files changed, 0 insertions(+), 45 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 327b938..bd22916 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -177,35 +177,6 @@ static const msi_table tables[] = #define MEDIA_SIZE 999999999 #define FOLDER_THRESHOLD 900000 -/* The following defintions were copied from dlls/cabinet/cabinet.h - * because they are undocumented in windows. - */ - -/* EXTRACTdest flags */ -#define EXTRACT_FILLFILELIST 0x00000001 -#define EXTRACT_EXTRACTFILES 0x00000002 - -struct ExtractFileList { - LPSTR filename; - struct ExtractFileList *next; - BOOL unknown; /* always 1L */ -}; - -/* the first parameter of the function extract */ -typedef struct { - long result1; /* 0x000 */ - long unknown1[3]; /* 0x004 */ - struct ExtractFileList *filelist; /* 0x010 */ - long filecount; /* 0x014 */ - long flags; /* 0x018 */ - char directory[0x104]; /* 0x01c */ - char lastfile[0x20c]; /* 0x120 */ -} EXTRACTDEST; - -/* cabinet function pointers */ -HMODULE hCabinet; -static HRESULT (WINAPI *pExtract)(EXTRACTDEST*, LPCSTR); - /* the FCI callbacks */ static void *mem_alloc(ULONG cb) @@ -418,19 +389,6 @@ static void create_cab_file(const CHAR * ok(res, "Failed to destroy the cabinet\n"); } -static BOOL init_function_pointers(void) -{ - hCabinet = LoadLibraryA("cabinet.dll"); - if (!hCabinet) - return FALSE; - - pExtract = (void *)GetProcAddress(hCabinet, "Extract"); - if (!pExtract) - return FALSE; - - return TRUE; -} - static BOOL get_program_files_dir(LPSTR buf) { HKEY hkey; @@ -750,9 +708,6 @@ START_TEST(install) { DWORD len; - if (!init_function_pointers()) - return; - GetCurrentDirectoryA(MAX_PATH, CURR_DIR); len = lstrlenA(CURR_DIR);

1 0

James Hawkins : msi: Allow more customization of install test files.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: 3fc13d4b051bd7189e8d8af85996dad755759566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fc13d4b051bd7189e8d8af85… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Oct 23 18:11:24 2006 -0700 msi: Allow more customization of install test files. --- dlls/msi/tests/install.c | 54 ++++++++++++++++++++++++++++----------------- 1 files changed, 33 insertions(+), 21 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index bd22916..2d845c4 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -336,25 +336,28 @@ static INT_PTR get_open_info(char *pszNa return (INT_PTR)handle; } -static void add_file(HFCI hfci, char *file) +static void add_file(HFCI hfci, const char *file, TCOMP compress) { char path[MAX_PATH]; + char filename[MAX_PATH]; BOOL res; lstrcpyA(path, CURR_DIR); lstrcatA(path, "\\"); lstrcatA(path, file); - res = FCIAddFile(hfci, path, file, FALSE, get_next_cabinet, progress, - get_open_info, tcompTYPE_MSZIP); + lstrcpyA(filename, file); + + res = FCIAddFile(hfci, path, filename, FALSE, get_next_cabinet, progress, + get_open_info, compress); ok(res, "Expected FCIAddFile to succeed\n"); } -static void set_cab_parameters(PCCAB pCabParams, const CHAR *name) +static void set_cab_parameters(PCCAB pCabParams, const CHAR *name, DWORD max_size) { ZeroMemory(pCabParams, sizeof(CCAB)); - pCabParams->cb = MEDIA_SIZE; + pCabParams->cb = max_size; pCabParams->cbFolderThresh = FOLDER_THRESHOLD; pCabParams->setID = 0xbeef; lstrcpyA(pCabParams->szCabPath, CURR_DIR); @@ -362,16 +365,15 @@ static void set_cab_parameters(PCCAB pCa lstrcpyA(pCabParams->szCab, name); } -static void create_cab_file(const CHAR *name) +static void create_cab_file(const CHAR *name, DWORD max_size, const CHAR *files) { CCAB cabParams; + LPCSTR ptr; HFCI hfci; ERF erf; - static CHAR four_txt[] = "four.txt", - five_txt[] = "five.txt"; BOOL res; - set_cab_parameters(&cabParams, name); + set_cab_parameters(&cabParams, name, max_size); hfci = FCICreate(&erf, file_placed, mem_alloc, mem_free, fci_open, fci_read, fci_write, fci_close, fci_seek, fci_delete, @@ -379,8 +381,12 @@ static void create_cab_file(const CHAR * ok(hfci != NULL, "Failed to create an FCI context\n"); - add_file(hfci, four_txt); - add_file(hfci, five_txt); + ptr = files; + while (*ptr) + { + add_file(hfci, ptr, tcompTYPE_MSZIP); + ptr += lstrlen(ptr) + 1; + } res = FCIFlushCabinet(hfci, FALSE, get_next_cabinet, progress); ok(res, "Failed to flush the cabinet\n"); @@ -406,15 +412,21 @@ static BOOL get_program_files_dir(LPSTR return TRUE; } -static void create_file(const CHAR *name) +static void create_file(const CHAR *name, DWORD size) { HANDLE file; - DWORD written; + DWORD written, left; file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "Failure to open file %s\n", name); WriteFile(file, name, strlen(name), &written, NULL); WriteFile(file, "\n", strlen("\n"), &written, NULL); + + left = size - lstrlen(name) - 1; + + SetFilePointer(file, left, NULL, FILE_CURRENT); + SetEndOfFile(file); + CloseHandle(file); } @@ -423,18 +435,18 @@ static void create_test_files(void) get_program_files_dir(PROG_FILES_DIR); CreateDirectoryA("msitest", NULL); - create_file("msitest\\one.txt"); + create_file("msitest\\one.txt", 100); CreateDirectoryA("msitest\\first", NULL); - create_file("msitest\\first\\two.txt"); + create_file("msitest\\first\\two.txt", 100); CreateDirectoryA("msitest\\second", NULL); - create_file("msitest\\second\\three.txt"); + create_file("msitest\\second\\three.txt", 100); - create_file("four.txt"); - create_file("five.txt"); - create_cab_file("msitest.cab"); + create_file("four.txt", 100); + create_file("five.txt", 100); + create_cab_file("msitest.cab", MEDIA_SIZE, "four.txt\0five.txt\0"); - create_file("msitest\\filename"); - create_file("msitest\\service.exe"); + create_file("msitest\\filename", 100); + create_file("msitest\\service.exe", 100); DeleteFileA("four.txt"); DeleteFileA("five.txt");

1 0