April 2007 - Wine-Commits - list.winehq.org

Huw Davies : winspool.drv: Implement level 1 support for EnumPrinters.
by Alexandre Julliard April 12, 2007

April 12, 2007

Module: wine Branch: master Commit: 09a2c89a6088c3b3dfbe73e26da7621d6ed514e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a2c89a6088c3b3dfbe73e26… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 12 14:08:22 2007 +0100 winspool.drv: Implement level 1 support for EnumPrinters. --- dlls/winspool.drv/info.c | 74 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 67 insertions(+), 7 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 7fc3e73..8ecf795 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3615,6 +3615,63 @@ static BOOL WINSPOOL_GetDevModeFromReg(HKEY hkey, LPCWSTR ValueName, } /********************************************************************* + * WINSPOOL_GetPrinter_1 + * + * Fills out a PRINTER_INFO_1A|W struct storing the strings in buf. + * The strings are either stored as unicode or ascii. + */ +static BOOL WINSPOOL_GetPrinter_1(HKEY hkeyPrinter, PRINTER_INFO_1W *pi1, + LPBYTE buf, DWORD cbBuf, LPDWORD pcbNeeded, + BOOL unicode) +{ + DWORD size, left = cbBuf; + BOOL space = (cbBuf > 0); + LPBYTE ptr = buf; + + *pcbNeeded = 0; + + if(WINSPOOL_GetStringFromReg(hkeyPrinter, NameW, ptr, left, &size, + unicode)) { + if(space && size <= left) { + pi1->pName = (LPWSTR)ptr; + ptr += size; + left -= size; + } else + space = FALSE; + *pcbNeeded += size; + } + + /* FIXME: pDescription should be something like "Name,Driver_Name,". */ + if(WINSPOOL_GetStringFromReg(hkeyPrinter, NameW, ptr, left, &size, + unicode)) { + if(space && size <= left) { + pi1->pDescription = (LPWSTR)ptr; + ptr += size; + left -= size; + } else + space = FALSE; + *pcbNeeded += size; + } + + if(WINSPOOL_GetStringFromReg(hkeyPrinter, DescriptionW, ptr, left, &size, + unicode)) { + if(space && size <= left) { + pi1->pComment = (LPWSTR)ptr; + ptr += size; + left -= size; + } else + space = FALSE; + *pcbNeeded += size; + } + + if(pi1) pi1->Flags = PRINTER_ENUM_ICON8; /* We're a printer */ + + if(!space && pi1) /* zero out pi1 if we can't completely fill buf */ + memset(pi1, 0, sizeof(*pi1)); + + return space; +} +/********************************************************************* * WINSPOOL_GetPrinter_2 * * Fills out a PRINTER_INFO_2A|W struct storing the strings in buf. @@ -4046,11 +4103,8 @@ static BOOL WINSPOOL_EnumPrinters(DWORD dwType, LPWSTR lpszName, switch(dwLevel) { case 1: - RegCloseKey(hkeyPrinters); - if (lpdwReturned) - *lpdwReturned = number; - return TRUE; - + used = number * sizeof(PRINTER_INFO_1W); + break; case 2: used = number * sizeof(PRINTER_INFO_2W); break; @@ -4092,6 +4146,12 @@ static BOOL WINSPOOL_EnumPrinters(DWORD dwType, LPWSTR lpszName, } switch(dwLevel) { + case 1: + WINSPOOL_GetPrinter_1(hkeyPrinter, (PRINTER_INFO_1W *)pi, buf, + left, &needed, unicode); + used += needed; + if(pi) pi += sizeof(PRINTER_INFO_1W); + break; case 2: WINSPOOL_GetPrinter_2(hkeyPrinter, (PRINTER_INFO_2W *)pi, buf, left, &needed, unicode); @@ -4145,8 +4205,8 @@ static BOOL WINSPOOL_EnumPrinters(DWORD dwType, LPWSTR lpszName, * RETURNS: * * If level is set to 1: - * Not implemented yet! - * Returns TRUE with an empty list. + * Returns an array of PRINTER_INFO_1 data structures in the + * lpbPrinters buffer. * * If level is set to 2: * Possible flags: PRINTER_ENUM_CONNECTIONS, PRINTER_ENUM_LOCAL.

1 0

Paul Vriens : advpack/tests: Don't hardcode the windows directory.
by Alexandre Julliard April 12, 2007

April 12, 2007

Module: wine Branch: master Commit: c7e40aa97259346fa673b4fec34a381c0bb06038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7e40aa97259346fa673b4fec… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Apr 12 10:57:43 2007 +0200 advpack/tests: Don't hardcode the windows directory. --- dlls/advpack/tests/files.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/tests/files.c b/dlls/advpack/tests/files.c index 89f8ba9..cbbbd3a 100644 --- a/dlls/advpack/tests/files.c +++ b/dlls/advpack/tests/files.c @@ -131,6 +131,7 @@ static void test_AddDelBackupEntry(void) { HRESULT res; CHAR path[MAX_PATH]; + CHAR windir[MAX_PATH]; lstrcpyA(path, CURR_DIR); lstrcatA(path, "\\backup\\basename.INI"); @@ -187,9 +188,10 @@ static void test_AddDelBackupEntry(void) ok(DeleteFileA(path), "Expected path to exist\n"); RemoveDirectoryA("backup"); - lstrcpyA(path, "c:\\windows\\basename.INI"); + GetWindowsDirectoryA(windir, sizeof(windir)); + sprintf(path, "%s\\basename.INI", windir); - /* try a NULL backup dir, INI is created in c:\windows */ + /* try a NULL backup dir, INI is created in the windows directory */ res = pAddDelBackupEntry("one\0two\0three\0", NULL, "basename", AADBE_ADD_ENTRY); ok(res == S_OK, "Expected S_OK, got %d\n", res); ok(check_ini_contents(path, TRUE), "Expected ini contents to match\n");

