July 2007 - Wine-commits - list.winehq.org

Misha Koshelev : urlmon/tests: Don't proceed with POST operation ( that will fail) if we run out of memory.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: c4f1adb7ccb8e6e4ba462712daee2bbacebae930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4f1adb7ccb8e6e4ba462712d… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Jul 26 00:03:25 2007 -0500 urlmon/tests: Don't proceed with POST operation (that will fail) if we run out of memory. --- dlls/urlmon/tests/protocol.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index a9d13d1..45ba841 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -159,6 +159,7 @@ static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate2 *iface, addl_headers = CoTaskMemAlloc(sizeof(wszHeaders)); if (!addl_headers) { + http_post_test = FALSE; skip("Out of memory\n"); return E_OUTOFMEMORY; } @@ -504,18 +505,19 @@ static HRESULT WINAPI BindInfo_GetBindInfo(IInternetBindInfo *iface, DWORD *grfB if (http_post_test) { - pbindinfo->dwBindVerb = BINDVERB_POST; - pbindinfo->stgmedData.tymed = TYMED_HGLOBAL; /* Must be GMEM_FIXED, GMEM_MOVABLE does not work properly * with urlmon on native (Win98 and WinXP) */ pbindinfo->stgmedData.hGlobal = GlobalAlloc(GPTR, sizeof(szPostData)); if (!pbindinfo->stgmedData.hGlobal) { + http_post_test = FALSE; skip("Out of memory\n"); return E_OUTOFMEMORY; } lstrcpy((LPSTR)pbindinfo->stgmedData.hGlobal, szPostData); pbindinfo->cbstgmedData = sizeof(szPostData)-1; + pbindinfo->dwBindVerb = BINDVERB_POST; + pbindinfo->stgmedData.tymed = TYMED_HGLOBAL; } return S_OK;

1 0

Misha Koshelev : urlmon/tests: Fix http protocol tests with absence of BINDF_FROMURLMON to properly expect ReportData .
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: d5fedcdab01755c55852c04cb445b819ff416f81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5fedcdab01755c55852c04cb… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Jul 26 00:02:17 2007 -0500 urlmon/tests: Fix http protocol tests with absence of BINDF_FROMURLMON to properly expect ReportData. --- dlls/urlmon/tests/protocol.c | 71 +++++++++++++++++++++++++++--------------- 1 files changed, 46 insertions(+), 25 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index ebc06bf..a9d13d1 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -104,6 +104,7 @@ static int state = 0; static DWORD bindf = 0; static IInternetBindInfo *prot_bind_info; static void *expect_pv; +static HANDLE received_data; static enum { FILE_TEST, @@ -416,9 +417,8 @@ static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWOR "grcfBSCF = %08x\n", grfBSCF); } - if (!(grfBSCF & BSCF_LASTDATANOTIFICATION) && - !(bindf & BINDF_FROMURLMON)) - SendMessage(protocol_hwnd, WM_USER, 0, 0); + if (!(bindf & BINDF_FROMURLMON)) + SetEvent(received_data); } return S_OK; } @@ -1233,19 +1233,25 @@ static void test_http_protocol_url(LPCWSTR url, BOOL is_first) if(!http_protocol_start(url, is_first)) return; - hres = IInternetProtocol_Read(http_protocol, buf, 2, &cb); - ok(hres == E_PENDING, "Read failed: %08x, expected E_PENDING\n", hres); - ok(!cb, "cb=%d, expected 0\n", cb); - - if(bindf & BINDF_FROMURLMON) - SET_EXPECT(Switch); SET_EXPECT(ReportResult); expect_hrResult = S_OK; - GetMessage(&msg, NULL, 0, 0); - if(bindf & BINDF_FROMURLMON) + { + hres = IInternetProtocol_Read(http_protocol, buf, 2, &cb); + ok(hres == E_PENDING, "Read failed: %08x, expected E_PENDING\n", hres); + ok(!cb, "cb=%d, expected 0\n", cb); + + SET_EXPECT(Switch); + GetMessage(&msg, NULL, 0, 0); CHECK_CALLED(Switch); + } + else + { + WaitForSingleObject(received_data, INFINITE); + SendMessage(protocol_hwnd, WM_USER, 0, 0); + } + CHECK_CALLED(ReportResult); hres = IInternetProtocol_Terminate(http_protocol, 0); @@ -1281,18 +1287,31 @@ static void test_http_protocol(void) http_post_test = FALSE; } +static HRESULT http_protocol_read(void) +{ + HRESULT hres; + DWORD cb; + BYTE buf[3600]; + + while(1) { + hres = IInternetProtocol_Read(http_protocol, buf, sizeof(buf), &cb); + if(!(bindf & BINDF_FROMURLMON) && + hres == E_PENDING) { + WaitForSingleObject(received_data, INFINITE); + CHECK_CALLED(ReportData); + SET_EXPECT(ReportData); + } else if(cb == 0) break; + } + + return hres; +} + static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { if(msg == WM_USER) { - BOOL first_call = FALSE; HRESULT hres; - DWORD cb; - BYTE buf[3600]; if(!state) { - first_call = TRUE; - state = 1; - if (http_is_first) { CHECK_CALLED(ReportProgress_FINDINGRESOURCE); @@ -1324,26 +1343,26 @@ static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ok(hres == S_OK, "Continue failed: %08x\n", hres); CHECK_CALLED(ReportData); - if(first_call) { + if(!state) { CHECK_CALLED(OnResponse); CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); } } - do hres = IInternetProtocol_Read(http_protocol, buf, sizeof(buf), &cb); - while(cb); - + hres = http_protocol_read(); ok(hres == S_FALSE || hres == E_PENDING, "Read failed: %08x\n", hres); - if(hres == S_FALSE) + if(hres == S_FALSE && + (bindf & BINDF_FROMURLMON)) PostMessage(protocol_hwnd, WM_USER+1, 0, 0); - if(first_call) { + if(!state) { + state = 1; + hres = IInternetProtocol_LockRequest(http_protocol, 0); ok(hres == S_OK, "LockRequest failed: %08x\n", hres); - do hres = IInternetProtocol_Read(http_protocol, buf, sizeof(buf), &cb); - while(cb); + hres = http_protocol_read(); ok(hres == S_FALSE || hres == E_PENDING, "Read failed: %08x\n", hres); } } @@ -1533,6 +1552,7 @@ START_TEST(protocol) { OleInitialize(NULL); + received_data = CreateEvent(NULL, FALSE, FALSE, NULL); protocol_hwnd = create_protocol_window(); test_file_protocol(); @@ -1541,6 +1561,7 @@ START_TEST(protocol) test_CreateBinding(); DestroyWindow(protocol_hwnd); + CloseHandle(received_data); OleUninitialize(); }

1 0

Alexandre Julliard : libwine: Get rid of the lookup in the top dlls/ dir, all dlls are named correctly now.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: 5fe7589bb41c227807699db8ca61c88fbcb37e56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fe7589bb41c227807699db8c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 26 11:52:53 2007 +0200 libwine: Get rid of the lookup in the top dlls/ dir, all dlls are named correctly now. --- libs/wine/loader.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index a86da98..c7fcece 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -182,13 +182,11 @@ static char *next_dll_path( struct dll_path_context *context ) case 1: /* try dlls dir with subdir prefix */ if (namelen > 4 && !memcmp( context->name + namelen - 4, ".dll", 4 )) namelen -= 4; path = prepend( path, context->name, namelen ); - /* fall through */ - case 2: /* try dlls dir without prefix */ path = prepend( path, "/dlls", sizeof("/dlls") - 1 ); path = prepend( path, build_dir, strlen(build_dir) ); return path; default: - index -= 3; + index -= 2; if (index < nb_dll_paths) return prepend( context->name, dll_paths[index], strlen( dll_paths[index] )); break; @@ -204,7 +202,7 @@ static char *first_dll_path( const char *name, const char *ext, struct dll_path_ int namelen = strlen( name ); context->buffer = malloc( dll_path_maxlen + 2 * namelen + strlen(ext) + 3 ); - context->index = build_dir ? 0 : 3; /* if no build dir skip all the build dir magic cases */ + context->index = build_dir ? 0 : 2; /* if no build dir skip all the build dir magic cases */ context->name = context->buffer + dll_path_maxlen + namelen + 1; context->namelen = namelen + 1; @@ -655,7 +653,7 @@ void wine_init( int argc, char *argv[], char *error, int error_size ) if ((ntdll = wine_dlopen( path, RTLD_NOW, error, error_size ))) { /* if we didn't use the default dll dir, remove it from the search path */ - if (default_dlldir[0] && context.index < nb_dll_paths) nb_dll_paths--; + if (default_dlldir[0] && context.index < nb_dll_paths + 2) nb_dll_paths--; break; } }

1 0

Misha Koshelev : urlmon: Don' t free structures that are used by asynchronous HttpSendRequest until we are sure they won 't be used.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: a8aa3fb5469de10c3b7b98acc01a7977b7e71be7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8aa3fb5469de10c3b7b98acc… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Wed Jul 25 23:58:37 2007 -0500 urlmon: Don't free structures that are used by asynchronous HttpSendRequest until we are sure they won't be used. --- dlls/urlmon/http.c | 68 +++++++++++++++++++++++++++++++-------------------- 1 files changed, 41 insertions(+), 27 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 79858e6..8dc3432 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -74,9 +74,11 @@ typedef struct { const IInternetPriorityVtbl *lpInternetPriorityVtbl; DWORD flags, grfBINDF; + BINDINFO bind_info; IInternetProtocolSink *protocol_sink; IHttpNegotiate *http_negotiate; HINTERNET internet, connect, request; + LPWSTR full_header; HANDLE lock; ULONG current_position, content_length, available_bytes; LONG priority; @@ -84,6 +86,10 @@ typedef struct { LONG ref; } HttpProtocol; +/* Default headers from native */ +static const WCHAR wszHeaders[] = {'A','c','c','e','p','t','-','E','n','c','o','d','i','n','g', + ':',' ','g','z','i','p',',',' ','d','e','f','l','a','t','e',0}; + /* * Helpers */ @@ -160,6 +166,17 @@ static void HTTPPROTOCOL_Close(HttpProtocol *This) InternetCloseHandle(This->internet); This->internet = 0; } + if (This->full_header) + { + if (This->full_header != wszHeaders) + HeapFree(GetProcessHeap(), 0, This->full_header); + This->full_header = 0; + } + if (This->bind_info.cbSize) + { + ReleaseBindInfo(&This->bind_info); + memset(&This->bind_info, 0, sizeof(This->bind_info)); + } This->flags = 0; } @@ -284,20 +301,17 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl { HttpProtocol *This = PROTOCOL_THIS(iface); URL_COMPONENTSW url; - BINDINFO bindinfo; DWORD len = 0, request_flags = INTERNET_FLAG_KEEP_CONNECTION; ULONG num = 0; IServiceProvider *service_provider = 0; IHttpNegotiate2 *http_negotiate2 = 0; LPWSTR host = 0, path = 0, user = 0, pass = 0, addl_header = 0, - full_header = 0, post_cookie = 0, optional = 0; + post_cookie = 0, optional = 0; BYTE security_id[512]; LPOLESTR user_agent, accept_mimes[257]; HRESULT hres; static const WCHAR wszHttp[] = {'h','t','t','p',':'}; - static const WCHAR wszHeaders[] = {'A','c','c','e','p','t','-','E','n','c','o','d','i','n','g', - ':',' ','g','z','i','p',',',' ','d','e','f','l','a','t','e',0}; static const WCHAR wszBindVerb[BINDVERB_CUSTOM][5] = {{'G','E','T',0}, {'P','O','S','T',0}, @@ -306,9 +320,9 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); - memset(&bindinfo, 0, sizeof(bindinfo)); - bindinfo.cbSize = sizeof(BINDINFO); - hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &This->grfBINDF, &bindinfo); + memset(&This->bind_info, 0, sizeof(This->bind_info)); + This->bind_info.cbSize = sizeof(BINDINFO); + hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &This->grfBINDF, &This->bind_info); if (hres != S_OK) { WARN("GetBindInfo failed: %08x\n", hres); @@ -407,8 +421,9 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl if (This->grfBINDF & BINDF_NOWRITECACHE) request_flags |= INTERNET_FLAG_NO_CACHE_WRITE; - This->request = HttpOpenRequestW(This->connect, bindinfo.dwBindVerb < BINDVERB_CUSTOM ? - wszBindVerb[bindinfo.dwBindVerb] : bindinfo.szCustomVerb, + This->request = HttpOpenRequestW(This->connect, This->bind_info.dwBindVerb < BINDVERB_CUSTOM ? + wszBindVerb[This->bind_info.dwBindVerb] : + This->bind_info.szCustomVerb, path, NULL, NULL, (LPCWSTR *)accept_mimes, request_flags, (DWORD)This); if (!This->request) @@ -443,20 +458,21 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl } else if (addl_header == NULL) { - full_header = (LPWSTR)wszHeaders; + This->full_header = (LPWSTR)wszHeaders; } else { - full_header = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(addl_header)+sizeof(wszHeaders))*sizeof(WCHAR)); - if (!full_header) + int len_addl_header = lstrlenW(addl_header); + This->full_header = HeapAlloc(GetProcessHeap(), 0, + len_addl_header*sizeof(WCHAR)+sizeof(wszHeaders)); + if (!This->full_header) { WARN("Out of memory\n"); hres = E_OUTOFMEMORY; goto done; } - lstrcpyW(full_header, addl_header); - lstrcpyW(&full_header[lstrlenW(addl_header)], wszHeaders); + lstrcpyW(This->full_header, addl_header); + lstrcpyW(&This->full_header[len_addl_header], wszHeaders); } hres = IServiceProvider_QueryService(service_provider, &IID_IHttpNegotiate2, @@ -479,7 +495,7 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl /* FIXME: Handle security_id. Native calls undocumented function IsHostInProxyBypassList. */ - if (bindinfo.dwBindVerb == BINDVERB_POST) + if (This->bind_info.dwBindVerb == BINDVERB_POST) { num = 0; hres = IInternetBindInfo_GetBindString(pOIBindInfo, BINDSTRING_POST_COOKIE, &post_cookie, @@ -493,18 +509,18 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl } } - if (bindinfo.dwBindVerb != BINDVERB_GET) + if (This->bind_info.dwBindVerb != BINDVERB_GET) { /* Native does not use GlobalLock/GlobalUnlock, so we won't either */ - if (bindinfo.stgmedData.tymed != TYMED_HGLOBAL) - WARN("Expected bindinfo.stgmedData.tymed to be TYMED_HGLOBAL, not %d\n", - bindinfo.stgmedData.tymed); + if (This->bind_info.stgmedData.tymed != TYMED_HGLOBAL) + WARN("Expected This->bind_info.stgmedData.tymed to be TYMED_HGLOBAL, not %d\n", + This->bind_info.stgmedData.tymed); else - optional = (LPWSTR)bindinfo.stgmedData.hGlobal; + optional = (LPWSTR)This->bind_info.stgmedData.hGlobal; } - if (!HttpSendRequestW(This->request, full_header, lstrlenW(full_header), + if (!HttpSendRequestW(This->request, This->full_header, lstrlenW(This->full_header), optional, - optional ? bindinfo.cbstgmedData : 0) && + optional ? This->bind_info.cbstgmedData : 0) && GetLastError() != ERROR_IO_PENDING) { WARN("HttpSendRequest failed: %d\n", GetLastError()); @@ -521,8 +537,6 @@ done: } CoTaskMemFree(post_cookie); - if (full_header != wszHeaders) - HeapFree(GetProcessHeap(), 0, full_header); CoTaskMemFree(addl_header); if (http_negotiate2) IHttpNegotiate2_Release(http_negotiate2); @@ -539,8 +553,6 @@ done: HeapFree(GetProcessHeap(), 0, path); HeapFree(GetProcessHeap(), 0, host); - ReleaseBindInfo(&bindinfo); - return hres; } @@ -904,9 +916,11 @@ HRESULT HttpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) ret->lpInternetProtocolVtbl = &HttpProtocolVtbl; ret->lpInternetPriorityVtbl = &HttpPriorityVtbl; ret->flags = ret->grfBINDF = 0; + memset(&ret->bind_info, 0, sizeof(ret->bind_info)); ret->protocol_sink = 0; ret->http_negotiate = 0; ret->internet = ret->connect = ret->request = 0; + ret->full_header = 0; ret->lock = 0; ret->current_position = ret->content_length = ret->available_bytes = 0; ret->priority = 0;

