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

Nikolay Sivov : msdaps: Added proxy/stub for IDBInitialize_Uninitialize().
by Alexandre Julliard April 22, 2013

April 22, 2013

Module: wine Branch: master Commit: 6d36bf5f276b8684b00d12c078391e6ec38fe356 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d36bf5f276b8684b00d12c07… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 19 13:47:27 2013 +0400 msdaps: Added proxy/stub for IDBInitialize_Uninitialize(). --- dlls/msdaps/usrmarshal.c | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index ff5ae28..690077d 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -235,14 +235,29 @@ HRESULT __RPC_STUB IDBInitialize_Initialize_Stub(IDBInitialize* This, IErrorInfo HRESULT CALLBACK IDBInitialize_Uninitialize_Proxy(IDBInitialize* This) { - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + IErrorInfo *error; + HRESULT hr; + + TRACE("(%p)\n", This); + hr = IDBInitialize_RemoteUninitialize_Proxy(This, &error); + if(error) + { + SetErrorInfo(0, error); + IErrorInfo_Release(error); + } + return hr; } -HRESULT __RPC_STUB IDBInitialize_Uninitialize_Stub(IDBInitialize* This, IErrorInfo **ppErrorInfoRem) +HRESULT __RPC_STUB IDBInitialize_Uninitialize_Stub(IDBInitialize* This, IErrorInfo **error) { - FIXME("(%p, %p): stub\n", This, ppErrorInfoRem); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p, %p)\n", This, error); + *error = NULL; + hr = IDBInitialize_Uninitialize(This); + if(FAILED(hr)) GetErrorInfo(0, error); + + return hr; } HRESULT CALLBACK IDBDataSourceAdmin_CreateDataSource_Proxy(IDBDataSourceAdmin* This, ULONG cPropertySets,

1 0

Matteo Bruni : wined3d: Add ARB_internalformat_query2 GL extension.
by Alexandre Julliard April 22, 2013

April 22, 2013

Module: wine Branch: master Commit: 1d17176a0d1a09aff6b681428217ff4f70ae9f23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d17176a0d1a09aff6b681428… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 19 19:06:12 2013 +0200 wined3d: Add ARB_internalformat_query2 GL extension. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_gl.h | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9b3ff1f..68016e0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -108,6 +108,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_half_float_pixel", ARB_HALF_FLOAT_PIXEL }, {"GL_ARB_half_float_vertex", ARB_HALF_FLOAT_VERTEX }, {"GL_ARB_instanced_arrays", ARB_INSTANCED_ARRAYS, }, + {"GL_ARB_internalformat_query2", ARB_INTERNALFORMAT_QUERY2, }, {"GL_ARB_map_buffer_alignment", ARB_MAP_BUFFER_ALIGNMENT }, {"GL_ARB_map_buffer_range", ARB_MAP_BUFFER_RANGE }, {"GL_ARB_multisample", ARB_MULTISAMPLE }, /* needs GLX_ARB_MULTISAMPLE as well */ diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 85756cb..f68fdc7 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -59,6 +59,7 @@ enum wined3d_gl_extension ARB_HALF_FLOAT_PIXEL, ARB_HALF_FLOAT_VERTEX, ARB_INSTANCED_ARRAYS, + ARB_INTERNALFORMAT_QUERY2, ARB_MAP_BUFFER_ALIGNMENT, ARB_MAP_BUFFER_RANGE, ARB_MULTISAMPLE, @@ -223,6 +224,10 @@ enum wined3d_gl_extension USE_GL_FUNC(glProgramParameteriARB) \ /* GL_ARB_instanced_arrays */ \ USE_GL_FUNC(glVertexAttribDivisorARB) \ + /* GL_ARB_internalformat_query */ \ + USE_GL_FUNC(glGetInternalformativ) \ + /* GL_ARB_internalformat_query2 */ \ + USE_GL_FUNC(glGetInternalformati64v) \ /* GL_ARB_map_buffer_range */ \ USE_GL_FUNC(glFlushMappedBufferRange) \ USE_GL_FUNC(glMapBufferRange) \

1 0

Alistair Leslie-Hughes : oledb32: Implement DataConvert DBTYPE_I8-> DBTYPE_VARIANT.
by Alexandre Julliard April 22, 2013

April 22, 2013

Module: wine Branch: master Commit: 01c282550b900e345b80bba04562c290722cd352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01c282550b900e345b80bba04… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 18 09:54:09 2013 +1000 oledb32: Implement DataConvert DBTYPE_I8->DBTYPE_VARIANT. --- dlls/oledb32/convert.c | 4 ++++ dlls/oledb32/tests/convert.c | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index b55c0d9..37ae25e 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -757,6 +757,10 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, V_I4(v) = *(signed int*)src; hr = S_OK; break; + case DBTYPE_I8: + V_VT(v) = VT_DECIMAL; + hr = VarDecFromI8( *(LONGLONG*)src, &V_DECIMAL(v)); + break; case DBTYPE_BSTR: { BSTR s = *(WCHAR**)src; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 65bd075..2a4caf2 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2544,6 +2544,7 @@ static void test_converttovar(void) CY cy, cy2; DATE date; INT i4; + LARGE_INTEGER i8; hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); if(FAILED(hr)) @@ -2574,6 +2575,19 @@ static void test_converttovar(void) V_VT(&dst) = VT_EMPTY; dst_len = 0; dst_status = DBSTATUS_S_DEFAULT; + i8.QuadPart = 12345; + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_I8, DBTYPE_VARIANT, sizeof(i8), &dst_len, &i8, &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(V_VT(&dst) == VT_DECIMAL, "got %d\n", V_VT(&dst)); + ok(S(U(V_DECIMAL(&dst))).scale == 0 && S(U(V_DECIMAL(&dst))).sign == 0 && + V_DECIMAL(&dst).Hi32 == 0 && U1(V_DECIMAL(&dst)).Lo64 == 12345, "Not Equal\n"); + + V_VT(&dst) = VT_EMPTY; + dst_len = 0; + dst_status = DBSTATUS_S_DEFAULT; i4 = 123; hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_VARIANT, sizeof(i4), &dst_len, &i4, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08x\n", hr);

1 0

Dmitry Timoshkov : ntdll: Refuse to create new thread if the target process is being terminated.
by Alexandre Julliard April 22, 2013

April 22, 2013

Module: wine Branch: master Commit: 59a23fb42f0bd431d06ece753437187f6cbab264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59a23fb42f0bd431d06ece753… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 22 18:33:22 2013 +0900 ntdll: Refuse to create new thread if the target process is being terminated. --- dlls/kernel32/tests/loader.c | 17 +++++++---------- dlls/ntdll/thread.c | 2 ++ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 8d26678..38c059c 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1183,7 +1183,6 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) /* manual call to LdrShutdownProcess doesn't prevent thread creation */ if (param && test_dll_phase != 4) { -todo_wine ok(!handle || broken(handle != 0) /* before win7 */, "CreateThread should fail\n"); if (!handle) ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); @@ -1192,16 +1191,15 @@ todo_wine } else { - ok(handle != 0, "CreateThread error %d\n", GetLastError()); - ret = WaitForSingleObject(handle, 1000); /* FIXME: remove once Wine is fixed */ if (test_dll_phase == 4) todo_wine { - ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); - ok(!noop_thread_started || broken(noop_thread_started) /* XP64 */, "thread shouldn't start yet\n"); + ok(handle != 0, "CreateThread error %d\n", GetLastError()); } else { + ok(handle != 0, "CreateThread error %d\n", GetLastError()); + ret = WaitForSingleObject(handle, 1000); ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); ok(!noop_thread_started || broken(noop_thread_started) /* XP64 */, "thread shouldn't start yet\n"); } @@ -1218,7 +1216,6 @@ todo_wine /* manual call to LdrShutdownProcess doesn't prevent thread creation */ if (param && test_dll_phase != 4) { -todo_wine ok(!handle || broken(handle != 0) /* before win7 */, "CreateRemoteThread should fail\n"); if (!handle) ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); @@ -1227,19 +1224,19 @@ todo_wine } else { - ok(handle != 0, "CreateRemoteThread error %d\n", GetLastError()); - ret = WaitForSingleObject(handle, 1000); /* FIXME: remove once Wine is fixed */ if (test_dll_phase == 4) todo_wine { - ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); - ok(!noop_thread_started || broken(noop_thread_started) /* XP64 */, "thread shouldn't start yet\n"); + ok(handle != 0, "CreateRemoteThread error %d\n", GetLastError()); } else { + ok(handle != 0, "CreateRemoteThread error %d\n", GetLastError()); + ret = WaitForSingleObject(handle, 1000); ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); ok(!noop_thread_started || broken(noop_thread_started) /* XP64 */, "thread shouldn't start yet\n"); } + CloseHandle(handle); } SetLastError(0xdeadbeef); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 01a8026..4499afa 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -461,6 +461,8 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * return result.create_thread.status; } + if (RtlDllShutdownInProgress()) return STATUS_ACCESS_DENIED; + if (server_pipe( request_pipe ) == -1) return STATUS_TOO_MANY_OPENED_FILES; wine_server_send_fd( request_pipe[0] );

