April 2008 - Wine-commits - list.winehq.org

Hans Leidekker : wininet: Remove dead code from HTTP_DealWithProxy and improve its debug trace.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 729631d907820f8f717d0b6df2dddc0fc024b400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=729631d907820f8f717d0b6df… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Mar 31 20:25:40 2008 +0200 wininet: Remove dead code from HTTP_DealWithProxy and improve its debug trace. --- dlls/wininet/http.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a197c43..6198651 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1269,12 +1269,10 @@ static BOOL HTTP_DealWithProxy( LPWININETAPPINFOW hIC, { WCHAR buf[MAXHOSTNAME]; WCHAR proxy[MAXHOSTNAME + 15]; /* 15 == "http://" + sizeof(port#) + ":/\0" */ - WCHAR* url; static WCHAR szNul[] = { 0 }; URL_COMPONENTSW UrlComponents; static const WCHAR szHttp[] = { 'h','t','t','p',':','/','/',0 }; static const WCHAR szFormat[] = { 'h','t','t','p',':','/','/','%','s',0 }; - int len; memset( &UrlComponents, 0, sizeof UrlComponents ); UrlComponents.dwStructSize = sizeof UrlComponents; @@ -1293,11 +1291,6 @@ static BOOL HTTP_DealWithProxy( LPWININETAPPINFOW hIC, if( !lpwhr->lpszPath ) lpwhr->lpszPath = szNul; - TRACE("server=%s path=%s\n", - debugstr_w(lpwhs->lpszHostName), debugstr_w(lpwhr->lpszPath)); - /* for constant 15 see above */ - len = strlenW(lpwhs->lpszHostName) + strlenW(lpwhr->lpszPath) + 15; - url = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); if(UrlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) UrlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT; @@ -1306,6 +1299,7 @@ static BOOL HTTP_DealWithProxy( LPWININETAPPINFOW hIC, lpwhs->lpszServerName = WININET_strdupW(UrlComponents.lpszHostName); lpwhs->nServerPort = UrlComponents.nPort; + TRACE("proxy server=%s port=%d\n", debugstr_w(lpwhs->lpszServerName), lpwhs->nServerPort); return TRUE; }

1 0

Hans Leidekker : wininet: Parse the redirect URL in HTTP_HandleRedirect in case of a proxy connection .
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 8210e1b45426aa5b210344ef99ce935c68d71f3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8210e1b45426aa5b210344ef9… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Mar 31 20:25:57 2008 +0200 wininet: Parse the redirect URL in HTTP_HandleRedirect in case of a proxy connection. --- dlls/wininet/http.c | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 6198651..912a07f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2864,6 +2864,7 @@ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) { LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; LPWININETAPPINFOW hIC = lpwhs->lpAppInfo; + BOOL using_proxy = hIC->lpszProxy && hIC->lpszProxy[0]; WCHAR path[2048]; if(lpszUrl[0]=='/') @@ -2871,11 +2872,6 @@ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) /* if it's an absolute path, keep the same session info */ lstrcpynW(path, lpszUrl, 2048); } - else if (NULL != hIC->lpszProxy && hIC->lpszProxy[0] != 0) - { - TRACE("Redirect through proxy\n"); - lstrcpynW(path, lpszUrl, 2048); - } else { URL_COMPONENTSW urlComponents; @@ -2997,11 +2993,9 @@ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) HTTP_ADDHDR_FLAG_ADD_IF_NEW); #endif - HeapFree(GetProcessHeap(), 0, lpwhs->lpszServerName); - lpwhs->lpszServerName = WININET_strdupW(hostName); HeapFree(GetProcessHeap(), 0, lpwhs->lpszHostName); if (urlComponents.nPort != INTERNET_DEFAULT_HTTP_PORT && - urlComponents.nPort != INTERNET_DEFAULT_HTTPS_PORT) + urlComponents.nPort != INTERNET_DEFAULT_HTTPS_PORT) { int len; static const WCHAR fmt[] = {'%','s',':','%','i',0}; @@ -3015,20 +3009,27 @@ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) HTTP_ProcessHeader(lpwhr, szHost, lpwhs->lpszHostName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); - HeapFree(GetProcessHeap(), 0, lpwhs->lpszUserName); lpwhs->lpszUserName = NULL; if (userName[0]) lpwhs->lpszUserName = WININET_strdupW(userName); - lpwhs->nServerPort = urlComponents.nPort; - if (!HTTP_ResolveName(lpwhr)) - return FALSE; + if (!using_proxy) + { + HeapFree(GetProcessHeap(), 0, lpwhs->lpszServerName); + lpwhs->lpszServerName = WININET_strdupW(hostName); + lpwhs->nServerPort = urlComponents.nPort; - NETCON_close(&lpwhr->netConnection); + if (!HTTP_ResolveName(lpwhr)) + return FALSE; - if (!NETCON_init(&lpwhr->netConnection,lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE)) - return FALSE; + NETCON_close(&lpwhr->netConnection); + + if (!NETCON_init(&lpwhr->netConnection,lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE)) + return FALSE; + } + else + TRACE("Redirect through proxy\n"); } HeapFree(GetProcessHeap(), 0, lpwhr->lpszPath);