1 0

Alexandre Julliard : crypt32: Don't use off_t for memory offsets.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: fd51447966d403b5f41b901a597dde17293704b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd51447966d403b5f41b901a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 26 11:52:23 2007 +0200 crypt32: Don't use off_t for memory offsets. --- dlls/crypt32/encode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 7359ed8..e6695cf 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -1215,7 +1215,7 @@ struct DERSetDescriptor DWORD cItems; const void *items; size_t itemSize; - off_t itemOffset; + size_t itemOffset; CryptEncodeObjectExFunc encode; };

1 0

Rob Shearman : mshtml: Handle Ctrl-Home and Ctrl-End in edit mode.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: 4dfdec2ef57f4cd8f36f53e086d50a76aaa224b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dfdec2ef57f4cd8f36f53e08… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jul 25 19:15:22 2007 -0500 mshtml: Handle Ctrl-Home and Ctrl-End in edit mode. --- dlls/mshtml/editor.c | 36 +++++++++++++++++++++++++++++++++++- 1 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index f9005b6..5bf160e 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -39,6 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_ALIGN "cmd_align" +#define NSCMD_BEGINLINE "cmd_beginLine" #define NSCMD_BOLD "cmd_bold" #define NSCMD_CHARNEXT "cmd_charNext" #define NSCMD_CHARPREVIOUS "cmd_charPrevious" @@ -46,6 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_CUT "cmd_cut" #define NSCMD_DELETECHARFORWARD "cmd_deleteCharForward" #define NSCMD_DELETEWORDFORWARD "cmd_deleteWordForward" +#define NSCMD_ENDLINE "cmd_endLine" #define NSCMD_FONTCOLOR "cmd_fontColor" #define NSCMD_FONTFACE "cmd_fontFace" #define NSCMD_INDENT "cmd_indent" @@ -53,17 +55,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_ITALIC "cmd_italic" #define NSCMD_LINENEXT "cmd_lineNext" #define NSCMD_LINEPREVIOUS "cmd_linePrevious" +#define NSCMD_MOVEBOTTOM "cmd_moveBottom" #define NSCMD_MOVEPAGEDOWN "cmd_movePageDown" #define NSCMD_MOVEPAGEUP "cmd_movePageUp" +#define NSCMD_MOVETOP "cmd_moveTop" #define NSCMD_OL "cmd_ol" #define NSCMD_OUTDENT "cmd_outdent" #define NSCMD_PASTE "cmd_paste" +#define NSCMD_SELECTBEGINLINE "cmd_selectBeginLine" +#define NSCMD_SELECTBOTTOM "cmd_selectBottom" #define NSCMD_SELECTCHARNEXT "cmd_selectCharNext" #define NSCMD_SELECTCHARPREVIOUS "cmd_selectCharPrevious" +#define NSCMD_SELECTENDLINE "cmd_selectEndLine" #define NSCMD_SELECTLINENEXT "cmd_selectLineNext" #define NSCMD_SELECTLINEPREVIOUS "cmd_selectLinePrevious" #define NSCMD_SELECTPAGEDOWN "cmd_selectPageDown" #define NSCMD_SELECTPAGEUP "cmd_selectPageUp" +#define NSCMD_SELECTTOP "cmd_selectTop" #define NSCMD_SELECTWORDNEXT "cmd_selectWordNext" #define NSCMD_SELECTWORDPREVIOUS "cmd_selectWordPrevious" #define NSCMD_UL "cmd_ul" @@ -83,6 +91,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define DOM_VK_RIGHT VK_RIGHT #define DOM_VK_DOWN VK_DOWN #define DOM_VK_DELETE VK_DELETE +#define DOM_VK_HOME VK_HOME +#define DOM_VK_END VK_END static const WCHAR wszFont[] = {'f','o','n','t',0}; static const WCHAR wszSize[] = {'s','i','z','e',0}; @@ -478,7 +488,7 @@ static nsIDOMNode *get_child_text_node(nsIDOMNode *node, BOOL first) return NULL; } -static void handle_arrow_key(HTMLDocument *This, nsIDOMKeyEvent *event, const char **cmds) +static void handle_arrow_key(HTMLDocument *This, nsIDOMKeyEvent *event, const char *cmds[4]) { int i=0; PRBool b; @@ -566,6 +576,30 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) handle_arrow_key(This, key_event, cmds); break; } + case DOM_VK_HOME: { + static const char *cmds[] = { + NSCMD_BEGINLINE, + NSCMD_MOVETOP, + NSCMD_SELECTBEGINLINE, + NSCMD_SELECTTOP + }; + + TRACE("home\n"); + handle_arrow_key(This, key_event, cmds); + break; + } + case DOM_VK_END: { + static const char *cmds[] = { + NSCMD_ENDLINE, + NSCMD_MOVEBOTTOM, + NSCMD_SELECTENDLINE, + NSCMD_SELECTBOTTOM + }; + + TRACE("end\n"); + handle_arrow_key(This, key_event, cmds); + break; + } } nsIDOMKeyEvent_Release(key_event);

