wine-commits December 2014

wine-commits@winehq.org

2 participants
319 discussions

Hans Leidekker : wininet: Use a helper function to remove request headers.
by Alexandre Julliard 19 Dec '14

19 Dec '14

Module: wine Branch: master Commit: de64feaa5ca6a4765bf1947f2eba66198b3c5451 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de64feaa5ca6a4765bf1947f2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 19 16:49:48 2014 +0100 wininet: Use a helper function to remove request headers. --- dlls/wininet/http.c | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b2a85c7..532b65a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -424,6 +424,15 @@ static void reset_data_stream(http_request_t *req) req->read_chunked = req->read_gzip = FALSE; } +static void remove_header( http_request_t *request, const WCHAR *str, BOOL from_request ) +{ + int index; + EnterCriticalSection( &request->headers_section ); + index = HTTP_GetCustomHeaderIndex( request, str, 0, from_request ); + if (index != -1) HTTP_DeleteCustomHeader( request, index ); + LeaveCriticalSection( &request->headers_section ); +} + #ifdef HAVE_ZLIB typedef struct { @@ -550,7 +559,7 @@ static void wininet_zfree(voidpf opaque, voidpf address) static DWORD init_gzip_stream(http_request_t *req, BOOL is_gzip) { gzip_stream_t *gzip_stream; - int index, zres; + int zres; gzip_stream = heap_alloc_zero(sizeof(gzip_stream_t)); if(!gzip_stream) @@ -567,11 +576,7 @@ static DWORD init_gzip_stream(http_request_t *req, BOOL is_gzip) return ERROR_OUTOFMEMORY; } - EnterCriticalSection( &req->headers_section ); - index = HTTP_GetCustomHeaderIndex(req, szContent_Length, 0, FALSE); - if(index != -1) - HTTP_DeleteCustomHeader(req, index); - LeaveCriticalSection( &req->headers_section ); + remove_header(req, szContent_Length, FALSE); if(req->read_size) { memcpy(gzip_stream->buf, req->read_buf+req->read_pos, req->read_size); @@ -4107,7 +4112,6 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) { http_session_t *session = request->session; WCHAR path[INTERNET_MAX_PATH_LENGTH]; - int index; if(lpszUrl[0]=='/') { @@ -4214,15 +4218,9 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) } } - EnterCriticalSection( &request->headers_section ); - /* Remove custom content-type/length headers on redirects. */ - index = HTTP_GetCustomHeaderIndex(request, szContent_Type, 0, TRUE); - if (index != -1) HTTP_DeleteCustomHeader(request, index); - index = HTTP_GetCustomHeaderIndex(request, szContent_Length, 0, TRUE); - if (index != -1) HTTP_DeleteCustomHeader(request, index); - - LeaveCriticalSection( &request->headers_section ); + remove_header(request, szContent_Type, TRUE); + remove_header(request, szContent_Length, TRUE); return ERROR_SUCCESS; } @@ -5185,8 +5183,6 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, } if (secure_proxy_connect && request->status_code == HTTP_STATUS_OK) { - int index; - res = NETCON_secure_connect(request->netconn, request->server); if (res != ERROR_SUCCESS) { @@ -5194,11 +5190,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, http_release_netconn( request, FALSE ); break; } - EnterCriticalSection( &request->headers_section ); - index = HTTP_GetCustomHeaderIndex(request, szProxy_Authorization, 0, TRUE); - if (index != -1) HTTP_DeleteCustomHeader(request, index); - LeaveCriticalSection( &request->headers_section ); - + remove_header(request, szProxy_Authorization, TRUE); destroy_authinfo(request->proxyAuthInfo); request->proxyAuthInfo = NULL;

1 0

Andrew Eikum : dsound: Don't send notify events before played range.
by Alexandre Julliard 19 Dec '14

19 Dec '14