1 0

Paul Vriens : winecfg: Update the Dutch resources.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 2b82aa1dc76f2d667a39f8b98d9cccce4a577edf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b82aa1dc76f2d667a39f8b98… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Mar 31 20:29:57 2008 +0200 winecfg: Update the Dutch resources. --- programs/winecfg/Nl.rc | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index cfa9153..c9c5cd3 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -62,30 +62,30 @@ IDD_GRAPHCFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Venster-instellingen ",IDC_STATIC,8,4,244,180 + GROUPBOX " Venster-instellingen ",IDC_STATIC,8,4,244,184 - CONTROL "Een DirectX programma kan de muis in een venster vasthouden.",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,14,230,8 + CONTROL "Een DirectX programma kan de muis in een venster vasthouden.",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,19,230,8 + CONTROL "Laat de window manager de vensters beheren",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,40,230,8 LTEXT "Wanneer de vensters door de window manager worden beheerd hebben deze de standaard kaders, er wordt rekening gehouden met de virtuele desktop en ze staan in de lijst met vensters.\n\nAls de vensters niet worden beheerd, worden ze losgekoppeld van de window manager. Dit betekent dat vensters niet perfect met uw desktop integreren. De 'emulatie' is echter exacter en kan ervoor zorgen dat programma's beter werken.", - IDC_STATIC,15,37,228,80 - CONTROL "Laat de window manager de vensters beheren",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,230,8 + IDC_STATIC,19,51,225,80 + CONTROL "Emuleer een virtuele desktop",IDC_ENABLE_DESKTOP,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,15,128,230,10 /* FIXME: the wording of this explanation could be a lot better */ LTEXT "U kunt kiezen voor een virtuele windows desktop waarop alle vensters geplaatst worden, of u kunt er voor kiezen dat de vensters op uw standaard desktop geplaatst worden.", - IDC_STATIC,15,125,228,28 - CONTROL "Emuleer een virtuele desktop",IDC_ENABLE_DESKTOP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,152,230,10 - LTEXT "Desktop afmetingen:",IDC_DESKTOP_SIZE,15,168,69,8,WS_DISABLED - EDITTEXT IDC_DESKTOP_WIDTH,89,167,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - LTEXT "X",IDC_DESKTOP_BY,133,168,8,8,WS_DISABLED - EDITTEXT IDC_DESKTOP_HEIGHT,142,167,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + IDC_STATIC,19,138,225,28 + LTEXT "Desktop afmetingen:",IDC_DESKTOP_SIZE,15,168,44,8,WS_DISABLED + LTEXT "X",IDC_DESKTOP_BY,109,168,8,8,WS_DISABLED + EDITTEXT IDC_DESKTOP_WIDTH,64,166,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_HEIGHT,117,166,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - GROUPBOX " Direct3D ",IDC_STATIC,8,189,244,50 + GROUPBOX " Direct3D ",IDC_STATIC,8,190,244,48 - LTEXT "Vertex Shader ondersteuning: ",IDC_STATIC,15,199,100,30 - COMBOBOX IDC_D3D_VSHADER_MODE,120,197,130,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Vertex Shader ondersteuning: ",IDC_STATIC,15,203,100,32 + COMBOBOX IDC_D3D_VSHADER_MODE,120,201,125,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Pixel Shader toestaan (indien ondersteund door de hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,216,230,10 + CONTROL "Pixel Shader toestaan (indien ondersteund door de hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,219,230,10 GROUPBOX " Screen Resolution ",IDC_STATIC,8,242,244,25 CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,250,187,15 EDITTEXT IDC_RES_DPIEDIT,204,250,23,13,ES_NUMBER|WS_TABSTOP @@ -167,8 +167,8 @@ BEGIN GROUPBOX " Stuurprogramma selectie ",IDC_STATIC,8,4,244,195 LTEXT "Selecteer een geluids-stuurprogramma door het aanvinken van het gewenste stuurprogramma. Zet het geluid uit door geen stuurprogramma te selecteren. Het selecteren van meerdere stuurprogramma's wordt niet aanbevolen. Configureer een stuurprogramma d.m.v. een rechter muisklik hierop.",IDC_STATIC,15,20,227,45 CONTROL "Apparaten",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,65,140,125 - PUSHBUTTON "Configuratiescherm",IDC_AUDIO_CONTROL_PANEL,170,65,79,14 - PUSHBUTTON "Geluidstest",IDC_AUDIO_TEST,170,85,79,14 + PUSHBUTTON "Geluidstest",IDC_AUDIO_TEST,165,65,79,14 + PUSHBUTTON "Configuratiescherm",IDC_AUDIO_CONTROL_PANEL,165,85,79,14 GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 LTEXT "Hardwareversnelling: ",IDC_STATIC,15,215,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

