September 2008 - Wine-Commits

Dmitry Timoshkov : jscript: Fix the uninitialized variable warning.
by Alexandre Julliard Sept. 17, 2008

Sept. 17, 2008

Module: wine Branch: master Commit: e853f1076cd79cde8927b8c9fcd199143faf1bde URL: http://source.winehq.org/git/wine.git/?a=commit;h=e853f1076cd79cde8927b8c9f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Sep 17 11:29:50 2008 +0900 jscript: Fix the uninitialized variable warning. --- dlls/jscript/engine.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index b700d33..2b663d3 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -533,7 +533,7 @@ HRESULT block_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t static HRESULT variable_list_eval(exec_ctx_t *ctx, variable_declaration_t *var_list, jsexcept_t *ei) { variable_declaration_t *iter; - HRESULT hres; + HRESULT hres = E_FAIL; for(iter = var_list; iter; iter = iter->next) { VARIANT val;

1 0

Jacek Caban : mshtml: Fixed tests on IE7.
by Alexandre Julliard Sept. 17, 2008

Sept. 17, 2008

Module: wine Branch: master Commit: ef221478f02a18fa867dd2fa07e87fcfd90054eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef221478f02a18fa867dd2fa0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 17 03:24:25 2008 +0200 mshtml: Fixed tests on IE7. --- dlls/mshtml/navigate.c | 5 +++++ dlls/mshtml/tests/htmldoc.c | 6 ++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 78ae19d..d019e29 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -344,6 +344,8 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac TRACE("(%p)->(%08x %s)\n", This, hresult, debugstr_w(szError)); + /* NOTE: IE7 calls GetBindResult here */ + if(This->binding) { IBinding_Release(This->binding); This->binding = NULL; @@ -687,6 +689,9 @@ HRESULT start_binding(HTMLDocument *doc, BSCallback *bscallback, IBindCtx *bctx) HRESULT hres; bscallback->doc = doc; + + /* NOTE: IE7 calls IsSystemMoniker here*/ + call_docview_84(doc); if(bctx) { diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 5e95448..00d682c 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -1009,8 +1009,10 @@ static HRESULT WINAPI Moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMon BINDSTATUS_ENDDOWNLOADDATA, NULL); ok(hres == S_OK, "OnProgress(BINDSTATUS_ENDDOWNLOADDATA) failed: %08x\n", hres); + SET_EXPECT(GetBindResult); hres = IBindStatusCallback_OnStopBinding(callback, S_OK, NULL); ok(hres == S_OK, "OnStopBinding failed: %08x\n", hres); + SET_CALLED(GetBindResult); /* IE7 */ IBindStatusCallback_Release(callback); @@ -2637,6 +2639,7 @@ static void test_Load(IPersistMoniker *persist) } SET_EXPECT(OnChanged_READYSTATE); SET_EXPECT(Exec_ShellDocView_84); + SET_EXPECT(IsSystemMoniker); SET_EXPECT(BindToStorage); SET_EXPECT(SetActiveObject); if(set_clientsite) { @@ -2674,6 +2677,7 @@ static void test_Load(IPersistMoniker *persist) container_locked = TRUE; } CHECK_CALLED(OnChanged_READYSTATE); + SET_CALLED(IsSystemMoniker); /* IE7 */ SET_CALLED(Exec_ShellDocView_84); CHECK_CALLED(BindToStorage); SET_CALLED(SetActiveObject); /* FIXME */ @@ -3046,6 +3050,7 @@ static void test_exec_editmode(IUnknown *unk, BOOL loaded) SET_EXPECT(Invoke_AMBIENT_SILENT); SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); SET_EXPECT(OnChanged_READYSTATE); + SET_EXPECT(IsSystemMoniker); SET_EXPECT(Exec_ShellDocView_84); if(loaded) SET_EXPECT(BindToStorage); @@ -3071,6 +3076,7 @@ static void test_exec_editmode(IUnknown *unk, BOOL loaded) CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); CHECK_CALLED(OnChanged_READYSTATE); + SET_CALLED(IsSystemMoniker); /* IE7 */ SET_CALLED(Exec_ShellDocView_84); if(loaded) CHECK_CALLED(BindToStorage);

