August 2009 - Wine-commits - list.winehq.org

Juan Lang : wininet: Partially implement InternetQueryOption for INTERNET_OPTION_DIAGNOSTIC_SOCKET_INFO .
by Alexandre Julliard 11 Aug '09

11 Aug '09

Module: wine Branch: master Commit: 6ae6ea99b4c1ead2de28c155d009c69ed02259c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae6ea99b4c1ead2de28c155d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 10 15:20:45 2009 -0700 wininet: Partially implement InternetQueryOption for INTERNET_OPTION_DIAGNOSTIC_SOCKET_INFO. --- dlls/wininet/http.c | 74 +++++++++++++++++++++++++++++++++++++------------- 1 files changed, 55 insertions(+), 19 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 117d302..7e6178c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1589,11 +1589,65 @@ static BOOL HTTP_GetRequestURL(http_request_t *req, LPWSTR buf) return TRUE; } +static BOOL HTTP_KeepAlive(http_request_t *lpwhr) +{ + WCHAR szVersion[10]; + WCHAR szConnectionResponse[20]; + DWORD dwBufferSize = sizeof(szVersion); + BOOL keepalive = FALSE; + + /* as per RFC 2068, S8.1.2.1, if the client is HTTP/1.1 then assume that + * the connection is keep-alive by default */ + if (HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_VERSION, szVersion, + &dwBufferSize, NULL) && + !strcmpiW(szVersion, g_szHttp1_1)) + { + keepalive = TRUE; + } + + dwBufferSize = sizeof(szConnectionResponse); + if (HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_PROXY_CONNECTION, szConnectionResponse, &dwBufferSize, NULL) || + HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_CONNECTION, szConnectionResponse, &dwBufferSize, NULL)) + { + keepalive = !strcmpiW(szConnectionResponse, szKeepAlive); + } + + return keepalive; +} + static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) { http_request_t *req = (http_request_t*)hdr; switch(option) { + case INTERNET_OPTION_DIAGNOSTIC_SOCKET_INFO: + { + http_session_t *lpwhs = req->lpHttpSession; + INTERNET_DIAGNOSTIC_SOCKET_INFO *info = buffer; + + FIXME("INTERNET_DIAGNOSTIC_SOCKET_INFO stub\n"); + + if (*size < sizeof(INTERNET_DIAGNOSTIC_SOCKET_INFO)) + return ERROR_INSUFFICIENT_BUFFER; + *size = sizeof(INTERNET_DIAGNOSTIC_SOCKET_INFO); + /* FIXME: can't get a SOCKET from our connection since we don't use + * winsock + */ + info->Socket = 0; + /* FIXME: get source port from req->netConnection */ + info->SourcePort = 0; + info->DestPort = lpwhs->nHostPort; + info->Flags = 0; + if (HTTP_KeepAlive(req)) + info->Flags |= IDSI_FLAG_KEEP_ALIVE; + if (lpwhs->lpAppInfo->lpszProxy && lpwhs->lpAppInfo->lpszProxy[0] != 0) + info->Flags |= IDSI_FLAG_PROXY; + if (req->netConnection.useSSL) + info->Flags |= IDSI_FLAG_SECURE; + + return ERROR_SUCCESS; + } + case INTERNET_OPTION_SECURITY_FLAGS: { http_session_t *lpwhs; @@ -4582,28 +4636,10 @@ static BOOL HTTP_ProcessHeader(http_request_t *lpwhr, LPCWSTR field, LPCWSTR val */ static BOOL HTTP_FinishedReading(http_request_t *lpwhr) { - WCHAR szVersion[10]; - WCHAR szConnectionResponse[20]; - DWORD dwBufferSize = sizeof(szVersion); - BOOL keepalive = FALSE; + BOOL keepalive = HTTP_KeepAlive(lpwhr); TRACE("\n"); - /* as per RFC 2068, S8.1.2.1, if the client is HTTP/1.1 then assume that - * the connection is keep-alive by default */ - if (HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_VERSION, szVersion, - &dwBufferSize, NULL) && - !strcmpiW(szVersion, g_szHttp1_1)) - { - keepalive = TRUE; - } - - dwBufferSize = sizeof(szConnectionResponse); - if (HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_PROXY_CONNECTION, szConnectionResponse, &dwBufferSize, NULL) || - HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_CONNECTION, szConnectionResponse, &dwBufferSize, NULL)) - { - keepalive = !strcmpiW(szConnectionResponse, szKeepAlive); - } if (!keepalive) {

1 0

Juan Lang : include: Add INTERNET_DIAGNOSTIC_SOCKET_INFO definitions.
by Alexandre Julliard 11 Aug '09

11 Aug '09

Module: wine Branch: master Commit: 7dd7109e9e36e82fe9af9a259e782ef5ea4c799d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dd7109e9e36e82fe9af9a259… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 10 15:18:28 2009 -0700 include: Add INTERNET_DIAGNOSTIC_SOCKET_INFO definitions. --- include/wininet.h | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/include/wininet.h b/include/wininet.h index fb6f31f..1cb0508 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -371,6 +371,19 @@ typedef struct _INTERNET_PER_CONN_OPTION_LISTW { DECL_WINELIB_TYPE_AW(INTERNET_PER_CONN_OPTION_LIST) DECL_WINELIB_TYPE_AW(LPINTERNET_PER_CONN_OPTION_LIST) +typedef struct _INTERNET_DIAGNOSTIC_SOCKET_INFO +{ + DWORD_PTR Socket; + DWORD SourcePort; + DWORD DestPort; + DWORD Flags; +} INTERNET_DIAGNOSTIC_SOCKET_INFO, *LPINTERNET_DIAGNOSTIC_SOCKET_INFO; + +#define IDSI_FLAG_KEEP_ALIVE 0x00000001 +#define IDSI_FLAG_SECURE 0x00000002 +#define IDSI_FLAG_PROXY 0x00000004 +#define IDSI_FLAG_TUNNEL 0x00000008 + BOOLAPI InternetTimeFromSystemTimeA(CONST SYSTEMTIME *,DWORD ,LPSTR ,DWORD); BOOLAPI InternetTimeFromSystemTimeW(CONST SYSTEMTIME *,DWORD ,LPWSTR ,DWORD); #define InternetTimeFromSystemTime WINELIB_NAME_AW(InternetTimeFromSystemTime)

1 0

Juan Lang : wininet: Fix memory leak querying proxy settings.
by Alexandre Julliard 11 Aug '09

11 Aug '09

Module: wine Branch: master Commit: 3ed82127c610f23c5b6d4549596957d417a15ab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ed82127c610f23c5b6d45495… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 10 15:18:00 2009 -0700 wininet: Fix memory leak querying proxy settings. --- dlls/wininet/internet.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 236e1f6..39349d0 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2027,12 +2027,15 @@ DWORD INET_QueryOption(DWORD option, void *buffer, DWORD *size, BOOL unicode) case INTERNET_OPTION_PROXY: { appinfo_t ai; + BOOL ret; TRACE("Getting global proxy info\n"); memset(&ai, 0, sizeof(appinfo_t)); INTERNET_ConfigureProxy(&ai); - return APPINFO_QueryOption(&ai.hdr, INTERNET_OPTION_PROXY, buffer, size, unicode); /* FIXME */ + ret = APPINFO_QueryOption(&ai.hdr, INTERNET_OPTION_PROXY, buffer, size, unicode); /* FIXME */ + APPINFO_Destroy(&ai.hdr); + return ret; } case INTERNET_OPTION_MAX_CONNS_PER_SERVER:

1 0

Juan Lang : wininet: Implement proxy-related per-connection option queries.
by Alexandre Julliard 11 Aug '09

11 Aug '09

Module: wine Branch: master Commit: 6ec60e26bc67b33dd534a46dbd481f3131e50b6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ec60e26bc67b33dd534a46db… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 10 15:18:15 2009 -0700 wininet: Implement proxy-related per-connection option queries. --- dlls/wininet/internet.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 39349d0..e51c964 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2080,23 +2080,44 @@ DWORD INET_QueryOption(DWORD option, void *buffer, DWORD *size, BOOL unicode) case INTERNET_OPTION_PER_CONNECTION_OPTION: { INTERNET_PER_CONN_OPTION_LISTW *con = buffer; + INTERNET_PER_CONN_OPTION_LISTA *conA = buffer; DWORD res = ERROR_SUCCESS, i; + appinfo_t ai; + + TRACE("Getting global proxy info\n"); + memset(&ai, 0, sizeof(appinfo_t)); + INTERNET_ConfigureProxy(&ai); FIXME("INTERNET_OPTION_PER_CONNECTION_OPTION stub\n"); - if (*size < sizeof(INTERNET_PER_CONN_OPTION_LISTW)) + if (*size < sizeof(INTERNET_PER_CONN_OPTION_LISTW)) { + APPINFO_Destroy(&ai.hdr); return ERROR_INSUFFICIENT_BUFFER; + } for (i = 0; i < con->dwOptionCount; i++) { INTERNET_PER_CONN_OPTIONW *option = con->pOptions + i; + INTERNET_PER_CONN_OPTIONA *optionA = conA->pOptions + i; switch (option->dwOption) { case INTERNET_PER_CONN_FLAGS: - option->Value.dwValue = PROXY_TYPE_DIRECT; + option->Value.dwValue = ai.dwAccessType; break; case INTERNET_PER_CONN_PROXY_SERVER: + if (unicode) + option->Value.pszValue = heap_strdupW(ai.lpszProxy); + else + optionA->Value.pszValue = heap_strdupWtoA(ai.lpszProxy); + break; + case INTERNET_PER_CONN_PROXY_BYPASS: + if (unicode) + option->Value.pszValue = heap_strdupW(ai.lpszProxyBypass); + else + optionA->Value.pszValue = heap_strdupWtoA(ai.lpszProxyBypass); + break; + case INTERNET_PER_CONN_AUTOCONFIG_URL: case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS: case INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL: @@ -2113,6 +2134,7 @@ DWORD INET_QueryOption(DWORD option, void *buffer, DWORD *size, BOOL unicode) break; } } + APPINFO_Destroy(&ai.hdr); return res; }

1 0

Dylan Smith : richedit: Update paragraph on saved cursor when inserting table start.
by Alexandre Julliard 11 Aug '09

11 Aug '09

Module: wine Branch: master Commit: 314bd5ca853e0ae3c77b99b7f21562eadf8f8e8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=314bd5ca853e0ae3c77b99b7f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Aug 10 15:44:59 2009 -0400 richedit: Update paragraph on saved cursor when inserting table start. Since the table row start is inserted after the rest of the table is inserted, the cursor is saved, and temporarily moved to the start of the row to insert the table row start paragraph. Unfortunately the paragraph in saved cursor becomes invalid during this insertion and needs to be updated, so this code introduced a regression once paragraphs started to be stored in cursors. --- dlls/riched20/table.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 69f4851..0d2dab5 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -96,6 +96,7 @@ ME_DisplayItem* ME_InsertTableRowStartAtParagraph(ME_TextEditor *editor, editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; startRowPara = ME_InsertTableRowStartFromCursor(editor); + savedCursor.pPara = ME_GetParagraph(savedCursor.pRun); editor->pCursors[0] = savedCursor; editor->pCursors[1] = editor->pCursors[0];

1 0

Juan Lang : crypt32: Don't free a certificate that hasn' t been removed from its store.
by Alexandre Julliard 11 Aug '09

11 Aug '09

Module: wine Branch: master Commit: ef79507d88674e2154606fccbbedc8a3f610fb02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef79507d88674e2154606fccb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 10 10:42:55 2009 -0700 crypt32: Don't free a certificate that hasn't been removed from its store. --- dlls/crypt32/store.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index e043315..8acc6f6 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -978,7 +978,8 @@ BOOL WINAPI CertDeleteCertificateFromStore(PCCERT_CONTEXT pCertContext) ret = FALSE; else ret = hcs->certs.deleteContext(hcs, (void *)pCertContext); - CertFreeCertificateContext(pCertContext); + if (ret) + CertFreeCertificateContext(pCertContext); } return ret; }

1 0

Jacek Caban : mshtml: Call stop_binding before releasing binding object.
by Alexandre Julliard 11 Aug '09

11 Aug '09

Module: wine Branch: master Commit: 780aff0bea4893c0b6d8094955344b4fe316ea0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=780aff0bea4893c0b6d809495… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 10 19:17:05 2009 +0200 mshtml: Call stop_binding before releasing binding object. --- dlls/mshtml/navigate.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index f882e6c..eee0b34 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -344,19 +344,23 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac HRESULT hresult, LPCWSTR szError) { BSCallback *This = STATUSCLB_THIS(iface); + HRESULT hres; TRACE("(%p)->(%08x %s)\n", This, hresult, debugstr_w(szError)); /* NOTE: IE7 calls GetBindResult here */ + hres = This->vtbl->stop_binding(This, hresult); + if(This->binding) { IBinding_Release(This->binding); This->binding = NULL; } list_remove(&This->entry); + This->doc = NULL; - return This->vtbl->stop_binding(This, hresult); + return hres; } static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface,

1 0

Mike Kaplinskiy : ntdll/tests: Fix NtWriteFile checks.
by Alexandre Julliard 11 Aug '09

11 Aug '09

Module: wine Branch: master Commit: b9c3e9310a1a231a6eb7f01169c65786b292b840 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9c3e9310a1a231a6eb7f0116… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Mon Aug 10 13:17:52 2009 -0400 ntdll/tests: Fix NtWriteFile checks. --- dlls/ntdll/tests/file.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 174daa5..a0e713a 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -390,8 +390,8 @@ static void read_file_test(void) iosb.Information = 0xdeadbeef; offset.QuadPart = 0; ResetEvent( event ); - pNtWriteFile( handle, event, apc, &apc_count, &iosb, text, strlen(text), &offset, NULL ); - ok( status == STATUS_PENDING, "wrong status %x\n", status ); + status = pNtWriteFile( handle, event, apc, &apc_count, &iosb, text, strlen(text), &offset, NULL ); + ok( status == STATUS_SUCCESS || status == STATUS_PENDING, "wrong status %x\n", status ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); ok( is_signaled( event ), "event is signaled\n" ); @@ -448,8 +448,9 @@ static void read_file_test(void) U(iosb).Status = 0xdeadbabe; iosb.Information = 0xdeadbeef; offset.QuadPart = 0; - pNtWriteFile( handle, event, apc, &apc_count, &iosb, text, strlen(text), &offset, NULL ); + status = pNtWriteFile( handle, event, apc, &apc_count, &iosb, text, strlen(text), &offset, NULL ); ok( status == STATUS_END_OF_FILE || + status == STATUS_SUCCESS || status == STATUS_PENDING, /* vista */ "wrong status %x\n", status ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status );

1 0

Łukasz Wojniłowicz : Polish translation for release 1.1.27
by Jeremy Newman 10 Aug '09

10 Aug '09

Module: website Branch: master Commit: e951664f70526ab56e8cd119284b7d2cf69da89e URL: http://source.winehq.org/git/website.git/?a=commit;h=e951664f70526ab56e8cd1… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Aug 8 19:28:15 2009 +0200 Polish translation for release 1.1.27 --- news/pl/2009080701.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/pl/2009080701.xml b/news/pl/2009080701.xml new file mode 100644 index 0000000..64c596f --- /dev/null +++ b/news/pl/2009080701.xml @@ -0,0 +1,16 @@ +<news> +<date>Sierpień 7, 2009</date> +<title>Wydano Wine 1.1.27</title> +<body> + Wydanie rozwojowe Wine 1.1.27 jest już dostępne. + <a href="{$root}/announce/1.1.27">What's new</a> in this release: +<ul> + <li>Nowa wersja silnika Gecko.</li> + <li>Wsparcie dla kodeków GSM 06.10.</li> + <li>Ulepszone wsparcie API dla wolumenów dysków.</li> + <li>Wsparcie dla map bitowych XShm dla lepszej wydajności.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.27.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">download pobieralniach</a>. +</body></news>

1 0

Dylan Smith : wordpad: Use richedit class string macro from public headers.
by Alexandre Julliard 10 Aug '09

10 Aug '09

Module: wine Branch: master Commit: 0c862dea009a97eb83fb000136042fdd6b9d8c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c862dea009a97eb83fb00013… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Aug 10 10:53:30 2009 -0400 wordpad: Use richedit class string macro from public headers. --- programs/wordpad/wordpad.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 022b9b1..80a6a07 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -52,7 +52,6 @@ /* use LoadString */ static const WCHAR wszAppTitle[] = {'W','i','n','e',' ','W','o','r','d','p','a','d',0}; -static const WCHAR wszRichEditClass[] = {'R','I','C','H','E','D','I','T','2','0','W',0}; static const WCHAR wszMainWndClass[] = {'W','O','R','D','P','A','D','T','O','P',0}; static const WCHAR stringFormat[] = {'%','2','d','\0'}; @@ -1867,7 +1866,7 @@ static LRESULT OnCreate( HWND hWnd ) PostQuitMessage(1); } - hEditorWnd = CreateWindowExW(WS_EX_CLIENTEDGE, wszRichEditClass, NULL, + hEditorWnd = CreateWindowExW(WS_EX_CLIENTEDGE, RICHEDIT_CLASS20W, NULL, WS_CHILD|WS_VISIBLE|ES_SELECTIONBAR|ES_MULTILINE|ES_AUTOVSCROLL |ES_WANTRETURN|WS_VSCROLL|ES_NOHIDESEL|WS_HSCROLL, 0, 0, 1000, 100, hWnd, (HMENU)IDC_EDITOR, hInstance, NULL);

1 0