1 0

Ken Thomases : winemac: Implement an IME that uses the OS X input methods.
by Alexandre Julliard April 22, 2013

April 22, 2013

Module: wine Branch: master Commit: 192b8dbf9d1dd4541aa6fc1deebd0d77866443ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=192b8dbf9d1dd4541aa6fc1de… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Apr 21 21:32:26 2013 -0500 winemac: Implement an IME that uses the OS X input methods. Developed with Aric Stewart. --- dlls/winemac.drv/Makefile.in | 3 +- dlls/winemac.drv/cocoa_app.h | 2 + dlls/winemac.drv/cocoa_app.m | 49 ++ dlls/winemac.drv/cocoa_event.m | 4 + dlls/winemac.drv/cocoa_window.h | 3 + dlls/winemac.drv/cocoa_window.m | 200 +++++- dlls/winemac.drv/event.c | 10 + dlls/winemac.drv/ime.c | 1511 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/keyboard.c | 47 ++ dlls/winemac.drv/macdrv.h | 15 + dlls/winemac.drv/macdrv_cocoa.h | 14 + dlls/winemac.drv/macdrv_main.c | 1 + dlls/winemac.drv/winemac.drv.spec | 18 + 13 files changed, 1875 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=192b8dbf9d1dd4541aa6f…

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMVISUAL.
by Alexandre Julliard April 22, 2013

