June 2006 - Wine-Commits - list.winehq.org

Alexandre Julliard : libwine: Fixed a compiler warning on MacOSX.
by Alexandre Julliard June 15, 2006

June 15, 2006

Module: wine Branch: refs/heads/master Commit: 3fb4b32949bcb0d903969bd6851a712856c73836 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3fb4b32949bcb0d903969bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 15 14:14:26 2006 +0200 libwine: Fixed a compiler warning on MacOSX. --- libs/wine/config.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 3158047..d287c5d 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -153,12 +153,12 @@ #endif p = server_dir + strlen(server_dir); if (sizeof(dev) > sizeof(unsigned long) && dev > ~0UL) - p += sprintf( p, "%lx%08lx-", (unsigned long)(dev >> 32), (unsigned long)dev ); + p += sprintf( p, "%lx%08lx-", (unsigned long)((unsigned long long)dev >> 32), (unsigned long)dev ); else p += sprintf( p, "%lx-", (unsigned long)dev ); if (sizeof(ino) > sizeof(unsigned long) && ino > ~0UL) - sprintf( p, "%lx%08lx", (unsigned long)(ino >> 32), (unsigned long)ino ); + sprintf( p, "%lx%08lx", (unsigned long)((unsigned long long)ino >> 32), (unsigned long)ino ); else sprintf( p, "%lx", (unsigned long)ino ); }

1 0

Peter Åstrand : winmm: Add support for "open new" commands.
by Alexandre Julliard June 15, 2006

June 15, 2006

