September 2011 - Wine-commits

Andrew Eikum : winecoreaudio.drv: Remove wave, mixer, and dsound driver code.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: a773b16d79b741f61056a65a7bd98d7ee6134e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a773b16d79b741f61056a65a7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Sep 23 15:04:05 2011 -0500 winecoreaudio.drv: Remove wave, mixer, and dsound driver code. --- dlls/winecoreaudio.drv/Makefile.in | 2 - dlls/winecoreaudio.drv/audio.c | 2539 ------------------------- dlls/winecoreaudio.drv/audiounit.c | 208 -- dlls/winecoreaudio.drv/coreaudio.c | 6 +- dlls/winecoreaudio.drv/mixer.c | 1028 ---------- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- dlls/winecoreaudio.drv/winecoreaudio.drv.spec | 3 - 7 files changed, 2 insertions(+), 3786 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a773b16d79b741f61056a…

1 0

Andrew Eikum : dsound: Remove hardware acceleration support.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: b1fdaa81b05dcf5931e5ab58f3ec640eac60e636 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1fdaa81b05dcf5931e5ab58f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Sat Sep 24 09:02:52 2011 -0500 dsound: Remove hardware acceleration support. --- dlls/dsound/buffer.c | 320 ++++++------------------- dlls/dsound/capture.c | 249 ++++--------------- dlls/dsound/dsound.c | 116 ++++----- dlls/dsound/dsound_convert.c | 1 - dlls/dsound/dsound_main.c | 60 ++---- dlls/dsound/dsound_private.h | 75 +++++-- dlls/dsound/duplex.c | 1 - dlls/dsound/mixer.c | 41 +--- dlls/dsound/primary.c | 558 ++++++++++++----------------------------- dlls/dsound/propset.c | 5 +- dlls/dsound/sound3d.c | 1 - dlls/winealsa.drv/midi.c | 1 - dlls/winealsa.drv/mmdevdrv.c | 1 - dlls/winmm/waveform.c | 68 ----- include/Makefile.in | 1 - include/dsdriver.h | 366 --------------------------- 16 files changed, 418 insertions(+), 1446 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1fdaa81b05dcf5931e5a…

1 0

