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

Marcus Meissner : hidclass.sys: Add missing case/missing HeapFree ( Coverity).
by Alexandre Julliard April 26, 2016

April 26, 2016

Module: wine Branch: master Commit: bb590b3f9f68917855fe822c31ef50d40af7d4f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb590b3f9f68917855fe822c3… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Apr 23 20:03:10 2016 +0200 hidclass.sys: Add missing case/missing HeapFree (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index d97184f..5a6a0a7 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -292,10 +292,9 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) case IRP_MN_QUERY_ID: { BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; - ULONG type = irpsp->Parameters.QueryId.IdType; WCHAR *id = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WCHAR)*REGSTR_VAL_MAX_HCID_LEN); - TRACE("IRP_MN_QUERY_ID[%i]\n", type); - switch (type) + TRACE("IRP_MN_QUERY_ID[%i]\n", irpsp->Parameters.QueryId.IdType); + switch (irpsp->Parameters.QueryId.IdType) { case BusQueryHardwareIDs: case BusQueryCompatibleIDs: @@ -326,6 +325,10 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) irp->IoStatus.Information = (ULONG_PTR)id; rc = STATUS_SUCCESS; break; + case BusQueryDeviceSerialNumber: + FIXME("BusQueryDeviceSerialNumber not implemented\n"); + HeapFree(GetProcessHeap(), 0, id); + break; } break; }

1 0

Henri Verbeet : wined3d: Pass a wined3d_vec4 structure to apply_clamped_constant().
by Alexandre Julliard April 26, 2016

April 26, 2016