Module: wine Branch: master Commit: 29d1ccc7e22c4e00c6212b4b15831bf5dc2071cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d1ccc7e22c4e00c6212b4b1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Dec 19 09:10:46 2014 -0600 dsound: Don't send notify events before played range. --- dlls/dsound/mixer.c | 18 +++++++++++------- dlls/dsound/tests/dsound.c | 5 +---- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 8d6b379..0fae20e 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -223,16 +223,20 @@ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len } } - TRACE("Not stopped: first notify: %u (%u), range: [%u,%u)\n", first, - dsb->notifies[check].dwOffset, playpos, (playpos + len) % dsb->buflen); + TRACE("Not stopped: first notify: %u (%u), left notify: %u (%u), range: [%u,%u)\n", + first, dsb->notifies[first].dwOffset, + left, dsb->notifies[left].dwOffset, + playpos, (playpos + len) % dsb->buflen); /* send notifications in range */ - for(check = left; check < dsb->nrofnotifies; ++check){ - if(dsb->notifies[check].dwOffset >= playpos + len) - break; + if(dsb->notifies[left].dwOffset >= playpos){ + for(check = left; check < dsb->nrofnotifies; ++check){ + if(dsb->notifies[check].dwOffset >= playpos + len) + break; - TRACE("Signalling %p (%u)\n", dsb->notifies[check].hEventNotify, dsb->notifies[check].dwOffset); - SetEvent(dsb->notifies[check].hEventNotify); + TRACE("Signalling %p (%u)\n", dsb->notifies[check].hEventNotify, dsb->notifies[check].dwOffset); + SetEvent(dsb->notifies[check].hEventNotify); + } } if(playpos + len > dsb->buflen){ diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 1df7ce4..e5a9110 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1532,10 +1532,9 @@ static void test_notifications(LPGUID lpGuid) rc = IDirectSoundBuffer_QueryInterface(buf, &IID_IDirectSoundNotify, (void**)&buf_notif); ok(rc == DS_OK, "QueryInterface(IID_IDirectSoundNotify): %08x\n", rc); - /* create notifications at each end of the buffer */ notifies[0].dwOffset = 0; handles[0] = notifies[0].hEventNotify = CreateEventW(NULL, FALSE, FALSE, NULL); - notifies[1].dwOffset = bufdesc.dwBufferBytes - 1; + notifies[1].dwOffset = bufdesc.dwBufferBytes / 2; handles[1] = notifies[1].hEventNotify = CreateEventW(NULL, FALSE, FALSE, NULL); rc = IDirectSoundNotify_SetNotificationPositions(buf_notif, 2, notifies); @@ -1550,8 +1549,6 @@ static void test_notifications(LPGUID lpGuid) for(cycles = 0; cycles < 6 /* 1.5s */; ++cycles){ DWORD wait; - /* since the notifications are on opposite ends of the entire buffer, - * they should arrive well-ordered in an alternating sequence. */ wait = WaitForMultipleObjects(2, handles, FALSE, 1000); ok(wait <= WAIT_OBJECT_0 + 1 && wait - WAIT_OBJECT_0 == expect, "Got unexpected notification order or timeout: %u\n", wait);

1 0

André Hentschel : Add WWN 382
by Jeremy Newman 19 Dec '14

19 Dec '14

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

Stefan Leichter : shell32: Export SHILCreateFromPath by name too.
by Alexandre Julliard 18 Dec '14

18 Dec '14

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

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

18 Dec '14

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 18 Dec '14

18 Dec '14

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 18 Dec '14

18 Dec '14

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

Drew Ronneberg : winemenubuilder: Eliminate an unused variable.
by Alexandre Julliard 18 Dec '14

18 Dec '14

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

Julian Rüger : German translation for release 1.7.33
by Jeremy Newman 17 Dec '14

17 Dec '14

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

Erich E. Hoover : ntdll: Unify retrieving the attributes of a file.
by Alexandre Julliard 17 Dec '14

17 Dec '14

Module: wine Branch: master Commit: ca51e113e4820f8b11016c13732b1a971d2b0054 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca51e113e4820f8b11016c137… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Tue Aug 19 20:31:00 2014 -0600 ntdll: Unify retrieving the attributes of a file. --- dlls/ntdll/directory.c | 12 ++---- dlls/ntdll/file.c | 103 ++++++++++++++++++++++++++++++++++-------------- dlls/ntdll/ntdll_misc.h | 4 +- 3 files changed, 79 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca51e113e4820f8b11016…

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2014