Module: wine Branch: refs/heads/master Commit: 2585e1a6fdabe038772cfd909cc72be66bfe7eda URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2585e1a6fdabe038772cfd9… Author: Peter Åstrand <astrand(a)cendio.se> Date: Mon Jun 12 16:19:06 2006 +0200 winmm: Add support for "open new" commands. --- dlls/winmm/mci.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 6c26535..156cbaf 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1260,6 +1260,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpst BOOL bAutoOpen = FALSE; static const WCHAR wszNew[] = {'n','e','w',0}; static const WCHAR wszSAliasS[] = {' ','a','l','i','a','s',' ',0}; + static const WCHAR wszTypeS[] = {'t','y','p','e',' ',0}; TRACE("(%s, %p, %d, %p)\n", debugstr_w(lpstrCommand), lpstrRet, uRetLen, hwndCallback); @@ -1281,18 +1282,26 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpst goto errCleanUp; } - /* case dev == 'new' has to be handled */ - if (!strcmpW(dev, wszNew)) { - FIXME("'new': NIY as device name\n"); - dwRet = MCIERR_MISSING_DEVICE_NAME; - goto errCleanUp; - } - - /* otherwise, try to grab devType from open */ + /* Determine devType from open */ if (!strcmpW(verb, wszOpen)) { LPWSTR devType, tmp; - if ((devType = strchrW(dev, '!')) != NULL) { + /* case dev == 'new' has to be handled */ + if (!strcmpW(dev, wszNew)) { + dev = 0; + if ((devType = strstrW(args, wszTypeS)) != NULL) { + devType += 5; + tmp = strchrW(devType, ' '); + if (tmp) *tmp = '\0'; + devType = str_dup_upper(devType); + if (tmp) *tmp = ' '; + /* dwFlags and data[2] will be correctly set in ParseOpt loop */ + } else { + WARN("open new requires device type\n"); + dwRet = MCIERR_MISSING_DEVICE_NAME; + goto errCleanUp; + } + } else if ((devType = strchrW(dev, '!')) != NULL) { *devType++ = '\0'; tmp = devType; devType = dev; dev = tmp; @@ -1309,7 +1318,6 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpst if (tmp) *tmp = ' '; dwFlags |= MCI_OPEN_TYPE; } else { - static const WCHAR wszTypeS[] = {'t','y','p','e',' ',0}; if ((devType = strstrW(args, wszTypeS)) != NULL) { devType += 5; tmp = strchrW(devType, ' '); @@ -1338,6 +1346,10 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpst data[4] = (DWORD)tmp2; /* should be done in regular options parsing */ /* dwFlags |= MCI_OPEN_ALIAS; */ + } else if (dev == 0) { + /* "open new" requires alias */ + dwRet = MCIERR_NEW_REQUIRES_ALIAS; + goto errCleanUp; } dwRet = MCI_LoadMciDriver(devType, &wmd);

1 0

Mike McCormack : msi: Add test for _Streams table ( based on patch by Andrey Turkin).
by Alexandre Julliard June 15, 2006

June 15, 2006

Module: wine Branch: refs/heads/master Commit: 94dc36e5a6f23d3742ba3c9d4c581bc00adfb28b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=94dc36e5a6f23d3742ba3c9… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jun 14 12:10:37 2006 +0900 msi: Add test for _Streams table (based on patch by Andrey Turkin). --- dlls/msi/tests/db.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 4320816..329e1a1 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -948,6 +948,44 @@ static void test_longstrings(void) MsiCloseHandle(hdb); DeleteFile(msifile); } + +static void test_streamtable(void) +{ + MSIHANDLE hdb = 0, rec; + UINT r; + + hdb = create_db(); + ok( hdb, "failed to create db\n"); + + r = run_query( hdb, + "CREATE TABLE `Properties` " + "( `Property` CHAR(255), `Value` CHAR(1) PRIMARY KEY `Property`)" ); + ok( r == ERROR_SUCCESS , "Failed to create table\n" ); + + /* check the column types */ + rec = get_column_info( hdb, "select * from `_Streams`", MSICOLINFO_TYPES ); + ok( rec, "failed to get column info record\n" ); + + todo_wine { + ok( check_record( rec, 1, "s62"), "wrong record type\n"); + ok( check_record( rec, 2, "V0"), "wrong record type\n"); + } + + MsiCloseHandle( rec ); + + /* now try the names */ + rec = get_column_info( hdb, "select * from `_Streams`", MSICOLINFO_NAMES ); + ok( rec, "failed to get column info record\n" ); + + todo_wine { + ok( check_record( rec, 1, "Name"), "wrong record type\n"); + ok( check_record( rec, 2, "Data"), "wrong record type\n"); + } + + MsiCloseHandle( rec ); + MsiCloseHandle( hdb ); + DeleteFile(msifile); +} START_TEST(db) { @@ -960,4 +998,5 @@ START_TEST(db) test_getcolinfo(); test_msiexport(); test_longstrings(); + test_streamtable(); }

1 0

Stefan Dösinger : wined3d: Correct vertex fog for transformed vertices and correctly
by Alexandre Julliard June 15, 2006

June 15, 2006

Module: wine Branch: refs/heads/master Commit: 5c3c5903a5a6d39530ed6d2a3b292ea2b0e8a741 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5c3c5903a5a6d39530ed6d2… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Jun 12 13:25:10 2006 +0200 wined3d: Correct vertex fog for transformed vertices and correctly handle non-vertex, non-table fog. --- dlls/wined3d/device.c | 137 ++++++++++++++++++++++++++++++++++----------- dlls/wined3d/drawprim.c | 58 +++++++++++++++++++ include/wine/wined3d_gl.h | 11 ++++ 3 files changed, 172 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5c3c5903a5a6d39530e…

1 0

Jason Green : wined3d: Implement more GLSL instructions.
by Alexandre Julliard June 15, 2006

June 15, 2006

Module: wine Branch: refs/heads/master Commit: cc06ed3d53b99adac596a18c1e1e5463eb996604 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cc06ed3d53b99adac596a18… Author: Jason Green <jave27(a)gmail.com> Date: Tue Jun 13 22:32:14 2006 -0400 wined3d: Implement more GLSL instructions. - Implemented: D3DSIO_SGN, LOOP, ENDLOOP, LOGP, LIT, DST, SINCOS - Process instruction-based modifiers (function existed, it just wasn't being called) - Add loop checking to register maps. - Renamed "sng" to "sgn" for D3DSIO_SGN - it's not handled anywhere except for GLSL, so won't matter. --- dlls/wined3d/baseshader.c | 11 +++++ dlls/wined3d/glsl_shader.c | 92 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/pixelshader.c | 12 +++-- dlls/wined3d/vertexshader.c | 18 ++++---- dlls/wined3d/wined3d_private.h | 11 ++++- 5 files changed, 128 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=cc06ed3d53b99adac59…

1 0

Robert Shearman : atl: Add a partial implementation of AtlModuleRegisterWndClassInfoW
by Alexandre Julliard June 15, 2006

June 15, 2006

Module: wine Branch: refs/heads/master Commit: da5cc563788045eef9c1defe0668a2d9d6dc1b2e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=da5cc563788045eef9c1def… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jun 14 13:20:41 2006 +0100 atl: Add a partial implementation of AtlModuleRegisterWndClassInfoW based on documentation by Mike McCormack. --- dlls/atl/atl_main.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 2d87b2e..dd12a5d 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -35,6 +35,8 @@ #include "atlbase.h" #include "atliface.h" #include "atlwin.h" +#include "wine/unicode.h" + WINE_DEFAULT_DEBUG_CHANNEL(atl); HINSTANCE hInst; @@ -363,9 +365,52 @@ HRESULT WINAPI AtlAxCreateControl(LPCOLE /*********************************************************************** * AtlModuleRegisterWndClassInfoW [ATL.@] + * + * PARAMS + * pm [IO] Information about the module registering the window. + * wci [IO] Information about the window being registered. + * pProc [O] Window procedure of the registered class. + * + * RETURNS + * Atom representing the registered class. + * + * NOTES + * Can be called multiple times without error, unlike RegisterClassEx(). + * + * If the class name is NULL then it a class with a name of "ATLxxxxxxxx" is + * registered, where the x's represent an unique value. + * */ ATOM WINAPI AtlModuleRegisterWndClassInfoW(_ATL_MODULEW *pm, _ATL_WNDCLASSINFOW *wci, WNDPROC *pProc) { - FIXME("%p %p %p)\n", pm, wci, pProc); - return 0; + ATOM atom; + + FIXME("%p %p %p semi-stub\n", pm, wci, pProc); + + atom = wci->m_atom; + if (!atom) + { + WNDCLASSEXW wc; + + TRACE("wci->m_wc.lpszClassName = %s\n", debugstr_w(wci->m_wc.lpszClassName)); + + if (!wci->m_wc.lpszClassName) + { + static const WCHAR szFormat[] = {'A','T','L','%','0','8','x',0}; + sprintfW(wci->m_szAutoName, szFormat, (UINT)(UINT_PTR)wci); + TRACE("auto-generated class name %s\n", debugstr_w(wci->m_szAutoName)); + wci->m_wc.lpszClassName = wci->m_szAutoName; + } + + atom = GetClassInfoExW(pm->m_hInst, wci->m_wc.lpszClassName, &wc); + if (!atom) + atom = RegisterClassExW(&wci->m_wc); + + wci->pWndProc = wci->m_wc.lpfnWndProc; + wci->m_atom = atom; + } + *pProc = wci->pWndProc; + + TRACE("returning 0x%04x\n", atom); + return atom; }

1 0

Robert Shearman : kernel: Add a test for mutexes.
by Alexandre Julliard June 15, 2006

June 15, 2006

Module: wine Branch: refs/heads/master Commit: 01739483008b4a03aabf33224ca162560ab99b0a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=01739483008b4a03aabf332… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jun 14 13:20:31 2006 +0100 kernel: Add a test for mutexes. --- dlls/kernel/tests/sync.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/kernel/tests/sync.c b/dlls/kernel/tests/sync.c index e50f2f2..321f5cf 100644 --- a/dlls/kernel/tests/sync.c +++ b/dlls/kernel/tests/sync.c @@ -126,7 +126,34 @@ static void test_signalandwait(void) CloseHandle(file); } +static void test_mutex(void) +{ + DWORD wait_ret; + BOOL ret; + HANDLE hCreated; + HANDLE hOpened; + + hCreated = CreateMutex(NULL, FALSE, "WineTestMutex"); + ok(hCreated != NULL, "CreateMutex failed with error %ld\n", GetLastError()); + wait_ret = WaitForSingleObject(hCreated, INFINITE); + ok(wait_ret == WAIT_OBJECT_0, "WaitForSingleObject failed with error 0x%08lx\n", wait_ret); + + /* yes, opening with just READ_CONTROL access allows us to successfully + * call ReleaseMutex */ + hOpened = OpenMutex(READ_CONTROL, FALSE, "WineTestMutex"); + ok(hOpened != NULL, "OpenMutex failed with error %ld\n", GetLastError()); + ret = ReleaseMutex(hOpened); + todo_wine ok(ret, "ReleaseMutex failed with error %ld\n", GetLastError()); + ret = ReleaseMutex(hCreated); + todo_wine ok(!ret && (GetLastError() == ERROR_NOT_OWNER), + "ReleaseMutex should have failed with ERROR_NOT_OWNER instead of %ld\n", GetLastError()); + + CloseHandle(hOpened); + CloseHandle(hCreated); +} + START_TEST(sync) { test_signalandwait(); + test_mutex(); }

1 0

Robert Shearman : kernel: Add some tests for VerifyVersionInfo.
by Alexandre Julliard June 15, 2006

June 15, 2006

Module: wine Branch: refs/heads/master Commit: 3fa7fa5bdfcc8c3c4f5595b718e851098bdc9b7f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3fa7fa5bdfcc8c3c4f5595b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jun 14 13:19:50 2006 +0100 kernel: Add some tests for VerifyVersionInfo. --- dlls/kernel/tests/.gitignore | 1 dlls/kernel/tests/Makefile.in | 1 dlls/kernel/tests/version.c | 129 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 131 insertions(+), 0 deletions(-) create mode 100644 dlls/kernel/tests/version.c diff --git a/dlls/kernel/tests/.gitignore b/dlls/kernel/tests/.gitignore index daf25ae..b5d1d5f 100644 --- a/dlls/kernel/tests/.gitignore +++ b/dlls/kernel/tests/.gitignore @@ -25,5 +25,6 @@ thread.ok time.ok timer.ok toolhelp.ok +version.ok virtual.ok volume.ok diff --git a/dlls/kernel/tests/Makefile.in b/dlls/kernel/tests/Makefile.in index 80eb401..bfeae14 100644 --- a/dlls/kernel/tests/Makefile.in +++ b/dlls/kernel/tests/Makefile.in @@ -31,6 +31,7 @@ CTESTS = \ time.c \ timer.c \ toolhelp.c \ + version.c \ virtual.c \ volume.c diff --git a/dlls/kernel/tests/version.c b/dlls/kernel/tests/version.c new file mode 100644 index 0000000..b216eee --- /dev/null +++ b/dlls/kernel/tests/version.c @@ -0,0 +1,129 @@ +/* + * Unit test suite for version functions + * + * Copyright 2006 Robert Shearman + * + * 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 "wine/test.h" +#include "winbase.h" + +START_TEST(version) +{ + OSVERSIONINFOEX info = { sizeof(info) }; + BOOL ret; + + ret = VerifyVersionInfo(&info, VER_MAJORVERSION | VER_MINORVERSION, + VerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL)); + todo_wine ok(ret, "VerifyVersionInfo failed with error %ld\n", GetLastError()); + + ret = VerifyVersionInfo(&info, VER_BUILDNUMBER | VER_MAJORVERSION | + VER_MINORVERSION/* | VER_PLATFORMID | VER_SERVICEPACKMAJOR | + VER_SERVICEPACKMINOR | VER_SUITENAME | VER_PRODUCT_TYPE */, + VerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL)); + todo_wine ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION), + "VerifyVersionInfo should have failed with ERROR_OLD_WIN_VERSION instead of %ld\n", GetLastError()); + + /* tests special handling of VER_SUITENAME */ + + ret = VerifyVersionInfo(&info, VER_SUITENAME, + VerSetConditionMask(0, VER_SUITENAME, VER_AND)); + ok(ret, "VerifyVersionInfo failed with error %ld\n", GetLastError()); + + ret = VerifyVersionInfo(&info, VER_SUITENAME, + VerSetConditionMask(0, VER_SUITENAME, VER_OR)); + ok(ret, "VerifyVersionInfo failed with error %ld\n", GetLastError()); + + /* test handling of version numbers */ + + /* v3.10 is always less than v4.x even + * if the minor version is tested */ + info.dwMajorVersion = 3; + info.dwMinorVersion = 10; + ret = VerifyVersionInfo(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + VerSetConditionMask(VerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL), + VER_MAJORVERSION, VER_GREATER_EQUAL)); + todo_wine ok(ret, "VerifyVersionInfo failed with error %ld\n", GetLastError()); + + info.dwMinorVersion = 0; + info.wServicePackMajor = 10; + ret = VerifyVersionInfo(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + VerSetConditionMask(VerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL), + VER_MAJORVERSION, VER_GREATER_EQUAL)); + todo_wine ok(ret, "VerifyVersionInfo failed with error %ld\n", GetLastError()); + + info.wServicePackMajor = 0; + info.wServicePackMinor = 10; + ret = VerifyVersionInfo(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + VerSetConditionMask(VerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL), + VER_MAJORVERSION, VER_GREATER_EQUAL)); + todo_wine ok(ret, "VerifyVersionInfo failed with error %ld\n", GetLastError()); + + GetVersionEx((OSVERSIONINFO *)&info); + info.wServicePackMinor++; + ret = VerifyVersionInfo(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + VerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL)); + todo_wine ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION), + "VerifyVersionInfo should have failed with ERROR_OLD_WIN_VERSION instead of %ld\n", GetLastError()); + + /* test the failure hierarchy for the four version fields */ + + GetVersionEx((OSVERSIONINFO *)&info); + info.wServicePackMajor++; + ret = VerifyVersionInfo(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + VerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL)); + todo_wine ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION), + "VerifyVersionInfo should have failed with ERROR_OLD_WIN_VERSION instead of %ld\n", GetLastError()); + + GetVersionEx((OSVERSIONINFO *)&info); + info.dwMinorVersion++; + ret = VerifyVersionInfo(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + VerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL)); + ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION), + "VerifyVersionInfo should have failed with ERROR_OLD_WIN_VERSION instead of %ld\n", GetLastError()); + + GetVersionEx((OSVERSIONINFO *)&info); + info.dwMajorVersion++; + ret = VerifyVersionInfo(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + VerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL)); + todo_wine ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION), + "VerifyVersionInfo should have failed with ERROR_OLD_WIN_VERSION instead of %ld\n", GetLastError()); + + ret = VerifyVersionInfo(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + VerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL)); + todo_wine ok(ret, "VerifyVersionInfo failed with error %ld\n", GetLastError()); + + + /* shows that build number fits into the hierarchy after major version, but before minor version */ + GetVersionEx((OSVERSIONINFO *)&info); + info.dwBuildNumber++; + ret = VerifyVersionInfo(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + VerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL)); + todo_wine ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION), + "VerifyVersionInfo should have failed with ERROR_OLD_WIN_VERSION instead of %ld\n", GetLastError()); + + ret = VerifyVersionInfo(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + VerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL)); + todo_wine ok(ret, "VerifyVersionInfo failed with error %ld\n", GetLastError()); + + /* test bad dwOSVersionInfoSize */ + GetVersionEx((OSVERSIONINFO *)&info); + info.dwOSVersionInfoSize = 0; + ret = VerifyVersionInfo(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + VerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL)); + todo_wine ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION), + "VerifyVersionInfo should have failed with ERROR_OLD_WIN_VERSION instead of %ld\n", GetLastError()); +}

