May 2013 - Wine-commits - list.winehq.org

Daniel Lehman : wininet: Copy should_bypass_proxy and domain_matches from winhttp.
by Alexandre Julliard 08 May '13

08 May '13

Module: wine Branch: master Commit: cbeb11b5f83a47e57be851d5e9d1df5a82933023 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbeb11b5f83a47e57be851d5e… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon May 6 11:16:28 2013 -0700 wininet: Copy should_bypass_proxy and domain_matches from winhttp. --- dlls/wininet/http.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 83 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 188259d..7d5175e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1698,6 +1698,88 @@ static WCHAR *build_proxy_path_url(http_request_t *req) return url; } +static BOOL HTTP_DomainMatches(LPCWSTR server, LPCWSTR domain) +{ + static const WCHAR localW[] = { '<','l','o','c','a','l','>',0 }; + BOOL ret = FALSE; + + if (!strcmpiW( domain, localW ) && !strchrW( server, '.' )) + ret = TRUE; + else if (*domain == '*') + { + if (domain[1] == '.') + { + LPCWSTR dot; + + /* For a hostname to match a wildcard, the last domain must match + * the wildcard exactly. E.g. if the wildcard is *.a.b, and the + * hostname is www.foo.a.b, it matches, but a.b does not. + */ + dot = strchrW( server, '.' ); + if (dot) + { + int len = strlenW( dot + 1 ); + + if (len > strlenW( domain + 2 )) + { + LPCWSTR ptr; + + /* The server's domain is longer than the wildcard, so it + * could be a subdomain. Compare the last portion of the + * server's domain. + */ + ptr = dot + len + 1 - strlenW( domain + 2 ); + if (!strcmpiW( ptr, domain + 2 )) + { + /* This is only a match if the preceding character is + * a '.', i.e. that it is a matching domain. E.g. + * if domain is '*.b.c' and server is 'www.ab.c' they + * do not match. + */ + ret = *(ptr - 1) == '.'; + } + } + else + ret = !strcmpiW( dot + 1, domain + 2 ); + } + } + } + else + ret = !strcmpiW( server, domain ); + return ret; +} + +static BOOL HTTP_ShouldBypassProxy(appinfo_t *lpwai, LPCWSTR server) +{ + LPCWSTR ptr; + BOOL ret = FALSE; + + if (!lpwai->proxyBypass) return FALSE; + ptr = lpwai->proxyBypass; + do { + LPCWSTR tmp = ptr; + + ptr = strchrW( ptr, ';' ); + if (!ptr) + ptr = strchrW( tmp, ' ' ); + if (ptr) + { + if (ptr - tmp < INTERNET_MAX_HOST_NAME_LENGTH) + { + WCHAR domain[INTERNET_MAX_HOST_NAME_LENGTH]; + + memcpy( domain, tmp, (ptr - tmp) * sizeof(WCHAR) ); + domain[ptr - tmp] = 0; + ret = HTTP_DomainMatches( server, domain ); + } + ptr += 1; + } + else if (*tmp) + ret = HTTP_DomainMatches( server, tmp ); + } while (ptr && !ret); + return ret; +} + /*********************************************************************** * HTTP_DealWithProxy */ @@ -3247,7 +3329,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, if (session->hostPort == INTERNET_INVALID_PORT_NUMBER) session->hostPort = INTERNET_DEFAULT_HTTP_PORT; - if (hIC->proxy && hIC->proxy[0]) + if (hIC->proxy && hIC->proxy[0] && !HTTP_ShouldBypassProxy(hIC, session->hostName)) HTTP_DealWithProxy( hIC, session, request ); INTERNET_SendCallback(&session->hdr, dwContext,

1 0

Daniel Lehman : wininet: Remove old FIXME about bypassing proxy.
by Alexandre Julliard 08 May '13

08 May '13

Module: wine Branch: master Commit: d853009ef835b00dbc927d0d05402b6f67b79072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d853009ef835b00dbc927d0d0… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon May 6 11:17:32 2013 -0700 wininet: Remove old FIXME about bypassing proxy. --- dlls/wininet/http.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 7d5175e..a0e4973 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -5753,10 +5753,6 @@ DWORD HTTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, session->appInfo = hIC; list_add_head( &hIC->hdr.children, &session->hdr.entry ); - if(hIC->proxy && hIC->accessType == INTERNET_OPEN_TYPE_PROXY) { - if(hIC->proxyBypass) - FIXME("Proxy bypass is ignored.\n"); - } session->hostName = heap_strdupW(lpszServerName); if (lpszUserName && lpszUserName[0]) session->userName = heap_strdupW(lpszUserName);

1 0

Daniel Lehman : wininet: Free local proxyinfo in INTERNET_ConfigureProxy.
by Alexandre Julliard 08 May '13

08 May '13

Module: wine Branch: master Commit: 2d89a140b2adf78dcec6db980265566121d9e791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d89a140b2adf78dcec6db980… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon May 6 14:53:34 2013 -0700 wininet: Free local proxyinfo in INTERNET_ConfigureProxy. --- dlls/wininet/internet.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 12e4096..856eb73 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -663,7 +663,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) */ static BOOL INTERNET_ConfigureProxy( appinfo_t *lpwai ) { - proxyinfo_t wpi; + proxyinfo_t wpi = {0}; if (INTERNET_LoadProxySettings( &wpi )) return FALSE; @@ -705,6 +705,7 @@ static BOOL INTERNET_ConfigureProxy( appinfo_t *lpwai ) } TRACE("http proxy = %s bypass = %s\n", debugstr_w(lpwai->proxy), debugstr_w(lpwai->proxyBypass)); + FreeProxyInfo(&wpi); return TRUE; } else @@ -715,6 +716,7 @@ static BOOL INTERNET_ConfigureProxy( appinfo_t *lpwai ) } lpwai->accessType = INTERNET_OPEN_TYPE_DIRECT; + FreeProxyInfo(&wpi); return FALSE; }