1 0

Dmitry Timoshkov : ntdll: Fix a compiler warning.
by Alexandre Julliard April 12, 2007

April 12, 2007

Module: wine Branch: master Commit: 335ce754b35b382d74821d380d305146fa13dcb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=335ce754b35b382d74821d380… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Apr 12 18:37:40 2007 +0900 ntdll: Fix a compiler warning. --- dlls/ntdll/server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 5489210..1e84a5a 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -569,7 +569,7 @@ int server_get_unix_fd( obj_handle_t handle, unsigned int wanted_access, int *un sigset_t sigset; obj_handle_t fd_handle; int ret = 0, fd; - unsigned int access; + unsigned int access = 0; *unix_fd = -1; *needs_close = 0;

1 0

Aric Stewart : msi: Do not crash in MsiGetUserInfo if org, user or serial are not present, instead return USERINFOSTATE_ABSENT.
by Alexandre Julliard April 12, 2007

April 12, 2007

Module: wine Branch: master Commit: b46ab0b8cb19c7728397b0a5865a1d4f0f5a63c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b46ab0b8cb19c7728397b0a58… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Apr 12 14:46:43 2007 +0900 msi: Do not crash in MsiGetUserInfo if org, user or serial are not present, instead return USERINFOSTATE_ABSENT. --- dlls/msi/msi.c | 32 +++++++++++++++++++++++--------- 1 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 2cb4848..ae67b75 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1562,15 +1562,29 @@ static USERINFOSTATE WINAPI MSI_GetUserInfo(LPCWSTR szProduct, state = USERINFOSTATE_PRESENT; - r = msi_strcpy_to_awstring( user, lpUserNameBuf, pcchUserNameBuf ); - if (r == ERROR_MORE_DATA) - state = USERINFOSTATE_MOREDATA; - r = msi_strcpy_to_awstring( org, lpOrgNameBuf, pcchOrgNameBuf ); - if (r == ERROR_MORE_DATA) - state = USERINFOSTATE_MOREDATA; - r = msi_strcpy_to_awstring( serial, lpSerialBuf, pcchSerialBuf ); - if (r == ERROR_MORE_DATA) - state = USERINFOSTATE_MOREDATA; + if (user) + { + r = msi_strcpy_to_awstring( user, lpUserNameBuf, pcchUserNameBuf ); + if (r == ERROR_MORE_DATA) + state = USERINFOSTATE_MOREDATA; + } + else + state = USERINFOSTATE_ABSENT; + if (org) + { + r = msi_strcpy_to_awstring( org, lpOrgNameBuf, pcchOrgNameBuf ); + if (r == ERROR_MORE_DATA && state == USERINFOSTATE_PRESENT) + state = USERINFOSTATE_MOREDATA; + } + /* msdn states: The user information is considered to be present even in the absence of a company name. */ + if (serial) + { + r = msi_strcpy_to_awstring( serial, lpSerialBuf, pcchSerialBuf ); + if (r == ERROR_MORE_DATA && state == USERINFOSTATE_PRESENT) + state = USERINFOSTATE_MOREDATA; + } + else + state = USERINFOSTATE_ABSENT; msi_free( user ); msi_free( org );

1 0

Lei Zhang : user32: WM_ACTIVATEAPP on minimize message test.
by Alexandre Julliard April 12, 2007

April 12, 2007

Module: wine Branch: master Commit: c569ab2a6727ce7cef6ca6e90f398c50640493bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c569ab2a6727ce7cef6ca6e90… Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 11 17:45:42 2007 -0700 user32: WM_ACTIVATEAPP on minimize message test. --- dlls/user32/tests/msg.c | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 50b00c8..f0e4747 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -329,6 +329,26 @@ static const struct message WmShowMaxOverlappedSeq[] = { { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { 0 } }; +/* ShowWindow(SW_SHOWMINIMIZED) for a not visible overlapped window */ +static const struct message WmShowMinOverlappedSeq[] = { + { HCBT_MINMAX, hook|lparam, 0, SW_MINIMIZE }, + { HCBT_SETFOCUS, hook }, + { WM_KILLFOCUS, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOCOPYBITS|SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent|wparam, TRUE }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_WINDOWPOSCHANGED, sent }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc|wparam, SIZE_MINIMIZED }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCACTIVATE, sent|wparam, 0 }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ACTIVATE, sent }, + { WM_ACTIVATEAPP, sent|wparam, 0 }, + { 0 } +}; /* ShowWindow(SW_HIDE) for a visible overlapped window */ static const struct message WmHideOverlappedSeq[] = { { WM_SHOWWINDOW, sent|wparam, 0 }, @@ -3712,6 +3732,14 @@ static void test_messages(void) /* FIXME: add ok_sequence() here */ flush_sequence(); + ShowWindow(hwnd, SW_MINIMIZE); + ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", TRUE); + flush_sequence(); + + ShowWindow(hwnd, SW_RESTORE); + /* FIXME: add ok_sequence() here */ + flush_sequence(); + ShowWindow(hwnd, SW_SHOW); ok_sequence(WmEmptySeq, "ShowWindow(SW_SHOW):overlapped already visible", FALSE); @@ -8444,7 +8472,7 @@ static const struct message WmSetWindowRgn_no_redraw[] = { }; static const struct message WmSetWindowRgn_clear[] = { - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE }, /* some versions of 2000/XP also has SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE in wparam */ { WM_NCCALCSIZE, sent|wparam, 1 }, { WM_NCPAINT, sent }, /* wparam != 1 */ { WM_GETTEXT, sent|defwinproc|optional },

1 0

Lei Zhang : comctl32: More monthcal hit tests.
by Alexandre Julliard April 12, 2007

April 12, 2007

Module: wine Branch: master Commit: b47a756ac7d7d1b158c2f37006c7e60fc1db37ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=b47a756ac7d7d1b158c2f3700… Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 11 21:34:48 2007 -0700 comctl32: More monthcal hit tests. --- dlls/comctl32/tests/monthcal.c | 143 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 142 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 47648a1..8cfe5f1 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -204,6 +204,20 @@ static const struct message monthcal_hit_test_seq[] = { { MCM_HITTEST, sent|wparam, 0}, { MCM_HITTEST, sent|wparam, 0}, { MCM_HITTEST, sent|wparam, 0}, + { MCM_HITTEST, sent|wparam, 0}, + { MCM_HITTEST, sent|wparam, 0}, + { MCM_HITTEST, sent|wparam, 0}, + { MCM_HITTEST, sent|wparam, 0}, + { MCM_HITTEST, sent|wparam, 0}, + { MCM_HITTEST, sent|wparam, 0}, + { MCM_HITTEST, sent|wparam, 0}, + { MCM_HITTEST, sent|wparam, 0}, + { MCM_HITTEST, sent|wparam, 0}, + { MCM_HITTEST, sent|wparam, 0}, + { MCM_HITTEST, sent|wparam, 0}, + { MCM_HITTEST, sent|wparam, 0}, + { MCM_HITTEST, sent|wparam, 0}, + { MCM_HITTEST, sent|wparam, 0}, { 0 } }; @@ -725,13 +739,140 @@ static void test_monthcal_HitTest(HWND hwnd) expect(mchit.uHit, res); todo_wine {expect(MCHT_NOWHERE, res);} - /* (150, 200) is in active area */ + /* (150, 200) is in active area - calendar background */ mchit.pt.x = 150; mchit.pt.y = 200; res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); expect(150, mchit.pt.x); expect(200, mchit.pt.y); expect(mchit.uHit, res); + expect(MCHT_CALENDARBK, res); + + /* (70, 20) is in active area - previous month button */ + mchit.pt.x = 70; + mchit.pt.y = 20; + res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); + expect(70, mchit.pt.x); + expect(20, mchit.pt.y); + expect(mchit.uHit, res); + todo_wine {expect(MCHT_TITLEBTNPREV, res);} + + /* (90, 20) is in active area - background section of the title */ + mchit.pt.x = 90; + mchit.pt.y = 20; + res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); + expect(90, mchit.pt.x); + expect(20, mchit.pt.y); + expect(mchit.uHit, res); + todo_wine {expect(MCHT_TITLE, res);} + + /* (150, 20) is in active area - month section of the title */ + mchit.pt.x = 150; + mchit.pt.y = 20; + res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); + expect(150, mchit.pt.x); + expect(20, mchit.pt.y); + expect(mchit.uHit, res); + todo_wine {expect(MCHT_TITLEMONTH, res);} + + /* (230, 20) is in active area - previous month button */ + mchit.pt.x = 230; + mchit.pt.y = 20; + res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); + expect(230, mchit.pt.x); + expect(20, mchit.pt.y); + expect(mchit.uHit, res); + todo_wine {expect(MCHT_TITLEBTNNEXT, res);} + + /* (70, 40) is in active area - day of the week */ + mchit.pt.x = 70; + mchit.pt.y = 40; + res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); + expect(70, mchit.pt.x); + expect(40, mchit.pt.y); + expect(mchit.uHit, res); + todo_wine {expect(MCHT_CALENDARDAY, res);} + + /* (70, 55) is in active area - date from prev month */ + mchit.pt.x = 70; + mchit.pt.y = 55; + res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); + expect(70, mchit.pt.x); + expect(55, mchit.pt.y); + expect(mchit.uHit, res); + todo_wine {expect(MCHT_CALENDARDATEPREV, res);} + + /* (125, 115) is in active area - date from this month */ + mchit.pt.x = 125; + mchit.pt.y = 115; + res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); + expect(125, mchit.pt.x); + expect(115, mchit.pt.y); + expect(mchit.uHit, res); + todo_wine {expect(MCHT_CALENDARDATE, res);} + + /* (80, 160) is in active area - background section of the title */ + mchit.pt.x = 80; + mchit.pt.y = 160; + res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); + expect(80, mchit.pt.x); + expect(160, mchit.pt.y); + expect(mchit.uHit, res); + todo_wine {expect(MCHT_TITLEBK, res);} + + /* (150, 160) is in active area - month section of the title */ + mchit.pt.x = 150; + mchit.pt.y = 160; + res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); + expect(150, mchit.pt.x); + expect(160, mchit.pt.y); + expect(mchit.uHit, res); + todo_wine {expect(MCHT_TITLEMONTH, res);} + + /* (170, 160) is in active area - year section of the title */ + mchit.pt.x = 170; + mchit.pt.y = 160; + res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); + expect(170, mchit.pt.x); + expect(160, mchit.pt.y); + expect(mchit.uHit, res); + todo_wine {expect(MCHT_TITLEYEAR, res);} + + /* (150, 240) is in active area - date from this month */ + mchit.pt.x = 150; + mchit.pt.y = 240; + res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); + expect(150, mchit.pt.x); + expect(240, mchit.pt.y); + expect(mchit.uHit, res); + todo_wine {expect(MCHT_CALENDARDATE, res);} + + /* (150, 270) is in active area - date from next month */ + mchit.pt.x = 150; + mchit.pt.y = 270; + res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); + expect(150, mchit.pt.x); + expect(270, mchit.pt.y); + expect(mchit.uHit, res); + todo_wine {expect(MCHT_CALENDARDATENEXT, res);} + + /* (150, 290) is in active area - today link */ + mchit.pt.x = 150; + mchit.pt.y = 290; + res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); + expect(150, mchit.pt.x); + expect(290, mchit.pt.y); + expect(mchit.uHit, res); + todo_wine {expect(MCHT_TODAYLINK, res);} + + /* (70, 290) is in active area - today link */ + mchit.pt.x = 70; + mchit.pt.y = 290; + res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); + expect(70, mchit.pt.x); + expect(290, mchit.pt.y); + expect(mchit.uHit, res); + todo_wine {expect(MCHT_TODAYLINK, res);} ok_sequence(sequences, MONTHCAL_SEQ_INDEX, monthcal_hit_test_seq, "monthcal hit test", FALSE); }

