August 2008 - Wine-commits - list.winehq.org

Juan Lang : crypt32: Add tests for CMSG_CMS_SIGNER_INFO_PARAM.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 6d9fc0f59d9b7dabe1b283186adc65e46103c2cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d9fc0f59d9b7dabe1b283186… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 12:01:37 2008 -0700 crypt32: Add tests for CMSG_CMS_SIGNER_INFO_PARAM. --- dlls/crypt32/tests/msg.c | 135 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 135 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 86ce6b1..4b080ee 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2265,9 +2265,56 @@ static void compare_signer_info(const CMSG_SIGNER_INFO *got, /* FIXME: check more things */ } +static void compare_cms_signer_info(const CMSG_CMS_SIGNER_INFO *got, + const CMSG_CMS_SIGNER_INFO *expected) +{ + ok(got->dwVersion == expected->dwVersion, "Expected version %d, got %d\n", + expected->dwVersion, got->dwVersion); + ok(got->SignerId.dwIdChoice == expected->SignerId.dwIdChoice, + "Expected id choice %d, got %d\n", expected->SignerId.dwIdChoice, + got->SignerId.dwIdChoice); + if (got->SignerId.dwIdChoice == expected->SignerId.dwIdChoice) + { + if (got->SignerId.dwIdChoice == CERT_ID_ISSUER_SERIAL_NUMBER) + { + ok(got->SignerId.IssuerSerialNumber.Issuer.cbData == + expected->SignerId.IssuerSerialNumber.Issuer.cbData, + "Expected issuer size %d, got %d\n", + expected->SignerId.IssuerSerialNumber.Issuer.cbData, + got->SignerId.IssuerSerialNumber.Issuer.cbData); + ok(!memcmp(got->SignerId.IssuerSerialNumber.Issuer.pbData, + expected->SignerId.IssuerSerialNumber.Issuer.pbData, + got->SignerId.IssuerSerialNumber.Issuer.cbData), + "Unexpected issuer\n"); + ok(got->SignerId.IssuerSerialNumber.SerialNumber.cbData == + expected->SignerId.IssuerSerialNumber.SerialNumber.cbData, + "Expected serial number size %d, got %d\n", + expected->SignerId.IssuerSerialNumber.SerialNumber.cbData, + got->SignerId.IssuerSerialNumber.SerialNumber.cbData); + ok(!memcmp(got->SignerId.IssuerSerialNumber.SerialNumber.pbData, + expected->SignerId.IssuerSerialNumber.SerialNumber.pbData, + got->SignerId.IssuerSerialNumber.SerialNumber.cbData), + "Unexpected serial number\n"); + } + else + { + ok(got->SignerId.KeyId.cbData == expected->SignerId.KeyId.cbData, + "expected key id size %d, got %d\n", + expected->SignerId.KeyId.cbData, got->SignerId.KeyId.cbData); + ok(!memcmp(expected->SignerId.KeyId.pbData, + got->SignerId.KeyId.pbData, got->SignerId.KeyId.cbData), + "unexpected key id\n"); + } + } + /* FIXME: check more things */ +} + static const BYTE signedWithCertAndCrlComputedHash[] = { 0x08,0xd6,0xc0,0x5a,0x21,0x51,0x2a,0x79,0xa1,0xdf,0xeb,0x9d,0x2a,0x8f,0x26, 0x2f }; +static BYTE keyIdIssuer[] = { +0x30,0x13,0x31,0x11,0x30,0x0f,0x06,0x0a,0x2b,0x06,0x01,0x04,0x01,0x82,0x37, +0x0a,0x07,0x01,0x04,0x01,0x01 }; static void test_decode_msg_get_param(void) { @@ -2354,6 +2401,32 @@ static void test_decode_msg_get_param(void) compare_signer_info((CMSG_SIGNER_INFO *)buf, &signer); CryptMemFree(buf); } + /* Getting the CMS signer info of a PKCS7 message is possible. */ + size = 0; + ret = CryptMsgGetParam(msg, CMSG_CMS_SIGNER_INFO_PARAM, 0, NULL, &size); + todo_wine + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + if (ret) + buf = CryptMemAlloc(size); + else + buf = NULL; + if (buf) + { + CMSG_CMS_SIGNER_INFO signer = { 0 }; + + signer.dwVersion = 1; + signer.SignerId.dwIdChoice = CERT_ID_ISSUER_SERIAL_NUMBER; + signer.SignerId.IssuerSerialNumber.Issuer.cbData = + sizeof(encodedCommonName); + signer.SignerId.IssuerSerialNumber.Issuer.pbData = encodedCommonName; + signer.SignerId.IssuerSerialNumber.SerialNumber.cbData = + sizeof(serialNum); + signer.SignerId.IssuerSerialNumber.SerialNumber.pbData = serialNum; + signer.HashAlgorithm.pszObjId = oid_rsa_md5; + CryptMsgGetParam(msg, CMSG_CMS_SIGNER_INFO_PARAM, 0, buf, &size); + compare_cms_signer_info((CMSG_CMS_SIGNER_INFO *)buf, &signer); + CryptMemFree(buf); + } /* index is ignored when getting signer count */ size = sizeof(value); ret = CryptMsgGetParam(msg, CMSG_SIGNER_COUNT_PARAM, 1, &value, &size); @@ -2383,6 +2456,68 @@ static void test_decode_msg_get_param(void) CMSG_COMPUTED_HASH_PARAM, signedWithCertAndCrlComputedHash, sizeof(signedWithCertAndCrlComputedHash)); CryptMsgClose(msg); + + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); + ret = CryptMsgUpdate(msg, signedKeyIdEmptyContent, + sizeof(signedKeyIdEmptyContent), TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + size = sizeof(value); + ret = CryptMsgGetParam(msg, CMSG_SIGNER_COUNT_PARAM, 0, &value, &size); + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + ok(value == 1, "Expected 1 signer, got %d\n", value); + /* Getting the regular (non-CMS) signer info from a CMS message is also + * possible.. + */ + size = 0; + ret = CryptMsgGetParam(msg, CMSG_SIGNER_INFO_PARAM, 0, NULL, &size); + todo_wine + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + if (ret) + buf = CryptMemAlloc(size); + else + buf = NULL; + if (buf) + { + CMSG_SIGNER_INFO signer; + BYTE zero = 0; + + /* and here's the little oddity: for a CMS message using the key id + * variant of a SignerId, retrieving the CMSG_SIGNER_INFO param yields + * a signer with a zero (not empty) serial number, and whose issuer is + * an RDN with OID szOID_KEYID_RDN, value type CERT_RDN_OCTET_STRING, + * and value of the key id. + */ + signer.dwVersion = CMSG_SIGNED_DATA_V3; + signer.Issuer.cbData = sizeof(keyIdIssuer); + signer.Issuer.pbData = keyIdIssuer; + signer.SerialNumber.cbData = 1; + signer.SerialNumber.pbData = &zero; + CryptMsgGetParam(msg, CMSG_SIGNER_INFO_PARAM, 0, buf, &size); + compare_signer_info((CMSG_SIGNER_INFO *)buf, &signer); + CryptMemFree(buf); + } + size = 0; + ret = CryptMsgGetParam(msg, CMSG_CMS_SIGNER_INFO_PARAM, 0, NULL, &size); + todo_wine + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + if (ret) + buf = CryptMemAlloc(size); + else + buf = NULL; + if (buf) + { + CMSG_CMS_SIGNER_INFO signer = { 0 }; + + signer.dwVersion = CMSG_SIGNED_DATA_V3; + signer.SignerId.dwIdChoice = CERT_ID_KEY_IDENTIFIER; + signer.SignerId.KeyId.cbData = sizeof(serialNum); + signer.SignerId.KeyId.pbData = (BYTE *)serialNum; + signer.HashAlgorithm.pszObjId = oid_rsa_md5; + CryptMsgGetParam(msg, CMSG_CMS_SIGNER_INFO_PARAM, 0, buf, &size); + compare_cms_signer_info((CMSG_CMS_SIGNER_INFO *)buf, &signer); + CryptMemFree(buf); + } + CryptMsgClose(msg); } static void test_decode_msg(void)

