May 2013 - Wine-commits - list.winehq.org

Andrew Eikum : dinput: Support DIPROP_AUTOCENTER for OSX joysticks.
by Alexandre Julliard 24 May '13

24 May '13

Module: wine Branch: master Commit: 0ba2a2f70b0d35a0accc253d816398167bb480b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ba2a2f70b0d35a0accc253d8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 23 14:58:24 2013 -0500 dinput: Support DIPROP_AUTOCENTER for OSX joysticks. --- dlls/dinput/joystick_osx.c | 49 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index b31774f..555cbf4 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -1118,6 +1118,51 @@ static HRESULT joydev_create_device(IDirectInputImpl *dinput, REFGUID rguid, REF return DIERR_DEVICENOTREG; } +static HRESULT osx_set_autocenter(JoystickImpl *This, + const DIPROPDWORD *header) +{ + UInt32 v; + HRESULT hr; + if(!This->ff) + return DIERR_UNSUPPORTED; + v = header->dwData; + hr = osx_to_win32_hresult(FFDeviceSetForceFeedbackProperty(This->ff, FFPROP_AUTOCENTER, &v)); + TRACE("returning: %08x\n", hr); + return hr; +} + +static HRESULT WINAPI JoystickWImpl_SetProperty(IDirectInputDevice8W *iface, + const GUID *prop, const DIPROPHEADER *header) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8W(iface); + + TRACE("%p %s %p\n", This, debugstr_guid(prop), header); + + switch(LOWORD(prop)) + { + case (DWORD_PTR)DIPROP_AUTOCENTER: + return osx_set_autocenter(This, (const DIPROPDWORD *)header); + } + + return JoystickWGenericImpl_SetProperty(iface, prop, header); +} + +static HRESULT WINAPI JoystickAImpl_SetProperty(IDirectInputDevice8A *iface, + const GUID *prop, const DIPROPHEADER *header) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); + + TRACE("%p %s %p\n", This, debugstr_guid(prop), header); + + switch(LOWORD(prop)) + { + case (DWORD_PTR)DIPROP_AUTOCENTER: + return osx_set_autocenter(This, (const DIPROPDWORD *)header); + } + + return JoystickAGenericImpl_SetProperty(iface, prop, header); +} + static CFUUIDRef effect_win_to_mac(const GUID *effect) { #define DO_MAP(X) \ @@ -1240,7 +1285,7 @@ static const IDirectInputDevice8AVtbl JoystickAvt = JoystickAGenericImpl_GetCapabilities, IDirectInputDevice2AImpl_EnumObjects, JoystickAGenericImpl_GetProperty, - JoystickAGenericImpl_SetProperty, + JoystickAImpl_SetProperty, IDirectInputDevice2AImpl_Acquire, IDirectInputDevice2AImpl_Unacquire, JoystickAGenericImpl_GetDeviceState, @@ -1276,7 +1321,7 @@ static const IDirectInputDevice8WVtbl JoystickWvt = JoystickWGenericImpl_GetCapabilities, IDirectInputDevice2WImpl_EnumObjects, JoystickWGenericImpl_GetProperty, - JoystickWGenericImpl_SetProperty, + JoystickWImpl_SetProperty, IDirectInputDevice2WImpl_Acquire, IDirectInputDevice2WImpl_Unacquire, JoystickWGenericImpl_GetDeviceState,

1 0

Andrew Eikum : dinput: Support DIPROP_FFGAIN for OSX joysticks.
by Alexandre Julliard 24 May '13

24 May '13

Module: wine Branch: master Commit: 51f97bb3f9213c0934e1dcb8c25ddc9d1e8c41e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51f97bb3f9213c0934e1dcb8c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 23 14:58:27 2013 -0500 dinput: Support DIPROP_FFGAIN for OSX joysticks. --- dlls/dinput/joystick_osx.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 555cbf4..66b020e 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -1131,6 +1131,18 @@ static HRESULT osx_set_autocenter(JoystickImpl *This, return hr; } +static HRESULT osx_set_ffgain(JoystickImpl *This, const DIPROPDWORD *header) +{ + UInt32 v; + HRESULT hr; + if(!This->ff) + return DIERR_UNSUPPORTED; + v = header->dwData; + hr = osx_to_win32_hresult(FFDeviceSetForceFeedbackProperty(This->ff, FFPROP_FFGAIN, &v)); + TRACE("returning: %08x\n", hr); + return hr; +} + static HRESULT WINAPI JoystickWImpl_SetProperty(IDirectInputDevice8W *iface, const GUID *prop, const DIPROPHEADER *header) { @@ -1142,6 +1154,8 @@ static HRESULT WINAPI JoystickWImpl_SetProperty(IDirectInputDevice8W *iface, { case (DWORD_PTR)DIPROP_AUTOCENTER: return osx_set_autocenter(This, (const DIPROPDWORD *)header); + case (DWORD_PTR)DIPROP_FFGAIN: + return osx_set_ffgain(This, (const DIPROPDWORD *)header); } return JoystickWGenericImpl_SetProperty(iface, prop, header); @@ -1158,6 +1172,8 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(IDirectInputDevice8A *iface, { case (DWORD_PTR)DIPROP_AUTOCENTER: return osx_set_autocenter(This, (const DIPROPDWORD *)header); + case (DWORD_PTR)DIPROP_FFGAIN: + return osx_set_ffgain(This, (const DIPROPDWORD *)header); } return JoystickAGenericImpl_SetProperty(iface, prop, header);

1 0

Detlef Riekenberg : include: Add missing InitOnce / RtlRunOnce prototypes.
by Alexandre Julliard 24 May '13

24 May '13

Module: wine Branch: master Commit: f8971d0342932579224a64bd63fd19a47d315f40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8971d0342932579224a64bd6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu May 23 19:46:45 2013 +0200 include: Add missing InitOnce / RtlRunOnce prototypes. --- include/winbase.h | 2 ++ include/winnt.h | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index ad51af3..4e21049 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1951,6 +1951,8 @@ WINADVAPI BOOL WINAPI InitializeSecurityDescriptor(PSECURITY_DESCRIPTOR, WINADVAPI BOOL WINAPI InitializeSid(PSID,PSID_IDENTIFIER_AUTHORITY,BYTE); WINBASEAPI VOID WINAPI InitializeSListHead(PSLIST_HEADER); WINBASEAPI VOID WINAPI InitializeSRWLock(PSRWLOCK); +WINBASEAPI BOOL WINAPI InitOnceBeginInitialize(PINIT_ONCE, DWORD, PBOOL, PVOID*); +WINBASEAPI BOOL WINAPI InitOnceComplete(PINIT_ONCE, DWORD, PVOID); WINBASEAPI BOOL WINAPI InitOnceExecuteOnce(PINIT_ONCE,PINIT_ONCE_FN,PVOID,PVOID*); WINBASEAPI VOID WINAPI InitOnceInitialize(PINIT_ONCE); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedFlushSList(PSLIST_HEADER); diff --git a/include/winnt.h b/include/winnt.h index 6911f1c..171141e 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5163,6 +5163,8 @@ typedef DWORD WINAPI RTL_RUN_ONCE_INIT_FN(PRTL_RUN_ONCE, PVOID, PVOID*); typedef RTL_RUN_ONCE_INIT_FN *PRTL_RUN_ONCE_INIT_FN; NTSYSAPI VOID WINAPI RtlRunOnceInitialize(PRTL_RUN_ONCE); NTSYSAPI DWORD WINAPI RtlRunOnceExecuteOnce(PRTL_RUN_ONCE,PRTL_RUN_ONCE_INIT_FN,PVOID,PVOID*); +NTSYSAPI DWORD WINAPI RtlRunOnceBeginInitialize(PRTL_RUN_ONCE, DWORD, PBOOL, PVOID*); +NTSYSAPI DWORD WINAPI RtlRunOnceComplete(PRTL_RUN_ONCE, DWORD, PVOID); #include <pshpack8.h> typedef struct _IO_COUNTERS {

1 0

André Hentschel : clusapi: Add stub for GetClusterInformation.
by Alexandre Julliard 24 May '13

24 May '13

Module: wine Branch: master Commit: c6acd7a41c818dee0ae5fdd45590ec48fd53c395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6acd7a41c818dee0ae5fdd45… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 24 01:01:03 2013 +0200 clusapi: Add stub for GetClusterInformation. --- dlls/clusapi/clusapi.c | 14 ++++++++++++++ dlls/clusapi/clusapi.spec | 2 +- include/clusapi.h | 17 +++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/clusapi/clusapi.c b/dlls/clusapi/clusapi.c index f782d43..88c6fbf 100644 --- a/dlls/clusapi/clusapi.c +++ b/dlls/clusapi/clusapi.c @@ -28,6 +28,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(clusapi); /*********************************************************************** + * GetClusterInformation (CLUSAPI.@) + * + */ +DWORD WINAPI GetClusterInformation(HCLUSTER hCluster, LPWSTR lpszClusterName, + LPDWORD lpcchClusterName, LPCLUSTERVERSIONINFO lpClusterInfo) +{ + FIXME("(%p, %p, %p, %p) stub!\n", hCluster, lpszClusterName, lpcchClusterName, lpClusterInfo); + + *lpcchClusterName = 0; + + return ERROR_SUCCESS; +} + +/*********************************************************************** * GetNodeClusterState (CLUSAPI.@) * * PARAMS diff --git a/dlls/clusapi/clusapi.spec b/dlls/clusapi/clusapi.spec index 9c6abe2..01d3329 100644 --- a/dlls/clusapi/clusapi.spec +++ b/dlls/clusapi/clusapi.spec @@ -70,7 +70,7 @@ @ stub GetClusterFromResource @ stub GetClusterGroupKey @ stub GetClusterGroupState -@ stub GetClusterInformation +@ stdcall GetClusterInformation(ptr ptr ptr ptr) @ stub GetClusterKey @ stub GetClusterNetInterface @ stub GetClusterNetInterfaceKey diff --git a/include/clusapi.h b/include/clusapi.h index 7e04964..4ab07cc 100644 --- a/include/clusapi.h +++ b/include/clusapi.h @@ -26,7 +26,24 @@ extern "C" { typedef struct _HCLUSTER *HCLUSTER; typedef struct _HCLUSENUM *HCLUSENUM; + +typedef struct _CLUSTERVERSIONINFO +{ + DWORD dwVersionInfoSize; + WORD MajorVersion; + WORD MinorVersion; + WORD BuildNumber; + WCHAR szVendorId[64]; + WCHAR szCSDVersion[64]; + DWORD dwClusterHighestVersion; + DWORD dwClusterLowestVersion; + DWORD dwFlags; + DWORD dwReserved; +} CLUSTERVERSIONINFO, *LPCLUSTERVERSIONINFO; + BOOL WINAPI CloseCluster(HCLUSTER hCluster); +DWORD WINAPI GetClusterInformation(HCLUSTER hCluster, LPWSTR lpszClusterName, + LPDWORD lpcchClusterName, LPCLUSTERVERSIONINFO lpClusterInfo); DWORD WINAPI GetNodeClusterState(LPCWSTR lpszNodeName, LPDWORD pdwClusterState); HCLUSTER WINAPI OpenCluster(LPCWSTR lpszClusterName); HCLUSENUM WINAPI ClusterOpenEnum(HCLUSTER hCluster, DWORD dwType);

1 0

Qian Hong : user32: Make CreateWindowExA and CreateWindowExW hotpatchable.
by Alexandre Julliard 24 May '13

24 May '13

Module: wine Branch: master Commit: 26683adf36e5a13844a9c832826aae40cb1ebf2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=26683adf36e5a13844a9c8328… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri May 24 15:24:11 2013 +0800 user32: Make CreateWindowExA and CreateWindowExW hotpatchable. --- dlls/user32/win.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index db4881a..1b4d34b 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1682,7 +1682,7 @@ failed: /*********************************************************************** * CreateWindowExA (USER32.@) */ -HWND WINAPI CreateWindowExA( DWORD exStyle, LPCSTR className, +HWND WINAPI DECLSPEC_HOTPATCH CreateWindowExA( DWORD exStyle, LPCSTR className, LPCSTR windowName, DWORD style, INT x, INT y, INT width, INT height, HWND parent, HMENU menu, @@ -1719,7 +1719,7 @@ HWND WINAPI CreateWindowExA( DWORD exStyle, LPCSTR className, /*********************************************************************** * CreateWindowExW (USER32.@) */ -HWND WINAPI CreateWindowExW( DWORD exStyle, LPCWSTR className, +HWND WINAPI DECLSPEC_HOTPATCH CreateWindowExW( DWORD exStyle, LPCWSTR className, LPCWSTR windowName, DWORD style, INT x, INT y, INT width, INT height, HWND parent, HMENU menu,

1 0

Dmitry Timoshkov : kernel32: Add a test to show that a process with a not closed handle to an already terminated thread fails to terminate cleanly .
by Alexandre Julliard 24 May '13

24 May '13

Module: wine Branch: master Commit: d256bf4b5fa12cb964ac8b3b6f75af012a169df9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d256bf4b5fa12cb964ac8b3b6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 24 16:57:16 2013 +0900 kernel32: Add a test to show that a process with a not closed handle to an already terminated thread fails to terminate cleanly. --- dlls/kernel32/tests/process.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 2bdc42e..350c858 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1926,6 +1926,44 @@ static void test_RegistryQuota(void) "Expected GetSystemRegistryQuota to return TRUE, got %d\n", ret); } +static void test_TerminateProcess(void) +{ + static char cmdline[] = "winver.exe"; + PROCESS_INFORMATION pi; + STARTUPINFO si; + DWORD ret; + HANDLE dummy, thread; + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + SetLastError(0xdeadbeef); + ret = CreateProcess(NULL, cmdline, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + thread = CreateRemoteThread(pi.hProcess, NULL, 0, (void *)0xdeadbeef, NULL, CREATE_SUSPENDED, &ret); + ok(thread != 0, "CreateRemoteThread error %d\n", GetLastError()); + + /* create a not closed thread handle duplicate in the target process */ + SetLastError(0xdeadbeef); + ret = DuplicateHandle(GetCurrentProcess(), thread, pi.hProcess, &dummy, + 0, FALSE, DUPLICATE_SAME_ACCESS); + ok(ret, "DuplicateHandle error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = TerminateThread(thread, 0); + ok(ret, "TerminateThread error %u\n", GetLastError()); + CloseHandle(thread); + + SetLastError(0xdeadbeef); + ret = TerminateProcess(pi.hProcess, 0); +todo_wine + ok(ret, "TerminateProcess error %u\n", GetLastError()); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); +} + START_TEST(process) { int b = init(); @@ -1937,6 +1975,7 @@ START_TEST(process) doChild(myARGV[2], (myARGC == 3) ? NULL : myARGV[3]); return; } + test_TerminateProcess(); test_Startup(); test_CommandLine(); test_Directory();

1 0

Jacek Caban : ieframe: Keep track of InternetExplore external references and use that to release document .
by Alexandre Julliard 24 May '13

24 May '13

Module: wine Branch: master Commit: b51af0b1c9e56e7bea16a7a53831401f8f75de8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b51af0b1c9e56e7bea16a7a53… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 24 10:39:20 2013 +0200 ieframe: Keep track of InternetExplore external references and use that to release document. --- dlls/ieframe/ie.c | 43 +++++++++++++++++++++++++++++++++++++++---- dlls/ieframe/ieframe.h | 2 ++ dlls/ieframe/iexplore.c | 7 +++++-- 3 files changed, 46 insertions(+), 6 deletions(-) diff --git a/dlls/ieframe/ie.c b/dlls/ieframe/ie.c index 42602f9..8ee2819 100644 --- a/dlls/ieframe/ie.c +++ b/dlls/ieframe/ie.c @@ -713,6 +713,31 @@ static inline InternetExplorer *impl_from_IExternalConnection(IExternalConnectio return CONTAINING_RECORD(iface, InternetExplorer, IExternalConnection_iface); } +/* + * Document may keep references to InternetExplorer object causing circular references. + * We keep track of external references and release the document object when all + * external references are released. A visible main window is also considered as + * an external reference. + */ +DWORD release_extern_ref(InternetExplorer *This, BOOL last_closes) +{ + LONG ref = InterlockedDecrement(&This->extern_ref); + + TRACE("ref = %d\n", ref); + + if(ref) + return ref; + + if(!last_closes) { + WARN("Last external connection released with FALSE last_closes.\n"); + return ref; + } + + if(This->doc_host) + deactivate_document(&This->doc_host->doc_host); + return ref; +} + static HRESULT WINAPI ExternalConnection_QueryInterface(IExternalConnection *iface, REFIID riid, void **ppv) { InternetExplorer *This = impl_from_IExternalConnection(iface); @@ -734,16 +759,26 @@ static ULONG WINAPI ExternalConnection_Release(IExternalConnection *iface) static DWORD WINAPI ExternalConnection_AddConnection(IExternalConnection *iface, DWORD extconn, DWORD reserved) { InternetExplorer *This = impl_from_IExternalConnection(iface); - FIXME("(%p)\n", This); - return 2; + + TRACE("(%p)->(%x %x)\n", This, extconn, reserved); + + if(extconn != EXTCONN_STRONG) + return 0; + + return InterlockedIncrement(&This->extern_ref); } static DWORD WINAPI ExternalConnection_ReleaseConnection(IExternalConnection *iface, DWORD extconn, DWORD reserved, BOOL fLastReleaseCloses) { InternetExplorer *This = impl_from_IExternalConnection(iface); - FIXME("(%p)\n", This); - return 1; + + TRACE("(%p)->(%x %x %x)\n", This, extconn, reserved, fLastReleaseCloses); + + if(extconn != EXTCONN_STRONG) + return 0; + + return release_extern_ref(This, fLastReleaseCloses); } static const IExternalConnectionVtbl ExternalConnectionVtbl = { diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 709789c..b879eec 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -229,6 +229,7 @@ struct InternetExplorer { HlinkFrame hlink_frame; LONG ref; + LONG extern_ref; HWND frame_hwnd; HWND status_hwnd; @@ -288,6 +289,7 @@ LRESULT process_dochost_tasks(DocHost*) DECLSPEC_HIDDEN; void InternetExplorer_WebBrowser_Init(InternetExplorer*) DECLSPEC_HIDDEN; HRESULT update_ie_statustext(InternetExplorer*, LPCWSTR) DECLSPEC_HIDDEN; void released_obj(void) DECLSPEC_HIDDEN; +DWORD release_extern_ref(InternetExplorer*,BOOL) DECLSPEC_HIDDEN; void register_iewindow_class(void) DECLSPEC_HIDDEN; void unregister_iewindow_class(void) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index c3d519a..3d822ff 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -669,10 +669,13 @@ static LRESULT WINAPI ie_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM return 0; case WM_SHOWWINDOW: TRACE("WM_SHOWWINDOW %lx\n", wparam); - if(wparam) + if(wparam) { IWebBrowser2_AddRef(&This->IWebBrowser2_iface); - else + InterlockedIncrement(&This->extern_ref); + }else { + release_extern_ref(This, TRUE); IWebBrowser2_Release(&This->IWebBrowser2_iface); + } break; case WM_DESTROY: return iewnd_OnDestroy(This);

1 0

Jacek Caban : ieframe: Get rid of no longer needed IEDocHost.
by Alexandre Julliard 24 May '13

24 May '13

Module: wine Branch: master Commit: 0bf9266bc74a2614eb610e4a2d12992705ca475c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bf9266bc74a2614eb610e4a2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 24 10:39:31 2013 +0200 ieframe: Get rid of no longer needed IEDocHost. --- dlls/ieframe/ie.c | 31 ++++++++------------- dlls/ieframe/ieframe.h | 10 +------ dlls/ieframe/iexplore.c | 69 +++++++++++++++-------------------------------- 3 files changed, 35 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0bf9266bc74a2614eb610…

1 0

Alistair Leslie-Hughes : oledb32: Implemented DataConvert DBTYPE_BSTR-> DBTYPE_DBTIMESTAMP.
by Alexandre Julliard 24 May '13

24 May '13

Module: wine Branch: master Commit: d103894ebca53c772dc3e29fa1fedb733db54b1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d103894ebca53c772dc3e29fa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 23 12:13:17 2013 +1000 oledb32: Implemented DataConvert DBTYPE_BSTR->DBTYPE_DBTIMESTAMP. --- dlls/oledb32/convert.c | 30 ++++++++++++++++++++++++++++-- dlls/oledb32/tests/convert.c | 11 +++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 9d41860..0961464 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -480,8 +480,34 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, DBTIMESTAMP *d=dst; switch (src_type) { - case DBTYPE_EMPTY: memset(d, 0, sizeof(DBTIMESTAMP)); hr = S_OK; break; - case DBTYPE_DBTIMESTAMP: memcpy(d, src, sizeof(DBTIMESTAMP)); hr = S_OK; break; + case DBTYPE_EMPTY: memset(d, 0, sizeof(DBTIMESTAMP)); hr = S_OK; break; + case DBTYPE_DBTIMESTAMP: memcpy(d, src, sizeof(DBTIMESTAMP)); hr = S_OK; break; + case DBTYPE_BSTR: + { + VARIANT var; + BSTR s = *(WCHAR**)src; + + VariantInit(&var); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(s); + + if ((hr = VariantChangeType(&var, &var, 0, VT_DATE)) == S_OK) + { + SYSTEMTIME st; + + hr = (VariantTimeToSystemTime( V_DATE(&var), &st) ? S_OK : E_FAIL); + d->year = st.wYear; + d->month = st.wMonth; + d->day = st.wDay; + d->hour = st.wHour; + d->minute = st.wMinute; + d->second = st.wSecond; + d->fraction = st.wMilliseconds * 1000000; + } + + VariantClear(&var); + } + break; case DBTYPE_DATE: { SYSTEMTIME st; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index ee2a39b..fd69fed 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2666,12 +2666,14 @@ static void test_converttovar(void) static void test_converttotimestamp(void) { + static const WCHAR strW[] = {'2','0','1','3','-','0','5','-','1','4',' ','0','2',':','0','4',':','1','2',0}; DBTIMESTAMP ts = {2013, 5, 14, 2, 4, 12, 0}; DBTIMESTAMP dst; DBSTATUS dst_status; DBLENGTH dst_len; VARIANT var; HRESULT hr; + BSTR bstr; VariantInit(&var); V_VT(&var) = VT_DATE; @@ -2682,6 +2684,15 @@ static void test_converttotimestamp(void) ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == sizeof(dst), "got %ld\n", dst_len); ok(!memcmp(&ts, &dst, sizeof(ts)), "Wrong timestamp\n"); + + bstr = SysAllocString(strW); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(!memcmp(&ts, &dst, sizeof(ts)), "Wrong timestamp\n"); + SysFreeString(bstr); } START_TEST(convert)

1 0

Alexandre Julliard : winetest: Use the original base URL in the redirect.
by Alexandre Julliard 23 May '13

23 May '13

Module: tools Branch: master Commit: 640251d21fa9bd458db0ec495a1647fbdaf83d5c URL: http://source.winehq.org/git/tools.git/?a=commit;h=640251d21fa9bd458db0ec49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 23 21:40:19 2013 +0200 winetest: Use the original base URL in the redirect. --- winetest/site | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/winetest/site b/winetest/site index aa1afe0..f7996a6 100755 --- a/winetest/site +++ b/winetest/site @@ -49,7 +49,8 @@ if ($q->param('testing')) { } # redirect to data dir when no vars present -print $q->redirect("http://test.winehq.org/data/" . $build); +my $base = $q->url(-base => 1); +print $q->redirect($base . "/data/" . $build); # done exit();

1 0