December 2006 - Wine-commits

Alexandre Julliard : oleaut32: Use LOCALE_NOUSEROVERRIDE where necessary in variant conversions.
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: 478ac3724dd7c47c26a60471beb015b2371a8edf URL: http://source.winehq.org/git/wine.git/?a=commit;h=478ac3724dd7c47c26a60471b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 7 14:05:25 2006 +0100 oleaut32: Use LOCALE_NOUSEROVERRIDE where necessary in variant conversions. --- dlls/oleaut32/vartype.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 9754e8c..a3e1f1a 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -4160,7 +4160,7 @@ HRESULT WINAPI VarDecFromR4(FLOAT fltIn, WCHAR buff[256]; sprintfW( buff, szFloatFormatW, fltIn ); - return VarDecFromStr(buff, LOCALE_EN_US, 0, pDecOut); + return VarDecFromStr(buff, LOCALE_EN_US, LOCALE_NOUSEROVERRIDE, pDecOut); } /************************************************************************ @@ -4180,7 +4180,7 @@ HRESULT WINAPI VarDecFromR8(double dblIn WCHAR buff[256]; sprintfW( buff, szDoubleFormatW, dblIn ); - return VarDecFromStr(buff, LOCALE_EN_US, 0, pDecOut); + return VarDecFromStr(buff, LOCALE_EN_US, LOCALE_NOUSEROVERRIDE, pDecOut); } /************************************************************************ @@ -6070,7 +6070,8 @@ static BSTR VARIANT_BstrReplaceDecimal(W the need to replace the decimal separator, and if so, will prepare an appropriate NUMBERFMTW structure to do the job via GetNumberFormatW(). */ - GetLocaleInfoW(lcid, LOCALE_SDECIMAL, lpDecimalSep, sizeof(lpDecimalSep) / sizeof(WCHAR)); + GetLocaleInfoW(lcid, LOCALE_SDECIMAL | (dwFlags & LOCALE_NOUSEROVERRIDE), + lpDecimalSep, sizeof(lpDecimalSep) / sizeof(WCHAR)); if (lpDecimalSep[0] == '.' && lpDecimalSep[1] == '\0') { /* locale is compatible with English - return original string */ @@ -6095,8 +6096,7 @@ static BSTR VARIANT_BstrReplaceDecimal(W if (p) minFormat.NumDigits = strlenW(p + 1); numbuff[0] = '\0'; - if (!GetNumberFormatW(lcid, dwFlags & LOCALE_NOUSEROVERRIDE, - buff, &minFormat, numbuff, sizeof(numbuff) / sizeof(WCHAR))) + if (!GetNumberFormatW(lcid, 0, buff, &minFormat, numbuff, sizeof(numbuff) / sizeof(WCHAR))) { WARN("GetNumberFormatW() failed, returning raw number string instead\n"); bstrOut = SysAllocString(buff);

1 0

Alexandre Julliard : oleaut32/tests: Use LOCALE_NOUSEROVERRIDE in tests that depend on the decimal separator.
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: 87fa2e3f914be98b2717caa6cd79aea237a3526e URL: http://source.winehq.org/git/wine.git/?a=commit;h=87fa2e3f914be98b2717caa6c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 7 14:05:45 2006 +0100 oleaut32/tests: Use LOCALE_NOUSEROVERRIDE in tests that depend on the decimal separator. --- dlls/oleaut32/tests/vartype.c | 174 ++++++++++++++++++++-------------------- 1 files changed, 87 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=87fa2e3f914be98b2717c…

1 0