1 0

Chris Robinson : quartz: Break processing loop when shutting down.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 4a68b33029137f08c8535db581a86ae37044a799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a68b33029137f08c8535db58… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Mon Mar 31 10:01:54 2008 -0700 quartz: Break processing loop when shutting down. --- dlls/quartz/mpegsplit.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index cb7528f..dca0042 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -363,8 +363,11 @@ static HRESULT MPEGSplitter_process_sample(LPVOID iface, IMediaSample * pSample) IMediaSample_SetSyncPoint(This->pCurrentSample, TRUE); } hr = FillBuffer(This, &pbSrcStream, &cbSrcStream); - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr)) { + if (hr == S_FALSE) + break; continue; + } fail: FIXME("Failed with hres: %08x!\n", hr);

1 0

Andrew Talbot : ws2_32: Make function declarations match definitions.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 15db05929ae1d1391e777275b6dbda057723bf9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=15db05929ae1d1391e777275b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Mar 31 17:55:20 2008 +0100 ws2_32: Make function declarations match definitions. --- dlls/ws2_32/async.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/async.c b/dlls/ws2_32/async.c index 963ed66..019f73f 100644 --- a/dlls/ws2_32/async.c +++ b/dlls/ws2_32/async.c @@ -126,8 +126,8 @@ CRITICAL_SECTION csWSgetXXXbyYYY = { &critsect_debug, -1, 0, 0, 0, 0 }; /* protoptypes of some functions in socket.c */ -UINT16 wsaErrno(void); -UINT16 wsaHerrno(int errnr); +UINT wsaErrno(void); +UINT wsaHerrno(int errnr); #define AQ_WIN16 0x00 #define AQ_WIN32 0x04

1 0