1 0

Jacek Caban : jscript: Fixed allocation of script buffer.
by Alexandre Julliard Sept. 17, 2008

Sept. 17, 2008

Module: wine Branch: master Commit: 4e670c1c6bde92bb6d760f7e3aca9850f2862492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e670c1c6bde92bb6d760f7e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 17 03:05:38 2008 +0200 jscript: Fixed allocation of script buffer. --- dlls/jscript/tests/run.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 29947fe..1b40237 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -544,7 +544,7 @@ static void run_from_res(const char *name) data = LoadResource(NULL, src); len = MultiByteToWideChar(CP_ACP, 0, data, size, NULL, 0); - str = SysAllocStringLen(NULL, len-1); + str = SysAllocStringLen(NULL, len); len = MultiByteToWideChar(CP_ACP, 0, data, size, str, len); SET_EXPECT(global_success_d);

1 0

Vitaliy Margolen : kernel32: Use NULL attributes if name and SA are not not specified.
by Alexandre Julliard Sept. 17, 2008

Sept. 17, 2008

Module: wine Branch: master Commit: c51ca178929dd8f901cc2085d597f8ac71166f61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c51ca178929dd8f901cc2085d… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Sep 14 11:02:25 2008 -0600 kernel32: Use NULL attributes if name and SA are not not specified. --- dlls/kernel32/virtual.c | 38 +++++++++++++++++++++----------------- 1 files changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 9c5080f..38a408a 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -338,26 +338,10 @@ HANDLE WINAPI CreateFileMappingW( HANDLE hFile, LPSECURITY_ATTRIBUTES sa, static const int sec_flags = SEC_FILE | SEC_IMAGE | SEC_RESERVE | SEC_COMMIT | SEC_NOCACHE; HANDLE ret; - OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW; NTSTATUS status; DWORD access, sec_type; LARGE_INTEGER size; - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = NULL; - attr.Attributes = OBJ_OPENIF | ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); - attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; - attr.SecurityQualityOfService = NULL; - - if (name) - { - RtlInitUnicodeString( &nameW, name ); - attr.ObjectName = &nameW; - attr.RootDirectory = get_BaseNamedObjects_handle(); - } - sec_type = protect & sec_flags; protect &= ~sec_flags; if (!sec_type) sec_type = SEC_COMMIT; @@ -402,7 +386,27 @@ HANDLE WINAPI CreateFileMappingW( HANDLE hFile, LPSECURITY_ATTRIBUTES sa, size.u.LowPart = size_low; size.u.HighPart = size_high; - status = NtCreateSection( &ret, access, &attr, &size, protect, sec_type, hFile ); + if (sa || name) + { + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = NULL; + attr.Attributes = OBJ_OPENIF | ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); + attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; + attr.SecurityQualityOfService = NULL; + if (name) + { + RtlInitUnicodeString( &nameW, name ); + attr.ObjectName = &nameW; + attr.RootDirectory = get_BaseNamedObjects_handle(); + } + status = NtCreateSection( &ret, access, &attr, &size, protect, sec_type, hFile ); + } + else status = NtCreateSection( &ret, access, NULL, &size, protect, sec_type, hFile ); + if (status == STATUS_OBJECT_NAME_EXISTS) SetLastError( ERROR_ALREADY_EXISTS ); else

1 0

Christian Costa : d3dxof: Implement object parsing in text mode.
by Alexandre Julliard Sept. 17, 2008

Sept. 17, 2008

Module: wine Branch: master Commit: 364d69d78de512a40c1136a8b496746503d5af75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=364d69d78de512a40c1136a8b… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Sep 16 22:22:28 2008 +0200 d3dxof: Implement object parsing in text mode. --- dlls/d3dxof/d3dxof.c | 394 ++++++++++++++++++++++++++++++++++++++++-- dlls/d3dxof/d3dxof_private.h | 43 +++++ 2 files changed, 418 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=364d69d78de512a40c113…

1 0