1 0

H. Verbeet : wined3d: Flip the scissor rect when rendering offscreen.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: b4e596e70e912e3cc362d81d43bfead3a21b608c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4e596e70e912e3cc362d81d4… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Jul 26 00:38:50 2007 +0200 wined3d: Flip the scissor rect when rendering offscreen. --- dlls/wined3d/context.c | 2 ++ dlls/wined3d/device.c | 17 ++++++++++++----- dlls/wined3d/state.c | 7 ++++++- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 32791b7..1c5abd0 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -700,6 +700,7 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf Context_MarkStateDirty(context, WINED3DTS_PROJECTION); Context_MarkStateDirty(context, STATE_VDECL); Context_MarkStateDirty(context, STATE_VIEWPORT); + Context_MarkStateDirty(context, STATE_SCISSORRECT); } } else { @@ -787,6 +788,7 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf Context_MarkStateDirty(context, WINED3DTS_PROJECTION); Context_MarkStateDirty(context, STATE_VDECL); Context_MarkStateDirty(context, STATE_VIEWPORT); + Context_MarkStateDirty(context, STATE_SCISSORRECT); } } if (readTexture) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9f6d63b..be4214e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4509,11 +4509,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun if (!curRect) { /* In drawable flag is set below */ - glScissor(This->stateBlock->viewport.X, - (((IWineD3DSurfaceImpl *)This->render_targets[0])->currentDesc.Height - - (This->stateBlock->viewport.Y + This->stateBlock->viewport.Height)), - This->stateBlock->viewport.Width, - This->stateBlock->viewport.Height); + if (This->render_offscreen) { + glScissor(This->stateBlock->viewport.X, + This->stateBlock->viewport.Y, + This->stateBlock->viewport.Width, + This->stateBlock->viewport.Height); + } else { + glScissor(This->stateBlock->viewport.X, + (((IWineD3DSurfaceImpl *)This->render_targets[0])->currentDesc.Height - + (This->stateBlock->viewport.Y + This->stateBlock->viewport.Height)), + This->stateBlock->viewport.Width, + This->stateBlock->viewport.Height); + } checkGLcall("glScissor"); glClear(glMask); checkGLcall("glClear"); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 3d6101d..71a6916 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3442,7 +3442,12 @@ static void scissorrect(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D winHeight = windowRect.bottom - windowRect.top; TRACE("(%p) Setting new Scissor Rect to %d:%d-%d:%d\n", stateblock->wineD3DDevice, pRect->left, pRect->bottom - winHeight, pRect->right - pRect->left, pRect->bottom - pRect->top); - glScissor(pRect->left, winHeight - pRect->bottom, pRect->right - pRect->left, pRect->bottom - pRect->top); + + if (stateblock->wineD3DDevice->render_offscreen) { + glScissor(pRect->left, pRect->top, pRect->right - pRect->left, pRect->bottom - pRect->top); + } else { + glScissor(pRect->left, winHeight - pRect->bottom, pRect->right - pRect->left, pRect->bottom - pRect->top); + } checkGLcall("glScissor"); }

1 0

H. Verbeet : d3d9: Trace the Format parameter to IDirect3DDevice9Impl_CreateTexture as hexadecimal .
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: 4194d784f8e678281205e17f79f8bf7c51847885 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4194d784f8e678281205e17f7… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Jul 26 00:38:45 2007 +0200 d3d9: Trace the Format parameter to IDirect3DDevice9Impl_CreateTexture as hexadecimal. --- dlls/d3d9/texture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index d45385d..aa873eb 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -333,7 +333,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateTexture(LPDIRECT3DDEVICE9 iface, UIN IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hrc = D3D_OK; - TRACE("(%p) : W(%d) H(%d), Lvl(%d) d(%d), Fmt(%u), Pool(%d)\n", This, Width, Height, Levels, Usage, Format, Pool); + TRACE("(%p) : W(%d) H(%d), Lvl(%d) d(%d), Fmt(%#x), Pool(%d)\n", This, Width, Height, Levels, Usage, Format, Pool); /* Allocate the storage for the device */ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DTexture9Impl));