Alexandre Julliard : kernel32: For LOCALE_NOUSEROVERRIDE, check locale against the appropriate default lcid.
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: 9967d82146ee3052a01c8d285fc33146d7958861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9967d82146ee3052a01c8d285… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 7 12:34:25 2006 +0100 kernel32: For LOCALE_NOUSEROVERRIDE, check locale against the appropriate default lcid. --- dlls/kernel32/locale.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 042ea7b..8792623 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1194,7 +1194,8 @@ INT WINAPI GetLocaleInfoW( LCID lcid, LC /* first check for overrides in the registry */ - if (!(lcflags & LOCALE_NOUSEROVERRIDE) && lcid == GetUserDefaultLCID()) + if (!(lcflags & LOCALE_NOUSEROVERRIDE) && + lcid == convert_default_lcid( LOCALE_USER_DEFAULT, lctype )) { const WCHAR *value = get_locale_value_name(lctype);

1 0

Eric Pouech : winecfg: A few fixes for the French translation.
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: 59e82f4ff94176351745ad6ca6ac2e1c92d9841c URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e82f4ff94176351745ad6ca… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Dec 6 21:35:38 2006 +0100 winecfg: A few fixes for the French translation. --- programs/winecfg/Fr.rc | 108 ++++++++++++++++++++++++------------------------ 1 files changed, 54 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59e82f4ff94176351745a…

1 0

Hwang YunSong(황윤성) : README: Updated Korean translation.
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: 04842dceaf48264c07d1c48fa8d0ac4365df08f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04842dceaf48264c07d1c48fa… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Thu Dec 7 09:24:16 2006 +0900 README: Updated Korean translation. --- documentation/README.ko | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/README.ko b/documentation/README.ko index 970016c..c364a64 100644 --- a/documentation/README.ko +++ b/documentation/README.ko @@ -30,7 +30,7 @@ Wine�� ϰ� ��Ű�� ؼ�, �� FreeBSD 5.3 �̳� �� ֽ� Solaris x86 2.5 �̳� �� ֽ� NetBSD-�� - MacOS X 10.4 �� ֽ� �� + Mac OS X 10.4 �� ֽ� �� Wine�� Ű�� ؼ� Ŀ�� 尡 �ʿ��մϴ�, �׷�� Ѵٰ� ��޵� �ü�� մϴ�. @@ -59,7 +59,7 @@ NetBSD ��: �� USER_LDT, SYSVSHM, SYSVSEM, �׸�� SYSVMSG �ɼ�� Ŀ�ο�� 밡��ϰ� �Ǿ��ִ�� Ȯ��Ͻʽÿ� -MacOS ��: +Mac OS X ��: �� x86�� ϱ� �� Xcode 2.4�� ֽŹ�� ʿ�� մϴ� .

1 0

Alexandre Julliard : kernel32/tests: Added LOCALE_NOUSEROVERRIDE flag on time tests that rely on AM/PM.
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: 82218fcf20bb511a01a918b0661655ccd07b768b URL: http://source.winehq.org/git/wine.git/?a=commit;h=82218fcf20bb511a01a918b06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 7 12:33:55 2006 +0100 kernel32/tests: Added LOCALE_NOUSEROVERRIDE flag on time tests that rely on AM/PM. --- dlls/kernel32/tests/locale.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index da51a24..95e1a10 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -177,15 +177,15 @@ static void test_GetTimeFormatA(void) curtime.wSecond = 13; curtime.wMilliseconds = 22; STRINGSA("tt HH':'mm'@'ss", "AM 08:56(a)13"); /* Valid time */ - ret = GetTimeFormatA(lcid, TIME_FORCE24HOURFORMAT, &curtime, input, buffer, COUNTOF(buffer)); + ret = GetTimeFormatA(lcid, NUO|TIME_FORCE24HOURFORMAT, &curtime, input, buffer, COUNTOF(buffer)); EXPECT_VALID; EXPECT_LENA; EXPECT_EQA; STRINGSA("tt HH':'mm'@'ss", "A"); /* Insufficent buffer */ - ret = GetTimeFormatA(lcid, TIME_FORCE24HOURFORMAT, &curtime, input, buffer, 2); + ret = GetTimeFormatA(lcid, NUO|TIME_FORCE24HOURFORMAT, &curtime, input, buffer, 2); EXPECT_BUFFER; EXPECT_LEN(0); EXPECT_EQA; STRINGSA("tt HH':'mm'@'ss", "AM 08:56(a)13"); /* Calculate length only */ - ret = GetTimeFormatA(lcid, TIME_FORCE24HOURFORMAT, &curtime, input, NULL, 0); + ret = GetTimeFormatA(lcid, NUO|TIME_FORCE24HOURFORMAT, &curtime, input, NULL, 0); EXPECT_VALID; EXPECT_LENA; STRINGSA("", "8 AM"); /* TIME_NOMINUTESORSECONDS, default format */ @@ -202,11 +202,11 @@ static void test_GetTimeFormatA(void) STRINGSA("h:m:s tt", "8:56 AM"); /* TIME_NOSECONDS */ strcpy(Expected, "8:56 AM"); - ret = GetTimeFormatA(lcid, TIME_NOSECONDS, &curtime, input, buffer, COUNTOF(buffer)); + ret = GetTimeFormatA(lcid, NUO|TIME_NOSECONDS, &curtime, input, buffer, COUNTOF(buffer)); EXPECT_VALID; EXPECT_LENA; EXPECT_EQA; STRINGSA("h.@:m.@:s.@:tt", "8.@:56AM"); /* Multiple delimiters */ - ret = GetTimeFormatA(lcid, TIME_NOSECONDS, &curtime, input, buffer, COUNTOF(buffer)); + ret = GetTimeFormatA(lcid, NUO|TIME_NOSECONDS, &curtime, input, buffer, COUNTOF(buffer)); EXPECT_VALID; EXPECT_LENA; EXPECT_EQA; STRINGSA("s1s2s3", ""); /* Duplicate tokens */ @@ -214,12 +214,12 @@ static void test_GetTimeFormatA(void) EXPECT_VALID; EXPECT_LENA; EXPECT_EQA; STRINGSA("t/tt", "A/AM"); /* AM time marker */ - ret = GetTimeFormatA(lcid, 0, &curtime, input, buffer, COUNTOF(buffer)); + ret = GetTimeFormatA(lcid, NUO, &curtime, input, buffer, COUNTOF(buffer)); EXPECT_VALID; EXPECT_LENA; EXPECT_EQA; curtime.wHour = 13; STRINGSA("t/tt", "P/PM"); /* PM time marker */ - ret = GetTimeFormatA(lcid, 0, &curtime, input, buffer, COUNTOF(buffer)); + ret = GetTimeFormatA(lcid, NUO, &curtime, input, buffer, COUNTOF(buffer)); EXPECT_VALID; EXPECT_LENA; EXPECT_EQA; STRINGSA("h1t2tt3m", "156"); /* TIME_NOTIMEMARKER: removes text around time marker token */ @@ -227,7 +227,7 @@ static void test_GetTimeFormatA(void) EXPECT_VALID; EXPECT_LENA; EXPECT_EQA; STRINGSA("h:m:s tt", "13:56:13 PM"); /* TIME_FORCE24HOURFORMAT */ - ret = GetTimeFormatA(lcid, TIME_FORCE24HOURFORMAT, &curtime, input, buffer, COUNTOF(buffer)); + ret = GetTimeFormatA(lcid, NUO|TIME_FORCE24HOURFORMAT, &curtime, input, buffer, COUNTOF(buffer)); EXPECT_VALID; EXPECT_LENA; EXPECT_EQA; STRINGSA("h:m:s", "13:56:13"); /* TIME_FORCE24HOURFORMAT doesn't add time marker */ @@ -238,7 +238,7 @@ static void test_GetTimeFormatA(void) curtime.wMinute = 5; curtime.wSecond = 3; STRINGSA("h hh H HH m mm s ss t tt", "2 02 14 14 5 05 3 03 P PM"); /* 24 hrs, leading 0 */ - ret = GetTimeFormatA(lcid, 0, &curtime, input, buffer, COUNTOF(buffer)); + ret = GetTimeFormatA(lcid, NUO, &curtime, input, buffer, COUNTOF(buffer)); EXPECT_VALID; EXPECT_LENA; EXPECT_EQA; curtime.wHour = 0; @@ -247,7 +247,7 @@ static void test_GetTimeFormatA(void) EXPECT_VALID; EXPECT_LENA; EXPECT_EQA; STRINGSA("h:m:s tt", "12:5:3 AM"); /* non-zero flags should fail with format, doesn't */ - ret = GetTimeFormatA(lcid, 0, &curtime, input, buffer, COUNTOF(buffer)); + ret = GetTimeFormatA(lcid, NUO, &curtime, input, buffer, COUNTOF(buffer)); EXPECT_VALID; EXPECT_LENA; EXPECT_EQA; /* try to convert formatting strings with more than two letters @@ -272,7 +272,7 @@ static void test_GetTimeFormatA(void) STRINGSA("h 'h' H 'H' HH 'HH' m 'm' s 's' t 't' tt 'tt'", "8 h 8 H 08 HH 56 m 13 s A t AM tt"); /* "'" preserves tokens */ - ret = GetTimeFormatA(lcid, 0, &curtime, input, buffer, COUNTOF(buffer)); + ret = GetTimeFormatA(lcid, NUO, &curtime, input, buffer, COUNTOF(buffer)); EXPECT_VALID; EXPECT_LENA; EXPECT_EQA; STRINGSA("'''", "'"); /* invalid quoted string */

1 0

Rob Shearman : ole32: Add some documentation for CoCreateInstance.
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: 7a5766346f665d51ef44c027bee77e7596227ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a5766346f665d51ef44c027b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 7 00:52:40 2006 +0000 ole32: Add some documentation for CoCreateInstance. --- dlls/ole32/compobj.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index f29de4d..dcae4f8 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2107,6 +2107,34 @@ HRESULT WINAPI GetClassFile(LPCOLESTR fi /*********************************************************************** * CoCreateInstance [OLE32.@] + * + * Creates an instance of the specified class. + * + * PARAMS + * rclsid [I] Class ID to create an instance of. + * pUnkOuter [I] Optional outer unknown to allow aggregation with another object. + * dwClsContext [I] Flags to restrict the location of the created instance. + * iid [I] The ID of the interface of the instance to return. + * ppv [O] On returns, contains a pointer to the specified interface of the instance. + * + * RETURNS + * Success: S_OK + * Failure: HRESULT code. + * + * NOTES + * The dwClsContext parameter can be one or more of the following: + *| CLSCTX_INPROC_SERVER - Use an in-process server, such as from a DLL. + *| CLSCTX_INPROC_HANDLER - Use an in-process object which handles certain functions for an object running in another process. + *| CLSCTX_LOCAL_SERVER - Connect to an object running in another process. + *| CLSCTX_REMOTE_SERVER - Connect to an object running on another machine. + * + * Aggregation is the concept of deferring the IUnknown of an object to another + * object. This allows a separate object to behave as though it was part of + * the object and to allow this the pUnkOuter parameter can be set. Note that + * not all objects support having an outer of unknown. + * + * SEE ALSO + * CoGetClassObject() */ HRESULT WINAPI CoCreateInstance( REFCLSID rclsid,

1 0

Francois Gouget : msvcmaker: Remove references to wine_unicode and to .spec .c files.
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: d60b99bd127e96d25fee24f911b43747eed78a32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d60b99bd127e96d25fee24f91… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 6 12:20:08 2006 +0100 msvcmaker: Remove references to wine_unicode and to .spec.c files. --- tools/winapi/msvcmaker | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 6ee5483..fac4359 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -425,12 +425,11 @@ sub _generate_dsp($$) { my @header_files = @{$modules{$module}{header_files}}; my @resource_files = @{$modules{$module}{resource_files}}; - if ($project !~ /^wine(?:_unicode|build|runtests|test)?$/ && + if ($project !~ /^wine(?:build|runtests|test)?$/ && $project !~ /^(?:gdi32)_.+?$/ && $project !~ /_test$/) { push @source_files, "$project.spec"; - # push @source_files, "$project.spec.c"; @source_files = sort(@source_files); } @@ -746,10 +745,9 @@ sub _generate_dsp($$) { if ($project eq "winebuild") { print OUT "# Begin Special Build Tool\r\n"; print OUT "SOURCE=\"\$(InputPath)\"\r\n"; - print OUT "PostBuild_Desc=Copying wine.lib and wine_unicode.lib ...\r\n"; + print OUT "PostBuild_Desc=Copying wine.lib ...\r\n"; print OUT "PostBuild_Cmds="; - print OUT "copy ..\\..\\libs\\wine\\$output_dir\\wine.lib \$(OutDir)\t"; - print OUT "copy ..\\..\\libs\\unicode\\$output_dir\\wine_unicode.lib \$(OutDir)\r\n"; + print OUT "copy ..\\..\\libs\\wine\\$output_dir\\wine.lib \$(OutDir)\r\n"; print OUT "# End Special Build Tool\r\n"; } print OUT "# Begin Target\r\n"; @@ -978,14 +976,14 @@ sub _generate_wine_dsw($) { my $dsp_file = $modules{$module}{dsp_file}; my @dependencies; - if($project =~ /^wine(?:_unicode)?$/) { + if($project eq "wine") { @dependencies = (); - } elsif($project =~ /^winebuild$/) { - @dependencies = ("wine", "wine_unicode"); + } elsif($project eq "winebuild") { + @dependencies = ("wine"); } elsif($project =~ /^(?:gdi32)_.+?$/) { @dependencies = (); } else { - @dependencies = ("wine", "wine_unicode", "winebuild"); + @dependencies = ("wine", "winebuild"); } if($project =~ /^gdi32$/) {

1 0

Rob Shearman : wininet: Make HTTP_HandleRedirect no longer call HTTP_HttpSendRequestW.
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: 4319ec6b838edb6bc5b289d37187b90c9f3e21ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=4319ec6b838edb6bc5b289d37… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 7 00:53:27 2006 +0000 wininet: Make HTTP_HandleRedirect no longer call HTTP_HttpSendRequestW. Make the redirect handling in HTTP_HttpSendRequestW iterate instead of recurse. --- dlls/wininet/http.c | 70 ++++++++++++++++++++++++-------------------------- 1 files changed, 34 insertions(+), 36 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 36c85da..f6e3421 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -102,9 +102,7 @@ static BOOL HTTP_InsertProxyAuthorizatio static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLevel, LPVOID lpBuffer, LPDWORD lpdwBufferLength, LPDWORD lpdwIndex); -static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl, - LPCWSTR lpszHeaders, DWORD dwHeaderLength, LPVOID lpOptional, DWORD - dwOptionalLength, DWORD dwContentLength); +static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl); LPHTTPHEADERW HTTP_GetHeader(LPWININETHTTPREQW req, LPCWSTR head) @@ -636,7 +634,9 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hR /* redirects are always GETs */ HeapFree(GetProcessHeap(),0,lpwhr->lpszVerb); lpwhr->lpszVerb = WININET_strdupW(szGET); - return HTTP_HandleRedirect(lpwhr, szNewLocation, NULL, 0, NULL, 0, 0); + rc = HTTP_HandleRedirect(lpwhr, szNewLocation); + if (rc) + rc = HTTP_HttpSendRequestW(lpwhr, NULL, 0, NULL, 0, 0, TRUE); } } } @@ -1928,9 +1928,7 @@ BOOL WINAPI HttpSendRequestA(HINTERNET h /*********************************************************************** * HTTP_HandleRedirect (internal) */ -static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl, LPCWSTR lpszHeaders, - DWORD dwHeaderLength, LPVOID lpOptional, DWORD dwOptionalLength, - DWORD dwContentLength) +static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) { LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; LPWININETAPPINFOW hIC = lpwhs->lpAppInfo; @@ -2136,8 +2134,7 @@ static BOOL HTTP_HandleRedirect(LPWININE } } - return HTTP_HttpSendRequestW(lpwhr, lpszHeaders, dwHeaderLength, lpOptional, - dwOptionalLength, dwContentLength, TRUE); + return TRUE; } /*********************************************************************** @@ -2225,7 +2222,6 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWINI INT responseLen; BOOL loop_next = FALSE; INTERNET_ASYNC_RESULT iar; - LPHTTPHEADERW Host; TRACE("--> %p\n", lpwhr); @@ -2247,14 +2243,16 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWINI HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REPLACE); } - Host = HTTP_GetHeader(lpwhr,szHost); do { DWORD len; char *ascii_req; - TRACE("Going to url %s %s\n", debugstr_w(Host->lpszValue), debugstr_w(lpwhr->lpszPath)); - loop_next = FALSE; + if (TRACE_ON(wininet)) + { + LPHTTPHEADERW Host = HTTP_GetHeader(lpwhr,szHost); + TRACE("Going to url %s %s\n", debugstr_w(Host->lpszValue), debugstr_w(lpwhr->lpszPath)); + } HTTP_FixURL(lpwhr); @@ -2315,8 +2313,30 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWINI INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, &responseLen, sizeof(DWORD)); - + HTTP_ProcessHeaders(lpwhr); + + if (!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_AUTO_REDIRECT) && bSuccess) + { + DWORD dwCode,dwCodeLength=sizeof(DWORD),dwIndex=0; + WCHAR szNewLocation[2048]; + DWORD dwBufferSize=2048; + if (HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE,&dwCode,&dwCodeLength,&dwIndex) && + (dwCode==HTTP_STATUS_REDIRECT || dwCode==HTTP_STATUS_MOVED) && + HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,&dwIndex)) + { + INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, + INTERNET_STATUS_REDIRECT, szNewLocation, + dwBufferSize); + bSuccess = HTTP_HandleRedirect(lpwhr, szNewLocation); + if (bSuccess) + { + HeapFree(GetProcessHeap(), 0, requestString); + loop_next = TRUE; + } + } + } + } else bSuccess = TRUE; @@ -2328,28 +2348,6 @@ lend: HeapFree(GetProcessHeap(), 0, requestString); /* TODO: send notification for P3P header */ - - if(!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_AUTO_REDIRECT) && bSuccess && bEndRequest) - { - DWORD dwCode,dwCodeLength=sizeof(DWORD),dwIndex=0; - if(HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE,&dwCode,&dwCodeLength,&dwIndex) && - (dwCode==302 || dwCode==301)) - { - WCHAR szNewLocation[2048]; - DWORD dwBufferSize=2048; - dwIndex=0; - if(HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,&dwIndex)) - { - INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, - INTERNET_STATUS_REDIRECT, szNewLocation, - dwBufferSize); - return HTTP_HandleRedirect(lpwhr, szNewLocation, lpszHeaders, - dwHeaderLength, lpOptional, dwOptionalLength, - dwContentLength); - } - } - } - iar.dwResult = (DWORD)bSuccess; iar.dwError = bSuccess ? ERROR_SUCCESS : INTERNET_GetLastError();