Alexandre Julliard : kernel32/tests: Comment out an UpdateResource call that causes failures.
by Alexandre Julliard Sept. 17, 2008

Sept. 17, 2008

Module: wine Branch: master Commit: b1412422ad854739bc4e9d5b5f364a6d20a4d2f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1412422ad854739bc4e9d5b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 16 22:36:58 2008 +0200 kernel32/tests: Comment out an UpdateResource call that causes failures. --- dlls/kernel32/tests/resource.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index 9f8dcce..90c8e9d 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -173,12 +173,15 @@ static void update_resources_version(void) res = BeginUpdateResource( filename, TRUE ); ok( res != NULL, "BeginUpdateResource failed\n"); - r = UpdateResource( res, - MAKEINTRESOURCE(0x1230), - MAKEINTRESOURCE(0x4567), - 0xabcd, - NULL, 0 ); - ok( r == FALSE, "UpdateResource failed\n"); + if (0) /* this causes subsequent tests to fail on Vista */ + { + r = UpdateResource( res, + MAKEINTRESOURCE(0x1230), + MAKEINTRESOURCE(0x4567), + 0xabcd, + NULL, 0 ); + ok( r == FALSE, "UpdateResource failed\n"); + } r = UpdateResource( res, MAKEINTRESOURCE(0x1230),

1 0

Alexandre Julliard : kernel32/tests: Support alternate results in the loader test on Vista.
by Alexandre Julliard Sept. 17, 2008

Sept. 17, 2008

Module: wine Branch: master Commit: 337fa823d27897b7320e0f7826c9560f5332ef72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=337fa823d27897b7320e0f782… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 16 22:36:42 2008 +0200 kernel32/tests: Support alternate results in the loader test on Vista. --- dlls/kernel32/tests/loader.c | 38 ++++++++++++++++---------------------- 1 files changed, 16 insertions(+), 22 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index a08cfdb..37f4c92 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -120,6 +120,7 @@ static void test_Loader(void) DWORD section_alignment, file_alignment; DWORD size_of_image, size_of_headers; DWORD error; /* 0 means LoadLibrary should succeed */ + DWORD alt_error; /* alternate error */ } td[] = { { &dos_header, sizeof(dos_header), @@ -148,7 +149,7 @@ static void test_Loader(void) 1, sizeof(IMAGE_OPTIONAL_HEADER), 0x200, 0x200, sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER) + 0x200, sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER), - ERROR_SUCCESS + ERROR_SUCCESS, ERROR_INVALID_ADDRESS /* vista is more strict */ }, { &dos_header, sizeof(dos_header), 1, sizeof(IMAGE_OPTIONAL_HEADER), 0x200, 0x1000, @@ -175,25 +176,25 @@ static void test_Loader(void) 1, FIELD_OFFSET(IMAGE_OPTIONAL_HEADER, CheckSum), 0x200, 0x200, sizeof(dos_header) + sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER) + FIELD_OFFSET(IMAGE_OPTIONAL_HEADER, CheckSum) + sizeof(IMAGE_SECTION_HEADER) + 0x10, sizeof(dos_header) + sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER) + FIELD_OFFSET(IMAGE_OPTIONAL_HEADER, CheckSum) + sizeof(IMAGE_SECTION_HEADER), - ERROR_SUCCESS + ERROR_SUCCESS, ERROR_BAD_EXE_FORMAT /* vista is more strict */ }, { &dos_header, sizeof(dos_header), 0, FIELD_OFFSET(IMAGE_OPTIONAL_HEADER, CheckSum), 0x200, 0x200, 0xd0, /* beyond of the end of file */ 0xc0, /* beyond of the end of file */ - ERROR_SUCCESS + ERROR_SUCCESS, ERROR_BAD_EXE_FORMAT /* vista is more strict */ }, { &dos_header, sizeof(dos_header), 0, FIELD_OFFSET(IMAGE_OPTIONAL_HEADER, CheckSum), 0x200, 0x200, 0x1000, 0, - ERROR_SUCCESS + ERROR_SUCCESS, ERROR_BAD_EXE_FORMAT /* vista is more strict */ }, { &dos_header, sizeof(dos_header), 0, FIELD_OFFSET(IMAGE_OPTIONAL_HEADER, CheckSum), 0x200, 0x200, 1, 0, - ERROR_SUCCESS + ERROR_SUCCESS, ERROR_BAD_EXE_FORMAT /* vista is more strict */ }, #if 0 /* not power of 2 alignments need more test cases */ { &dos_header, sizeof(dos_header), @@ -207,13 +208,13 @@ static void test_Loader(void) 0, FIELD_OFFSET(IMAGE_OPTIONAL_HEADER, CheckSum), 4, 4, 1, 0, - ERROR_SUCCESS + ERROR_SUCCESS, ERROR_BAD_EXE_FORMAT /* vista is more strict */ }, { &dos_header, sizeof(dos_header), 0, FIELD_OFFSET(IMAGE_OPTIONAL_HEADER, CheckSum), 1, 1, 1, 0, - ERROR_SUCCESS + ERROR_SUCCESS, ERROR_BAD_EXE_FORMAT /* vista is more strict */ }, { &dos_header, sizeof(dos_header), 0, FIELD_OFFSET(IMAGE_OPTIONAL_HEADER, CheckSum), 0x200, 0x200, @@ -234,7 +235,7 @@ static void test_Loader(void) 0x04 /* also serves as e_lfanew in the truncated MZ header */, 0x04, 1, 0, - ERROR_SUCCESS + ERROR_SUCCESS, ERROR_BAD_EXE_FORMAT /* vista is more strict */ } }; static const char filler[0x1000]; @@ -330,18 +331,11 @@ static void test_Loader(void) SetLastError(0xdeadbeef); hlib = LoadLibrary(dll_name); - if (td[i].error == ERROR_SUCCESS) + if (hlib) { MEMORY_BASIC_INFORMATION info; - ok(hlib != 0, "%d: LoadLibrary error %d\n", i, GetLastError()); - - /* No point in crashing. Test crashes on Vista with some of the given files */ - if (hlib == 0) - { - skip("Failed to load dll number %d\n", i); - goto endloop; - } + ok( td[i].error == ERROR_SUCCESS, "%d: should have failed\n", i ); SetLastError(0xdeadbeef); ok(VirtualQuery(hlib, &info, sizeof(info)) == sizeof(info), @@ -468,8 +462,8 @@ static void test_Loader(void) ok(FreeLibrary(hlib_as_data_file), "FreeLibrary error %d\n", GetLastError()); } else - { /* LoadLibrary is expected to fail */ - ok(!hlib, "%d: LoadLibrary should fail\n", i); + { + ok(td[i].error || td[i].alt_error, "%d: LoadLibrary should succeed\n", i); if (GetLastError() == ERROR_GEN_FAILURE) /* Win9x, broken behaviour */ { @@ -478,11 +472,11 @@ static void test_Loader(void) return; } - ok(td[i].error == GetLastError(), "%d: expected error %d, got %d\n", - i, td[i].error, GetLastError()); + ok(td[i].error == GetLastError() || td[i].alt_error == GetLastError(), + "%d: expected error %d or %d, got %d\n", + i, td[i].error, td[i].alt_error, GetLastError()); } -endloop: SetLastError(0xdeadbeef); ok(DeleteFile(dll_name), "DeleteFile error %d\n", GetLastError()); }

