September 2016 - Wine-commits

Sebastian Lackner : services: Do not create environment block before first service startup.
by Alexandre Julliard 01 Sep '16

01 Sep '16

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

Sebastian Lackner : services: Add a separate winedevice service for each kernel driver.
by Alexandre Julliard 01 Sep '16

01 Sep '16

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: Load kernel drivers with same load order group into a single process.
by Alexandre Julliard 01 Sep '16

01 Sep '16

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 : webservices: Fix handling of duplicate headers in WsAddCustomHeader.
by Alexandre Julliard 01 Sep '16

01 Sep '16

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

Sebastian Lackner : webservices: Fix handling of duplicate headers in WsRemoveCustomHeader.
by Alexandre Julliard 01 Sep '16

01 Sep '16

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

Sebastian Lackner : webservices: Fix invalid memory access in remove_header.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: 4358f7c39ecc013855a9bd0b3d062a7b1016f16b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4358f7c39ecc013855a9bd0b3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 31 21:09:25 2016 +0200 webservices: Fix invalid memory access in remove_header. 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 6fcd046..e7da06f 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -787,7 +787,7 @@ HRESULT WINAPI WsSetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val static void remove_header( struct msg *msg, ULONG i ) { free_header( msg->header[i] ); - memmove( &msg->header[i], &msg->header[i + 1], (msg->header_count - i) * sizeof(struct header *) ); + memmove( &msg->header[i], &msg->header[i + 1], (msg->header_count - i - 1) * sizeof(struct header *) ); msg->header_count--; }

1 0

Andrew Eikum : winhttp: Indicate that WinHttpCrackUrl should return string pointers.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: 668d4299b02926f1b7073ef019ec9cc0990e1f69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=668d4299b02926f1b7073ef01… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 31 14:21:00 2016 -0500 winhttp: Indicate that WinHttpCrackUrl should return string pointers. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 30909ff..90e7946 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1750,6 +1750,8 @@ static char *download_script( const WCHAR *url, DWORD *out_size ) memset( &uc, 0, sizeof(uc) ); uc.dwStructSize = sizeof(uc); + uc.dwHostNameLength = -1; + uc.dwUrlPathLength = -1; if (!WinHttpCrackUrl( url, 0, 0, &uc )) return NULL; if (!(hostname = heap_alloc( (uc.dwHostNameLength + 1) * sizeof(WCHAR) ))) return NULL; memcpy( hostname, uc.lpszHostName, uc.dwHostNameLength * sizeof(WCHAR) );

1 0