1 0

Rob Shearman : wininet: Make a function for resolving the server name for an HTTP request
by Alexandre Julliard 07 Dec '06

07 Dec '06

Module: wine Branch: master Commit: 72575a06ca3b9a3c154f4934420f5f48480af241 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72575a06ca3b9a3c154f49344… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 7 00:52:50 2006 +0000 wininet: Make a function for resolving the server name for an HTTP request and sending the appropriate callbacks and use it to remove some duplicated code. --- dlls/wininet/http.c | 63 +++++++++++++++++++++----------------------------- 1 files changed, 27 insertions(+), 36 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f6e3421..8327b8b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -964,6 +964,31 @@ static BOOL HTTP_DealWithProxy( LPWININE return TRUE; } +static BOOL HTTP_ResolveName(LPWININETHTTPREQW lpwhr) +{ + char szaddr[32]; + LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; + + INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, + INTERNET_STATUS_RESOLVING_NAME, + lpwhs->lpszServerName, + strlenW(lpwhs->lpszServerName)+1); + + if (!GetAddress(lpwhs->lpszServerName, lpwhs->nServerPort, + &lpwhs->socketAddress)) + { + INTERNET_SetLastError(ERROR_INTERNET_NAME_NOT_RESOLVED); + return FALSE; + } + + inet_ntop(lpwhs->socketAddress.sin_family, &lpwhs->socketAddress.sin_addr, + szaddr, sizeof(szaddr)); + INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, + INTERNET_STATUS_NAME_RESOLVED, + szaddr, strlen(szaddr)+1); + return TRUE; +} + /*********************************************************************** * HTTP_HttpOpenRequestW (internal) * @@ -988,7 +1013,6 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(L static const WCHAR szUrlForm[] = {'h','t','t','p',':','/','/','%','s',0}; DWORD len; LPHTTPHEADERW Host; - char szaddr[32]; TRACE("-->\n"); @@ -1135,29 +1159,12 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(L * A STATUS_REQUEST_COMPLETE is NOT sent here as per my tests on windows */ - /* - * According to my tests. The name is not resolved until a request is Opened - */ - INTERNET_SendCallback(&lpwhr->hdr, dwContext, - INTERNET_STATUS_RESOLVING_NAME, - lpwhs->lpszServerName, - strlenW(lpwhs->lpszServerName)+1); - - if (!GetAddress(lpwhs->lpszServerName, lpwhs->nServerPort, - &lpwhs->socketAddress)) + if (!HTTP_ResolveName(lpwhr)) { - INTERNET_SetLastError(ERROR_INTERNET_NAME_NOT_RESOLVED); InternetCloseHandle( handle ); handle = NULL; - goto lend; } - inet_ntop(lpwhs->socketAddress.sin_family, &lpwhs->socketAddress.sin_addr, - szaddr, sizeof(szaddr)); - INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, - INTERNET_STATUS_NAME_RESOLVED, - szaddr, strlen(szaddr)+1); - lend: if( lpwhr ) WININET_Release( &lpwhr->hdr ); @@ -1933,7 +1940,6 @@ static BOOL HTTP_HandleRedirect(LPWININE LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; LPWININETAPPINFOW hIC = lpwhs->lpAppInfo; WCHAR path[2048]; - char szaddr[32]; if(lpszUrl[0]=='/') { @@ -2090,23 +2096,8 @@ static BOOL HTTP_HandleRedirect(LPWININE lpwhs->lpszUserName = WININET_strdupW(userName); lpwhs->nServerPort = urlComponents.nPort; - INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, - INTERNET_STATUS_RESOLVING_NAME, - lpwhs->lpszServerName, - strlenW(lpwhs->lpszServerName)+1); - - if (!GetAddress(lpwhs->lpszServerName, lpwhs->nServerPort, - &lpwhs->socketAddress)) - { - INTERNET_SetLastError(ERROR_INTERNET_NAME_NOT_RESOLVED); + if (!HTTP_ResolveName(lpwhr)) return FALSE; - } - - inet_ntop(lpwhs->socketAddress.sin_family, &lpwhs->socketAddress.sin_addr, - szaddr, sizeof(szaddr)); - INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, - INTERNET_STATUS_NAME_RESOLVED, - szaddr, strlen(szaddr)+1); NETCON_close(&lpwhr->netConnection);

1 0