1 0

Alexandre Julliard : kernel32/tests: Fix a test on win9x.
by Alexandre Julliard Sept. 17, 2008

Sept. 17, 2008

Module: wine Branch: master Commit: 9f0773587bfd0a4e1a4d9b21ce2f837306d98fd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f0773587bfd0a4e1a4d9b21c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 16 22:36:04 2008 +0200 kernel32/tests: Fix a test on win9x. --- dlls/kernel32/tests/file.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 722e892..06f4caa 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1614,6 +1614,9 @@ static void test_async_file_errors(void) strcat(szFile, "\\win.ini"); hFile = CreateFileA(szFile, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_ALWAYS, FILE_FLAG_OVERLAPPED, NULL); + if (hFile == INVALID_HANDLE_VALUE) /* win9x doesn't like FILE_SHARE_DELETE */ + hFile = CreateFileA(szFile, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_ALWAYS, FILE_FLAG_OVERLAPPED, NULL); ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA(%s ...) failed\n", szFile); while (TRUE) { @@ -2078,7 +2081,9 @@ static void test_ReplaceFileA(void) ret = GetFileTime(hReplacedFile, NULL, NULL, &ftReplaced); ok( ret, "GetFileTime error (backup %d\n", GetLastError()); ok(CompareFileTime(&ftReplaced, &ftReplacement) == 0, - "replaced file has wrong filetime\n"); + "replaced file has wrong filetime %x%08x / %x%08x\n", + ftReplaced.dwHighDateTime, ftReplaced.dwLowDateTime, + ftReplacement.dwHighDateTime, ftReplacement.dwLowDateTime ); CloseHandle(hReplacedFile); /* re-create replacement file for pass w/o backup (blank) */

1 0

Alexandre Julliard : ntdll/tests: Clear the direction flag in the handler since Windows may not do it.
by Alexandre Julliard Sept. 17, 2008

Sept. 17, 2008

Module: wine Branch: master Commit: c190bdde506ade777376fff3df9b539e58a2cd0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c190bdde506ade777376fff3d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 16 22:35:48 2008 +0200 ntdll/tests: Clear the direction flag in the handler since Windows may not do it. Add some comments to make it easier to identify failing tests. --- dlls/ntdll/tests/exception.c | 82 +++++++++++++++++++++--------------------- 1 files changed, 41 insertions(+), 41 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 3a9b65d..1cb687d 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -65,112 +65,112 @@ static const struct exception } exceptions[] = { /* test some privileged instructions */ - { { 0xfb, 0xc3 }, /* sti; ret */ + { { 0xfb, 0xc3 }, /* 0: sti; ret */ 0, 1, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0x6c, 0xc3 }, /* insb (%dx); ret */ + { { 0x6c, 0xc3 }, /* 1: insb (%dx); ret */ 0, 1, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0x6d, 0xc3 }, /* insl (%dx); ret */ + { { 0x6d, 0xc3 }, /* 2: insl (%dx); ret */ 0, 1, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0x6e, 0xc3 }, /* outsb (%dx); ret */ + { { 0x6e, 0xc3 }, /* 3: outsb (%dx); ret */ 0, 1, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0x6f, 0xc3 }, /* outsl (%dx); ret */ + { { 0x6f, 0xc3 }, /* 4: outsl (%dx); ret */ 0, 1, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0xe4, 0x11, 0xc3 }, /* inb $0x11,%al; ret */ + { { 0xe4, 0x11, 0xc3 }, /* 5: inb $0x11,%al; ret */ 0, 2, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0xe5, 0x11, 0xc3 }, /* inl $0x11,%eax; ret */ + { { 0xe5, 0x11, 0xc3 }, /* 6: inl $0x11,%eax; ret */ 0, 2, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0xe6, 0x11, 0xc3 }, /* outb %al,$0x11; ret */ + { { 0xe6, 0x11, 0xc3 }, /* 7: outb %al,$0x11; ret */ 0, 2, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0xe7, 0x11, 0xc3 }, /* outl %eax,$0x11; ret */ + { { 0xe7, 0x11, 0xc3 }, /* 8: outl %eax,$0x11; ret */ 0, 2, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0xed, 0xc3 }, /* inl (%dx),%eax; ret */ + { { 0xed, 0xc3 }, /* 9: inl (%dx),%eax; ret */ 0, 1, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0xee, 0xc3 }, /* outb %al,(%dx); ret */ + { { 0xee, 0xc3 }, /* 10: outb %al,(%dx); ret */ 0, 1, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0xef, 0xc3 }, /* outl %eax,(%dx); ret */ + { { 0xef, 0xc3 }, /* 11: outl %eax,(%dx); ret */ 0, 1, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0xf4, 0xc3 }, /* hlt; ret */ + { { 0xf4, 0xc3 }, /* 12: hlt; ret */ 0, 1, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0xfa, 0xc3 }, /* cli; ret */ + { { 0xfa, 0xc3 }, /* 13: cli; ret */ 0, 1, STATUS_PRIVILEGED_INSTRUCTION, 0 }, /* test long jump to invalid selector */ - { { 0xea, 0, 0, 0, 0, 0, 0, 0xc3 }, /* ljmp $0,$0; ret */ + { { 0xea, 0, 0, 0, 0, 0, 0, 0xc3 }, /* 14: ljmp $0,$0; ret */ 0, 7, STATUS_ACCESS_VIOLATION, 2, { 0, 0xffffffff } }, /* test iret to invalid selector */ { { 0x6a, 0x00, 0x6a, 0x00, 0x6a, 0x00, 0xcf, 0x83, 0xc4, 0x0c, 0xc3 }, - /* pushl $0; pushl $0; pushl $0; iret; addl $12,%esp; ret */ + /* 15: pushl $0; pushl $0; pushl $0; iret; addl $12,%esp; ret */ 6, 1, STATUS_ACCESS_VIOLATION, 2, { 0, 0xffffffff } }, /* test loading an invalid selector */ - { { 0xb8, 0xef, 0xbe, 0x00, 0x00, 0x8e, 0xe8, 0xc3 }, /* mov $beef,%ax; mov %ax,%gs; ret */ + { { 0xb8, 0xef, 0xbe, 0x00, 0x00, 0x8e, 0xe8, 0xc3 }, /* 16: mov $beef,%ax; mov %ax,%gs; ret */ 5, 2, STATUS_ACCESS_VIOLATION, 2, { 0, 0xbee8 } }, /* 0xbee8 or 0xffffffff */ /* test accessing a zero selector */ { { 0x06, 0x31, 0xc0, 0x8e, 0xc0, 0x26, 0xa1, 0, 0, 0, 0, 0x07, 0xc3 }, - /* push %es; xor %eax,%eax; mov %ax,%es; mov %es:(0),%ax; pop %es */ + /* 17: push %es; xor %eax,%eax; mov %ax,%es; mov %es:(0),%ax; pop %es; ret */ 5, 6, STATUS_ACCESS_VIOLATION, 2, { 0, 0xffffffff } }, /* test moving %cs -> %ss */ - { { 0x0e, 0x17, 0x58, 0xc3 }, /* pushl %cs; popl %ss; popl %eax; ret */ + { { 0x0e, 0x17, 0x58, 0xc3 }, /* 18: pushl %cs; popl %ss; popl %eax; ret */ 1, 1, STATUS_ACCESS_VIOLATION, 2, { 0, 0xffffffff } }, - /* test overlong instruction (limit is 16 bytes) */ + /* 19: test overlong instruction (limit is 16 bytes) */ { { 0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0xfa,0xc3 }, 0, 16, STATUS_ILLEGAL_INSTRUCTION, 0 }, { { 0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0xfa,0xc3 }, 0, 15, STATUS_PRIVILEGED_INSTRUCTION, 0 }, /* test invalid interrupt */ - { { 0xcd, 0xff, 0xc3 }, /* int $0xff; ret */ + { { 0xcd, 0xff, 0xc3 }, /* 21: int $0xff; ret */ 0, 2, STATUS_ACCESS_VIOLATION, 2, { 0, 0xffffffff } }, /* test moves to/from Crx */ - { { 0x0f, 0x20, 0xc0, 0xc3 }, /* movl %cr0,%eax; ret */ + { { 0x0f, 0x20, 0xc0, 0xc3 }, /* 22: movl %cr0,%eax; ret */ 0, 3, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0x0f, 0x20, 0xe0, 0xc3 }, /* movl %cr4,%eax; ret */ + { { 0x0f, 0x20, 0xe0, 0xc3 }, /* 23: movl %cr4,%eax; ret */ 0, 3, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0x0f, 0x22, 0xc0, 0xc3 }, /* movl %eax,%cr0; ret */ + { { 0x0f, 0x22, 0xc0, 0xc3 }, /* 24: movl %eax,%cr0; ret */ 0, 3, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0x0f, 0x22, 0xe0, 0xc3 }, /* movl %eax,%cr4; ret */ + { { 0x0f, 0x22, 0xe0, 0xc3 }, /* 25: movl %eax,%cr4; ret */ 0, 3, STATUS_PRIVILEGED_INSTRUCTION, 0 }, /* test moves to/from Drx */ - { { 0x0f, 0x21, 0xc0, 0xc3 }, /* movl %dr0,%eax; ret */ + { { 0x0f, 0x21, 0xc0, 0xc3 }, /* 26: movl %dr0,%eax; ret */ 0, 3, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0x0f, 0x21, 0xc8, 0xc3 }, /* movl %dr1,%eax; ret */ + { { 0x0f, 0x21, 0xc8, 0xc3 }, /* 27: movl %dr1,%eax; ret */ 0, 3, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0x0f, 0x21, 0xf8, 0xc3 }, /* movl %dr7,%eax; ret */ + { { 0x0f, 0x21, 0xf8, 0xc3 }, /* 28: movl %dr7,%eax; ret */ 0, 3, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0x0f, 0x23, 0xc0, 0xc3 }, /* movl %eax,%dr0; ret */ + { { 0x0f, 0x23, 0xc0, 0xc3 }, /* 29: movl %eax,%dr0; ret */ 0, 3, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0x0f, 0x23, 0xc8, 0xc3 }, /* movl %eax,%dr1; ret */ + { { 0x0f, 0x23, 0xc8, 0xc3 }, /* 30: movl %eax,%dr1; ret */ 0, 3, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0x0f, 0x23, 0xf8, 0xc3 }, /* movl %eax,%dr7; ret */ + { { 0x0f, 0x23, 0xf8, 0xc3 }, /* 31: movl %eax,%dr7; ret */ 0, 3, STATUS_PRIVILEGED_INSTRUCTION, 0 }, /* test memory reads */ - { { 0xa1, 0xfc, 0xff, 0xff, 0xff, 0xc3 }, /* movl 0xfffffffc,%eax; ret */ + { { 0xa1, 0xfc, 0xff, 0xff, 0xff, 0xc3 }, /* 32: movl 0xfffffffc,%eax; ret */ 0, 5, STATUS_ACCESS_VIOLATION, 2, { 0, 0xfffffffc } }, - { { 0xa1, 0xfd, 0xff, 0xff, 0xff, 0xc3 }, /* movl 0xfffffffd,%eax; ret */ + { { 0xa1, 0xfd, 0xff, 0xff, 0xff, 0xc3 }, /* 33: movl 0xfffffffd,%eax; ret */ 0, 5, STATUS_ACCESS_VIOLATION, 2, { 0, 0xfffffffd } }, - { { 0xa1, 0xfe, 0xff, 0xff, 0xff, 0xc3 }, /* movl 0xfffffffe,%eax; ret */ + { { 0xa1, 0xfe, 0xff, 0xff, 0xff, 0xc3 }, /* 34: movl 0xfffffffe,%eax; ret */ 0, 5, STATUS_ACCESS_VIOLATION, 2, { 0, 0xfffffffe } }, - { { 0xa1, 0xff, 0xff, 0xff, 0xff, 0xc3 }, /* movl 0xffffffff,%eax; ret */ + { { 0xa1, 0xff, 0xff, 0xff, 0xff, 0xc3 }, /* 35: movl 0xffffffff,%eax; ret */ 0, 5, STATUS_ACCESS_VIOLATION, 2, { 0, 0xffffffff } }, /* test memory writes */ - { { 0xa3, 0xfc, 0xff, 0xff, 0xff, 0xc3 }, /* movl %eax,0xfffffffc; ret */ + { { 0xa3, 0xfc, 0xff, 0xff, 0xff, 0xc3 }, /* 36: movl %eax,0xfffffffc; ret */ 0, 5, STATUS_ACCESS_VIOLATION, 2, { 1, 0xfffffffc } }, - { { 0xa3, 0xfd, 0xff, 0xff, 0xff, 0xc3 }, /* movl %eax,0xfffffffd; ret */ + { { 0xa3, 0xfd, 0xff, 0xff, 0xff, 0xc3 }, /* 37: movl %eax,0xfffffffd; ret */ 0, 5, STATUS_ACCESS_VIOLATION, 2, { 1, 0xfffffffd } }, - { { 0xa3, 0xfe, 0xff, 0xff, 0xff, 0xc3 }, /* movl %eax,0xfffffffe; ret */ + { { 0xa3, 0xfe, 0xff, 0xff, 0xff, 0xc3 }, /* 38: movl %eax,0xfffffffe; ret */ 0, 5, STATUS_ACCESS_VIOLATION, 2, { 1, 0xfffffffe } }, - { { 0xa3, 0xff, 0xff, 0xff, 0xff, 0xc3 }, /* movl %eax,0xffffffff; ret */ + { { 0xa3, 0xff, 0xff, 0xff, 0xff, 0xc3 }, /* 39: movl %eax,0xffffffff; ret */ 0, 5, STATUS_ACCESS_VIOLATION, 2, { 1, 0xffffffff } }, - /* test exception with cleared %ds and %es */ + /* 40: test exception with cleared %ds and %es */ { { 0x1e, 0x06, 0x31, 0xc0, 0x8e, 0xd8, 0x8e, 0xc0, 0xfa, 0x07, 0x1f, 0xc3 }, /* push %ds; push %es; xorl %eax,%eax; mov %ax,%ds; mov %ax,%es; cli; pop %es; pop %ds; ret */ 8, 1, STATUS_PRIVILEGED_INSTRUCTION, 0 }, @@ -501,7 +501,7 @@ static DWORD direction_flag_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATI { #ifdef __GNUC__ unsigned int flags; - __asm__("pushfl; popl %0" : "=r" (flags) ); + __asm__("pushfl; popl %0; cld" : "=r" (flags) ); /* older windows versions don't clear DF properly so don't test */ if (flags & 0x400) trace( "eflags has DF bit set\n" ); #endif

1 0

Hans Leidekker : winhttp: Close the network connection if necessary.
by Alexandre Julliard Sept. 17, 2008

Sept. 17, 2008

Module: wine Branch: master Commit: 70f2f5d6a8d5152e25b221ce4999ae41b5677c43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70f2f5d6a8d5152e25b221ce4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 16 21:32:46 2008 +0200 winhttp: Close the network connection if necessary. --- dlls/winhttp/request.c | 16 +++++++++++++++- dlls/winhttp/winhttp_private.h | 1 + 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 4468963..1f91c99 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1225,7 +1225,21 @@ static BOOL receive_data_chunked( request_t *request, void *buffer, DWORD size, static void finished_reading( request_t *request ) { - /* FIXME: close connection here if necessary */ + static const WCHAR closeW[] = {'c','l','o','s','e',0}; + + BOOL close = FALSE; + WCHAR connection[20]; + DWORD size = sizeof(connection); + + if (request->hdr.disable_flags & WINHTTP_DISABLE_KEEP_ALIVE) close = TRUE; + else if (query_headers( request, WINHTTP_QUERY_CONNECTION, NULL, connection, &size, NULL ) || + query_headers( request, WINHTTP_QUERY_PROXY_CONNECTION, NULL, connection, &size, NULL )) + { + if (!strcmpiW( connection, closeW )) close = TRUE; + } + else if (!strcmpW( request->version, http1_0 )) close = TRUE; + + if (close) close_connection( request ); request->content_length = ~0UL; request->content_read = 0; } diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 0270ea8..8f5e17c 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -39,6 +39,7 @@ static const WCHAR getW[] = {'G','E','T',0}; static const WCHAR postW[] = {'P','O','S','T',0}; static const WCHAR slashW[] = {'/',0}; +static const WCHAR http1_0[] = {'H','T','T','P','/','1','.','0',0}; static const WCHAR http1_1[] = {'H','T','T','P','/','1','.','1',0}; typedef struct _object_header_t object_header_t;

1 0