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

Aaryaman Vasishta : d3drm/tests: Replace test_Texture.
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: c64ce8cdbb673a8424898173a94ff1f5e9147ea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c64ce8cdbb673a8424898173a… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Apr 25 22:17:39 2016 +0530 d3drm/tests: Replace test_Texture. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 155 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 141 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c64ce8cdbb673a8424898…

1 0

Aaryaman Vasishta : d3drm/tests: Add tests for IDirect3DRMTexture{2-3}_InitFromImage.
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: 2fe8e29140fbec38a2c83b78b39e871e187e7ef5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fe8e29140fbec38a2c83b78b… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Apr 25 22:17:40 2016 +0530 d3drm/tests: Add tests for IDirect3DRMTexture{2-3}_InitFromImage. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 1c38ec8..583dbec 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1852,6 +1852,61 @@ static void test_Texture(void) ref4 = get_refcount((IUnknown *)d3drm3); ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4); + /* InitFromImage tests */ + d3drm_img = NULL; + hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2, (void **)&texture2); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %x).\n", hr); + ref2 = get_refcount((IUnknown *)texture2); + hr = IDirect3DRMTexture2_InitFromImage(texture2, NULL); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %x.\n", hr); + ref3 = get_refcount((IUnknown *)texture2); + ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3); + hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg); + todo_wine ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture2 from image (hr = %x).\n", hr); + ref2 = get_refcount((IUnknown *)d3drm1); + todo_wine ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3); + ref4 = get_refcount((IUnknown *)d3drm3); + ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4); + d3drm_img = IDirect3DRMTexture2_GetImage(texture2); + todo_wine ok(!!d3drm_img, "Failed to get image.\n"); + todo_wine ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); + IDirect3DRMTexture2_Release(texture2); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3); + ref4 = get_refcount((IUnknown *)d3drm3); + ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4); + + d3drm_img = NULL; + hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3, (void **)&texture3); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %x).\n", hr); + ref2 = get_refcount((IUnknown *)texture3); + hr = IDirect3DRMTexture3_InitFromImage(texture3, NULL); + todo_wine ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %x.\n", hr); + ref3 = get_refcount((IUnknown *)texture3); + ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3); + hr = IDirect3DRMTexture3_InitFromImage(texture3, &initimg); + todo_wine ok(SUCCEEDED(hr), "Cannot initialize IDirect3DRMTexture3 from image (hr = %x).\n", hr); + ref2 = get_refcount((IUnknown *)d3drm1); + todo_wine ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3); + ref4 = get_refcount((IUnknown *)d3drm3); + ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4); + d3drm_img = IDirect3DRMTexture3_GetImage(texture3); + todo_wine ok(!!d3drm_img, "Failed to get image.\n"); + todo_wine ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); + IDirect3DRMTexture3_Release(texture3); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", ref1, ref3); + ref4 = get_refcount((IUnknown *)d3drm3); + ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4); + IDirect3DRM3_Release(d3drm3); IDirect3DRM2_Release(d3drm2); IDirect3DRM_Release(d3drm1);

1 0