1 0

Jacek Caban : winegcc: Use gcc -shared instead of dllwrap to build DLLs.
by Alexandre Julliard 08 May '13

08 May '13

Module: wine Branch: master Commit: c3b64d94b50744d0c17a57fa14873aaa7d4ba134 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3b64d94b50744d0c17a57fa1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 8 17:33:10 2013 +0200 winegcc: Use gcc -shared instead of dllwrap to build DLLs. --- tools/winegcc/winegcc.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 4b0d3e8..65f066c 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -798,6 +798,8 @@ static void build(struct options* opts) if (opts->win16_app) error( "Building 16-bit code is not supported for Windows\n" ); + strarray_addall(link_args, get_translator(opts)); + if (opts->shared) { /* run winebuild to generate the .def file */ @@ -814,16 +816,13 @@ static void build(struct options* opts) spawn(opts->prefix, spec_args, 0); strarray_free(spec_args); - if (opts->target) strarray_add(link_args, strmake("%s-dllwrap", opts->target)); - else strarray_add(link_args, "dllwrap"); + strarray_add(link_args, "-shared"); if (verbose) strarray_add(link_args, "-v"); - strarray_add(link_args, "-k"); - strarray_add(link_args, "--def"); + strarray_add(link_args, "-Wl,--kill-at"); strarray_add(link_args, spec_def_name); } else { - strarray_addall(link_args, get_translator(opts)); strarray_add(link_args, opts->gui_app ? "-mwindows" : "-mconsole"); if (opts->nodefaultlibs) strarray_add(link_args, "-nodefaultlibs"); }

1 0

Daniel Lehman : wininet: Accept ProxyBypass from environment or registry.
by Alexandre Julliard 08 May '13

08 May '13

Module: wine Branch: master Commit: 73895b3279266cb0951b4059e48226d3b5f09619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73895b3279266cb0951b4059e… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri May 3 17:11:48 2013 -0700 wininet: Accept ProxyBypass from environment or registry. --- dlls/wininet/internet.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 42 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index dc0c89c..b9f3e98 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -116,6 +116,7 @@ static const WCHAR szInternetSettings[] = 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s',0 }; static const WCHAR szProxyServer[] = { 'P','r','o','x','y','S','e','r','v','e','r', 0 }; static const WCHAR szProxyEnable[] = { 'P','r','o','x','y','E','n','a','b','l','e', 0 }; +static const WCHAR szProxyOverride[] = { 'P','r','o','x','y','O','v','e','r','r','i','d','e', 0 }; void *alloc_object(object_header_t *parent, const object_vtbl_t *vtbl, size_t size) { @@ -610,9 +611,49 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwpi->proxy)); } - RegCloseKey( key ); lpwpi->proxyBypass = NULL; + if (lpwpi->proxyEnabled) + { + if (!(envproxy = getenv( "no_proxy" ))) + { + /* figure out how much memory the proxy setting takes */ + if (!RegQueryValueExW( key, szProxyOverride, NULL, &type, NULL, &len ) && len && (type == REG_SZ)) + { + LPWSTR szProxy; + + if (!(szProxy = heap_alloc(len))) + { + RegCloseKey( key ); + return ERROR_OUTOFMEMORY; + } + RegQueryValueExW( key, szProxyOverride, NULL, &type, (BYTE*)szProxy, &len ); + + lpwpi->proxyBypass = szProxy; + + TRACE("http proxy bypass = %s\n", debugstr_w(lpwpi->proxyBypass)); + } + else + { + TRACE("No proxy bypass server settings in registry.\n"); + } + } + else if (envproxy) + { + WCHAR *envproxyW; + + len = MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, NULL, 0 ); + if (!(envproxyW = heap_alloc(len * sizeof(WCHAR)))) + return ERROR_OUTOFMEMORY; + MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, envproxyW, len ); + + lpwpi->proxyBypass = envproxyW; + + TRACE("http proxy bypass (from environment) = %s\n", debugstr_w(lpwpi->proxyBypass)); + } + } + + RegCloseKey( key ); return ERROR_SUCCESS; }