1 0

Jacek Caban : mshtml: Make sure we have associated listener before calling OnStopRequest.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: cb9527ac069dcbc27ad8d27f8637795c00e77b76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb9527ac069dcbc27ad8d27f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 26 00:14:45 2007 +0200 mshtml: Make sure we have associated listener before calling OnStopRequest. --- dlls/mshtml/navigate.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 76fd5f2..014fcdb 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -249,6 +249,12 @@ static void add_nsrequest(BSCallback *This) } } +static void on_stop_nsrequest(BSCallback *This) { + if(This->nslistener) + nsIStreamListener_OnStopRequest(This->nslistener, (nsIRequest*)NSCHANNEL(This->nschannel), + This->nscontext, NS_OK); +} + #define STATUSCLB_THIS(iface) DEFINE_THIS(BSCallback, BindStatusCallback, iface) static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *iface, @@ -391,10 +397,9 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac This->binding = NULL; } - if(This->nslistener) { - nsIStreamListener_OnStopRequest(This->nslistener, (nsIRequest*)NSCHANNEL(This->nschannel), - This->nscontext, NS_OK); + on_stop_nsrequest(This); + if(This->nslistener) { if(This->nschannel->load_group) { nsresult nsres; @@ -796,8 +801,7 @@ HRESULT start_binding(BSCallback *bscallback) hres = CreateAsyncBindCtx(0, STATUSCLB(bscallback), NULL, &bctx); if(FAILED(hres)) { WARN("CreateAsyncBindCtx failed: %08x\n", hres); - nsIStreamListener_OnStopRequest(bscallback->nslistener, (nsIRequest*)NSCHANNEL(bscallback->nschannel), - bscallback->nscontext, NS_OK); + on_stop_nsrequest(bscallback); return hres; } @@ -805,8 +809,7 @@ HRESULT start_binding(BSCallback *bscallback) IBindCtx_Release(bctx); if(FAILED(hres)) { WARN("BindToStorage failed: %08x\n", hres); - nsIStreamListener_OnStopRequest(bscallback->nslistener, (nsIRequest*)NSCHANNEL(bscallback->nschannel), - bscallback->nscontext, NS_OK); + on_stop_nsrequest(bscallback); return hres; }

1 0

Jacek Caban : urlmon: Change some gotos to return.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: 262db80776a8f06518b49175c43ec08949582ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=262db80776a8f06518b49175c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 26 00:13:44 2007 +0200 urlmon: Change some gotos to return. --- dlls/urlmon/http.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index a720651..79858e6 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -558,22 +558,22 @@ static HRESULT WINAPI HttpProtocol_Continue(IInternetProtocol *iface, PROTOCOLDA if (!pProtocolData) { WARN("Expected pProtocolData to be non-NULL\n"); - goto done; + return S_OK; } else if (!This->request) { WARN("Expected request to be non-NULL\n"); - goto done; + return S_OK; } else if (!This->http_negotiate) { WARN("Expected IHttpNegotiate pointer to be non-NULL\n"); - goto done; + return S_OK; } else if (!This->protocol_sink) { WARN("Expected IInternetProtocolSink pointer to be non-NULL\n"); - goto done; + return S_OK; } if (pProtocolData->pData == (LPVOID)BINDSTATUS_DOWNLOADINGDATA)

1 0