Andrew Eikum : dsound: Validate buffer pointers in Unlock methods.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 7fae5f4f9feb456739654a3c0a1df5f4e0a28ebe URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fae5f4f9feb456739654a3c0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Sat Sep 24 09:03:06 2011 -0500 dsound: Validate buffer pointers in Unlock methods. --- dlls/dsound/buffer.c | 6 ++++++ dlls/dsound/primary.c | 6 ++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index aa870f4..50fe7c9 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -651,6 +651,12 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(IDirectSoundBuffer8 *iface, if (!p2) x2 = 0; + if((p1 && ((BYTE*)p1 < This->buffer->memory || + (BYTE*)p1 >= This->buffer->memory + This->buflen)) || + (p2 && ((BYTE*)p2 < This->buffer->memory || + (BYTE*)p2 >= This->buffer->memory + This->buflen))) + return DSERR_INVALIDPARAM; + if (x1 || x2) { RtlAcquireResourceShared(&This->device->buffer_list_lock, TRUE); diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 9eb74b7..df35abd 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -850,6 +850,12 @@ static HRESULT WINAPI PrimaryBufferImpl_Unlock( return DSERR_PRIOLEVELNEEDED; } + if((p1 && ((BYTE*)p1 < device->buffer || + (BYTE*)p1 >= device->buffer + device->buflen)) || + (p2 && ((BYTE*)p2 < device->buffer || + (BYTE*)p2 >= device->buffer + device->buflen))) + return DSERR_INVALIDPARAM; + return DS_OK; }

1 0

Frédéric Delanoy : cmd: Use helper function to return file io buffer.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: e5565a6d64d7260eba21ce11175409e01c7605b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5565a6d64d7260eba21ce111… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 23 12:37:43 2011 +0200 cmd: Use helper function to return file io buffer. --- programs/cmd/wcmdmain.c | 47 +++++++++++++++++++++++++---------------------- 1 files changed, 25 insertions(+), 22 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 26f377a..b254728 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -102,6 +102,19 @@ static char *output_bufA = NULL; #define MAX_WRITECONSOLE_SIZE 65535 static BOOL unicodePipes = FALSE; +/* + * Returns a buffer for reading from/writing to file + * Never freed + */ +static char *get_file_buffer(void) +{ + if (!output_bufA) { + output_bufA = HeapAlloc(GetProcessHeap(), 0, MAX_WRITECONSOLE_SIZE); + if (!output_bufA) + WINE_FIXME("Out of memory - could not allocate ansi 64K buffer\n"); + } + return output_bufA; +} /******************************************************************* * WCMD_output_asis_len - send output to current standard output @@ -126,23 +139,18 @@ static void WCMD_output_asis_len(const WCHAR *message, int len, HANDLE device) { if (!res) { BOOL usedDefaultChar = FALSE; DWORD convertedChars; + char *buffer; if (!unicodePipes) { - /* - * Allocate buffer to use when writing to file. (Not freed, as one off) - */ - if (!output_bufA) output_bufA = HeapAlloc(GetProcessHeap(), 0, - MAX_WRITECONSOLE_SIZE); - if (!output_bufA) { - WINE_FIXME("Out of memory - could not allocate ansi 64K buffer\n"); - return; - } + + if (!(buffer = get_file_buffer())) + return; /* Convert to OEM, then output */ convertedChars = WideCharToMultiByte(GetConsoleOutputCP(), 0, message, - len, output_bufA, MAX_WRITECONSOLE_SIZE, + len, buffer, MAX_WRITECONSOLE_SIZE, "?", &usedDefaultChar); - WriteFile(device, output_bufA, convertedChars, + WriteFile(device, buffer, convertedChars, &nOut, FALSE); } else { WriteFile(device, message, len*sizeof(WCHAR), @@ -223,21 +231,16 @@ BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, if (!res) { DWORD numRead; - /* - * Allocate buffer to use when reading from file. Not freed - */ - if (!output_bufA) output_bufA = HeapAlloc(GetProcessHeap(), 0, - MAX_WRITECONSOLE_SIZE); - if (!output_bufA) { - WINE_FIXME("Out of memory - could not allocate ansi 64K buffer\n"); - return 0; - } + char *buffer; + + if (!(buffer = get_file_buffer())) + return FALSE; /* Read from file (assume OEM codepage) */ - res = ReadFile(hIn, output_bufA, maxChars, &numRead, unused); + res = ReadFile(hIn, buffer, maxChars, &numRead, unused); /* Convert from OEM */ - *charsRead = MultiByteToWideChar(GetConsoleCP(), 0, output_bufA, numRead, + *charsRead = MultiByteToWideChar(GetConsoleCP(), 0, buffer, numRead, intoBuf, maxChars); }

1 0

Frédéric Delanoy : cmd: Add WCMD_output_stderr function to output error messages to stderr.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: fbddecab774e8cc6c07b292b4b1034f55e4c95ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbddecab774e8cc6c07b292b4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Sep 24 12:50:55 2011 +0200 cmd: Add WCMD_output_stderr function to output error messages to stderr. --- programs/cmd/wcmd.h | 1 + programs/cmd/wcmdmain.c | 23 ++++++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletions(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 940cb6e..d370764 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -73,6 +73,7 @@ void WCMD_leave_paged_mode(void); void WCMD_more (WCHAR *); void WCMD_move (void); void WCMD_output (const WCHAR *format, ...); +void WCMD_output_stderr (const WCHAR *format, ...); void WCMD_output_asis (const WCHAR *message); void WCMD_output_asis_stderr (const WCHAR *message); void WCMD_pause (void); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index b254728..8e222a3 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -174,7 +174,7 @@ void WCMD_output (const WCHAR *format, ...) { va_start(ap,format); ret = vsnprintfW(string, sizeof(string)/sizeof(WCHAR), format, ap); if( ret >= (sizeof(string)/sizeof(WCHAR))) { - WINE_ERR("Output truncated in WCMD_output\n" ); + WINE_ERR("Output truncated\n" ); ret = (sizeof(string)/sizeof(WCHAR)) - 1; string[ret] = '\0'; } @@ -182,6 +182,27 @@ void WCMD_output (const WCHAR *format, ...) { WCMD_output_asis_len(string, ret, GetStdHandle(STD_OUTPUT_HANDLE)); } +/******************************************************************* + * WCMD_output_stderr - send output to current standard error device. + * + */ + +void WCMD_output_stderr (const WCHAR *format, ...) { + + va_list ap; + WCHAR string[1024]; + int ret; + + va_start(ap,format); + ret = vsnprintfW(string, sizeof(string)/sizeof(WCHAR), format, ap); + if( ret >= (sizeof(string)/sizeof(WCHAR))) { + WINE_ERR("Output truncated\n" ); + ret = (sizeof(string)/sizeof(WCHAR)) - 1; + string[ret] = '\0'; + } + va_end(ap); + WCMD_output_asis_len(string, ret, GetStdHandle(STD_ERROR_HANDLE)); +} static int line_count; static int max_height;

1 0

Frédéric Delanoy : cmd: Output error messages to stderr where appropriate.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 9c616563078fe14ed89e565c2ac9e887c04eeba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c616563078fe14ed89e565c2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Sep 24 12:50:56 2011 +0200 cmd: Output error messages to stderr where appropriate. --- programs/cmd/batch.c | 2 +- programs/cmd/builtins.c | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index f988d95..800f05e 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -585,7 +585,7 @@ void WCMD_call (WCHAR *command) { SetFilePointer(context -> h, li.u.LowPart, &li.u.HighPart, FILE_BEGIN); } else { - WCMD_output_asis( WCMD_LoadMessage(WCMD_CALLINSCRIPT)); + WCMD_output_asis_stderr(WCMD_LoadMessage(WCMD_CALLINSCRIPT)); } } } diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index d8c69ba..33437d1 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -524,7 +524,7 @@ void WCMD_create_dir (WCHAR *command) { WCHAR *argN = command; if (param1[0] == 0x00) { - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); return; } /* Loop through all args */ @@ -575,7 +575,7 @@ static void WCMD_delete_parse_attributes(DWORD *wantSet, DWORD *wantClear) { case 'S': mask = FILE_ATTRIBUTE_SYSTEM; break; case 'A': mask = FILE_ATTRIBUTE_ARCHIVE; break; default: - WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_SYNTAXERR)); } if (negate) *wantClear |= mask; @@ -843,14 +843,14 @@ BOOL WCMD_delete (WCHAR *command) { found = WCMD_delete_one(thisArg); if (!found) { errorlevel = 1; - WCMD_output (WCMD_LoadMessage(WCMD_FILENOTFOUND), thisArg); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_FILENOTFOUND), thisArg); } foundAny |= found; } /* Handle no valid args */ if (!argsProcessed) - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); return foundAny; } @@ -1380,7 +1380,7 @@ void WCMD_goto (CMD_LIST **cmdList) { static const WCHAR eofW[] = {':','e','o','f','\0'}; if (param1[0] == 0x00) { - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); return; } @@ -1408,7 +1408,7 @@ void WCMD_goto (CMD_LIST **cmdList) { if (lstrcmpiW (current, paramStart) == 0) return; } } - WCMD_output (WCMD_LoadMessage(WCMD_NOTARGET)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOTARGET)); } return; } @@ -1568,7 +1568,7 @@ void WCMD_move (void) { WCHAR ext[MAX_PATH]; if (param1[0] == 0x00) { - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); return; } @@ -1760,7 +1760,7 @@ void WCMD_remove_dir (WCHAR *command) { /* Handle no valid args */ if (argsProcessed == 0) { - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); return; } @@ -1789,7 +1789,7 @@ void WCMD_rename (void) { /* Must be at least two args */ if (param1[0] == 0x00 || param2[0] == 0x00) { - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); errorlevel = 1; return; } @@ -2256,7 +2256,7 @@ void WCMD_setshow_env (WCHAR *s) { /* If no parameter, or no '=' sign, return an error */ if (!(*s) || ((p = strchrW (s, '=')) == NULL )) { - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); return; } @@ -2284,7 +2284,7 @@ void WCMD_setshow_env (WCHAR *s) { if (p == NULL) { env = GetEnvironmentStringsW(); if (WCMD_setshow_sortenv( env, s ) == 0) { - WCMD_output (WCMD_LoadMessage(WCMD_MISSINGENV), s); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_MISSINGENV), s); errorlevel = 1; } return; @@ -2321,7 +2321,7 @@ void WCMD_setshow_path (const WCHAR *command) { WCMD_output_asis ( newline); } else { - WCMD_output (WCMD_LoadMessage(WCMD_NOPATH)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOPATH)); } } else { @@ -2445,7 +2445,7 @@ void WCMD_type (WCHAR *command) { BOOL writeHeaders = FALSE; if (param1[0] == 0x00) { - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); return; } @@ -2467,7 +2467,7 @@ void WCMD_type (WCHAR *command) { FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) { WCMD_print_error (); - WCMD_output (WCMD_LoadMessage(WCMD_READFAIL), thisArg); + WCMD_output(WCMD_LoadMessage(WCMD_READFAIL), thisArg); /* should be _stderr */ errorlevel = 1; } else { if (writeHeaders) { @@ -2570,7 +2570,7 @@ void WCMD_more (WCHAR *command) { FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) { WCMD_print_error (); - WCMD_output (WCMD_LoadMessage(WCMD_READFAIL), thisArg); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_READFAIL), thisArg); errorlevel = 1; } else { ULONG64 curPos = 0; @@ -2626,7 +2626,7 @@ void WCMD_verify (const WCHAR *command) { verify_mode = FALSE; return; } - else WCMD_output (WCMD_LoadMessage(WCMD_VERIFYERR)); + else WCMD_output_stderr(WCMD_LoadMessage(WCMD_VERIFYERR)); } /**************************************************************************** @@ -2667,7 +2667,7 @@ int WCMD_volume(BOOL set_label, const WCHAR *path) else { static const WCHAR fmt[] = {'%','s','\\','\0'}; if ((path[1] != ':') || (strlenW(path) != 2)) { - WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_SYNTAXERR)); return 0; } wsprintfW (curdir, fmt, path); @@ -2916,7 +2916,7 @@ void WCMD_color (void) { HANDLE hStdOut = GetStdHandle(STD_OUTPUT_HANDLE); if (param1[0] != 0x00 && strlenW(param1) > 2) { - WCMD_output (WCMD_LoadMessage(WCMD_ARGERR)); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_ARGERR)); return; }

1 0

Frédéric Delanoy : cmd: Fix WCMD_fgets documentation.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 83daee9a89f8bd72cecf93bec75d5c2176b3c5b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83daee9a89f8bd72cecf93bec… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Sep 24 23:31:01 2011 +0200 cmd: Fix WCMD_fgets documentation. --- programs/cmd/batch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 800f05e..c5e73c6 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -176,7 +176,7 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where, WCHAR **end) { /**************************************************************************** * WCMD_fgets * - * Get one line from a batch file. We can't use the native f* functions because + * Get one line from a batch file/console. We can't use the native f* functions because * of the filename syntax differences between DOS and Unix. Also need to lose * the LF (or CRLF) from the line. */

1 0

Alistair Leslie-Hughes : msxml3: Support creating IXMLParser Interface.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: 5df9ff3aa995f72f4f01289ae66b5908ffe48dca URL: http://source.winehq.org/git/wine.git/?a=commit;h=5df9ff3aa995f72f4f01289ae… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 30 20:13:11 2011 +1000 msxml3: Support creating IXMLParser Interface. --- dlls/msxml3/Makefile.in | 5 +- dlls/msxml3/factory.c | 8 + dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/tests/Makefile.in | 3 +- dlls/msxml3/tests/xmlparser.c | 62 ++++++ dlls/msxml3/xmlparser.c | 421 +++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/xmlparser.idl | 24 ++- 7 files changed, 517 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5df9ff3aa995f72f4f012…

1 0

Alistair Leslie-Hughes : mshtml: IID_IHTMLCurrentStyle4 isn' t supported on IE6.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: f8baa370523f6f3c5a2fe49c6ea0b173452d6d1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8baa370523f6f3c5a2fe49c6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 26 20:19:45 2011 +1000 mshtml: IID_IHTMLCurrentStyle4 isn't supported on IE6. --- dlls/mshtml/tests/dom.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f585c45..0ce3ead 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -365,7 +365,6 @@ static const IID * const cstyle_iids[] = { &IID_IHTMLCurrentStyle, &IID_IHTMLCurrentStyle2, &IID_IHTMLCurrentStyle3, - &IID_IHTMLCurrentStyle4, NULL }; @@ -4568,8 +4567,20 @@ static void test_defaults(IHTMLDocument2 *doc) hres = IHTMLElement2_get_currentStyle(elem2, &cstyle); ok(hres == S_OK, "get_currentStyle failed: %08x\n", hres); if(SUCCEEDED(hres)) { + IUnknown *unk; + test_disp((IUnknown*)cstyle, &DIID_DispHTMLCurrentStyle, "[object]"); test_ifaces((IUnknown*)cstyle, cstyle_iids); + + hres = IHTMLCurrentStyle_QueryInterface(cstyle, &IID_IHTMLCurrentStyle4, (void**)&unk); + if(SUCCEEDED(hres)) + IUnknown_Release(unk); + else + { + /*IE6 doesn't have interface */ + win_skip("IID_IHTMLCurrentStyle4 not supported\n"); + } + IHTMLCurrentStyle_Release(cstyle); } IHTMLElement2_Release(elem2);

1 0

André Hentschel : wininet: Fix UrlComponents initialisation.
by Alexandre Julliard 26 Sep '11

26 Sep '11

Module: wine Branch: master Commit: c09e6bf881eb647245eee637a7e943206b7c8176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c09e6bf881eb647245eee637a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Sep 26 19:40:15 2011 +0200 wininet: Fix UrlComponents initialisation. --- dlls/wininet/internet.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 79ec790..f9e8dea 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -635,6 +635,7 @@ static BOOL INTERNET_ConfigureProxy( appinfo_t *lpwai ) UrlComponents.dwUserNameLength = INTERNET_MAX_USER_NAME_LENGTH; UrlComponents.lpszPassword = password; UrlComponents.dwPasswordLength = INTERNET_MAX_PASSWORD_LENGTH; + UrlComponents.dwUrlPathLength = 0; UrlComponents.dwExtraInfoLength = 0; if(InternetCrackUrlW(wpi.proxy, 0, 0, &UrlComponents))

1 0