Module: wine Branch: master Commit: 468b1d9d9b4296acfe4e4ff9718bf37b33ff4529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=468b1d9d9b4296acfe4e4ff97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 25 17:19:29 2016 +0200 wined3d: Pass a wined3d_vec4 structure to apply_clamped_constant(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 474cace..8c3958d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -625,16 +625,17 @@ static inline void walk_constant_heap(const struct wined3d_gl_info *gl_info, con } /* Context activation is done by the caller. */ -static inline void apply_clamped_constant(const struct wined3d_gl_info *gl_info, GLint location, const GLfloat *data) +static inline void apply_clamped_constant(const struct wined3d_gl_info *gl_info, + GLint location, const struct wined3d_vec4 *data) { GLfloat clamped_constant[4]; if (location == -1) return; - clamped_constant[0] = data[0] < -1.0f ? -1.0f : data[0] > 1.0f ? 1.0f : data[0]; - clamped_constant[1] = data[1] < -1.0f ? -1.0f : data[1] > 1.0f ? 1.0f : data[1]; - clamped_constant[2] = data[2] < -1.0f ? -1.0f : data[2] > 1.0f ? 1.0f : data[2]; - clamped_constant[3] = data[3] < -1.0f ? -1.0f : data[3] > 1.0f ? 1.0f : data[3]; + clamped_constant[0] = data->x < -1.0f ? -1.0f : data->x > 1.0f ? 1.0f : data->x; + clamped_constant[1] = data->y < -1.0f ? -1.0f : data->y > 1.0f ? 1.0f : data->y; + clamped_constant[2] = data->z < -1.0f ? -1.0f : data->z > 1.0f ? 1.0f : data->z; + clamped_constant[3] = data->w < -1.0f ? -1.0f : data->w > 1.0f ? 1.0f : data->w; GL_EXTCALL(glUniform4fv(location, 1, clamped_constant)); } @@ -650,7 +651,7 @@ static inline void walk_constant_heap_clamped(const struct wined3d_gl_info *gl_i if (heap->entries[heap_idx].version <= version) return; idx = heap->entries[heap_idx].idx; - apply_clamped_constant(gl_info, constant_locations[idx], &constants[idx * 4]); + apply_clamped_constant(gl_info, constant_locations[idx], (const struct wined3d_vec4 *)&constants[idx * 4]); stack[stack_idx] = HEAP_NODE_TRAVERSE_LEFT; while (stack_idx >= 0) @@ -665,7 +666,8 @@ static inline void walk_constant_heap_clamped(const struct wined3d_gl_info *gl_i { heap_idx = left_idx; idx = heap->entries[heap_idx].idx; - apply_clamped_constant(gl_info, constant_locations[idx], &constants[idx * 4]); + apply_clamped_constant(gl_info, constant_locations[idx], + (const struct wined3d_vec4 *)&constants[idx * 4]); stack[stack_idx++] = HEAP_NODE_TRAVERSE_RIGHT; stack[stack_idx] = HEAP_NODE_TRAVERSE_LEFT; @@ -680,7 +682,8 @@ static inline void walk_constant_heap_clamped(const struct wined3d_gl_info *gl_i { heap_idx = right_idx; idx = heap->entries[heap_idx].idx; - apply_clamped_constant(gl_info, constant_locations[idx], &constants[idx * 4]); + apply_clamped_constant(gl_info, constant_locations[idx], + (const struct wined3d_vec4 *)&constants[idx * 4]); stack[stack_idx++] = HEAP_NODE_POP; stack[stack_idx] = HEAP_NODE_TRAVERSE_LEFT;

1 0

Francois Gouget : msvcrt: The fpclass() constants are not defines.
by Alexandre Julliard April 26, 2016

April 26, 2016

Module: wine Branch: master Commit: 8e382e97e9c1209695b2ac621423852f7799d794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e382e97e9c1209695b2ac621… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 25 01:09:46 2016 +0200 msvcrt: The fpclass() constants are not defines. Solaris is the only platform that has fpclass() and it defines the constants in the fpclass_t enum. So this reverts commit b0047713142de79eba454d1196b230d53781518f. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b9e0533..402e8b2 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -665,36 +665,16 @@ int CDECL MSVCRT__fpclass(double num) #if defined(HAVE_FPCLASS) || defined(fpclass) switch (fpclass( num )) { -#ifdef FP_SNAN case FP_SNAN: return MSVCRT__FPCLASS_SNAN; -#endif -#ifdef FP_QNAN case FP_QNAN: return MSVCRT__FPCLASS_QNAN; -#endif -#ifdef FP_NINF case FP_NINF: return MSVCRT__FPCLASS_NINF; -#endif -#ifdef FP_PINF case FP_PINF: return MSVCRT__FPCLASS_PINF; -#endif -#ifdef FP_NDENORM case FP_NDENORM: return MSVCRT__FPCLASS_ND; -#endif -#ifdef FP_PDENORM case FP_PDENORM: return MSVCRT__FPCLASS_PD; -#endif -#ifdef FP_NZERO case FP_NZERO: return MSVCRT__FPCLASS_NZ; -#endif -#ifdef FP_PZERO case FP_PZERO: return MSVCRT__FPCLASS_PZ; -#endif -#ifdef FP_NNORM case FP_NNORM: return MSVCRT__FPCLASS_NN; -#endif -#ifdef FP_PNORM case FP_PNORM: return MSVCRT__FPCLASS_PN; -#endif default: return MSVCRT__FPCLASS_PN; } #elif defined (fpclassify)

1 0

Henri Verbeet : ddraw: Return early in d3d_device7_DrawPrimitiveVB() with a 0 vertex count.
by Alexandre Julliard April 26, 2016

April 26, 2016

Module: wine Branch: master Commit: 078aefddba7cf4278a6d95c58001220980beaf07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=078aefddba7cf4278a6d95c58… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 25 17:19:27 2016 +0200 ddraw: Return early in d3d_device7_DrawPrimitiveVB() with a 0 vertex count. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 2a74da8..80a2f0b 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4256,28 +4256,28 @@ static HRESULT WINAPI d3d_device3_DrawIndexedPrimitiveStrided(IDirect3DDevice3 * * DDERR_INVALIDPARAMS if D3DVertexBuf is NULL * *****************************************************************************/ -static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVETYPE PrimitiveType, - IDirect3DVertexBuffer7 *D3DVertexBuf, DWORD StartVertex, DWORD NumVertices, DWORD Flags) +static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVETYPE primitive_type, + IDirect3DVertexBuffer7 *vb, DWORD start_vertex, DWORD vertex_count, DWORD flags) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - struct d3d_vertex_buffer *vb = unsafe_impl_from_IDirect3DVertexBuffer7(D3DVertexBuf); + struct d3d_vertex_buffer *vb_impl = unsafe_impl_from_IDirect3DVertexBuffer7(vb); HRESULT hr; DWORD stride; TRACE("iface %p, primitive_type %#x, vb %p, start_vertex %u, vertex_count %u, flags %#x.\n", - iface, PrimitiveType, D3DVertexBuf, StartVertex, NumVertices, Flags); + iface, primitive_type, vb, start_vertex, vertex_count, flags); - /* Sanity checks */ - if (!vb) + if (!vertex_count) { - WARN("No Vertex buffer specified.\n"); - return DDERR_INVALIDPARAMS; + WARN("0 vertex count.\n"); + return D3D_OK; } - stride = get_flexible_vertex_size(vb->fvf); + + stride = get_flexible_vertex_size(vb_impl->fvf); wined3d_mutex_lock(); - wined3d_device_set_vertex_declaration(device->wined3d_device, vb->wineD3DVertexDeclaration); - hr = wined3d_device_set_stream_source(device->wined3d_device, 0, vb->wineD3DVertexBuffer, 0, stride); + wined3d_device_set_vertex_declaration(device->wined3d_device, vb_impl->wineD3DVertexDeclaration); + hr = wined3d_device_set_stream_source(device->wined3d_device, 0, vb_impl->wineD3DVertexBuffer, 0, stride); if (FAILED(hr)) { WARN("Failed to set stream source, hr %#x.\n", hr); @@ -4286,8 +4286,8 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE } /* Now draw the primitives */ - wined3d_device_set_primitive_type(device->wined3d_device, PrimitiveType); - hr = wined3d_device_draw_primitive(device->wined3d_device, StartVertex, NumVertices); + wined3d_device_set_primitive_type(device->wined3d_device, primitive_type); + hr = wined3d_device_draw_primitive(device->wined3d_device, start_vertex, vertex_count); wined3d_mutex_unlock();

1 0

Hugh McMaster : reg: Support recursion when querying a registry key.
by Alexandre Julliard April 25, 2016

April 25, 2016

Module: wine Branch: master Commit: c81b0494ba71acfedaa9d8dffd6959592bb6ebf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c81b0494ba71acfedaa9d8dff… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 25 11:26:38 2016 +0000 reg: Support recursion when querying a registry key. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 32e75a0..4ccc7dc 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -640,18 +640,34 @@ static void output_value(const WCHAR *value_name, DWORD type, BYTE *data, DWORD output_string(newlineW); } -static int query_all(HKEY key, WCHAR *path) +static WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD subkey_len) +{ + WCHAR *subkey_path; + WCHAR fmt[] = {'%','s','\\','%','s',0}; + + subkey_path = HeapAlloc(GetProcessHeap(), 0, (path_len + subkey_len + 2) * sizeof(WCHAR)); + if (!subkey_path) + { + ERR("Failed to allocate memory for subkey_path\n"); + return NULL; + } + sprintfW(subkey_path, fmt, path, subkey_name); + return subkey_path; +} + +static int query_all(HKEY key, WCHAR *path, BOOL recurse) { LONG rc; DWORD num_subkeys, max_subkey_len, subkey_len; DWORD num_values, max_value_len, value_len; DWORD max_data_bytes, data_size; - DWORD i, type; + DWORD i, type, path_len; WCHAR fmt[] = {'%','1','\n',0}; WCHAR fmt_path[] = {'%','1','\\','%','2','\n',0}; - WCHAR *value_name, *subkey_name; + WCHAR *value_name, *subkey_name, *subkey_path; WCHAR newlineW[] = {'\n',0}; BYTE *data; + HKEY subkey; rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, &num_subkeys, &max_subkey_len, NULL, &num_values, &max_value_len, &max_data_bytes, NULL, NULL); @@ -691,7 +707,7 @@ static int query_all(HKEY key, WCHAR *path) HeapFree(GetProcessHeap(), 0, data); HeapFree(GetProcessHeap(), 0, value_name); - if (num_values) + if (num_values || recurse) output_string(newlineW); max_subkey_len++; @@ -702,17 +718,31 @@ static int query_all(HKEY key, WCHAR *path) return 1; } + path_len = strlenW(path); + for (i = 0; i < num_subkeys; i++) { subkey_len = max_subkey_len; rc = RegEnumKeyExW(key, i, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); if (rc == ERROR_SUCCESS) - output_string(fmt_path, path, subkey_name); + { + if (recurse) + { + subkey_path = build_subkey_path(path, path_len, subkey_name, subkey_len); + if (!RegOpenKeyExW(key, subkey_name, 0, KEY_READ, &subkey)) + { + query_all(subkey, subkey_path, recurse); + RegCloseKey(subkey); + } + HeapFree(GetProcessHeap(), 0, subkey_path); + } + else output_string(fmt_path, path, subkey_name); + } } HeapFree(GetProcessHeap(), 0, subkey_name); - if (num_subkeys) + if (num_subkeys && !recurse) output_string(newlineW); return 0; @@ -751,13 +781,13 @@ static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL return 1; } - if (value_name || value_empty || recurse) + if (value_name || value_empty) { output_string(stubW, key_name, value_name, value_empty, recurse); return 1; } - ret = query_all(key, key_name); + ret = query_all(key, key_name, recurse); RegCloseKey(key);

1 0

Austin English : wine.inf: Create Microsoft Shared/TextConv directory.
by Alexandre Julliard April 25, 2016

April 25, 2016

Module: wine Branch: master Commit: 09cc2b93217b00ce4b53d79ff12409c3e4c8c9bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=09cc2b93217b00ce4b53d79ff… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Apr 25 01:18:31 2016 -0500 wine.inf: Create Microsoft Shared/TextConv directory. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d22b29b..589a1ff 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2584,6 +2584,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16422,Internet Explorer,iexplore.exe 16422,Windows Media Player,wmplayer.exe 16422,Windows NT\Accessories,wordpad.exe +16427,Microsoft Shared\TextConv, 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll 11,,*

1 0

Francois Gouget : ddraw: Remove DDENUMSURFACES_{MATCH, SEARCH}TYPE as they are unused.
by Alexandre Julliard April 25, 2016

April 25, 2016

Module: wine Branch: master Commit: 2738f7690d4209ebf98a8415bdb0202436379b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2738f7690d4209ebf98a8415b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Apr 24 12:41:27 2016 +0200 ddraw: Remove DDENUMSURFACES_{MATCH,SEARCH}TYPE as they are unused. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 60875d2..eb1652c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2963,9 +2963,6 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, return hr; } -#define DDENUMSURFACES_SEARCHTYPE (DDENUMSURFACES_CANBECREATED|DDENUMSURFACES_DOESEXIST) -#define DDENUMSURFACES_MATCHTYPE (DDENUMSURFACES_ALL|DDENUMSURFACES_MATCH|DDENUMSURFACES_NOMATCH) - static BOOL Main_DirectDraw_DDPIXELFORMAT_Match(const DDPIXELFORMAT *requested, const DDPIXELFORMAT *provided) @@ -3072,9 +3069,6 @@ static BOOL ddraw_match_surface_desc(const DDSURFACEDESC2 *requested, const DDSU return TRUE; } -#undef DDENUMSURFACES_SEARCHTYPE -#undef DDENUMSURFACES_MATCHTYPE - struct surfacescallback2_context { LPDDENUMSURFACESCALLBACK2 func;