1 0

James Hawkins : msi: Reset the is_extracted flag when every cabinet is loaded.
by Alexandre Julliard April 12, 2007

April 12, 2007

Module: wine Branch: master Commit: 7ef8428b5e5e14c5a048d7a655b68249178837c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ef8428b5e5e14c5a048d7a65… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Apr 11 18:52:00 2007 -0500 msi: Reset the is_extracted flag when every cabinet is loaded. --- dlls/msi/files.c | 1 + dlls/msi/tests/install.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 0 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index e9f1043..d1e7fe6 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -526,6 +526,7 @@ static UINT load_media_info(MSIPACKAGE *package, MSIFILE *file, struct media_inf return ERROR_FUNCTION_FAILED; } + mi->is_extracted = FALSE; mi->disk_id = MSI_RecordGetInteger(row, 1); mi->last_sequence = MSI_RecordGetInteger(row, 2); msi_free(mi->disk_prompt); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 426e1ec..cc490a7 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -285,6 +285,37 @@ static const CHAR sdp_custom_action_dat[] = "Action\tType\tSource\tTarget\tISCom "CustomAction\tAction\n" "SetDirProperty\t51\tMSITESTDIR\t[CommonFilesFolder]msitest\\\t\n"; +static const CHAR cie_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "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\t1\tgaius\n"; + +static const CHAR cie_feature_comp_dat[] = "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "feature\tmaximus\n" + "feature\taugustus\n" + "feature\tcaesar\n" + "feature\tgaius"; + +static const CHAR cie_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "maximus\tmaximus\tmaximus\t500\t\t\t16384\t1\n" + "augustus\taugustus\taugustus\t50000\t\t\t16384\t2\n" + "caesar\tcaesar\tcaesar\t500\t\t\t16384\t12\n" + "gaius\tgaius\tgaius\t500\t\t\t8192\t11"; + +static const CHAR cie_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" + "i2\ti4\tL64\tS255\tS32\tS72\n" + "Media\tDiskId\n" + "1\t1\t\ttest1.cab\tDISK1\t\n" + "2\t2\t\ttest2.cab\tDISK2\t\n" + "3\t12\t\ttest3.cab\tDISK3\t\n"; + typedef struct _msi_table { const CHAR *filename; @@ -408,6 +439,18 @@ static const msi_table sdp_tables[] = ADD_TABLE(property), }; +static const msi_table cie_tables[] = +{ + ADD_TABLE(cie_component), + ADD_TABLE(directory), + ADD_TABLE(cc_feature), + ADD_TABLE(cie_feature_comp), + ADD_TABLE(cie_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(cie_media), + ADD_TABLE(property), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -1261,6 +1304,40 @@ static void test_setdirproperty(void) DeleteFile(msifile); } +static void test_cabisextracted(void) +{ + UINT r; + + CreateDirectoryA("msitest", NULL); + create_file("msitest\\gaius", 500); + create_file("maximus", 500); + create_file("augustus", 500); + create_file("caesar", 500); + + create_database(msifile, mm_tables, sizeof(mm_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + create_cab_file("test1.cab", MEDIA_SIZE, "maximus\0"); + create_cab_file("test2.cab", MEDIA_SIZE, "augustus\0"); + create_cab_file("test3.cab", MEDIA_SIZE, "caesar\0"); + + create_database(msifile, cie_tables, sizeof(cie_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + 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 installed\n"); + ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\gaius", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + delete_cab_files(); + DeleteFile(msifile); +} + START_TEST(install) { DWORD len; @@ -1288,6 +1365,7 @@ START_TEST(install) test_uiLevelFlags(); test_readonlyfile(); test_setdirproperty(); + test_cabisextracted(); SetCurrentDirectoryA(prev_path); }