1 0

Robert Shearman : ole32: Always rewind the stream in StdGlobalInterfaceTable_GetInterfaceFromGlobal
by Alexandre Julliard June 15, 2006

June 15, 2006

Module: wine Branch: refs/heads/master Commit: f2dc25a5f328bc6aafd5776b45f4d233ad2baf46 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f2dc25a5f328bc6aafd5776… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jun 14 13:20:14 2006 +0100 ole32: Always rewind the stream in StdGlobalInterfaceTable_GetInterfaceFromGlobal as CoUnmarshalInterface may have advanced the stream, even if it failed. --- dlls/ole32/git.c | 9 +++++---- dlls/ole32/tests/marshal.c | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index cb36be3..872df65 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -298,16 +298,17 @@ StdGlobalInterfaceTable_GetInterfaceFrom /* unmarshal the interface */ hres = CoUnmarshalInterface(entry->stream, riid, ppv); - if (hres) { - WARN("Failed to unmarshal stream\n"); - return hres; - } /* rewind stream, in case it's used again */ move.u.LowPart = 0; move.u.HighPart = 0; IStream_Seek(entry->stream, move, STREAM_SEEK_SET, NULL); + if (hres) { + WARN("Failed to unmarshal stream\n"); + return hres; + } + /* addref it */ lpUnk = *ppv; IUnknown_AddRef(lpUnk); diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 32e2d93..a1be2c3 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1978,7 +1978,7 @@ static DWORD CALLBACK get_global_interfa CoInitialize(NULL); hr = IGlobalInterfaceTable_GetInterfaceFromGlobal(params->git, params->cookie, &IID_IClassFactory, (void **)&cf); - todo_wine ok_ole_success(hr, IGlobalInterfaceTable_GetInterfaceFromGlobal); + ok_ole_success(hr, IGlobalInterfaceTable_GetInterfaceFromGlobal); CoUninitialize(); return hr;