April 22, 2013

Module: wine Branch: master Commit: c179bee49416b0403a8d6f1a86617704c0913d64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c179bee49416b0403a8d6f1a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 22 15:18:45 2013 +0200 d3drm: Avoid LPDIRECT3DRMVISUAL. --- dlls/d3drm/d3drm.c | 32 +++++++++++++------------------- dlls/d3drm/frame.c | 26 ++++++++++++-------------- dlls/d3drm/tests/d3drm.c | 18 +++++++++--------- include/d3drm.h | 12 +++++++----- include/d3drmobj.h | 24 +++++++++++++----------- 5 files changed, 54 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c179bee49416b0403a8d6…

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMFRAME3.
by Alexandre Julliard April 22, 2013

April 22, 2013

Module: wine Branch: master Commit: 65f9ddc2ca8ab0591e038f7d2ae470375db531fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=65f9ddc2ca8ab0591e038f7d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 22 15:18:44 2013 +0200 d3drm: Avoid LPDIRECT3DRMFRAME3. --- dlls/d3drm/d3drm.c | 59 ++++++++++++++------------------ dlls/d3drm/frame.c | 83 +++++++++++++++------------------------------ dlls/d3drm/meshbuilder.c | 7 +--- dlls/d3drm/viewport.c | 21 +++-------- include/d3drm.h | 14 ++++--- include/d3drmobj.h | 46 +++++++++++++------------ 6 files changed, 94 insertions(+), 136 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65f9ddc2ca8ab0591e038…

1 0

Henri Verbeet : wined3d: Rename the device "strided_streams" field to " stream_info".
by Alexandre Julliard April 22, 2013

April 22, 2013

Module: wine Branch: master Commit: c756496326b23bc61dc1d8e2bebf6f12ee98752c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c756496326b23bc61dc1d8e2b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 22 15:18:43 2013 +0200 wined3d: Rename the device "strided_streams" field to "stream_info". The "strided" in there is mostly historic, it hasn't really been accurate for a while now. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/drawprim.c | 4 ++-- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 12 +++--------- dlls/wined3d/state.c | 22 +++++++++++----------- dlls/wined3d/wined3d_private.h | 2 +- 9 files changed, 22 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c756496326b23bc61dc1d…

1 0

Henri Verbeet : wined3d: Get rid of the unused TRACE_STRIDED macro.
by Alexandre Julliard April 22, 2013

April 22, 2013

Module: wine Branch: master Commit: 82a06a0a366ff618787e47d00538680efec9f9a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82a06a0a366ff618787e47d00… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 22 15:18:42 2013 +0200 wined3d: Get rid of the unused TRACE_STRIDED macro. --- dlls/wined3d/wined3d_private.h | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 17f3a68..39995a0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -863,12 +863,6 @@ do { \ #define checkGLcall(A) do {} while(0) #endif -/* Trace vector and strided data information */ -#define TRACE_STRIDED(si, name) do { if (si->use_map & (1 << name)) \ - TRACE( #name " = (data {%#x:%p}, stride %d, format %s, stream %u)\n", \ - si->elements[name].data.buffer_object, si->elements[name].data.addr, si->elements[name].stride, \ - debug_d3dformat(si->elements[name].format->id), si->elements[name].stream_idx); } while(0) - /* Global variables */ extern const struct wined3d_matrix identity DECLSPEC_HIDDEN;

1 0

Michael Stefaniuc : dsound/tests: Skip tests if there is no default device.
by Alexandre Julliard April 22, 2013

April 22, 2013

Module: wine Branch: master Commit: 7f652810562fc3e0158b35ab29e17e5a82bb76b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f652810562fc3e0158b35ab2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 22 00:19:47 2013 +0200 dsound/tests: Skip tests if there is no default device. --- dlls/dsound/tests/dsound8.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 664ba0c..e22265b 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1095,6 +1095,10 @@ static void test_first_device(void) hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum, eRender, eMultimedia, &defdev); + if (hr == E_NOTFOUND) { + win_skip("No default device found\n"); + return; + } ok(hr == S_OK, "GetDefaultAudioEndpoint failed: %08x\n", hr); hr = IMMDevice_OpenPropertyStore(defdev, STGM_READ, &ps);

1 0