September 2016 - Wine-Commits

Sebastian Lackner : services: Load kernel drivers with same load order group into a single process.
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

Module: wine Branch: master Commit: b79891a2ed8888a74967b0a167166ec35f577f3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b79891a2ed8888a74967b0a16… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 1 07:39:34 2016 +0200 services: Load kernel drivers with same load order group into a single process. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/programs/services/services.c b/programs/services/services.c index 8df75cb..a12215e 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -737,6 +737,31 @@ static DWORD get_winedevice_binary_path(WCHAR **path, BOOL *is_wow64) return ERROR_SUCCESS; } +static struct process_entry *get_winedevice_process(struct service_entry *service_entry, WCHAR *path, BOOL is_wow64) +{ + struct service_entry *winedevice_entry; + + if (!service_entry->config.lpLoadOrderGroup) + return NULL; + + LIST_FOR_EACH_ENTRY(winedevice_entry, &service_entry->db->services, struct service_entry, entry) + { + if (winedevice_entry->status.dwCurrentState != SERVICE_START_PENDING && + winedevice_entry->status.dwCurrentState != SERVICE_RUNNING) continue; + if (!winedevice_entry->process) continue; + + if (winedevice_entry->is_wow64 != is_wow64) continue; + if (strcmpW(winedevice_entry->config.lpBinaryPathName, path)) continue; + + if (!winedevice_entry->config.lpLoadOrderGroup) continue; + if (strcmpW(winedevice_entry->config.lpLoadOrderGroup, service_entry->config.lpLoadOrderGroup)) continue; + + return grab_process(winedevice_entry->process); + } + + return NULL; +} + static DWORD add_winedevice_service(const struct service_entry *service, WCHAR *path, BOOL is_wow64, struct service_entry **entry) { @@ -829,6 +854,12 @@ static DWORD service_start_process(struct service_entry *service_entry, struct p return err; } + if ((process = get_winedevice_process(service_entry, path, is_wow64))) + { + HeapFree(GetProcessHeap(), 0, path); + goto found; + } + err = add_winedevice_service(service_entry, path, is_wow64, &winedevice_entry); HeapFree(GetProcessHeap(), 0, path); if (err != ERROR_SUCCESS) @@ -858,6 +889,7 @@ static DWORD service_start_process(struct service_entry *service_entry, struct p return ERROR_SERVICE_REQUEST_TIMEOUT; } +found: service_entry->status.dwCurrentState = SERVICE_START_PENDING; service_entry->status.dwControlsAccepted = 0; ResetEvent(service_entry->status_changed_event);

1 0

Sebastian Lackner : services: Add a separate winedevice service for each kernel driver.
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

Module: wine Branch: master Commit: f628cbbaa1b22115c0f9377c1bf1c4889a0acdc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f628cbbaa1b22115c0f9377c1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 1 07:39:29 2016 +0200 services: Add a separate winedevice service for each kernel driver. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/svcctl.idl | 1 + programs/services/rpc.c | 58 +++++++++++- programs/services/services.c | 205 +++++++++++++++++++++++++++++++++---------- programs/services/services.h | 5 +- programs/winedevice/device.c | 67 ++++++++++---- 5 files changed, 266 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f628cbbaa1b22115c0f93…

1 0

Sebastian Lackner : services: Do not create environment block before first service startup.
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

Module: wine Branch: master Commit: b783f207fedc968d78900cfe9703d436ec5141df URL: http://source.winehq.org/git/wine.git/?a=commit;h=b783f207fedc968d78900cfe9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 1 07:39:21 2016 +0200 services: Do not create environment block before first service startup. This basically reverts ce07a77610dec0f273912425dc68fc646a7f3624. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 26 ++++++++++++-------------- programs/services/tests/service.c | 5 +++++ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index e7610bd..04f440f 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -41,7 +41,7 @@ struct scmdatabase *active_database; DWORD service_pipe_timeout = 10000; DWORD service_kill_timeout = 60000; static DWORD default_preshutdown_timeout = 180000; -static void *env = NULL; +static void *environment = NULL; static HKEY service_current_key = NULL; static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); @@ -748,6 +748,7 @@ static DWORD service_start_process(struct service_entry *service_entry, struct p struct process_entry *process; PROCESS_INFORMATION pi; STARTUPINFOW si; + HANDLE token; LPWSTR path = NULL; DWORD err; BOOL r; @@ -791,6 +792,12 @@ static DWORD service_start_process(struct service_entry *service_entry, struct p si.lpDesktop = desktopW; } + if (!environment && OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY | TOKEN_DUPLICATE, &token)) + { + CreateEnvironmentBlock(&environment, token, FALSE); + CloseHandle(token); + } + service_entry->status.dwCurrentState = SERVICE_START_PENDING; service_entry->status.dwControlsAccepted = 0; ResetEvent(service_entry->status_changed_event); @@ -801,7 +808,7 @@ static DWORD service_start_process(struct service_entry *service_entry, struct p service_unlock(service_entry); - r = CreateProcessW(NULL, path, NULL, NULL, FALSE, CREATE_UNICODE_ENVIRONMENT, env, NULL, &si, &pi); + r = CreateProcessW(NULL, path, NULL, NULL, FALSE, CREATE_UNICODE_ENVIRONMENT, environment, NULL, &si, &pi); HeapFree(GetProcessHeap(),0,path); if (!r) { @@ -975,20 +982,11 @@ int main(int argc, char *argv[]) 'C','o','n','t','r','o','l','\\', 'S','e','r','v','i','c','e','C','u','r','r','e','n','t',0}; static const WCHAR svcctl_started_event[] = SVCCTL_STARTED_EVENT; - HANDLE started_event, htok; + HANDLE started_event; DWORD err; started_event = CreateEventW(NULL, TRUE, FALSE, svcctl_started_event); - if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &htok)) - { - CreateEnvironmentBlock(&env, htok, FALSE); - CloseHandle(htok); - } - - if (!env) - WINE_ERR("failed to create services environment\n"); - err = RegCreateKeyExW(HKEY_LOCAL_MACHINE, service_current_key_str, 0, NULL, REG_OPTION_VOLATILE, KEY_SET_VALUE | KEY_QUERY_VALUE, NULL, &service_current_key, NULL); @@ -1010,8 +1008,8 @@ int main(int argc, char *argv[]) RPC_Stop(); } scmdatabase_destroy(active_database); - if (env) - DestroyEnvironmentBlock(env); + if (environment) + DestroyEnvironmentBlock(environment); WINE_TRACE("services.exe exited with code %d\n", err); return err; diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index 66b273c..70f3262 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -96,6 +96,7 @@ static DWORD WINAPI service_handler(DWORD ctrl, DWORD event_type, void *event_da static void WINAPI service_main(DWORD argc, char **argv) { SERVICE_STATUS status; + char buf[64]; BOOL res; service_ok(argc == 3, "argc = %u, expected 3\n", argc); @@ -103,6 +104,10 @@ static void WINAPI service_main(DWORD argc, char **argv) service_ok(!strcmp(argv[1], "param1"), "argv[1] = '%s', expected 'param1'\n", argv[1]); service_ok(!strcmp(argv[2], "param2"), "argv[2] = '%s', expected 'param2'\n", argv[2]); + buf[0] = 0; + GetEnvironmentVariableA("PATHEXT", buf, sizeof(buf)); + service_ok(buf[0], "did not find PATHEXT environment variable\n"); + service_handle = pRegisterServiceCtrlHandlerExA(service_name, service_handler, NULL); service_ok(service_handle != NULL, "RegisterServiceCtrlHandlerEx failed: %u\n", GetLastError()); if(!service_handle)

1 0

Nikolay Sivov : netcfgx: Return pointer to interface.
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

Module: wine Branch: master Commit: 271f8a7072d64c0b6d00aca824e5bca802b62aa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=271f8a7072d64c0b6d00aca82… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 1 03:16:34 2016 +0300 netcfgx: Return pointer to interface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netcfgx/netcfg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/netcfgx/netcfg.c b/dlls/netcfgx/netcfg.c index 43db0ef..90bfe75 100644 --- a/dlls/netcfgx/netcfg.c +++ b/dlls/netcfgx/netcfg.c @@ -233,7 +233,7 @@ HRESULT INetCfg_CreateInstance(IUnknown **ppUnk) This->INetCfgLock_iface.lpVtbl = &NetCfgLockVtbl; This->ref = 1; - *ppUnk = (IUnknown*)This; + *ppUnk = (IUnknown*)&This->INetCfg_iface; return S_OK; }