Alexandre Julliard : user32: Don't start explorer. exe on non-visible window stations.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: bd09340cf2d4dae6e9abd2dd11c532fee7711c41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd09340cf2d4dae6e9abd2dd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 31 17:26:42 2008 +0200 user32: Don't start explorer.exe on non-visible window stations. --- dlls/user32/win.c | 49 +++++++++++++++++++++++++++---------------------- 1 files changed, 27 insertions(+), 22 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index d5d0267..aa5bd87 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1620,30 +1620,35 @@ HWND WINAPI GetDesktopWindow(void) if (!thread_info->desktop) { - static const WCHAR command_line[] = {'\\','e','x','p','l','o','r','e','r','.','e','x','e',' ','/','d','e','s','k','t','o','p',0}; - STARTUPINFOW si; - PROCESS_INFORMATION pi; - WCHAR cmdline[MAX_PATH + sizeof(command_line)/sizeof(WCHAR)]; - - memset( &si, 0, sizeof(si) ); - si.cb = sizeof(si); - si.dwFlags = STARTF_USESTDHANDLES; - si.hStdInput = 0; - si.hStdOutput = 0; - si.hStdError = GetStdHandle( STD_ERROR_HANDLE ); - - GetSystemDirectoryW( cmdline, MAX_PATH ); - lstrcatW( cmdline, command_line ); - if (CreateProcessW( NULL, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, - NULL, NULL, &si, &pi )) - { - TRACE( "started explorer pid %04x tid %04x\n", pi.dwProcessId, pi.dwThreadId ); - WaitForInputIdle( pi.hProcess, 10000 ); - CloseHandle( pi.hThread ); - CloseHandle( pi.hProcess ); - - } - else WARN( "failed to start explorer, err %d\n", GetLastError() ); + USEROBJECTFLAGS flags; + if (!GetUserObjectInformationW( GetProcessWindowStation(), UOI_FLAGS, &flags, + sizeof(flags), NULL ) || (flags.dwFlags & WSF_VISIBLE)) + { + static const WCHAR command_line[] = {'\\','e','x','p','l','o','r','e','r','.','e','x','e',' ','/','d','e','s','k','t','o','p',0}; + STARTUPINFOW si; + PROCESS_INFORMATION pi; + WCHAR cmdline[MAX_PATH + sizeof(command_line)/sizeof(WCHAR)]; + + memset( &si, 0, sizeof(si) ); + si.cb = sizeof(si); + si.dwFlags = STARTF_USESTDHANDLES; + si.hStdInput = 0; + si.hStdOutput = 0; + si.hStdError = GetStdHandle( STD_ERROR_HANDLE ); + + GetSystemDirectoryW( cmdline, MAX_PATH ); + lstrcatW( cmdline, command_line ); + if (CreateProcessW( NULL, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, + NULL, NULL, &si, &pi )) + { + TRACE( "started explorer pid %04x tid %04x\n", pi.dwProcessId, pi.dwThreadId ); + WaitForInputIdle( pi.hProcess, 10000 ); + CloseHandle( pi.hThread ); + CloseHandle( pi.hProcess ); + } + else WARN( "failed to start explorer, err %d\n", GetLastError() ); + } + else TRACE( "not starting explorer since winstation is not visible\n" ); SERVER_START_REQ( get_desktop_window ) {

1 0

Alexandre Julliard : wineboot: No longer needs to keep running now that we have services.exe.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: bd2ee68d6d8bf8951f3227ae39b5fda4430522dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd2ee68d6d8bf8951f3227ae3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 31 17:26:24 2008 +0200 wineboot: No longer needs to keep running now that we have services.exe. --- programs/wineboot/wineboot.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 024eef3..30c7752 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -762,9 +762,5 @@ int main( int argc, char *argv[] ) WINE_TRACE("Operation done\n"); SetEvent( event ); - - /* FIXME: the wait is needed to keep services running */ - /* it should be removed once we have a proper services.exe */ - if (!restart) WaitForSingleObject( __wine_make_process_system(), INFINITE ); return 0; }

1 0

Alexandre Julliard : advapi32: Silence the pipe read error in the normal case.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 9bb129d17b2522197ffa6535282e09f3b3aecfbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bb129d17b2522197ffa65352… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 31 17:26:07 2008 +0200 advapi32: Silence the pipe read error in the normal case. --- dlls/advapi32/service.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index b89022d..0d13442 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -615,9 +615,15 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) DWORD count, req[2] = {0,0}; r = ReadFile( pipe, &req, sizeof req, &count, NULL ); - if (!r || count!=sizeof req) + if (!r) { - ERR("pipe read failed\n"); + if (GetLastError() != ERROR_BROKEN_PIPE) + ERR( "pipe read failed error %u\n", GetLastError() ); + break; + } + if (count != sizeof(req)) + { + ERR( "partial pipe read %u\n", count ); break; }

1 0