1 0

Maarten Lankhorst : winecfg: Close audio driver when not needed any more.
by Alexandre Julliard April 12, 2007

April 12, 2007

Module: wine Branch: master Commit: a9355f2b16e9962926ede242746b061c8a824c03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9355f2b16e9962926ede2427… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Apr 12 00:32:30 2007 +0200 winecfg: Close audio driver when not needed any more. --- programs/winecfg/audio.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index d59d0c2..e54aaa6 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -481,6 +481,7 @@ static void initAudioDeviceTree(HWND hDlg) } } } + CloseDriver(hdrv, 0, 0); } }

1 0

Detlef Riekenberg : localui: Add version resource.
by Alexandre Julliard April 12, 2007

April 12, 2007

Module: wine Branch: master Commit: 4da1d2ae04683c0d5f3b6d1768b8acb673fc4be3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4da1d2ae04683c0d5f3b6d176… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Apr 11 23:16:26 2007 +0200 localui: Add version resource. --- .gitignore | 1 + dlls/localui/Makefile.in | 2 ++ dlls/localui/localui.rc | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index c2709e8..6ac3e49 100644 --- a/.gitignore +++ b/.gitignore @@ -282,6 +282,7 @@ dlls/localspl/localspl.res dlls/localspl/tests/*.ok dlls/localspl/tests/localspl_crosstest.exe dlls/localspl/tests/testlist.c +dlls/localui/localui.res dlls/localui/tests/*.ok dlls/localui/tests/localui_crosstest.exe dlls/localui/tests/testlist.c diff --git a/dlls/localui/Makefile.in b/dlls/localui/Makefile.in index 7505c15..f002e23 100644 --- a/dlls/localui/Makefile.in +++ b/dlls/localui/Makefile.in @@ -8,6 +8,8 @@ IMPORTS = kernel32 C_SRCS = \ localui.c +RC_SRCS = localui.rc + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/localui/localui.rc b/dlls/localui/localui.rc new file mode 100644 index 0000000..5162b6e --- /dev/null +++ b/dlls/localui/localui.rc @@ -0,0 +1,37 @@ +/* + * Top level resource file for localui + * + * Copyright 2007 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "windef.h" +#include "winbase.h" +#include "winver.h" + + +#define WINE_FILENAME_STR "localui.dll" +#define WINE_FILEDESCRIPTION_STR "User Interface for the Local Monitor" + +/* Same Version as WinXP_sp2 */ +#define WINE_FILEVERSION 5,1,2600,2180 +#define WINE_FILEVERSION_STR "5.1.2600.2180" + +#define WINE_PRODUCTVERSION 5,1,2600,2180 +#define WINE_PRODUCTVERSION_STR "5.1.2600.2180" + +#include "wine/wine_common_ver.rc"