Andrew Eikum : winhttp: Also pass hostname to jsproxy.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: c8b166e3bf4e4a4fe865f7216340a35f5394cc96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8b166e3bf4e4a4fe865f7216… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 31 14:21:05 2016 -0500 winhttp: Also pass hostname to jsproxy. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 20 +++++++++++++++++--- dlls/winhttp/winhttp_private.h | 15 +++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 90e7946..600624c 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1813,6 +1813,7 @@ static BOOL run_script( char *script, DWORD size, const WCHAR *url, WINHTTP_PROX char *result, *urlA; DWORD len_result; struct AUTO_PROXY_SCRIPT_BUFFER buffer; + URL_COMPONENTSW uc; buffer.dwStructSize = sizeof(buffer); buffer.lpszScriptBuffer = script; @@ -1824,10 +1825,23 @@ static BOOL run_script( char *script, DWORD size, const WCHAR *url, WINHTTP_PROX heap_free( urlA ); return FALSE; } - if ((ret = InternetGetProxyInfo( urlA, strlen(urlA), NULL, 0, &result, &len_result ))) + + memset( &uc, 0, sizeof(uc) ); + uc.dwStructSize = sizeof(uc); + uc.dwHostNameLength = -1; + + if (WinHttpCrackUrl( url, 0, 0, &uc )) { - ret = parse_script_result( result, info ); - heap_free( result ); + char *hostnameA = strdupWA_sized( uc.lpszHostName, uc.dwHostNameLength ); + + if ((ret = InternetGetProxyInfo( urlA, strlen(urlA), + hostnameA, strlen(hostnameA), &result, &len_result ))) + { + ret = parse_script_result( result, info ); + heap_free( result ); + } + + heap_free( hostnameA ); } heap_free( urlA ); return InternetDeInitializeAutoProxyDll( NULL, 0 ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index b3e28d2..388fc33 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -365,4 +365,19 @@ static inline char *strdupWA( const WCHAR *src ) return dst; } +static inline char *strdupWA_sized( const WCHAR *src, DWORD size ) +{ + char *dst = NULL; + if (src) + { + int len = WideCharToMultiByte( CP_ACP, 0, src, size, NULL, 0, NULL, NULL ) + 1; + if ((dst = heap_alloc( len ))) + { + WideCharToMultiByte( CP_ACP, 0, src, len, dst, size, NULL, NULL ); + dst[len - 1] = 0; + } + } + return dst; +} + #endif /* _WINE_WINHTTP_PRIVATE_H_ */

1 0

Stefan Dösinger : ddraw/tests: Move IDirect3DViewport ::TransformVertices tests to ddraw1.c.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: cbb2f34a79a6e89c54f99baad5f932caaceaccfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbb2f34a79a6e89c54f99baad… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Aug 31 22:01:23 2016 +0100 ddraw/tests: Move IDirect3DViewport::TransformVertices tests to ddraw1.c. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/d3d.c | 275 ---------------------------------- dlls/ddraw/tests/ddraw1.c | 365 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 365 insertions(+), 275 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cbb2f34a79a6e89c54f99…

1 0

Stefan Dösinger : ddraw: Copy extra vertex data in viewport::TransformVertices.
by Alexandre Julliard 01 Sep '16

01 Sep '16

Module: wine Branch: master Commit: 606441e57ef9f00a817949d344ea42132f28c8be URL: http://source.winehq.org/git/wine.git/?a=commit;h=606441e57ef9f00a817949d34… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Aug 31 22:01:24 2016 +0100 ddraw: Copy extra vertex data in viewport::TransformVertices. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/viewport.c | 46 ++++++++++++++++++++++++++-------------------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index cd2d791..84cd8b8 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -9210,7 +9210,7 @@ static void test_transform_vertices(void) ok(compare_vec4(&cmp[i], out[i].x, out[i].y, out[i].z, out[i].w, 4096), "Vertex %u differs. Got %f %f %f %f.\n", i, out[i].x, out[i].y, out[i].z, out[i].w); - todo_wine ok(out[i].v1 == position_tests[i].v1 && out[i].v2 == position_tests[i].v2 + ok(out[i].v1 == position_tests[i].v1 && out[i].v2 == position_tests[i].v2 && out[i].v3 == position_tests[i].v3 && out[i].v4 == position_tests[i].v4, "Vertex %u payload is %u %u %u %u.\n", i, out[i].v1, out[i].v2, out[i].v3, out[i].v4); ok(out[i].unused3 == 0xdeadbeef && out[i].unused4 == 0xcafecafe, diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 000158d..8a42faf 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -381,14 +381,22 @@ static HRESULT WINAPI d3d_viewport_SetViewport(IDirect3DViewport3 *iface, D3DVIE * DDERR_INVALIDPARAMS if no clipping flag is specified * *****************************************************************************/ +struct transform_vertices_vertex +{ + float x, y, z, w; /* w is unused in input data. */ + struct + { + DWORD p[4]; + } payload; +}; + static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, DWORD dwVertexCount, D3DTRANSFORMDATA *lpData, DWORD dwFlags, DWORD *lpOffScreen) { struct d3d_viewport *viewport = impl_from_IDirect3DViewport3(iface); D3DVIEWPORT vp = viewport->viewports.vp1; D3DMATRIX view_mat, world_mat, mat; - float *in; - float *out; + struct transform_vertices_vertex *in, *out; float x, y, z, w; unsigned int i; D3DHVERTEX *outH; @@ -420,15 +428,16 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, multiply_matrix(&mat, &view_mat, &world_mat); multiply_matrix(&mat, &viewport->active_device->legacy_projection, &mat); - in = lpData->lpIn; - out = lpData->lpOut; outH = lpData->lpHOut; for(i = 0; i < dwVertexCount; i++) { - x = (in[0] * mat._11) + (in[1] * mat._21) + (in[2] * mat._31) + mat._41; - y = (in[0] * mat._12) + (in[1] * mat._22) + (in[2] * mat._32) + mat._42; - z = (in[0] * mat._13) + (in[1] * mat._23) + (in[2] * mat._33) + mat._43; - w = (in[0] * mat._14) + (in[1] * mat._24) + (in[2] * mat._34) + mat._44; + in = (struct transform_vertices_vertex *)((char *)lpData->lpIn + lpData->dwInSize * i); + out = (struct transform_vertices_vertex *)((char *)lpData->lpOut + lpData->dwOutSize * i); + + x = (in->x * mat._11) + (in->y * mat._21) + (in->z * mat._31) + mat._41; + y = (in->x * mat._12) + (in->y * mat._22) + (in->z * mat._32) + mat._42; + z = (in->x * mat._13) + (in->y * mat._23) + (in->z * mat._33) + mat._43; + w = (in->x * mat._14) + (in->y * mat._24) + (in->z * mat._34) + mat._44; if(dwFlags & D3DTRANSFORM_CLIPPED) { @@ -458,12 +467,10 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, * The exact scheme hasn't been figured out yet, but windows * definitely writes something there. */ - out[0] = x; - out[1] = y; - out[2] = z; - out[3] = w; - in = (float *) ((char *) in + lpData->dwInSize); - out = (float *) ((char *) out + lpData->dwOutSize); + out->x = x; + out->y = y; + out->z = z; + out->w = w; continue; } } @@ -471,12 +478,11 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, w = 1 / w; x *= w; y *= w; z *= w; - out[0] = vp.dwWidth / 2 + vp.dwX + x * vp.dvScaleX; - out[1] = vp.dwHeight / 2 + vp.dwY - y * vp.dvScaleY; - out[2] = z; - out[3] = w; - in = (float *) ((char *) in + lpData->dwInSize); - out = (float *) ((char *) out + lpData->dwOutSize); + out->x = vp.dwWidth / 2 + vp.dwX + x * vp.dvScaleX; + out->y = vp.dwHeight / 2 + vp.dwY - y * vp.dvScaleY; + out->z = z; + out->w = w; + out->payload = in->payload; } /* According to the d3d test, the offscreen flag is set only

1 0