June 2009 - Wine-commits - list.winehq.org

Hans Leidekker : msi: Don't trace an out parameter.
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: c1670fb353ed3c2ca4424a3c11ea613d8011a160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1670fb353ed3c2ca4424a3c1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 4 10:12:31 2009 +0200 msi: Don't trace an out parameter. --- dlls/msi/format.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index de531bf..f59024a 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -869,7 +869,7 @@ UINT MSI_FormatRecordW( MSIPACKAGE* package, MSIRECORD* record, LPWSTR buffer, DWORD len; UINT rc = ERROR_INVALID_PARAMETER; - TRACE("%p %p %p %i\n", package, record ,buffer, *size); + TRACE("%p %p %p %p\n", package, record, buffer, size); rec = msi_dup_record_field(record,0); if (!rec)

1 0

Hans Leidekker : msi: Initialize some variables.
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: d02dbf44922231799f851bff962759b651c41c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d02dbf44922231799f851bff9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 4 10:12:56 2009 +0200 msi: Initialize some variables. --- dlls/msi/registry.c | 2 +- dlls/msi/tests/package.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 3ba34d1..f22c01f 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1822,7 +1822,7 @@ static UINT msi_check_product_patches(LPCWSTR prodcode, LPCWSTR usersid, LPWSTR patch, LPWSTR targetprod, MSIINSTALLCONTEXT *targetctx, LPWSTR targetsid, DWORD *sidsize, LPWSTR *transforms) { - MSIPATCHSTATE state; + MSIPATCHSTATE state = MSIPATCHSTATE_INVALID; LPWSTR ptr, patches = NULL; HKEY prod, patchkey = 0; HKEY localprod = 0, localpatch = 0; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index a9eef76..3263ec1 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -939,6 +939,7 @@ static void test_settargetpath(void) sz = sizeof tempdir - 1; r = MsiGetTargetPath( hpkg, "TARGETDIR", tempdir, &sz ); sprintf( file, "%srootfile.txt", tempdir ); + buffer[0] = 0; query_file_path( hpkg, "[#RootFile]", buffer ); ok( r == ERROR_SUCCESS, "failed to get target path: %d\n", r); ok( !lstrcmp(buffer, file), "Expected %s, got %s\n", file, buffer ); @@ -11057,8 +11058,8 @@ static void test_access(void) static void test_emptypackage(void) { - MSIHANDLE hpkg, hdb, hsuminfo; - MSIHANDLE hview, hrec; + MSIHANDLE hpkg = 0, hdb = 0, hsuminfo = 0; + MSIHANDLE hview = 0, hrec = 0; MSICONDITION condition; CHAR buffer[MAX_PATH]; DWORD size;

1 0

Hans Leidekker : msi: Add tests for importing a _SummaryInformation table.
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: a0b9315dffa3610cf3fc3b0c8d0d84ce143ff896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0b9315dffa3610cf3fc3b0c8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 4 10:13:14 2009 +0200 msi: Add tests for importing a _SummaryInformation table. --- dlls/msi/tests/db.c | 142 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 142 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index a48bcab..95f2170 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -24,6 +24,7 @@ #include <windows.h> #include <msi.h> +#include <msidefs.h> #include <msiquery.h> #include <objidl.h> @@ -1711,6 +1712,24 @@ static const CHAR endlines2[] = "A\tB\tC\tD\tE\tF\r" "a\tb\tc\td\te\tf\n" "g\th\ti\tj\tk\tl\r\n"; +static const CHAR suminfo[] = "PropertyId\tValue\n" + "i2\tl255\n" + "_SummaryInformation\tPropertyId\n" + "1\t1252\n" + "2\tInstaller Database\n" + "3\tInstaller description\n" + "4\tWineHQ\n" + "5\tInstaller\n" + "6\tInstaller comments\n" + "7\tIntel;1033\n" + "9\t{12345678-1234-1234-1234-123456789012}\n" + "12\t2009/04/12 15:46:11\n" + "13\t2009/04/12 15:46:11\n" + "14\t200\n" + "15\t2\n" + "18\tVim\n" + "19\t2\n"; + static void write_file(const CHAR *filename, const char *data, int data_size) { DWORD size; @@ -1733,6 +1752,128 @@ static UINT add_table_to_db(MSIHANDLE hdb, LPCSTR table_data) return r; } +static void test_suminfo_import(void) +{ + MSIHANDLE hdb, hsi, view = 0; + LPCSTR query; + UINT r, count, size, type; + char str_value[50]; + INT int_value; + FILETIME ft_value; + + GetCurrentDirectoryA(MAX_PATH, CURR_DIR); + + r = MsiOpenDatabaseA(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = add_table_to_db(hdb, suminfo); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + /* _SummaryInformation is not imported as a regular table... */ + + query = "SELECT * FROM `_SummaryInformation`"; + r = MsiDatabaseOpenViewA(hdb, query, &view); + ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %u\n", r); + MsiCloseHandle(view); + + /* ...its data is added to the special summary information stream */ + + r = MsiGetSummaryInformationA(hdb, NULL, 0, &hsi); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = MsiSummaryInfoGetPropertyCount(hsi, &count); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(count == 14, "Expected 14, got %u\n", count); + + r = MsiSummaryInfoGetPropertyA(hsi, PID_CODEPAGE, &type, &int_value, NULL, NULL, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_I2, "Expected VT_I2, got %u\n", type); + ok(int_value == 1252, "Expected 1252, got %d\n", int_value); + + size = sizeof(str_value); + r = MsiSummaryInfoGetPropertyA(hsi, PID_TITLE, &type, NULL, NULL, str_value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_LPSTR, "Expected VT_LPSTR, got %u\n", type); + ok(size == 18, "Expected 18, got %u\n", size); + ok(!strcmp(str_value, "Installer Database"), + "Expected \"Installer Database\", got %s\n", str_value); + + size = sizeof(str_value); + r = MsiSummaryInfoGetPropertyA(hsi, PID_SUBJECT, &type, NULL, NULL, str_value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_LPSTR, "Expected VT_LPSTR, got %u\n", type); + ok(!strcmp(str_value, "Installer description"), + "Expected \"Installer description\", got %s\n", str_value); + + size = sizeof(str_value); + r = MsiSummaryInfoGetPropertyA(hsi, PID_AUTHOR, &type, NULL, NULL, str_value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_LPSTR, "Expected VT_LPSTR, got %u\n", type); + ok(!strcmp(str_value, "WineHQ"), + "Expected \"WineHQ\", got %s\n", str_value); + + size = sizeof(str_value); + r = MsiSummaryInfoGetPropertyA(hsi, PID_KEYWORDS, &type, NULL, NULL, str_value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_LPSTR, "Expected VT_LPSTR, got %u\n", type); + ok(!strcmp(str_value, "Installer"), + "Expected \"Installer\", got %s\n", str_value); + + size = sizeof(str_value); + r = MsiSummaryInfoGetPropertyA(hsi, PID_COMMENTS, &type, NULL, NULL, str_value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_LPSTR, "Expected VT_LPSTR, got %u\n", type); + ok(!strcmp(str_value, "Installer comments"), + "Expected \"Installer comments\", got %s\n", str_value); + + size = sizeof(str_value); + r = MsiSummaryInfoGetPropertyA(hsi, PID_TEMPLATE, &type, NULL, NULL, str_value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_LPSTR, "Expected VT_LPSTR, got %u\n", type); + ok(!strcmp(str_value, "Intel;1033"), + "Expected \"Intel;1033\", got %s\n", str_value); + + size = sizeof(str_value); + r = MsiSummaryInfoGetPropertyA(hsi, PID_REVNUMBER, &type, NULL, NULL, str_value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_LPSTR, "Expected VT_LPSTR, got %u\n", type); + ok(!strcmp(str_value, "{12345678-1234-1234-1234-123456789012}"), + "Expected \"{12345678-1234-1234-1234-123456789012}\", got %s\n", str_value); + + r = MsiSummaryInfoGetPropertyA(hsi, PID_CREATE_DTM, &type, NULL, &ft_value, NULL, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_FILETIME, "Expected VT_FILETIME, got %u\n", type); + + r = MsiSummaryInfoGetPropertyA(hsi, PID_LASTSAVE_DTM, &type, NULL, &ft_value, NULL, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_FILETIME, "Expected VT_FILETIME, got %u\n", type); + + r = MsiSummaryInfoGetPropertyA(hsi, PID_PAGECOUNT, &type, &int_value, NULL, NULL, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_I4, "Expected VT_I4, got %u\n", type); + ok(int_value == 200, "Expected 200, got %d\n", int_value); + + r = MsiSummaryInfoGetPropertyA(hsi, PID_WORDCOUNT, &type, &int_value, NULL, NULL, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_I4, "Expected VT_I4, got %u\n", type); + ok(int_value == 2, "Expected 2, got %d\n", int_value); + + r = MsiSummaryInfoGetPropertyA(hsi, PID_SECURITY, &type, &int_value, NULL, NULL, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_I4, "Expected VT_I4, got %u\n", type); + ok(int_value == 2, "Expected 2, got %d\n", int_value); + + size = sizeof(str_value); + r = MsiSummaryInfoGetPropertyA(hsi, PID_APPNAME, &type, NULL, NULL, str_value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(type == VT_LPSTR, "Expected VT_LPSTR, got %u\n", type); + ok(!strcmp(str_value, "Vim"), "Expected \"Vim\", got %s\n", str_value); + + MsiCloseHandle(hsi); + MsiCloseHandle(hdb); + DeleteFileA(msifile); +} + static void test_msiimport(void) { MSIHANDLE hdb, view, rec; @@ -7784,4 +7925,5 @@ START_TEST(db) test_dbmerge(); test_insertorder(); test_columnorder(); + test_suminfo_import(); }

1 0

Alexandre Julliard : rpcrt4: Add checks for the number of methods being larger than what we support.
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: cbf9d1b0c6bca854c23044c0467a5841e75178e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf9d1b0c6bca854c23044c04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 16:52:06 2009 +0200 rpcrt4: Add checks for the number of methods being larger than what we support. --- dlls/rpcrt4/cproxy.c | 5 +++++ dlls/rpcrt4/cstub.c | 10 ++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 6461612..5186ea6 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -133,6 +133,11 @@ static BOOL fill_stubless_table( IUnknownVtbl *vtbl, DWORD num ) const void **entry = (const void **)(vtbl + 1); DWORD i, j; + if (num - 3 > BLOCK_SIZE * MAX_BLOCKS) + { + FIXME( "%u methods not supported\n", num ); + return FALSE; + } for (i = 0; i < (num - 3 + BLOCK_SIZE - 1) / BLOCK_SIZE; i++) { const struct thunk *block = method_blocks[i]; diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 3e1ae8f..95ac1d8 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -201,6 +201,11 @@ static BOOL fill_delegated_stub_table(IUnknownVtbl *vtbl, DWORD num) const void **entry = (const void **)(vtbl + 1); DWORD i, j; + if (num - 3 > BLOCK_SIZE * MAX_BLOCKS) + { + FIXME( "%u methods not supported\n", num ); + return FALSE; + } vtbl->QueryInterface = delegating_QueryInterface; vtbl->AddRef = delegating_AddRef; vtbl->Release = delegating_Release; @@ -218,6 +223,11 @@ BOOL fill_delegated_proxy_table(IUnknownVtbl *vtbl, DWORD num) const void **entry = (const void **)(vtbl + 1); DWORD i, j; + if (num - 3 > BLOCK_SIZE * MAX_BLOCKS) + { + FIXME( "%u methods not supported\n", num ); + return FALSE; + } vtbl->QueryInterface = IUnknown_QueryInterface_Proxy; vtbl->AddRef = IUnknown_AddRef_Proxy; vtbl->Release = IUnknown_Release_Proxy;

1 0

Vincent Povirk : winex11.drv: Don' t use XEvents uninitialized when waits time out.
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: cedc8e709914b3fb9584fd5194c5e40983efa9db URL: http://source.winehq.org/git/wine.git/?a=commit;h=cedc8e709914b3fb9584fd519… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 3 08:54:22 2009 -0500 winex11.drv: Don't use XEvents uninitialized when waits time out. --- dlls/winex11.drv/clipboard.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index f14a84c..b634451 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1842,6 +1842,11 @@ static BOOL X11DRV_CLIPBOARD_QueryTargets(Display *display, Window w, Atom selec usleep(SELECTION_WAIT); } + if (i == SELECTION_RETRIES) + { + ERR("Timed out waiting for SelectionNotify event\n"); + return FALSE; + } /* Verify that the selection returned a valid TARGETS property */ if ((xe->xselection.target != target) || (xe->xselection.property == None)) { @@ -2111,8 +2116,12 @@ static BOOL X11DRV_CLIPBOARD_ReadSelectionData(Display *display, LPWINE_CLIPDATA usleep(SELECTION_WAIT); } + if (i == SELECTION_RETRIES) + { + ERR("Timed out waiting for SelectionNotify event\n"); + } /* Verify that the selection returned a valid TARGETS property */ - if (xe.xselection.property != None) + else if (xe.xselection.property != None) { /* * Read the contents of the X selection property

1 0

Paul Vriens : ole32/tests: Fix remaining test failures on NT4 and below.
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: cb81487707ce146823d5a5df1534e156329085be URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb81487707ce146823d5a5df1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jun 3 17:15:30 2009 +0200 ole32/tests: Fix remaining test failures on NT4 and below. --- dlls/ole32/tests/storage32.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index e561861..29ff0c6 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1336,8 +1336,11 @@ static void test_simple(void) ok(upos.QuadPart == 3, "got %d\n", upos.u.LowPart); r = IStream_Stat(stm, &stat, STATFLAG_NONAME); - ok(r == S_OK, "got %08x\n", r); - ok(stat.cbSize.QuadPart == 3, "got %d\n", stat.cbSize.u.LowPart); + ok(r == S_OK || + broken(r == STG_E_INVALIDFUNCTION), /* NT4 and below */ + "got %08x\n", r); + if (r == S_OK) + ok(stat.cbSize.QuadPart == 3, "got %d\n", stat.cbSize.u.LowPart); pos.QuadPart = 1; r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &upos); @@ -1345,8 +1348,11 @@ static void test_simple(void) ok(upos.QuadPart == 1, "got %d\n", upos.u.LowPart); r = IStream_Stat(stm, &stat, STATFLAG_NONAME); - ok(r == S_OK, "got %08x\n", r); - ok(stat.cbSize.QuadPart == 1, "got %d\n", stat.cbSize.u.LowPart); + ok(r == S_OK || + broken(r == STG_E_INVALIDFUNCTION), /* NT4 and below */ + "got %08x\n", r); + if (r == S_OK) + ok(stat.cbSize.QuadPart == 1, "got %d\n", stat.cbSize.u.LowPart); IStream_Release(stm);

1 0

Paul Vriens : kernel32/tests: Skip WritePrivateProfileString tests on Win9x /WinME.
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: eca3d7487715d92dc43c841d8bb8a6f9522bc4cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=eca3d7487715d92dc43c841d8… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jun 3 21:56:10 2009 +0200 kernel32/tests: Skip WritePrivateProfileString tests on Win9x/WinME. --- dlls/kernel32/tests/profile.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index fbf5d24..b9a71d3 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -822,18 +822,12 @@ static void test_GetPrivateProfileString(const char *content, const char *descri DeleteFileA(filename); } -static DWORD timeout = 0; - static BOOL check_binary_file_data(LPCSTR path, const VOID *data, DWORD size) { HANDLE file; CHAR buf[MAX_PATH]; BOOL ret; - /* Sleep() is needed on Win9x and WinME */ - if (timeout) - Sleep(timeout); - file = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); if (file == INVALID_HANDLE_VALUE) return FALSE; @@ -864,6 +858,19 @@ static void test_WritePrivateProfileString(void) CHAR path[MAX_PATH]; CHAR temp[MAX_PATH]; + SetLastError(0xdeadbeef); + ret = WritePrivateProfileStringW(NULL, NULL, NULL, NULL); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + /* Win9x/WinME needs (variable) timeouts between tests and even long timeouts don't + * guarantee a correct result. + * Win9x/WinMe also produces different ini files where there is always a newline before + * a section start (except for the first one). + */ + win_skip("WritePrivateProfileString on Win9x/WinME is hard to test reliably\n"); + return; + } + GetTempPathA(MAX_PATH, temp); GetTempFileNameA(temp, "wine", 0, path); DeleteFileA(path); @@ -878,8 +885,6 @@ static void test_WritePrivateProfileString(void) broken(GetLastError() == ERROR_INVALID_PARAMETER) || /* NT4 */ broken(GetLastError() == 0xdeadbeef), /* Win9x and WinME */ "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); - if (GetLastError() == 0xdeadbeef) - timeout = 1000; ok(GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES, "Expected path to not exist\n");

1 0

Paul Vriens : user32/tests: Remove a trace() message.
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: 96ef5d38affd2daacb1170fcdd54354fd4a10ae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96ef5d38affd2daacb1170fcd… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jun 4 09:32:43 2009 +0200 user32/tests: Remove a trace() message. --- dlls/user32/tests/msg.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 72cf9ed..dfc4c0d 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -3972,7 +3972,6 @@ static void test_hv_scroll_1(HWND hwnd, INT ctl, DWORD clear, DWORD set, INT min xmin = 0xdeadbeef; xmax = 0xdeadbeef; - trace("Ignore GetScrollRange error below if you are on Win9x\n"); ret = GetScrollRange(hwnd, ctl, &xmin, &xmax); ok( ret, "GetScrollRange(%d) error %d\n", ctl, GetLastError()); ok_sequence(WmEmptySeq, "GetScrollRange(SB_HORZ/SB_VERT) empty sequence", FALSE);

1 0

Paul Vriens : user32/tests: Fix a test failure on Win95.
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: f9ecd7397eefdee6dd11f3ccd478d1d72607f2f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9ecd7397eefdee6dd11f3ccd… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jun 4 10:54:25 2009 +0200 user32/tests: Fix a test failure on Win95. --- dlls/user32/tests/sysparams.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index d055fa0..7b2edaf 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2731,12 +2731,14 @@ static void test_EnumDisplaySettings(void) DWORD num; memset(&devmode, 0, sizeof(devmode)); - devmode.dmSize = sizeof(devmode); + /* Win95 doesn't handle ENUM_CURRENT_SETTINGS correctly */ EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &devmode); hdc = GetDC(0); val = GetDeviceCaps(hdc, BITSPIXEL); - ok(devmode.dmBitsPerPel == val, "GetDeviceCaps(BITSPIXEL) returned %d, EnumDisplaySettings returned %d\n", + ok(devmode.dmBitsPerPel == val || + broken(devmode.dmDeviceName[0] == 0), /* Win95 */ + "GetDeviceCaps(BITSPIXEL) returned %d, EnumDisplaySettings returned %d\n", val, devmode.dmBitsPerPel); val = GetDeviceCaps(hdc, NUMCOLORS);

1 0

Andrew Talbot : comctl32: Various const qualifier fixes.
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: b898f8dd582dc52bbf6b42ca5a19a12988edb21a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b898f8dd582dc52bbf6b42ca5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jun 3 21:47:16 2009 +0100 comctl32: Various const qualifier fixes. --- dlls/comctl32/comctl32.h | 6 +++--- dlls/comctl32/dpa.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index 872638d..1f2f63e 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -183,15 +183,15 @@ DWORD WINAPI GetSize (LPVOID); INT WINAPI Str_GetPtrA (LPCSTR, LPSTR, INT); INT WINAPI Str_GetPtrW (LPCWSTR, LPWSTR, INT); -INT WINAPI DPA_GetPtrIndex (const HDPA, LPVOID); -BOOL WINAPI DPA_Grow (const HDPA, INT); +INT WINAPI DPA_GetPtrIndex (HDPA, LPCVOID); +BOOL WINAPI DPA_Grow (HDPA, INT); #define DPAM_NOSORT 0x0001 #define DPAM_INSERT 0x0004 #define DPAM_DELETE 0x0008 typedef PVOID (CALLBACK *PFNDPAMERGE)(DWORD,PVOID,PVOID,LPARAM); -BOOL WINAPI DPA_Merge (const HDPA, const HDPA, DWORD, PFNDPACOMPARE, PFNDPAMERGE, LPARAM); +BOOL WINAPI DPA_Merge (HDPA, HDPA, DWORD, PFNDPACOMPARE, PFNDPAMERGE, LPARAM); #define DPA_GetPtrCount(hdpa) (*(INT*)(hdpa)) diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index a14c530..bbad10d 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -217,7 +217,7 @@ HRESULT WINAPI DPA_SaveStream (const HDPA hDpa, DPALOADPROC loadProc, * NOTES * No more information available yet! */ -BOOL WINAPI DPA_Merge (const HDPA hdpa1, const HDPA hdpa2, DWORD dwFlags, +BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, PFNDPACOMPARE pfnCompare, PFNDPAMERGE pfnMerge, LPARAM lParam) { @@ -381,7 +381,7 @@ BOOL WINAPI DPA_Destroy (const HDPA hdpa) * Success: TRUE * Failure: FALSE */ -BOOL WINAPI DPA_Grow (const HDPA hdpa, INT nGrow) +BOOL WINAPI DPA_Grow (HDPA hdpa, INT nGrow) { TRACE("(%p %d)\n", hdpa, nGrow); @@ -504,7 +504,7 @@ LPVOID WINAPI DPA_GetPtr (const HDPA hdpa, INT nIndex) * Success: index of the specified pointer * Failure: -1 */ -INT WINAPI DPA_GetPtrIndex (const HDPA hdpa, LPVOID p) +INT WINAPI DPA_GetPtrIndex (HDPA hdpa, LPCVOID p) { INT i;

1 0