1 0

Andrew Talbot : ntdll: Remove superfluous semicolons.
by Alexandre Julliard April 12, 2007

April 12, 2007

Module: wine Branch: master Commit: ab2a48ae437da1168dd61cfe8c4d78b055867294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab2a48ae437da1168dd61cfe8… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Apr 11 21:42:56 2007 +0100 ntdll: Remove superfluous semicolons. --- dlls/ntdll/exception.c | 4 ++-- dlls/ntdll/relay.c | 6 +++--- dlls/ntdll/signal_i386.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index be82a84..7f0da0c 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -391,7 +391,7 @@ void WINAPI __regs_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context ) /**********************************************************************/ #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 4, 4 ); +DEFINE_REGS_ENTRYPOINT( RtlRaiseException, 4, 4 ) #else void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec ) { @@ -483,7 +483,7 @@ void WINAPI __regs_RtlUnwind( EXCEPTION_REGISTRATION_RECORD* pEndFrame, PVOID un /**********************************************************************/ #ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( RtlUnwind, 16, 16 ); +DEFINE_REGS_ENTRYPOINT( RtlUnwind, 16, 16 ) #else void WINAPI RtlUnwind( PVOID pEndFrame, PVOID unusedEip, PEXCEPTION_RECORD pRecord, PVOID returnEax ) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 75dbe7c..09419b5 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -472,7 +472,7 @@ void WINAPI __regs_relay_call_from_32_regs( struct relay_descr *descr, unsigned } } extern void WINAPI relay_call_from_32_regs(void); -DEFINE_REGS_ENTRYPOINT( relay_call_from_32_regs, 16, 16 ); +DEFINE_REGS_ENTRYPOINT( relay_call_from_32_regs, 16, 16 ) /*********************************************************************** @@ -945,8 +945,8 @@ void WINAPI __regs_SNOOP_Return( CONTEXT86 *context ) } /* assembly wrappers that save the context */ -DEFINE_REGS_ENTRYPOINT( SNOOP_Entry, 0, 0 ); -DEFINE_REGS_ENTRYPOINT( SNOOP_Return, 0, 0 ); +DEFINE_REGS_ENTRYPOINT( SNOOP_Entry, 0, 0 ) +DEFINE_REGS_ENTRYPOINT( SNOOP_Return, 0, 0 ) #else /* __i386__ */ diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 106ebed..69ae4dd 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -732,7 +732,7 @@ void WINAPI __regs_get_cpu_context( CONTEXT *context, CONTEXT *regs ) *context = *regs; save_fpu( context ); } -DEFINE_REGS_ENTRYPOINT( get_cpu_context, 4, 4 ); +DEFINE_REGS_ENTRYPOINT( get_cpu_context, 4, 4 ) /***********************************************************************

1 0