December 2014 - Wine-Commits

Hans Leidekker : wininet/tests: Add a test to show that the Content-Length header is not updated when a request is reused.
by Alexandre Julliard Dec. 19, 2014

Dec. 19, 2014

Module: wine Branch: master Commit: 3d9ba21d2f2dd9666eaca11cef706401789ac537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d9ba21d2f2dd9666eaca11ce… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 19 16:50:17 2014 +0100 wininet/tests: Add a test to show that the Content-Length header is not updated when a request is reused. --- dlls/wininet/tests/http.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 98c8d62..92a6b8d 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2290,6 +2290,28 @@ static DWORD CALLBACK server_thread(LPVOID param) else if (strstr(buffer, "Cache-Control: no-cache\r\n")) send(c, okmsg, sizeof(okmsg)-1, 0); else send(c, notokmsg, sizeof(notokmsg)-1, 0); } + if (strstr(buffer, "/test_request_content_length")) + { + static char msg[] = "HTTP/1.1 200 OK\r\nConnection: Keep-Alive\r\n\r\n"; + static int seen_content_length; + + if (!seen_content_length) + { + if (strstr(buffer, "Content-Length: 0")) + { + seen_content_length = 1; + send(c, msg, sizeof msg-1, 0); + } + else send(c, notokmsg, sizeof notokmsg-1, 0); + WaitForSingleObject(hCompleteEvent, 5000); + } + else + { + if (strstr(buffer, "Content-Length: 0")) send(c, msg, sizeof msg-1, 0); + else send(c, notokmsg, sizeof notokmsg-1, 0); + WaitForSingleObject(hCompleteEvent, 5000); + } + } if (strstr(buffer, "GET /test_premature_disconnect")) trace("closing connection\n"); @@ -4111,6 +4133,42 @@ static void test_cache_control_verb(int port) InternetCloseHandle(session); } +static void test_request_content_length(int port) +{ + char data[] = {'t','e','s','t'}; + HINTERNET ses, con, req; + BOOL ret; + + hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, "POST", "/test_request_content_length", NULL, NULL, NULL, + INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed %u\n", GetLastError()); + test_status_code(req, 200); + + SetEvent(hCompleteEvent); + + ret = HttpSendRequestA(req, NULL, 0, data, sizeof(data)); + ok(ret, "HttpSendRequest failed %u\n", GetLastError()); + test_status_code(req, 200); + + SetEvent(hCompleteEvent); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); + CloseHandle(hCompleteEvent); +} + static void test_http_connection(void) { struct server_info si; @@ -4156,6 +4214,7 @@ static void test_http_connection(void) test_cache_control_verb(si.port); test_successive_HttpSendRequest(si.port); test_head_request(si.port); + test_request_content_length(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Sergey Kalinichev : ntdll: Add stub for RtlSetHeapInformation.
by Alexandre Julliard Dec. 19, 2014

Dec. 19, 2014

Module: wine Branch: master Commit: 7eed378f5dc907e9733124727bcd03aacebbd3b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eed378f5dc907e9733124727… Author: Sergey Kalinichev <kalinichev.so.0(a)gmail.com> Date: Mon Dec 15 21:15:07 2014 +0400 ntdll: Add stub for RtlSetHeapInformation. --- dlls/kernel32/heap.c | 5 +++-- dlls/ntdll/heap.c | 9 +++++++++ dlls/ntdll/ntdll.spec | 2 +- include/winternl.h | 1 + 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 9037f8e..cac73ec 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -296,8 +296,9 @@ BOOL WINAPI HeapQueryInformation( HANDLE heap, HEAP_INFORMATION_CLASS info_class BOOL WINAPI HeapSetInformation( HANDLE heap, HEAP_INFORMATION_CLASS infoclass, PVOID info, SIZE_T size) { - FIXME("%p %d %p %ld\n", heap, infoclass, info, size ); - return TRUE; + NTSTATUS ret = RtlSetHeapInformation( heap, infoclass, info, size ); + if (ret) SetLastError( RtlNtStatusToDosError(ret) ); + return !ret; } /* diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 3bb7a11..4ef44cf 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -2252,3 +2252,12 @@ NTSTATUS WINAPI RtlQueryHeapInformation( HANDLE heap, HEAP_INFORMATION_CLASS inf return STATUS_INVALID_INFO_CLASS; } } + +/*********************************************************************** + * RtlSetHeapInformation (NTDLL.@) + */ +NTSTATUS WINAPI RtlSetHeapInformation( HANDLE heap, HEAP_INFORMATION_CLASS info_class, PVOID info, SIZE_T size) +{ + FIXME("%p %d %p %ld stub\n", heap, info_class, info, size); + return STATUS_SUCCESS; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 7e95969..51de6e7 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -847,7 +847,7 @@ @ stdcall RtlSetDaclSecurityDescriptor(ptr long ptr long) @ stdcall RtlSetEnvironmentVariable(ptr ptr ptr) @ stdcall RtlSetGroupSecurityDescriptor(ptr ptr long) -# @ stub RtlSetHeapInformation +@ stdcall RtlSetHeapInformation(long long ptr long) @ stub RtlSetInformationAcl @ stdcall RtlSetIoCompletionCallback(long ptr long) @ stdcall RtlSetLastWin32Error(long) diff --git a/include/winternl.h b/include/winternl.h index 5a27f94..1a694da 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2507,6 +2507,7 @@ NTSYSAPI NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING*); NTSYSAPI void WINAPI RtlSetCurrentEnvironment(PWSTR, PWSTR*); NTSYSAPI NTSTATUS WINAPI RtlSetDaclSecurityDescriptor(PSECURITY_DESCRIPTOR,BOOLEAN,PACL,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlSetEnvironmentVariable(PWSTR*,PUNICODE_STRING,PUNICODE_STRING); +NTSYSAPI NTSTATUS WINAPI RtlSetHeapInformation(HANDLE,HEAP_INFORMATION_CLASS,PVOID,SIZE_T); NTSYSAPI NTSTATUS WINAPI RtlSetOwnerSecurityDescriptor(PSECURITY_DESCRIPTOR,PSID,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlSetGroupSecurityDescriptor(PSECURITY_DESCRIPTOR,PSID,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlSetIoCompletionCallback(HANDLE,PRTL_OVERLAPPED_COMPLETION_ROUTINE,ULONG);

1 0

André Hentschel : Add WWN 382
by Jeremy Newman Dec. 19, 2014

Dec. 19, 2014

Module: website Branch: master Commit: 7fec317d00bf5d3ae17f804079e03b19aca4a15a URL: http://source.winehq.org/git/website.git/?a=commit;h=7fec317d00bf5d3ae17f80… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Dec 19 22:11:16 2014 +0100 Add WWN 382 --- news/de/2014121901.xml | 11 + news/en/2014121901.xml | 11 + wwn/en/wn20141219_382.xml | 620 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 642 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=7fec317d00bf5d3ae1…

1 0

Drew Ronneberg : winemenubuilder: Eliminate an unused variable.
by Alexandre Julliard Dec. 18, 2014

Dec. 18, 2014

Module: wine Branch: master Commit: cbc8f3c81148079a17f4062fb9bad6569107fb34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbc8f3c81148079a17f4062fb… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Wed Dec 17 21:05:11 2014 -0500 winemenubuilder: Eliminate an unused variable. --- programs/winemenubuilder/winemenubuilder.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index fae89f9..d902e93 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1012,7 +1012,6 @@ static HRESULT open_file_type_icon(LPCWSTR szFileName, IStream **ppStream) WCHAR *comma; WCHAR *executable = NULL; int index = 0; - char *output_path = NULL; HRESULT hr = HRESULT_FROM_WIN32(ERROR_NOT_FOUND); extension = strrchrW(szFileName, '.'); @@ -1040,7 +1039,6 @@ static HRESULT open_file_type_icon(LPCWSTR szFileName, IStream **ppStream) end: HeapFree(GetProcessHeap(), 0, icon); HeapFree(GetProcessHeap(), 0, executable); - HeapFree(GetProcessHeap(), 0, output_path); return hr; }

1 0

Hans Leidekker : mlang: Add a stub implementation of IMultiLanguage3:: DetectOutboundCodePageInIStream.
by Alexandre Julliard Dec. 18, 2014

Dec. 18, 2014

Module: wine Branch: master Commit: e11f91ed8d55373761fab8d29b08b61c23b26646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e11f91ed8d55373761fab8d29… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 18 16:33:03 2014 +0100 mlang: Add a stub implementation of IMultiLanguage3::DetectOutboundCodePageInIStream. --- dlls/mlang/mlang.c | 28 +++++-- dlls/mlang/tests/mlang.c | 213 +++++++++++++++++++++++++++++++++++++++++++++++ include/mlang.idl | 12 +++ 3 files changed, 246 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e11f91ed8d55373761fab…

1 0

Akihiro Sagawa : advapi32/tests: Add more KEY_WOW64_32KEY tests for 64-bit.
by Alexandre Julliard Dec. 18, 2014

Dec. 18, 2014

Module: wine Branch: master Commit: 88778ec0b85ef5ff0f39381596c1ee47360a80ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=88778ec0b85ef5ff0f3938159… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Dec 19 00:21:38 2014 +0900 advapi32/tests: Add more KEY_WOW64_32KEY tests for 64-bit. --- dlls/advapi32/tests/registry.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 55a74f6..bcf3d7d 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2106,6 +2106,29 @@ static void test_redirection(void) check_key_value( key, "Wow6432Node\\Wine\\Winetest", KEY_WOW64_32KEY, is_vista ? 32 : 0 ); RegCloseKey( key ); } + else + { + err = RegCreateKeyExA( HKEY_LOCAL_MACHINE, "Software", 0, NULL, 0, + KEY_WOW64_64KEY | KEY_ALL_ACCESS, NULL, &key, NULL ); + ok( err == ERROR_SUCCESS, "RegCreateKeyExA failed: %u\n", err ); + check_key_value( key, "Wine\\Winetest", 0, 64 ); + check_key_value( key, "Wine\\Winetest", KEY_WOW64_64KEY, 64 ); + dw = get_key_value( key, "Wine\\Winetest", KEY_WOW64_32KEY ); + todo_wine ok( dw == 32, "wrong value %u\n", dw ); + check_key_value( key, "Wow6432Node\\Wine\\Winetest", 0, 32 ); + RegCloseKey( key ); + + err = RegCreateKeyExA( HKEY_LOCAL_MACHINE, "Software", 0, NULL, 0, + KEY_WOW64_32KEY | KEY_ALL_ACCESS, NULL, &key, NULL ); + ok( err == ERROR_SUCCESS, "RegCreateKeyExA failed: %u\n", err ); + dw = get_key_value( key, "Wine\\Winetest", 0 ); + todo_wine ok( dw == 32, "wrong value %u\n", dw ); + dw = get_key_value( key, "Wine\\Winetest", KEY_WOW64_64KEY ); + todo_wine ok( dw == 32 || broken(dw == 64) /* vista */, "wrong value %u\n", dw ); + dw = get_key_value( key, "Wine\\Winetest", KEY_WOW64_32KEY ); + todo_wine ok( dw == 32, "wrong value %u\n", dw ); + RegCloseKey( key ); + } check_key_value( HKEY_LOCAL_MACHINE, "Software\\Wine\\Winetest", 0, ptr_size ); check_key_value( HKEY_LOCAL_MACHINE, "Software\\Wow6432Node\\Wine\\Winetest", 0, 32 );

1 0

Akihiro Sagawa : advapi32: Remove unused parameter.
by Alexandre Julliard Dec. 18, 2014

Dec. 18, 2014

Module: wine Branch: master Commit: 9f9104d6bd891e96b1d6218daf1e1bf23e199b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f9104d6bd891e96b1d6218da… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Dec 19 00:21:36 2014 +0900 advapi32: Remove unused parameter. --- dlls/advapi32/registry.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 7675a59..8e33ab3 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -103,7 +103,7 @@ static BOOL is_wow6432node( const UNICODE_STRING *name ) } /* open the Wow6432Node subkey of the specified key */ -static HANDLE open_wow6432node( HANDLE key, const UNICODE_STRING *name ) +static HANDLE open_wow6432node( HANDLE key ) { static const WCHAR wow6432nodeW[] = {'W','o','w','6','4','3','2','N','o','d','e',0}; OBJECT_ATTRIBUTES attr; @@ -150,7 +150,7 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES if (force_wow32 && pos) { if (is_wow6432node( &str )) force_wow32 = FALSE; - else if ((subkey = open_wow6432node( attr->RootDirectory, &str ))) + else if ((subkey = open_wow6432node( attr->RootDirectory ))) { if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); attr->RootDirectory = subkey; @@ -204,7 +204,7 @@ static NTSTATUS open_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *a if (force_wow32 && pos) { if (is_wow6432node( &str )) force_wow32 = FALSE; - else if ((subkey = open_wow6432node( attr->RootDirectory, &str ))) + else if ((subkey = open_wow6432node( attr->RootDirectory ))) { if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); attr->RootDirectory = subkey;

1 0

Stefan Leichter : shell32: Export SHILCreateFromPath by name too.
by Alexandre Julliard Dec. 18, 2014

Dec. 18, 2014

Module: wine Branch: master Commit: 6f98de084b5fa50e08c82ac9bee579e55fddfc14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f98de084b5fa50e08c82ac9b… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Wed Dec 17 22:21:33 2014 +0100 shell32: Export SHILCreateFromPath by name too. --- dlls/shell32/shell32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 0a8d448..f168ed7 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -24,7 +24,7 @@ 25 stdcall -ordinal ILCombine(ptr ptr) 26 stdcall -noname ILLoadFromStream(ptr ptr) 27 stdcall -ordinal ILSaveToStream(ptr ptr) - 28 stdcall -noname SHILCreateFromPath(ptr ptr ptr) SHILCreateFromPathAW + 28 stdcall SHILCreateFromPath(ptr ptr ptr) SHILCreateFromPathAW 29 stdcall -noname PathIsRoot(ptr) PathIsRootAW 30 stdcall -noname PathBuildRoot(ptr long) PathBuildRootAW 31 stdcall -noname PathFindExtension(ptr) PathFindExtensionAW

1 0

Julian Rüger : German translation for release 1.7.33
by Jeremy Newman Dec. 17, 2014

Dec. 17, 2014

Module: website Branch: master Commit: e286547060e04c4700d83e89071ad25af13d7442 URL: http://source.winehq.org/git/website.git/?a=commit;h=e286547060e04c4700d83e… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Dec 17 15:25:53 2014 +0100 German translation for release 1.7.33 --- news/de/2014121201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2014121201.xml b/news/de/2014121201.xml new file mode 100644 index 0000000..f47c6c5 --- /dev/null +++ b/news/de/2014121201.xml @@ -0,0 +1,16 @@ +<news> +<date>12. Dezember 2014</date> +<title>Wine 1.7.33 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.33 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.33">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für Kopieren/Einfügen in MSHTML.</li> + <li>Ein wenig mehr Schriftarten-Unterstützung in DirectWrite.</li> + <li>Bessere Behandlung von Fokusverlust bei Direct3D-Fenstern.</li> + <li>Mehrere zusätzliche API-* DLLs.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.33.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Aidan Thornton : quartz: Implement IFilterGraph2:: AddSourceFilterForMoniker.
by Alexandre Julliard Dec. 17, 2014

Dec. 17, 2014

Module: wine Branch: master Commit: 1f7683777babab98197c39e5965ba6f70c01c8d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f7683777babab98197c39e59… Author: Aidan Thornton <makosoft(a)gmail.com> Date: Tue Dec 16 18:49:34 2014 +0000 quartz: Implement IFilterGraph2::AddSourceFilterForMoniker. --- dlls/quartz/filtergraph.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 3d495db..fcdd05b 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1737,8 +1737,27 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilterForMoniker(IFilterGraph2 *ifac IMoniker *pMoniker, IBindCtx *pCtx, LPCWSTR lpcwstrFilterName, IBaseFilter **ppFilter) { IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); + HRESULT hr; + IBaseFilter* pfilter; + + TRACE("(%p/%p)->(%p %p %s %p)\n", This, iface, pMoniker, pCtx, debugstr_w(lpcwstrFilterName), ppFilter); + + hr = IMoniker_BindToObject(pMoniker, pCtx, NULL, &IID_IBaseFilter, (void**)&pfilter); + if(FAILED(hr)) { + WARN("Unable to bind moniker to filter object (%x)\n", hr); + return hr; + } + + hr = IFilterGraph2_AddFilter(iface, pfilter, lpcwstrFilterName); + if (FAILED(hr)) { + WARN("Unable to add filter (%x)\n", hr); + IBaseFilter_Release(pfilter); + return hr; + } - TRACE("(%p/%p)->(%p %p %s %p): stub !!!\n", This, iface, pMoniker, pCtx, debugstr_w(lpcwstrFilterName), ppFilter); + if(ppFilter) + *ppFilter = pfilter; + else IBaseFilter_Release(pfilter); return S_OK; }

1 0