1 0

Robert Shearman : ole32: Add a tests for OleSetMenuDescriptor and the global interface table.
by Alexandre Julliard June 15, 2006

June 15, 2006

Module: wine Branch: refs/heads/master Commit: fa757df8837d6c276cf0a74c14c54fe13de4cf41 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fa757df8837d6c276cf0a74… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jun 14 13:20:01 2006 +0100 ole32: Add a tests for OleSetMenuDescriptor and the global interface table. --- dlls/ole32/tests/compobj.c | 32 +++++++++++++++++++++++ dlls/ole32/tests/marshal.c | 61 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 92 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 535d891..06bf381 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -100,10 +100,42 @@ static void test_CoCreateInstance(void) ok(hr == CO_E_NOTINITIALIZED, "CoCreateInstance should have returned CO_E_NOTINITIALIZED instead of 0x%08lx\n", hr); } +static ATOM register_dummy_class(void) +{ + WNDCLASS wc = + { + 0, + DefWindowProc, + 0, + 0, + GetModuleHandle(NULL), + NULL, + LoadCursor(NULL, IDC_ARROW), + (HBRUSH)(COLOR_BTNFACE+1), + NULL, + TEXT("WineOleTestClass"), + }; + + return RegisterClass(&wc); +} + +static void test_ole_menu(void) +{ + HWND hwndFrame; + HRESULT hr; + + hwndFrame = CreateWindow(MAKEINTATOM(register_dummy_class()), "Test", 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, NULL); + hr = OleSetMenuDescriptor(NULL, hwndFrame, NULL, NULL, NULL); + todo_wine ok_ole_success(hr, "OleSetMenuDescriptor"); + + DestroyWindow(hwndFrame); +} + START_TEST(compobj) { test_ProgIDFromCLSID(); test_CLSIDFromProgID(); test_CLSIDFromString(); test_CoCreateInstance(); + test_ole_menu(); } diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 061a843..32e2d93 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1959,6 +1959,65 @@ static void test_ROT(void) ok_no_locks(); } +struct git_params +{ + DWORD cookie; + IGlobalInterfaceTable *git; +}; + +static DWORD CALLBACK get_global_interface_proc(LPVOID pv) +{ + HRESULT hr; + struct git_params *params = (struct git_params *)pv; + IClassFactory *cf; + + hr = IGlobalInterfaceTable_GetInterfaceFromGlobal(params->git, params->cookie, &IID_IClassFactory, (void **)&cf); + ok(hr == CO_E_NOTINITIALIZED, + "IGlobalInterfaceTable_GetInterfaceFromGlobal should have failed with error CO_E_NOTINITIALIZED instead of 0x%08lx\n", + hr); + + CoInitialize(NULL); + hr = IGlobalInterfaceTable_GetInterfaceFromGlobal(params->git, params->cookie, &IID_IClassFactory, (void **)&cf); + todo_wine ok_ole_success(hr, IGlobalInterfaceTable_GetInterfaceFromGlobal); + CoUninitialize(); + + return hr; +} + +static void test_globalinterfacetable(void) +{ + HRESULT hr; + IGlobalInterfaceTable *git; + DWORD cookie; + HANDLE thread; + DWORD tid; + struct git_params params; + DWORD ret; + + hr = CoCreateInstance(&CLSID_StdGlobalInterfaceTable, NULL, CLSCTX_INPROC_SERVER, &IID_IGlobalInterfaceTable, (void **)&git); + ok_ole_success(hr, CoCreateInstance); + + hr = IGlobalInterfaceTable_RegisterInterfaceInGlobal(git, (IUnknown *)&Test_ClassFactory, &IID_IClassFactory, &cookie); + ok_ole_success(hr, IGlobalInterfaceTable_RegisterInterfaceInGlobal); + + params.cookie = cookie; + params.git = git; + /* note: params is on stack so we MUST wait for get_global_interface_proc + * to exit before we can return */ + thread = CreateThread(NULL, 0, get_global_interface_proc, &params, 0, &tid); + + ret = MsgWaitForMultipleObjects(1, &thread, FALSE, INFINITE, QS_ALLINPUT); + while (ret == WAIT_OBJECT_0 + 1) + { + MSG msg; + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) + DispatchMessage(&msg); + ret = MsgWaitForMultipleObjects(1, &thread, FALSE, INFINITE, QS_ALLINPUT); + } + + CloseHandle(thread); +} + static const char cf_marshaled[] = { 0x9, 0x0, 0x0, 0x0, @@ -2197,7 +2256,7 @@ START_TEST(marshal) if (0) test_out_of_process_com(); test_ROT(); - /* FIXME: test GIT */ + test_globalinterfacetable(); test_marshal_CLIPFORMAT(); test_marshal_HWND();

1 0