1 0

Aric Stewart : winex11.drv: Improve setting IME result text with no composition.
by Alexandre Julliard April 25, 2016

April 25, 2016

Module: wine Branch: master Commit: e4d94e48138ff4963e1b896d392e6fa6b9b87054 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4d94e48138ff4963e1b896d3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 22 13:59:03 2016 -0500 winex11.drv: Improve setting IME result text with no composition. This greatly improves behaviors around deadkeys in Microsoft Word. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/ime.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 22698cf..ee622c1 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -1046,24 +1046,38 @@ void IME_SetResultString(LPWSTR lpResult, DWORD dwResultLen) LPINPUTCONTEXT lpIMC; HIMCC newCompStr; LPIMEPRIVATE myPrivate; + BOOL inComp; imc = RealIMC(FROM_X11); lpIMC = ImmLockIMC(imc); if (lpIMC == NULL) return; + newCompStr = updateCompStr(lpIMC->hCompStr, NULL, 0); + ImmDestroyIMCC(lpIMC->hCompStr); + lpIMC->hCompStr = newCompStr; + newCompStr = updateResultStr(lpIMC->hCompStr, lpResult, dwResultLen); ImmDestroyIMCC(lpIMC->hCompStr); lpIMC->hCompStr = newCompStr; myPrivate = ImmLockIMCC(lpIMC->hPrivate); - if (!myPrivate->bInComposition) - GenerateIMEMessage(imc, WM_IME_STARTCOMPOSITION, 0, 0); - GenerateIMEMessage(imc, WM_IME_COMPOSITION, 0, GCS_RESULTSTR); - if (!myPrivate->bInComposition) - GenerateIMEMessage(imc, WM_IME_ENDCOMPOSITION, 0, 0); + inComp = myPrivate->bInComposition; ImmUnlockIMCC(lpIMC->hPrivate); + if (!inComp) + { + ImmSetOpenStatus(imc, TRUE); + GenerateIMEMessage(imc, WM_IME_STARTCOMPOSITION, 0, 0); + } + + GenerateIMEMessage(imc, WM_IME_COMPOSITION, 0, GCS_COMPSTR); + GenerateIMEMessage(imc, WM_IME_COMPOSITION, lpResult[0], GCS_RESULTSTR|GCS_RESULTCLAUSE); + GenerateIMEMessage(imc, WM_IME_ENDCOMPOSITION, 0, 0); + + if (!inComp) + ImmSetOpenStatus(imc, FALSE); + ImmUnlockIMC(imc); }