1 0

Sebastian Lackner : webservices: Fix handling of duplicate headers in WsAddCustomHeader.
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

Module: wine Branch: master Commit: 5f51b603fca1299675b4c76e843eb305a1f6744b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f51b603fca1299675b4c76e8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 31 21:23:51 2016 +0200 webservices: Fix handling of duplicate headers in WsAddCustomHeader. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 25 ++----------------------- dlls/webservices/tests/msg.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 4a47fd3..01b6625 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -1022,9 +1022,7 @@ HRESULT WINAPI WsAddCustomHeader( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTI { struct msg *msg = (struct msg *)handle; struct header *header; - BOOL found = FALSE; HRESULT hr; - ULONG i; TRACE( "%p %p %08x %p %u %08x %p\n", handle, desc, option, value, size, attrs, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -1032,30 +1030,11 @@ HRESULT WINAPI WsAddCustomHeader( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTI if (!handle || !desc) return E_INVALIDARG; if (msg->state < WS_MESSAGE_STATE_INITIALIZED) return WS_E_INVALID_OPERATION; - for (i = 0; i < msg->header_count; i++) - { - if (msg->header[i]->type || msg->header[i]->mapped) continue; - if (WsXmlStringEquals( desc->elementLocalName, &msg->header[i]->name, NULL ) && - WsXmlStringEquals( desc->elementNs, &msg->header[i]->ns, NULL ) == S_OK) - { - found = TRUE; - break; - } - } - - if (!found) - { - if ((hr = grow_header_array( msg, msg->header_count + 1 )) != S_OK) return hr; - i = msg->header_count; - } - + if ((hr = grow_header_array( msg, msg->header_count + 1 )) != S_OK) return hr; if ((hr = build_custom_header( msg->heap, desc->elementLocalName, desc->elementNs, desc->type, desc->typeDescription, option, value, size, &header )) != S_OK) return hr; - if (!found) msg->header_count++; - else free_header( msg->header[i] ); - - msg->header[i] = header; + msg->header[msg->header_count++] = header; return write_envelope( msg ); } diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index 0a8456a..b78c52e 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -749,8 +749,22 @@ static void test_WsAddCustomHeader(void) "xmlns:s=\"http://www.w3.org/2003/05/soap-envelope\"><s:Header>" "<a:MessageID>urn:uuid:00000000-0000-0000-0000-000000000000</a:MessageID>" "</s:Header><s:Body/></s:Envelope>"; + static const char expected3[] = + "<s:Envelope xmlns:a=\"http://www.w3.org/2005/08/addressing\" " + "xmlns:s=\"http://www.w3.org/2003/05/soap-envelope\"><s:Header>" + "<a:MessageID>urn:uuid:00000000-0000-0000-0000-000000000000</a:MessageID>" + "<header xmlns=\"ns\">value</header><header xmlns=\"ns\">value2</header>" + "</s:Header><s:Body/></s:Envelope>"; + static const char expected4[] = + "<s:Envelope xmlns:a=\"http://www.w3.org/2005/08/addressing\" " + "xmlns:s=\"http://www.w3.org/2003/05/soap-envelope\"><s:Header>" + "<a:MessageID>urn:uuid:00000000-0000-0000-0000-000000000000</a:MessageID>" + "<header xmlns=\"ns\">value</header><header xmlns=\"ns\">value2</header>" + "<header2 xmlns=\"ns\">value2</header2></s:Header><s:Body/></s:Envelope>"; static WS_XML_STRING header = {6, (BYTE *)"header"}, ns = {2, (BYTE *)"ns"}; + static WS_XML_STRING header2 = {7, (BYTE *)"header2"}; static WCHAR valueW[] = {'v','a','l','u','e',0}; + static WCHAR value2W[] = {'v','a','l','u','e','2',0}; HRESULT hr; WS_MESSAGE *msg; WS_ELEMENT_DESCRIPTION desc; @@ -797,6 +811,16 @@ static void test_WsAddCustomHeader(void) ok( hr == S_OK, "got %08x\n", hr ); check_output_header( msg, expected, -1, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); + test.value = value2W; + hr = WsAddCustomHeader( msg, &desc, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected3, -1, strstr(expected3, "urn:uuid:") - expected3, 46, __LINE__ ); + + desc.elementLocalName = &header2; + hr = WsAddCustomHeader( msg, &desc, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected4, -1, strstr(expected4, "urn:uuid:") - expected4, 46, __LINE__ ); + hr = WsAddCustomHeader( msg, &desc, WS_WRITE_REQUIRED_VALUE, NULL, 0, 0, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr );

1 0

Henri Verbeet : ddraw: Use resource mapping functions in d3d_device7_DrawIndexedPrimitiveVB().
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

Module: wine Branch: master Commit: 612071c365941c4ea5c37e3fe175448c2f77eeb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=612071c365941c4ea5c37e3fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 11:57:42 2016 +0200 ddraw: Use resource mapping functions in d3d_device7_DrawIndexedPrimitiveVB(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 8cebe65..c7a516e 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4372,7 +4372,9 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, struct d3d_device *device = impl_from_IDirect3DDevice7(iface); struct d3d_vertex_buffer *vb_impl = unsafe_impl_from_IDirect3DVertexBuffer7(vb); DWORD stride = get_flexible_vertex_size(vb_impl->fvf); - WORD *index_data; + struct wined3d_map_desc wined3d_map_desc; + struct wined3d_box wined3d_box = {0}; + struct wined3d_resource *ib; HRESULT hr; UINT ib_pos; @@ -4412,16 +4414,18 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, * method could be created which takes an user pointer containing the * indices or a SetData-Method for the index buffer, which overrides the * index buffer data with our pointer. */ - hr = wined3d_buffer_map(device->index_buffer, ib_pos, index_count * sizeof(WORD), - (BYTE **)&index_data, ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + wined3d_box.left = ib_pos; + wined3d_box.right = ib_pos + index_count * sizeof(WORD); + ib = wined3d_buffer_get_resource(device->index_buffer); + if (FAILED(hr = wined3d_resource_map(ib, 0, &wined3d_map_desc, &wined3d_box, + ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) { ERR("Failed to map buffer, hr %#x.\n", hr); wined3d_mutex_unlock(); return hr; } - memcpy(index_data, indices, index_count * sizeof(WORD)); - wined3d_buffer_unmap(device->index_buffer); + memcpy(wined3d_map_desc.data, indices, index_count * sizeof(WORD)); + wined3d_resource_unmap(ib, 0); device->index_buffer_pos = ib_pos + index_count * sizeof(WORD); /* Set the index stream */

1 0

Sebastian Lackner : webservices: Fix handling of duplicate headers in WsRemoveCustomHeader.
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

Module: wine Branch: master Commit: 0238d470316a7ee60abe695fef089580464b4891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0238d470316a7ee60abe695fe… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 31 21:09:04 2016 +0200 webservices: Fix handling of duplicate headers in WsRemoveCustomHeader. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 2 +- dlls/webservices/tests/msg.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 01b6625..6fcd046 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -1062,7 +1062,7 @@ HRESULT WINAPI WsRemoveCustomHeader( WS_MESSAGE *handle, const WS_XML_STRING *na { remove_header( msg, i ); removed = TRUE; - break; + i--; } } diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index b78c52e..5d0901e 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -839,8 +839,15 @@ static void test_WsRemoveCustomHeader(void) "xmlns:s=\"http://www.w3.org/2003/05/soap-envelope\"><s:Header>" "<a:MessageID>urn:uuid:00000000-0000-0000-0000-000000000000</a:MessageID>" "</s:Header><s:Body/></s:Envelope>"; + static const char expected3[] = + "<s:Envelope xmlns:a=\"http://www.w3.org/2005/08/addressing\" " + "xmlns:s=\"http://www.w3.org/2003/05/soap-envelope\"><s:Header>" + "<a:MessageID>urn:uuid:00000000-0000-0000-0000-000000000000</a:MessageID>" + "<test xmlns=\"ns\">value</test><test xmlns=\"ns\">value2</test>" + "</s:Header><s:Body/></s:Envelope>"; static WS_XML_STRING localname = {4, (BYTE *)"test"}, ns = {2, (BYTE *)"ns"}; static const WS_XML_STRING value = {5, (BYTE *)"value"}; + static const WS_XML_STRING value2 = {6, (BYTE *)"value2"}; HRESULT hr; WS_MESSAGE *msg; WS_ELEMENT_DESCRIPTION desc; @@ -866,6 +873,10 @@ static void test_WsRemoveCustomHeader(void) ok( hr == S_OK, "got %08x\n", hr ); check_output_header( msg, expected, -1, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); + hr = WsAddCustomHeader( msg, &desc, WS_WRITE_REQUIRED_VALUE, &value2, sizeof(value2), 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected3, -1, strstr(expected3, "urn:uuid:") - expected3, 46, __LINE__ ); + hr = WsRemoveCustomHeader( msg, NULL, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr );

1 0

Nikolay Sivov : msimtf: Return interface pointers.
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

Module: wine Branch: master Commit: 9aadb9921f57b6f3cc15f12f63d3e66c3e731534 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aadb9921f57b6f3cc15f12f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 1 03:18:53 2016 +0300 msimtf: Return interface pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msimtf/activeimmapp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msimtf/activeimmapp.c b/dlls/msimtf/activeimmapp.c index 5749735..313cd8c 100644 --- a/dlls/msimtf/activeimmapp.c +++ b/dlls/msimtf/activeimmapp.c @@ -65,7 +65,7 @@ static HRESULT WINAPI ActiveIMMApp_QueryInterface (IActiveIMMApp* iface, if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IActiveIMMApp)) { - *ppvOut = This; + *ppvOut = &This->IActiveIMMApp_iface; } else if (IsEqualIID(iid, &IID_IActiveIMMMessagePumpOwner)) { @@ -906,6 +906,6 @@ DECLSPEC_HIDDEN HRESULT ActiveIMMApp_Constructor(IUnknown *pUnkOuter, IUnknown * This->refCount = 1; TRACE("returning %p\n",This); - *ppOut = (IUnknown *)This; + *ppOut = (IUnknown *)&This->IActiveIMMApp_iface; return S_OK; }

1 0

Henri Verbeet : d3d8: Use resource mapping functions in d3d8_device_DrawPrimitiveUP().
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

Module: wine Branch: master Commit: 0338e10a73dc2a2fa5cf259af885243b4241f0ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=0338e10a73dc2a2fa5cf259af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 11:57:43 2016 +0200 d3d8: Use resource mapping functions in d3d8_device_DrawPrimitiveUP(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 0e3b5cc..fc1d220 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2034,9 +2034,11 @@ static HRESULT WINAPI d3d8_device_DrawPrimitiveUP(IDirect3DDevice8 *iface, struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); HRESULT hr; UINT vtx_count = vertex_count_from_primitive_count(primitive_type, primitive_count); + struct wined3d_map_desc wined3d_map_desc; + struct wined3d_box wined3d_box = {0}; UINT size = vtx_count * stride; + struct wined3d_resource *vb; UINT vb_pos, align; - BYTE *buffer_data; TRACE("iface %p, primitive_type %#x, primitive_count %u, data %p, stride %u.\n", iface, primitive_type, primitive_count, data, stride); @@ -2060,12 +2062,14 @@ static HRESULT WINAPI d3d8_device_DrawPrimitiveUP(IDirect3DDevice8 *iface, else vb_pos += align; - hr = wined3d_buffer_map(device->vertex_buffer, vb_pos, size, &buffer_data, - vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + wined3d_box.left = vb_pos; + wined3d_box.right = vb_pos + size; + vb = wined3d_buffer_get_resource(device->vertex_buffer); + if (FAILED(wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, + vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) goto done; - memcpy(buffer_data, data, size); - wined3d_buffer_unmap(device->vertex_buffer); + memcpy(wined3d_map_desc.data, data, size); + wined3d_resource_unmap(vb, 0); device->vertex_buffer_pos = vb_pos + size; hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, stride);

1 0

Nikolay Sivov : amstream: Remove some casts.
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

Module: wine Branch: master Commit: e5f01e5107c6d826b37d8151dfc6c15d7da374fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f01e5107c6d826b37d8151d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 1 03:06:48 2016 +0300 amstream: Remove some casts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/amstream.c | 2 +- dlls/amstream/mediastreamfilter.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 1f8428b..463cba6 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -67,7 +67,7 @@ HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) object->IAMMultiMediaStream_iface.lpVtbl = &AM_Vtbl; object->ref = 1; - *ppObj = object; + *ppObj = &object->IAMMultiMediaStream_iface; return S_OK; } diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index d0c6714..3eeafd3 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -360,7 +360,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* i if (!pins) return E_OUTOFMEMORY; This->pins = pins; - info.pFilter = (IBaseFilter*)&This->filter; + info.pFilter = &This->filter.IBaseFilter_iface; info.dir = PINDIR_INPUT; hr = IAMMediaStream_GetInformation(pAMMediaStream, &purpose_id, NULL); if (FAILED(hr)) @@ -374,11 +374,11 @@ static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* i return hr; pin = (MediaStreamFilter_InputPin*)This->pins[This->nb_streams]; - pin->pin.pin.pinInfo.pFilter = (LPVOID)This; + pin->pin.pin.pinInfo.pFilter = &This->filter.IBaseFilter_iface; This->streams[This->nb_streams] = (IMediaStream*)pAMMediaStream; This->nb_streams++; - IMediaStream_AddRef((IMediaStream*)pAMMediaStream); + IAMMediaStream_AddRef(pAMMediaStream); return S_OK; } @@ -522,7 +522,7 @@ HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, void **ppObj) BaseFilter_Init(&object->filter, (IBaseFilterVtbl*)&MediaStreamFilter_Vtbl, &CLSID_MediaStreamFilter, (DWORD_PTR)(__FILE__ ": MediaStreamFilterImpl.csFilter"), &BaseFuncTable); - *ppObj = object; + *ppObj = &object->filter.IBaseFilter_iface; return S_OK; }

1 0