1 0

Daniel Lehman : wininet: Only accept proxy and proxy bypass if type is INTERNET_OPEN_TYPE_PROXY.
by Alexandre Julliard 08 May '13

08 May '13

Module: wine Branch: master Commit: d3308e6f09245e905d02de55f352855b561e3d0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3308e6f09245e905d02de55f… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon May 6 09:52:37 2013 -0700 wininet: Only accept proxy and proxy bypass if type is INTERNET_OPEN_TYPE_PROXY. --- dlls/wininet/internet.c | 10 ++++++++-- dlls/wininet/tests/http.c | 10 +++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index b9f3e98..f8c36f7 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1015,6 +1015,11 @@ HINTERNET WINAPI InternetOpenW(LPCWSTR lpszAgent, DWORD dwAccessType, /* Clear any error information */ INTERNET_SetLastError(0); + if((dwAccessType == INTERNET_OPEN_TYPE_PROXY) && !lpszProxy) { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + lpwai = alloc_object(NULL, &APPINFOVtbl, sizeof(appinfo_t)); if (!lpwai) { SetLastError(ERROR_OUTOFMEMORY); @@ -1031,9 +1036,10 @@ HINTERNET WINAPI InternetOpenW(LPCWSTR lpszAgent, DWORD dwAccessType, lpwai->agent = heap_strdupW(lpszAgent); if(dwAccessType == INTERNET_OPEN_TYPE_PRECONFIG) INTERNET_ConfigureProxy( lpwai ); - else + else if(dwAccessType == INTERNET_OPEN_TYPE_PROXY) { lpwai->proxy = heap_strdupW(lpszProxy); - lpwai->proxyBypass = heap_strdupW(lpszProxyBypass); + lpwai->proxyBypass = heap_strdupW(lpszProxyBypass); + } TRACE("returning %p\n", lpwai); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 264aee7..bc3505f 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2170,7 +2170,7 @@ out: static void test_proxy_direct(int port) { HINTERNET hi, hc, hr; - DWORD r, sz; + DWORD r, sz, error; char buffer[0x40], *url; WCHAR bufferW[0x40]; static CHAR username[] = "mike", @@ -2181,6 +2181,14 @@ static void test_proxy_direct(int port) passwordW[] = {'1','1','0','1',0}, useragentW[] = {'w','i','n','e','t','e','s','t',0}; + /* specify proxy type without the proxy and bypass */ + SetLastError(0xdeadbeef); + hi = InternetOpen(NULL, INTERNET_OPEN_TYPE_PROXY, NULL, NULL, 0); + error = GetLastError(); + ok(error == ERROR_INVALID_PARAMETER || + broken(error == ERROR_SUCCESS) /* WinXPProSP2 */, "got %u\n", error); + ok(hi == NULL || broken(!!hi) /* WinXPProSP2 */, "open should have failed\n"); + sprintf(buffer, "localhost:%d\n", port); hi = InternetOpen(NULL, INTERNET_OPEN_TYPE_PROXY, buffer, NULL, 0); ok(hi != NULL, "open failed\n");

1 0

Austin English : wined3d: Add NVidia GeForce GT 630.
by Alexandre Julliard 08 May '13

08 May '13

Module: wine Branch: master Commit: c012b1a13c67ce6759725b00e3f3aa764e1b2867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c012b1a13c67ce6759725b00e… Author: Austin English <austinenglish(a)gmail.com> Date: Tue May 7 12:17:06 2013 -0700 wined3d: Add NVidia GeForce GT 630. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3f3cf3a..3ef5eeb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1154,6 +1154,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX570, "NVIDIA GeForce GTX 570", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX580, "NVIDIA GeForce GTX 580", DRIVER_NVIDIA_GEFORCE6, 1536}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT610, "NVIDIA GeForce GT 610", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT630, "NVIDIA GeForce GT 630", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT630M, "NVIDIA GeForce GT 630M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT640M, "NVIDIA GeForce GT 640M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT650M, "NVIDIA GeForce GT 650M", DRIVER_NVIDIA_GEFORCE6, 2048}, @@ -1573,6 +1574,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GT 650M", CARD_NVIDIA_GEFORCE_GT650M}, /* Geforce 600 - midend mobile */ {"GT 640M", CARD_NVIDIA_GEFORCE_GT640M}, /* Geforce 600 - midend mobile */ {"GT 630M", CARD_NVIDIA_GEFORCE_GT630M}, /* Geforce 600 - midend mobile */ + {"GT 630", CARD_NVIDIA_GEFORCE_GT630}, /* Geforce 600 - lowend */ {"GT 610", CARD_NVIDIA_GEFORCE_GT610}, /* Geforce 600 - lowend */ {"GTX 580", CARD_NVIDIA_GEFORCE_GTX580}, /* Geforce 500 - highend */ {"GTX 570", CARD_NVIDIA_GEFORCE_GTX570}, /* Geforce 500 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9f68cf9..abf44c9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1447,6 +1447,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX570 = 0x1081, CARD_NVIDIA_GEFORCE_GTX580 = 0x1080, CARD_NVIDIA_GEFORCE_GT610 = 0x104a, + CARD_NVIDIA_GEFORCE_GT630 = 0x0f00, CARD_NVIDIA_GEFORCE_GT630M = 0x0de9, CARD_NVIDIA_GEFORCE_GT640M = 0x0fd2, CARD_NVIDIA_GEFORCE_GT650M = 0x0fd1,

1 0

Dmitry Timoshkov : kernel32: Add more remote process tests.
by Alexandre Julliard 08 May '13

08 May '13

Module: wine Branch: master Commit: c79a514fe5a9efbee620b531d3f1aa0ac75bfdab URL: http://source.winehq.org/git/wine.git/?a=commit;h=c79a514fe5a9efbee620b531d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 8 14:32:38 2013 +0900 kernel32: Add more remote process tests. --- dlls/kernel32/tests/loader.c | 38 +++++++++++++++++++++++++++++++++++++- 1 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 17e6cd8..e44b5df 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1675,7 +1675,7 @@ static void test_ExitProcess(void) #include "poppack.h" static const char filler[0x1000]; DWORD dummy, file_align; - HANDLE file, thread, hmap; + HANDLE file, thread, process, hmap, hmap_dup; char temp_path[MAX_PATH], dll_name[MAX_PATH], cmdline[MAX_PATH * 2]; DWORD ret, target_offset, old_prot; char **argv, buf[256]; @@ -1683,6 +1683,7 @@ static void test_ExitProcess(void) STARTUPINFO si = { sizeof(si) }; CONTEXT ctx; struct PROCESS_BASIC_INFORMATION_PRIVATE pbi; + MEMORY_BASIC_INFORMATION mbi; DWORD_PTR affinity; void *addr; LARGE_INTEGER offset; @@ -1906,6 +1907,10 @@ static void test_ExitProcess(void) ok(ret, "VirtualProtectEx error %d\n", GetLastError()); ok(old_prot == PAGE_READWRITE, "expected PAGE_READWRITE, got %#x\n", old_prot); SetLastError(0xdeadbeef); + size = VirtualQueryEx(pi.hProcess, NULL, &mbi, sizeof(mbi)); + ok(size == sizeof(mbi), "VirtualQueryEx error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); ret = ReadProcessMemory(pi.hProcess, addr, buf, 4, &size); ok(ret, "ReadProcessMemory error %d\n", GetLastError()); ok(size == 4, "expected 4, got %lu\n", size); @@ -1914,6 +1919,11 @@ static void test_ExitProcess(void) hmap = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, NULL); ok(hmap != 0, "CreateFileMapping error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = DuplicateHandle(GetCurrentProcess(), hmap, pi.hProcess, &hmap_dup, + 0, FALSE, DUPLICATE_SAME_ACCESS); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + offset.u.LowPart = 0; offset.u.HighPart = 0; addr = NULL; @@ -1959,6 +1969,11 @@ static void test_ExitProcess(void) ret = WaitForSingleObject(pi.hProcess, 1000); ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed: %x\n", ret); + SetLastError(0xdeadbeef); + process = OpenProcess(PROCESS_ALL_ACCESS, FALSE, pi.dwProcessId); + ok(process != NULL, "OpenProcess error %d\n", GetLastError()); + CloseHandle(process); + memset(&pbi, 0, sizeof(pbi)); ret = pNtQueryInformationProcess(pi.hProcess, ProcessBasicInformation, &pbi, sizeof(pbi), NULL); ok(!ret, "NtQueryInformationProcess error %#x\n", ret); @@ -2027,6 +2042,27 @@ static void test_ExitProcess(void) addr = VirtualAllocEx(pi.hProcess, NULL, 4096, MEM_COMMIT, PAGE_READWRITE); ok(!addr, "VirtualAllocEx should fail\n"); ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + size = VirtualQueryEx(pi.hProcess, NULL, &mbi, sizeof(mbi)); + ok(!size, "VirtualQueryEx should fail\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + + /* CloseHandle() call below leads to premature process termination + * under some Windows versions. + */ +if (0) +{ + SetLastError(0xdeadbeef); + ret = CloseHandle(hmap_dup); + ok(ret, "CloseHandle should not fail\n"); +} + + SetLastError(0xdeadbeef); + ret = DuplicateHandle(GetCurrentProcess(), hmap, pi.hProcess, &hmap_dup, + 0, FALSE, DUPLICATE_SAME_ACCESS); + ok(!ret, "DuplicateHandle should fail\n"); +todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); offset.u.LowPart = 0; offset.u.HighPart = 0;

1 0

Dmitry Timoshkov : server: Set error to STATUS_PROCESS_IS_TERMINATING if the process is terminating.
by Alexandre Julliard 08 May '13

08 May '13

Module: wine Branch: master Commit: bfe3b3bdb6759a4ea525aa4cba662954fd19efca URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe3b3bdb6759a4ea525aa4cb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 8 14:33:20 2013 +0900 server: Set error to STATUS_PROCESS_IS_TERMINATING if the process is terminating. --- server/ptrace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 9788339..ed72b7d 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -322,7 +322,7 @@ static struct thread *get_ptrace_thread( struct process *process ) { if (thread->unix_pid != -1) return thread; } - set_error( STATUS_ACCESS_DENIED ); /* process is dead */ + set_error( STATUS_PROCESS_IS_TERMINATING ); /* process is dead */ return NULL; }

1 0

Dmitry Timoshkov : server: A destroyed process handle table means that the process is terminating.
by Alexandre Julliard 08 May '13

08 May '13

Module: wine Branch: master Commit: 094e4657906f162a68a05db9c1502beae4526df2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=094e4657906f162a68a05db9c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 8 14:34:12 2013 +0900 server: A destroyed process handle table means that the process is terminating. --- dlls/kernel32/tests/loader.c | 2 -- server/handle.c | 2 +- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index e44b5df..31b91c6 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2061,7 +2061,6 @@ if (0) ret = DuplicateHandle(GetCurrentProcess(), hmap, pi.hProcess, &hmap_dup, 0, FALSE, DUPLICATE_SAME_ACCESS); ok(!ret, "DuplicateHandle should fail\n"); -todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); offset.u.LowPart = 0; @@ -2070,7 +2069,6 @@ todo_wine size = 0; ret = pNtMapViewOfSection(hmap, pi.hProcess, &addr, 0, 0, &offset, &size, 1 /* ViewShare */, 0, PAGE_READONLY); -todo_wine ok(ret == STATUS_PROCESS_IS_TERMINATING, "expected STATUS_PROCESS_IS_TERMINATING, got %#x\n", ret); SetLastError(0xdeadbeef); diff --git a/server/handle.c b/server/handle.c index 0fd155a..1d8087b 100644 --- a/server/handle.c +++ b/server/handle.c @@ -244,7 +244,7 @@ obj_handle_t alloc_handle_no_access_check( struct process *process, void *ptr, u if (attr & OBJ_INHERIT) access |= RESERVED_INHERIT; if (!process->handles) { - set_error( STATUS_NO_MEMORY ); + set_error( STATUS_PROCESS_IS_TERMINATING ); return 0; } return alloc_entry( process->handles, obj, access );

1 0