1 0

Alex Henrie : qedit: Stub out AMTimeline.
by Alexandre Julliard April 25, 2016

April 25, 2016

Module: wine Branch: master Commit: 69eafe63ad7e3525f3498ab6af9f4c149753407f URL: http://source.winehq.org/git/wine.git/?a=commit;h=69eafe63ad7e3525f3498ab6a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Apr 24 21:40:27 2016 -0600 qedit: Stub out AMTimeline. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/Makefile.in | 3 +- dlls/qedit/main.c | 1 + dlls/qedit/qedit_classes.idl | 6 + dlls/qedit/qedit_private.h | 1 + dlls/qedit/timeline.c | 397 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 407 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69eafe63ad7e3525f3498…

1 0

Nikolay Sivov : d3d10_1/tests: Add a IDXGISurface1 GetDC() test.
by Alexandre Julliard April 25, 2016

April 25, 2016

Module: wine Branch: master Commit: a566f6742a95186099accbc3833aa3a2253ca8c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a566f6742a95186099accbc38… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 25 11:44:01 2016 +0200 d3d10_1/tests: Add a IDXGISurface1 GetDC() test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/tests/d3d10_1.c | 115 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 105 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index f7d188d..f5b1454 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -37,18 +37,32 @@ static ULONG get_refcount(IUnknown *iface) return IUnknown_Release(iface); } -static ID3D10Device1 *create_device(D3D10_FEATURE_LEVEL1 feature_level) +struct device_desc { + D3D10_FEATURE_LEVEL1 feature_level; + UINT flags; +}; + +static ID3D10Device1 *create_device(const struct device_desc *desc) +{ + D3D10_FEATURE_LEVEL1 feature_level = D3D10_FEATURE_LEVEL_10_1; ID3D10Device1 *device; + UINT flags = 0; - if (SUCCEEDED(D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, feature_level, D3D10_1_SDK_VERSION, - &device))) + if (desc) + { + feature_level = desc->feature_level; + flags = desc->flags; + } + + if (SUCCEEDED(D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_HARDWARE, + NULL, flags, feature_level, D3D10_1_SDK_VERSION, &device))) return device; - if (SUCCEEDED(D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_WARP, NULL, 0, feature_level, D3D10_1_SDK_VERSION, - &device))) + if (SUCCEEDED(D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_WARP, + NULL, flags, feature_level, D3D10_1_SDK_VERSION, &device))) return device; - if (SUCCEEDED(D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, feature_level, D3D10_1_SDK_VERSION, - &device))) + if (SUCCEEDED(D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_REFERENCE, + NULL, flags, feature_level, D3D10_1_SDK_VERSION, &device))) return device; return NULL; @@ -240,7 +254,12 @@ static void test_device_interfaces(void) for (i = 0; i < sizeof(d3d10_feature_levels) / sizeof(*d3d10_feature_levels); ++i) { - if (!(device = create_device(d3d10_feature_levels[i]))) + struct device_desc device_desc; + + device_desc.feature_level = d3d10_feature_levels[i]; + device_desc.flags = 0; + + if (!(device = create_device(&device_desc))) { skip("Failed to create device for feature level %#x.\n", d3d10_feature_levels[i]); continue; @@ -306,7 +325,7 @@ static void test_create_shader_resource_view(void) IUnknown *iface; HRESULT hr; - if (!(device = create_device(D3D10_FEATURE_LEVEL_10_1))) + if (!(device = create_device(NULL))) { skip("Failed to create device.\n"); return; @@ -494,7 +513,7 @@ static void test_create_blend_state(void) IUnknown *iface; HRESULT hr; - if (!(device = create_device(D3D10_FEATURE_LEVEL_10_1))) + if (!(device = create_device(NULL))) { skip("Failed to create device.\n"); return; @@ -624,10 +643,86 @@ static void test_create_blend_state(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_getdc(void) +{ + struct device_desc device_desc; + D3D10_TEXTURE2D_DESC desc; + ID3D10Texture2D *texture; + IDXGISurface1 *surface1; + ID3D10Device1 *device; + ULONG refcount; + HRESULT hr; + HDC dc; + + device_desc.feature_level = D3D10_FEATURE_LEVEL_10_1; + device_desc.flags = D3D10_CREATE_DEVICE_BGRA_SUPPORT; + if (!(device = create_device(&device_desc))) + { + skip("Failed to create device.\n"); + return; + } + + /* Without D3D10_RESOURCE_MISC_GDI_COMPATIBLE. */ + desc.Width = 512; + desc.Height = 512; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.Usage = D3D10_USAGE_DEFAULT; + desc.BindFlags = D3D10_BIND_RENDER_TARGET; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + hr = ID3D10Device1_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D10Texture2D_QueryInterface(texture, &IID_IDXGISurface1, (void**)&surface1); + ok(SUCCEEDED(hr), "Failed to get IDXGISurface1 interface, hr %#x.\n", hr); + + hr = IDXGISurface1_GetDC(surface1, FALSE, &dc); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + IDXGISurface1_Release(surface1); + ID3D10Texture2D_Release(texture); + + desc.MiscFlags = D3D10_RESOURCE_MISC_GDI_COMPATIBLE; + hr = ID3D10Device1_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D10Texture2D_QueryInterface(texture, &IID_IDXGISurface1, (void**)&surface1); + ok(SUCCEEDED(hr), "Failed to get IDXGISurface1 interface, hr %#x.\n", hr); + + hr = IDXGISurface1_ReleaseDC(surface1, NULL); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + hr = IDXGISurface1_GetDC(surface1, FALSE, &dc); + todo_wine ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); + + /* One more time. */ + dc = (HDC)0xdeadbeef; + hr = IDXGISurface1_GetDC(surface1, FALSE, &dc); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(dc == (HDC)0xdeadbeef, "Got unexpected dc %p.\n", dc); + + hr = IDXGISurface1_ReleaseDC(surface1, NULL); + todo_wine ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr); + + hr = IDXGISurface1_ReleaseDC(surface1, NULL); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + IDXGISurface1_Release(surface1); + ID3D10Texture2D_Release(texture); + + refcount = ID3D10Device1_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d10_1) { test_create_device(); test_device_interfaces(); test_create_shader_resource_view(); test_create_blend_state(); + test_getdc(); }

1 0