1 0

Alexandre Julliard : configure: Require autoconf version 2.59d.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: b990e60a01b99de500cbf6d7c7ff52221db46068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b990e60a01b99de500cbf6d7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 20 15:22:02 2008 +0200 configure: Require autoconf version 2.59d. --- configure.ac | 21 ++++----------------- 1 files changed, 4 insertions(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac index 290e802..2c11335 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,8 @@ dnl See ChangeLog file for detailed change history. m4_define(WINE_VERSION,regexp(m4_include(VERSION),[version $[-.0-9A-Za-z]+$],[\1])) -AC_PREREQ(2.53b) +dnl autoconf versions before 2.59d don't handle multi-line subst variables correctly +AC_PREREQ(2.59d) AC_INIT([Wine],[WINE_VERSION],[wine-devel(a)winehq.org]) AC_CONFIG_SRCDIR(server/atom.c) AC_CONFIG_HEADERS(include/config.h) @@ -1657,21 +1658,7 @@ esac dnl **** Generate output files **** -dnl autoconf versions before 2.59d need backslashes to escape newlines in subst variables -AC_SUBST(DEPENDENCIES,m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [2.59d]), -1, -["### Dependencies:\\ -\\ -.INIT: Makefile\\ -.BEGIN: Makefile\\ -Makefile: dummy\\ - -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS)\\ -\\ -\$(OBJS): \$(IDL_GEN_HEADERS)\\ -\$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS)\\ -\$(RC_SRCS:.rc=.res): \$(IDL_TLB_SRCS:.idl=.tlb)\\ -\$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c)\\ -\$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"], -["### Dependencies: +AC_SUBST(DEPENDENCIES,["### Dependencies: .INIT: Makefile .BEGIN: Makefile @@ -1682,7 +1669,7 @@ Makefile: dummy \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS) \$(RC_SRCS:.rc=.res): \$(IDL_TLB_SRCS:.idl=.tlb) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c) -\$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"])) +\$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"]) AH_TOP([#define __WINE_CONFIG_H])

1 0

Alexandre Julliard : configure: Generate the makefiles list in configure instead of make_makefiles.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: a360e934306750c923216a4488b1ec75803ce789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a360e934306750c923216a448… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 20 16:02:37 2008 +0200 configure: Generate the makefiles list in configure instead of make_makefiles. --- Makefile.in | 865 +------------------------- aclocal.m4 | 26 + configure | 1731 +++++++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 870 +++++++++++++------------- tools/make_makefiles | 56 +-- 5 files changed, 2193 insertions(+), 1355 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a360e934306750c923216…

1 0

Juan Lang : crypt32: Use CMS messages rather than PKCS messages internally.
by Alexandre Julliard 21 Aug '08

21 Aug '08

Module: wine Branch: master Commit: 282eb73bc3eafe63f3f33117370b7e891011353b URL: http://source.winehq.org/git/wine.git/?a=commit;h=282eb73bc3eafe63f3f331173… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 11:57:21 2008 -0700 crypt32: Use CMS messages rather than PKCS messages internally. --- dlls/crypt32/crypt32_private.h | 20 +++--- dlls/crypt32/decode.c | 6 +- dlls/crypt32/encode.c | 10 ++-- dlls/crypt32/msg.c | 149 +++++++++++++++++++++++++++++++--------- dlls/crypt32/serialize.c | 4 +- 5 files changed, 135 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=282eb73bc3eafe63f3f33…

1 0

Michael Karcher : ntdll: Add sub-second resolution to NtQueryInformationFile.
by Alexandre Julliard 20 Aug '08

20 Aug '08

Module: wine Branch: master Commit: af2d274f0e95657279b3e44dcef14f4d48bcb7ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=af2d274f0e95657279b3e44dc… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun Aug 17 19:03:44 2008 +0200 ntdll: Add sub-second resolution to NtQueryInformationFile. --- configure | 303 +++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 4 +- dlls/ntdll/file.c | 20 ++++ include/config.h.in | 9 ++ 4 files changed, 334 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af2d274f0e95657279b3e…

1 0

Michael Karcher : kernel32: Fix profile cache logic and don' t cache new files.
by Alexandre Julliard 20 Aug '08

20 Aug '08

Module: wine Branch: master Commit: 34aa6b7002af0155c6f0cc31a013391b17f62eea URL: http://source.winehq.org/git/wine.git/?a=commit;h=34aa6b7002af0155c6f0cc31a… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun Aug 17 19:03:24 2008 +0200 kernel32: Fix profile cache logic and don't cache new files. --- dlls/kernel32/profile.c | 37 +++++++++++++++++++++++++++++-------- dlls/kernel32/tests/profile.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index ac983ff..22d4cb5 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -702,6 +702,25 @@ static void PROFILE_ReleaseFile(void) ZeroMemory(&CurProfile->LastWriteTime, sizeof(CurProfile->LastWriteTime)); } +/*********************************************************************** + * + * Compares a file time with the current time. If the file time is + * at least 2.1 seconds in the past, return true. + * + * Intended as cache safety measure: The time resolution on FAT is + * two seconds, so files that are not at least two seconds old might + * keep their time even on modification, so don't cache them. + */ +static BOOL is_not_current(FILETIME * ft) +{ + FILETIME Now; + LONGLONG ftll, nowll; + GetSystemTimeAsFileTime(&Now); + ftll = ((LONGLONG)ft->dwHighDateTime << 32) + ft->dwLowDateTime; + nowll = ((LONGLONG)Now.dwHighDateTime << 32) + Now.dwLowDateTime; + TRACE("%08x;%08x\n",(unsigned)ftll+21000000,(unsigned)nowll); + return ftll + 21000000 < nowll; +} /*********************************************************************** * PROFILE_Open @@ -780,15 +799,17 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) if (hFile != INVALID_HANDLE_VALUE) { - if (TRACE_ON(profile)) + GetFileTime(hFile, NULL, NULL, &LastWriteTime); + if (!memcmp( &CurProfile->LastWriteTime, &LastWriteTime, sizeof(FILETIME) ) && + is_not_current(&LastWriteTime)) + TRACE("(%s): already opened (mru=%d)\n", + debugstr_w(buffer), i); + else { - GetFileTime(hFile, NULL, NULL, &LastWriteTime); - if (memcmp(&CurProfile->LastWriteTime, &LastWriteTime, sizeof(FILETIME))) - TRACE("(%s): already opened (mru=%d)\n", - debugstr_w(buffer), i); - else - TRACE("(%s): already opened, needs refreshing (mru=%d)\n", - debugstr_w(buffer), i); + TRACE("(%s): already opened, needs refreshing (mru=%d)\n", + debugstr_w(buffer), i); + CurProfile->section = PROFILE_Load(hFile, &CurProfile->encoding); + CurProfile->LastWriteTime = LastWriteTime; } CloseHandle(hFile); } diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 4463f50..9cccac2 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -362,9 +362,42 @@ static void test_profile_delete_on_close() ok( size == sizeof contents - 1, "Test file: partial write\n"); res = GetPrivateProfileInt(SECTION, KEY, 0, testfile); + ok( res == 123, "Got %d instead of 123\n", res); + + /* This also deletes the file */ + CloseHandle(h); +} + +static void test_profile_refresh(void) +{ + static CHAR testfile[] = ".\\winetest4.ini"; + HANDLE h; + DWORD size, res; + static const char contents1[] = "[" SECTION "]\n" KEY "=123\n"; + static const char contents2[] = "[" SECTION "]\n" KEY "=124\n"; + + h = CreateFile(testfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, + CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, NULL); + ok( WriteFile( h, contents1, sizeof contents1 - 1, &size, NULL ), + "Cannot write test file: %x\n", GetLastError() ); + ok( size == sizeof contents1 - 1, "Test file: partial write\n"); + res = GetPrivateProfileInt(SECTION, KEY, 0, testfile); ok( res == 123, "Got %d instead of 123\n", res); + CloseHandle(h); + + /* Test proper invalidation of wine's profile file cache */ + + h = CreateFile(testfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, + CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, NULL); + ok( WriteFile( h, contents2, sizeof contents2 - 1, &size, NULL ), + "Cannot write test file: %x\n", GetLastError() ); + ok( size == sizeof contents2 - 1, "Test file: partial write\n"); + + res = GetPrivateProfileInt(SECTION, KEY, 0, testfile); + ok( res == 124, "Got %d instead of 124\n", res); + /* This also deletes the file */ CloseHandle(h); } @@ -417,6 +450,10 @@ static void test_GetPrivateProfileString(void) create_test_file(filename, content, sizeof(content)); + /* Run this test series with caching. Wine won't cache profile + files younger than 2.1 seconds. */ + Sleep(2500); + /* lpAppName is NULL */ lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA(NULL, "name1", "default", @@ -664,5 +701,6 @@ START_TEST(profile) test_profile_sections_names(); test_profile_existing(); test_profile_delete_on_close(); + test_profile_refresh(); test_GetPrivateProfileString(); }

1 0

Vitaliy Margolen : dinput: Add mouse warp override config option.
by Alexandre Julliard 20 Aug '08

20 Aug '08

Module: wine Branch: master Commit: 517462cf9a864b82bd58ee92b9d69e942e87c328 URL: http://source.winehq.org/git/wine.git/?a=commit;h=517462cf9a864b82bd58ee92b… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Aug 18 19:18:29 2008 -0600 dinput: Add mouse warp override config option. --- dlls/dinput/mouse.c | 39 ++++++++++++++++++++++++++++++++++----- 1 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index a361057..1572784 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -30,6 +30,7 @@ #include "wingdi.h" #include "winuser.h" #include "winerror.h" +#include "winreg.h" #include "dinput.h" #include "dinput_private.h" @@ -50,6 +51,13 @@ static const IDirectInputDevice8WVtbl SysMouseWvt; typedef struct SysMouseImpl SysMouseImpl; +typedef enum +{ + WARP_DEFAULT, + WARP_DISABLE, + WARP_FORCE_ON +} WARP_MOUSE; + struct SysMouseImpl { struct IDirectInputDevice2AImpl base; @@ -66,6 +74,8 @@ struct SysMouseImpl /* This is for mouse reporting. */ DIMOUSESTATE2 m_state; + + WARP_MOUSE warp_override; }; static void dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ); @@ -174,6 +184,8 @@ static SysMouseImpl *alloc_device(REFGUID rguid, const void *mvt, IDirectInputIm SysMouseImpl* newDevice; LPDIDATAFORMAT df = NULL; unsigned i; + char buffer[20]; + HKEY hkey, appkey; newDevice = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(SysMouseImpl)); if (!newDevice) return NULL; @@ -186,6 +198,17 @@ static SysMouseImpl *alloc_device(REFGUID rguid, const void *mvt, IDirectInputIm newDevice->base.dinput = dinput; newDevice->base.event_proc = dinput_mouse_hook; + get_app_key(&hkey, &appkey); + if (!get_config_key(hkey, appkey, "MouseWarpOverride", buffer, sizeof(buffer))) + { + if (!strcasecmp(buffer, "disable")) + newDevice->warp_override = WARP_DISABLE; + else if (!strcasecmp(buffer, "force")) + newDevice->warp_override = WARP_FORCE_ON; + } + if (appkey) RegCloseKey(appkey); + if (hkey) RegCloseKey(hkey); + /* Create copy of default data format */ if (!(df = HeapAlloc(GetProcessHeap(), 0, c_dfDIMouse2.dwSize))) goto failed; memcpy(df, &c_dfDIMouse2, c_dfDIMouse2.dwSize); @@ -306,7 +329,9 @@ static void dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARA wdata = pt1.y; } - This->need_warp = (pt.x || pt.y) && dwCoop & DISCL_EXCLUSIVE; + This->need_warp = This->warp_override != WARP_DISABLE && + (pt.x || pt.y) && + (dwCoop & DISCL_EXCLUSIVE || This->warp_override == WARP_FORCE_ON); break; } case WM_MOUSEWHEEL: @@ -422,14 +447,18 @@ static HRESULT WINAPI SysMouseAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) else ERR("Failed to get RECT: %d\n", GetLastError()); } - + + /* Need a window to warp mouse in. */ + if (This->warp_override == WARP_FORCE_ON && !This->base.win) + This->base.win = GetDesktopWindow(); + /* Get the window dimension and find the center */ GetWindowRect(This->base.win, &rect); This->win_centerX = (rect.right - rect.left) / 2; This->win_centerY = (rect.bottom - rect.top ) / 2; - + /* Warp the mouse to the center of the window */ - if (This->base.dwCoopLevel & DISCL_EXCLUSIVE) + if (This->base.dwCoopLevel & DISCL_EXCLUSIVE || This->warp_override == WARP_FORCE_ON) { This->mapped_center.x = This->win_centerX; This->mapped_center.y = This->win_centerY; @@ -463,7 +492,7 @@ static HRESULT WINAPI SysMouseAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) } /* And put the mouse cursor back where it was at acquire time */ - if (This->base.dwCoopLevel & DISCL_EXCLUSIVE) + if (This->base.dwCoopLevel & DISCL_EXCLUSIVE || This->warp_override == WARP_FORCE_ON) { TRACE(" warping mouse back to (%d , %d)\n", This->org_coords.x, This->org_coords.y); SetCursorPos(This->org_coords.x, This->org_coords.y);

1 0

David Adam : d3dx8: Implement D3DXBoxBoundProbe.
by Alexandre Julliard 20 Aug '08

20 Aug '08

Module: wine Branch: master Commit: 5bb6e4ab8c16fc6b1962616f3f574d772e040e0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bb6e4ab8c16fc6b1962616f3… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Tue Aug 19 20:11:58 2008 +0200 d3dx8: Implement D3DXBoxBoundProbe. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/mesh.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx8/tests/mesh.c | 51 ++++++++++++++++++++++++++++++++-- include/d3dx8mesh.h | 1 + 4 files changed, 120 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index b7c8577..3587c6b 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -109,7 +109,7 @@ @ stub D3DXWeldVertices @ stub D3DXIntersect @ stdcall D3DXSphereBoundProbe(ptr long ptr ptr) -@ stub D3DXBoxBoundProbe +@ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) @ stub D3DXCreatePolygon @ stub D3DXCreateBox @ stub D3DXCreateCylinder diff --git a/dlls/d3dx8/mesh.c b/dlls/d3dx8/mesh.c index 6846d5d..b9ba976 100644 --- a/dlls/d3dx8/mesh.c +++ b/dlls/d3dx8/mesh.c @@ -24,6 +24,76 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); +BOOL WINAPI D3DXBoxBoundProbe(CONST D3DXVECTOR3 *pmin, CONST D3DXVECTOR3 *pmax, CONST D3DXVECTOR3 *prayposition, CONST D3DXVECTOR3 *praydirection) + +/* Algorithm taken from the article: An Efficient and Robust Ray-Box Intersection Algoritm +Amy Williams University of Utah +Steve Barrus University of Utah +R. Keith Morley University of Utah +Peter Shirley University of Utah + +International Conference on Computer Graphics and Interactive Techniques archive +ACM SIGGRAPH 2005 Courses +Los Angeles, California + +This algorithm is free of patents or of copyrights, as confirmed by Peter Shirley himself. + +Algorithm: Consider the box as the intersection of three slabs. Clip the ray +against each slab, if there's anything left of the ray after we're +done we've got an intersection of the ray with the box. +*/ + +{ + FLOAT div, tmin, tmax, tymin, tymax, tzmin, tzmax; + + div = 1.0f / praydirection->x; + if ( div >= 0.0f ) + { + tmin = ( pmin->x - prayposition->x ) * div; + tmax = ( pmax->x - prayposition->x ) * div; + } + else + { + tmin = ( pmax->x - prayposition->x ) * div; + tmax = ( pmin->x - prayposition->x ) * div; + } + + if ( tmax < 0.0f ) return FALSE; + + div = 1.0f / praydirection->y; + if ( div >= 0.0f ) + { + tymin = ( pmin->y - prayposition->y ) * div; + tymax = ( pmax->y - prayposition->y ) * div; + } + else + { + tymin = ( pmax->y - prayposition->y ) * div; + tymax = ( pmin->y - prayposition->y ) * div; + } + + if ( ( tymax < 0.0f ) || ( tmin > tymax ) || ( tymin > tmax ) ) return FALSE; + + if ( tymin > tmin ) tmin = tymin; + if ( tymax < tmax ) tmax = tymax; + + div = 1.0f / praydirection->z; + if ( div >= 0.0f ) + { + tzmin = ( pmin->z - prayposition->z ) * div; + tzmax = ( pmax->z - prayposition->z ) * div; + } + else + { + tzmin = ( pmax->z - prayposition->z ) * div; + tzmax = ( pmin->z - prayposition->z ) * div; + } + + if ( (tzmax < 0.0f ) || ( tmin > tzmax ) || ( tzmin > tmax ) ) return FALSE; + + return TRUE; +} + BOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *pcenter, FLOAT radius, CONST D3DXVECTOR3 *prayposition, CONST D3DXVECTOR3 *praydirection) { D3DXVECTOR3 difference; diff --git a/dlls/d3dx8/tests/mesh.c b/dlls/d3dx8/tests/mesh.c index 5a5eb67..e3370de 100644 --- a/dlls/d3dx8/tests/mesh.c +++ b/dlls/d3dx8/tests/mesh.c @@ -22,12 +22,57 @@ static void D3DXBoundProbeTest(void) { -/*____________Test the Sphere case________________________*/ - BOOL result; - D3DXVECTOR3 center, raydirection, rayposition; + D3DXVECTOR3 bottom_point, center, top_point, raydirection, rayposition; FLOAT radius; +/*____________Test the Box case___________________________*/ + bottom_point.x = -3.0f; bottom_point.y = -2.0f; bottom_point.z = -1.0f; + top_point.x = 7.0f; top_point.y = 8.0f; top_point.z = 9.0f; + + raydirection.x = -4.0f; raydirection.y = -5.0f; raydirection.z = -6.0f; + rayposition.x = 5.0f; rayposition.y = 5.0f; rayposition.z = 11.0f; + result = D3DXBoxBoundProbe(&bottom_point, &top_point, &rayposition, &raydirection); + ok(result == TRUE, "expected TRUE, received FALSE\n"); + + raydirection.x = 4.0f; raydirection.y = 5.0f; raydirection.z = 6.0f; + rayposition.x = 5.0f; rayposition.y = 5.0f; rayposition.z = 11.0f; + result = D3DXBoxBoundProbe(&bottom_point, &top_point, &rayposition, &raydirection); + ok(result == FALSE, "expected FALSE, received TRUE\n"); + + rayposition.x = -4.0f; rayposition.y = 1.0f; rayposition.z = -2.0f; + result = D3DXBoxBoundProbe(&bottom_point, &top_point, &rayposition, &raydirection); + ok(result == TRUE, "expected TRUE, received FALSE\n"); + + bottom_point.x = 1.0f; bottom_point.y = 0.0f; bottom_point.z = 0.0f; + top_point.x = 1.0f; top_point.y = 0.0f; top_point.z = 0.0f; + rayposition.x = 0.0f; rayposition.y = 1.0f; rayposition.z = 0.0f; + raydirection.x = 0.0f; raydirection.y = 3.0f; raydirection.z = 0.0f; + result = D3DXBoxBoundProbe(&bottom_point, &top_point, &rayposition, &raydirection); + ok(result == FALSE, "expected FALSE, received TRUE\n"); + + bottom_point.x = 1.0f; bottom_point.y = 2.0f; bottom_point.z = 3.0f; + top_point.x = 10.0f; top_point.y = 15.0f; top_point.z = 20.0f; + + raydirection.x = 7.0f; raydirection.y = 8.0f; raydirection.z = 9.0f; + rayposition.x = 3.0f; rayposition.y = 7.0f; rayposition.z = -6.0f; + result = D3DXBoxBoundProbe(&bottom_point, &top_point, &rayposition, &raydirection); + ok(result == TRUE, "expected TRUE, received FALSE\n"); + + bottom_point.x = 0.0f; bottom_point.y = 0.0f; bottom_point.z = 0.0f; + top_point.x = 1.0f; top_point.y = 1.0f; top_point.z = 1.0f; + + raydirection.x = 0.0f; raydirection.y = 1.0f; raydirection.z = .0f; + rayposition.x = -3.0f; rayposition.y = 0.0f; rayposition.z = 0.0f; + result = D3DXBoxBoundProbe(&bottom_point, &top_point, &rayposition, &raydirection); + ok(result == FALSE, "expected FALSE, received TRUE\n"); + + raydirection.x = 1.0f; raydirection.y = 0.0f; raydirection.z = .0f; + rayposition.x = -3.0f; rayposition.y = 0.0f; rayposition.z = 0.0f; + result = D3DXBoxBoundProbe(&bottom_point, &top_point, &rayposition, &raydirection); + ok(result == TRUE, "expected TRUE, received FALSE\n"); + +/*____________Test the Sphere case________________________*/ radius = sqrt(77.0f); center.x = 1.0f; center.y = 2.0f; center.z = 3.0f; raydirection.x = 2.0f; raydirection.y = -4.0f; raydirection.z = 2.0f; diff --git a/include/d3dx8mesh.h b/include/d3dx8mesh.h index d063f6d..0d399ea 100644 --- a/include/d3dx8mesh.h +++ b/include/d3dx8mesh.h @@ -28,6 +28,7 @@ extern "C" { HRESULT WINAPI D3DXCreateBuffer(DWORD,LPD3DXBUFFER*); UINT WINAPI D3DXGetFVFVertexSize(DWORD); +BOOL WINAPI D3DXBoxBoundProbe(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *); BOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *,FLOAT,CONST D3DXVECTOR3 *,CONST D3DXVECTOR3 *); #ifdef __cplusplus

1 0

Christian Costa : msvcirt: Implement some ostream stubs.
by Alexandre Julliard 20 Aug '08

20 Aug '08

Module: wine Branch: master Commit: f2b0e3168a3560a868e452fb25461b3bfe6f4320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b0e3168a3560a868e452fb2… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Aug 20 10:18:58 2008 +0200 msvcirt: Implement some ostream stubs. --- dlls/msvcirt/msvcirt.c | 58 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 6 ++-- 2 files changed, 61 insertions(+), 3 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 686ca7c..6178aca 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include "windef.h" @@ -24,6 +27,61 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcirt); +typedef struct { + LPVOID VTable; +} class_ostream; + +#ifdef __i386__ /* thiscall functions are i386-specific */ + +#define THISCALL(func) __thiscall_ ## func +#define THISCALL_NAME(func) __ASM_NAME("__thiscall_" #func) +#define DEFINE_THISCALL_WRAPPER(func) \ + extern void THISCALL(func)(); \ + __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ + "popl %eax\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME(#func) ) +#else /* __i386__ */ + +#define THISCALL(func) func +#define THISCALL_NAME(func) __ASM_NAME(#func) +#define DEFINE_THISCALL_WRAPPER(func) /* nothing */ + +#endif /* __i386__ */ + +/****************************************************************** + * ??6ostream@@QAEAAV0(a)H@Z (MSVCRTI.@) + * class ostream & __thiscall ostream::operator<<(int) + */ +DEFINE_THISCALL_WRAPPER(MSVCIRT_operator_sl_int) +void * __stdcall MSVCIRT_operator_sl_int(class_ostream * _this, int integer) +{ + FIXME("(%p)->(%d) stub\n", _this, integer); + return _this; +} + +/****************************************************************** + * ??6ostream@@QAEAAV0(a)PBD@Z (MSVCRTI.@) + * class ostream & __thiscall ostream::operator<<(char const *) + */ +DEFINE_THISCALL_WRAPPER(MSVCIRT_operator_sl_pchar) +void * __stdcall MSVCIRT_operator_sl_pchar(class_ostream * _this, const char * string) +{ + FIXME("(%p)->(%s) stub\n", _this, string); + return _this; +} + +/****************************************************************** + * ?endl@@YAAAVostream@@AAV1@@Z (MSVCRTI.@) + * class ostream & __cdecl endl(class ostream &) + */ +void * CDECL MSVCIRT_endl(class_ostream * _this) +{ + FIXME("(%p)->() stub\n", _this); + return _this; +} + BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) { switch (reason) diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index 0588b55..a91cec7 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -134,7 +134,7 @@ @ stub ??6ostream@@QAEAAV0(a)E@Z # class ostream & __thiscall ostream::operator<<(unsigned char) @ stub ??6ostream@@QAEAAV0(a)F@Z # class ostream & __thiscall ostream::operator<<(short) @ stub ??6ostream@@QAEAAV0(a)G@Z # class ostream & __thiscall ostream::operator<<(unsigned short) -@ stub ??6ostream@@QAEAAV0(a)H@Z # class ostream & __thiscall ostream::operator<<(int) +@ cdecl -i386 -norelay ??6ostream@@QAEAAV0(a)H@Z(ptr long) __thiscall_MSVCIRT_operator_sl_int # class ostream & __thiscall ostream::operator<<(int) @ stub ??6ostream@@QAEAAV0(a)I@Z # class ostream & __thiscall ostream::operator<<(unsigned int) @ stub ??6ostream@@QAEAAV0(a)J@Z # class ostream & __thiscall ostream::operator<<(long) @ stub ??6ostream@@QAEAAV0(a)K@Z # class ostream & __thiscall ostream::operator<<(unsigned long) @@ -145,7 +145,7 @@ @ stub ??6ostream@@QAEAAV0(a)P6AAAVios@@AAV1@@Z(a)Z # class ostream & __thiscall ostream::operator<<(class ios & (__cdecl*)(class ios &)) @ stub ??6ostream@@QAEAAV0(a)PAVstreambuf@@@Z # class ostream & __thiscall ostream::operator<<(class streambuf *) @ stub ??6ostream@@QAEAAV0(a)PBC@Z # class ostream & __thiscall ostream::operator<<(signed char const *) -@ stub ??6ostream@@QAEAAV0(a)PBD@Z # class ostream & __thiscall ostream::operator<<(char const *) +@ cdecl -i386 -norelay ??6ostream@@QAEAAV0(a)PBD@Z(ptr ptr) __thiscall_MSVCIRT_operator_sl_pchar # class ostream & __thiscall ostream::operator<<(char const *) @ stub ??6ostream@@QAEAAV0(a)PBE@Z # class ostream & __thiscall ostream::operator<<(unsigned char const *) @ stub ??6ostream@@QAEAAV0(a)PBX@Z # class ostream & __thiscall ostream::operator<<(void const *) @ stub ??7ios@@QBEHXZ # int __thiscall ios::operator!(void)const @@ -268,7 +268,7 @@ @ stub ?eback(a)streambuf@@IBEPADXZ # char * __thiscall streambuf::eback(void)const @ stub ?ebuf(a)streambuf@@IBEPADXZ # char * __thiscall streambuf::ebuf(void)const @ stub ?egptr(a)streambuf@@IBEPADXZ # char * __thiscall streambuf::egptr(void)const -@ stub ?endl@@YAAAVostream@@AAV1@@Z # class ostream & __cdecl endl(class ostream &) +@ cdecl ?endl@@YAAAVostream@@AAV1@@Z(ptr) MSVCIRT_endl # class ostream & __cdecl endl(class ostream &) @ stub ?ends@@YAAAVostream@@AAV1@@Z # class ostream & __cdecl ends(class ostream &) @ stub ?eof(a)ios@@QBEHXZ # int __thiscall ios::eof(void)const @ stub ?epptr(a)streambuf@@IBEPADXZ # char * __thiscall streambuf::epptr(void)const

1 0

Aric Stewart : dinput: The DIK_ keycode is not the same as the scancode.
by Alexandre Julliard 20 Aug '08

20 Aug '08

Module: wine Branch: master Commit: 304ff3c7280a53b7cbadfa83eaeda458ff5959d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=304ff3c7280a53b7cbadfa83e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Aug 6 08:04:36 2008 -0500 dinput: The DIK_ keycode is not the same as the scancode. It is mapped with the keyboard mapping to the resulting character so the key 'A' is DIK_A nomatter what its scancode or vkey would be. This is relevant to Japanese keymapping where the '@' key is in the '[' location the scancode for both is 0x22 but dinput generates DIK_AT in japanese and DIK_LBRACKET in us_qwerty. --- dlls/dinput/keyboard.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index b2c4942..e0f76fa 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -50,6 +50,30 @@ struct SysKeyboardImpl BYTE DInputKeyState[WINE_DINPUT_KEYBOARD_MAX_KEYS]; }; +static BYTE map_dik_code(DWORD scanCode, DWORD vkCode) +{ + static const BYTE asciiCodes[] = + {/*32*/ DIK_SPACE,0,0,0,0,0,0,DIK_APOSTROPHE, \ + /*40*/ 0,0,0,0,DIK_COMMA,DIK_MINUS,DIK_PERIOD,DIK_SLASH, \ + /*48*/ DIK_0,DIK_1,DIK_2,DIK_3,DIK_4,DIK_5,DIK_6,DIK_7, \ + /*56*/ DIK_8,DIK_9,DIK_COLON,DIK_SEMICOLON,0,DIK_EQUALS,0,0, \ + /*64*/ DIK_AT,DIK_A,DIK_B,DIK_C,DIK_D,DIK_E,DIK_F,DIK_G, \ + /*72*/ DIK_H,DIK_I,DIK_J,DIK_K,DIK_L,DIK_M,DIK_N,DIK_O, \ + /*80*/ DIK_P,DIK_Q,DIK_R,DIK_S,DIK_T,DIK_U,DIK_V,DIK_W, \ + /*88*/ DIK_X,DIK_Y,DIK_Z,DIK_LBRACKET,0,DIK_RBRACKET,DIK_CIRCUMFLEX,DIK_UNDERLINE} /*95*/ ; + + BYTE out_code = 0; + WCHAR c = MapVirtualKeyW(vkCode,MAPVK_VK_TO_CHAR); + + if (c > 31 && c < 96) + out_code = asciiCodes[c - 32]; + + if (out_code == 0) + out_code = scanCode; + + return out_code; +} + static void KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ) { SysKeyboardImpl *This = (SysKeyboardImpl *)iface; @@ -63,7 +87,7 @@ static void KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM TRACE("(%p) %ld,%ld\n", iface, wparam, lparam); - dik_code = hook->scanCode & 0xff; + dik_code = map_dik_code(hook->scanCode & 0xff,hook->vkCode); /* R-Shift is special - it is an extended key with separate scan code */ if (hook->flags & LLKHF_EXTENDED && dik_code != 0x36) dik_code |= 0x80;

1 0