Sebastian Lackner : wined3d: Fix a typo in TRACE message.
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: ad887d6049b7194dae899e0d4696835e4d2ba601 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad887d6049b7194dae899e0d4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 25 22:47:19 2016 +0200 wined3d: Fix a typo in TRACE message. Spotted by Sergey Isakov. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4aa5fe1..43208b6f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1454,7 +1454,7 @@ static const struct gpu_description *query_gpu_description(const struct wined3d_ if (wined3d_settings.pci_device_id != PCI_DEVICE_NONE) { device = wined3d_settings.pci_device_id; - TRACE("Overriding device PCI ID with 0x%04x.\n", vendor); + TRACE("Overriding device PCI ID with 0x%04x.\n", device); } if (wined3d_settings.emulated_textureram)

1 0

Henri Verbeet : ddraw: Return early in d3d_device7_DrawPrimitiveVB() with a 0 vertex count.
by Alexandre Julliard 26 Apr '16

26 Apr '16

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

Aric Stewart : winex11.drv: Improve setting IME result text with no composition.
by Alexandre Julliard 25 Apr '16

25 Apr '16

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

Sebastian Lackner : server: Increase size of PID table and do not reuse recently freed ptids.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: 1025ed38c07102aa0bc4fb4e66b37ba35e5e9bd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1025ed38c07102aa0bc4fb4e6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Apr 21 12:34:00 2016 +0200 server: Increase size of PID table and do not reuse recently freed ptids. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server/process.c b/server/process.c index 11d2987..d2eab45 100644 --- a/server/process.c +++ b/server/process.c @@ -338,6 +338,7 @@ static unsigned int used_ptid_entries; /* number of entries in use */ static unsigned int alloc_ptid_entries; /* number of allocated entries */ static unsigned int next_free_ptid; /* next free entry */ static unsigned int last_free_ptid; /* last free entry */ +static unsigned int num_free_ptids; /* number of free ptids */ static void kill_all_processes(void); @@ -354,16 +355,17 @@ unsigned int alloc_ptid( void *ptr ) id = used_ptid_entries + PTID_OFFSET; entry = &ptid_entries[used_ptid_entries++]; } - else if (next_free_ptid) + else if (next_free_ptid && num_free_ptids >= 256) { id = next_free_ptid; entry = &ptid_entries[id - PTID_OFFSET]; if (!(next_free_ptid = entry->next)) last_free_ptid = 0; + num_free_ptids--; } else /* need to grow the array */ { unsigned int count = alloc_ptid_entries + (alloc_ptid_entries / 2); - if (!count) count = 64; + if (!count) count = 512; if (!(entry = realloc( ptid_entries, count * sizeof(*entry) ))) { set_error( STATUS_NO_MEMORY ); @@ -390,8 +392,8 @@ void free_ptid( unsigned int id ) /* append to end of free list so that we don't reuse it too early */ if (last_free_ptid) ptid_entries[last_free_ptid - PTID_OFFSET].next = id; else next_free_ptid = id; - last_free_ptid = id; + num_free_ptids++; } /* retrieve the pointer corresponding to a process or thread id */

1 0

Sebastian Lackner : server: Do not hold reference on parent process.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: bae3dcc2957683a4e2ca04a75ef10f91688300e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bae3dcc2957683a4e2ca04a75… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Apr 21 12:34:07 2016 +0200 server: Do not hold reference on parent process. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 2 +- server/console.c | 3 +-- server/process.c | 7 +++---- server/process.h | 2 +- server/snapshot.c | 2 +- server/thread.c | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 2708072..2631aa3 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1157,7 +1157,7 @@ static void test_Toolhelp(void) Sleep(100); } /* The following test fails randomly on some Windows versions, but Gothic 2 depends on it */ - todo_wine ok(i < 20 || broken(i == 20), "process object not released\n"); + ok(i < 20 || broken(i == 20), "process object not released\n"); snapshot = pCreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); ok(snapshot != INVALID_HANDLE_VALUE, "CreateToolhelp32Snapshot failed %u\n", GetLastError()); diff --git a/server/console.c b/server/console.c index 0d98b78..efb20da 100644 --- a/server/console.c +++ b/server/console.c @@ -1424,13 +1424,12 @@ DECL_HANDLER(alloc_console) case 0: /* renderer is current, console to be attached to parent process */ renderer = current; - if (!(process = current->process->parent)) + if (!(process = get_process_from_id( current->process->parent_id ))) { if (fd != -1) close( fd ); set_error( STATUS_ACCESS_DENIED ); return; } - grab_object( process ); attach = 1; break; case 0xffffffff: diff --git a/server/process.c b/server/process.c index d2eab45..52bd462 100644 --- a/server/process.c +++ b/server/process.c @@ -506,7 +506,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit close( fd ); goto error; } - process->parent = NULL; + process->parent_id = 0; process->debugger = NULL; process->handles = NULL; process->msg_fd = NULL; @@ -558,7 +558,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit else { struct process *parent = parent_thread->process; - process->parent = (struct process *)grab_object( parent ); + process->parent_id = parent->id; process->handles = inherit_all ? copy_handle_table( process, parent ) : alloc_handle_table( process, 0 ); /* Note: for security reasons, starting a new process does not attempt @@ -625,7 +625,6 @@ static void process_destroy( struct object *obj ) release_object( process->job ); } if (process->console) release_object( process->console ); - if (process->parent) release_object( process->parent ); if (process->msg_fd) release_object( process->msg_fd ); list_remove( &process->entry ); if (process->idle_event) release_object( process->idle_event ); @@ -1354,7 +1353,7 @@ DECL_HANDLER(get_process_info) if ((process = get_process_from_handle( req->handle, PROCESS_QUERY_LIMITED_INFORMATION ))) { reply->pid = get_process_id( process ); - reply->ppid = process->parent ? get_process_id( process->parent ) : 0; + reply->ppid = process->parent_id; reply->exit_code = process->exit_code; reply->priority = process->priority; reply->affinity = process->affinity; diff --git a/server/process.h b/server/process.h index fa7f60d..34b6ea6 100644 --- a/server/process.h +++ b/server/process.h @@ -56,7 +56,7 @@ struct process { struct object obj; /* object header */ struct list entry; /* entry in system-wide process list */ - struct process *parent; /* parent process */ + process_id_t parent_id; /* parent process id (at the time of creation) */ struct list thread_list; /* thread list */ struct thread *debugger; /* thread debugging this process */ struct handle_table *handles; /* handle entries */ diff --git a/server/snapshot.c b/server/snapshot.c index 3566b89..e35588a 100644 --- a/server/snapshot.c +++ b/server/snapshot.c @@ -115,7 +115,7 @@ static int snapshot_next_process( struct snapshot *snapshot, struct next_process ptr = &snapshot->processes[snapshot->process_pos++]; reply->count = ptr->count; reply->pid = get_process_id( ptr->process ); - reply->ppid = ptr->process->parent ? get_process_id( ptr->process->parent ) : 0; + reply->ppid = ptr->process->parent_id; reply->threads = ptr->threads; reply->priority = ptr->priority; reply->handles = ptr->handles; diff --git a/server/thread.c b/server/thread.c index ca02a8a..5f8405b 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1304,7 +1304,7 @@ DECL_HANDLER(init_thread) process->peb = req->entry; process->cpu = req->cpu; reply->info_size = init_process( current ); - if (!process->parent) + if (!process->parent_id) process->affinity = current->affinity = get_thread_affinity( current ); else set_thread_affinity( current, current->affinity );

1 0

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

25 Apr '16

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

Aaryaman Vasishta : d3drm: Use sizeof instead of strlen in d3drm_texture3_GetClassName.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: 93c2196189fb1a358aae91a8f712378075ce8b17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93c2196189fb1a358aae91a8f… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sun Apr 24 21:38:19 2016 +0530 d3drm: Use sizeof instead of strlen in d3drm_texture3_GetClassName. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index f81fc03..60374d3 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -796,7 +796,7 @@ static HRESULT WINAPI d3drm_texture3_GetClassName(IDirect3DRMTexture3 *iface, DW { TRACE("iface %p, size %p, name %p.\n", iface, size, name); - if (!size || *size < strlen("Texture") || !name) + if (!size || *size < sizeof("Texture") || !name) return E_INVALIDARG; strcpy(name, "Texture");

1 0

Aaryaman Vasishta : d3drm: Use ref and appdata from d3drm_object in d3drm_texture.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: e5e499d399e405f533c1a322e3f9dc47a2864682 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e499d399e405f533c1a322e… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sun Apr 24 21:38:20 2016 +0530 d3drm: Use ref and appdata from d3drm_object in d3drm_texture. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 2 -- dlls/d3drm/texture.c | 9 ++++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 3dae0bb..2eb8e4d 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -40,8 +40,6 @@ struct d3drm_texture IDirect3DRMTexture IDirect3DRMTexture_iface; IDirect3DRMTexture2 IDirect3DRMTexture2_iface; IDirect3DRMTexture3 IDirect3DRMTexture3_iface; - LONG ref; - DWORD app_data; }; void d3drm_object_init(struct d3drm_object *object) DECLSPEC_HIDDEN; diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 60374d3..886bb0b 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -707,7 +707,7 @@ static HRESULT WINAPI d3drm_texture3_QueryInterface(IDirect3DRMTexture3 *iface, static ULONG WINAPI d3drm_texture3_AddRef(IDirect3DRMTexture3 *iface) { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); - ULONG refcount = InterlockedIncrement(&texture->ref); + ULONG refcount = InterlockedIncrement(&texture->obj.ref); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -717,7 +717,7 @@ static ULONG WINAPI d3drm_texture3_AddRef(IDirect3DRMTexture3 *iface) static ULONG WINAPI d3drm_texture3_Release(IDirect3DRMTexture3 *iface) { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); - ULONG refcount = InterlockedDecrement(&texture->ref); + ULONG refcount = InterlockedDecrement(&texture->obj.ref); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -764,7 +764,7 @@ static HRESULT WINAPI d3drm_texture3_SetAppData(IDirect3DRMTexture3 *iface, DWOR TRACE("iface %p, data %#x.\n", iface, data); - texture->app_data = data; + texture->obj.appdata = data; return D3DRM_OK; } @@ -775,7 +775,7 @@ static DWORD WINAPI d3drm_texture3_GetAppData(IDirect3DRMTexture3 *iface) TRACE("iface %p.\n", iface); - return texture->app_data; + return texture->obj.appdata; } static HRESULT WINAPI d3drm_texture3_SetName(IDirect3DRMTexture3 *iface, const char *name) @@ -1056,7 +1056,6 @@ HRESULT d3drm_texture_create(struct d3drm_texture **texture) object->IDirect3DRMTexture_iface.lpVtbl = &d3drm_texture1_vtbl; object->IDirect3DRMTexture2_iface.lpVtbl = &d3drm_texture2_vtbl; object->IDirect3DRMTexture3_iface.lpVtbl = &d3drm_texture3_vtbl; - object->ref = 1; d3drm_object_init(&object->obj);

1 0