wine-commits January 2011

wine-commits@winehq.org

2 participants
879 discussions

Michael Stefaniuc : mshtml: COM cleanup for the nsIDOMEventListener iface.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: c8d6a502f0c98c47443136ebb6cfd28bc3e16838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8d6a502f0c98c47443136ebb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 3 12:19:35 2011 +0100 mshtml: COM cleanup for the nsIDOMEventListener iface. --- dlls/mshtml/mshtml_private.h | 2 - dlls/mshtml/nsevents.c | 55 +++++++++++++++++++++++------------------ 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 36ea68e..bc0b5fc 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -624,8 +624,6 @@ struct HTMLDocumentNode { struct list plugin_hosts; }; -#define NSEVENTLIST(x) ((nsIDOMEventListener*) &(x)->lpDOMEventListenerVtbl) - #define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl))) HRESULT HTMLDocument_Create(IUnknown*,REFIID,void**); diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 85d6e56..f6a1ed6 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { - const nsIDOMEventListenerVtbl *lpDOMEventListenerVtbl; + nsIDOMEventListener nsIDOMEventListener_iface; nsDocumentEventListener *This; } nsEventListener; @@ -67,25 +67,28 @@ static LONG release_listener(nsDocumentEventListener *This) return ref; } -#define NSEVENTLIST_THIS(iface) DEFINE_THIS(nsEventListener, DOMEventListener, iface) +static inline nsEventListener *impl_from_nsIDOMEventListener(nsIDOMEventListener *iface) +{ + return CONTAINING_RECORD(iface, nsEventListener, nsIDOMEventListener_iface); +} static nsresult NSAPI nsDOMEventListener_QueryInterface(nsIDOMEventListener *iface, nsIIDRef riid, void **result) { - nsEventListener *This = NSEVENTLIST_THIS(iface); + nsEventListener *This = impl_from_nsIDOMEventListener(iface); *result = NULL; if(IsEqualGUID(&IID_nsISupports, riid)) { TRACE("(%p)->(IID_nsISupports, %p)\n", This, result); - *result = NSEVENTLIST(This); + *result = &This->nsIDOMEventListener_iface; }else if(IsEqualGUID(&IID_nsIDOMEventListener, riid)) { TRACE("(%p)->(IID_nsIDOMEventListener %p)\n", This, result); - *result = NSEVENTLIST(This); + *result = &This->nsIDOMEventListener_iface; } if(*result) { - nsIWebBrowserChrome_AddRef(NSEVENTLIST(This)); + nsIWebBrowserChrome_AddRef(&This->nsIDOMEventListener_iface); return NS_OK; } @@ -95,19 +98,19 @@ static nsresult NSAPI nsDOMEventListener_QueryInterface(nsIDOMEventListener *ifa static nsrefcnt NSAPI nsDOMEventListener_AddRef(nsIDOMEventListener *iface) { - nsDocumentEventListener *This = NSEVENTLIST_THIS(iface)->This; - LONG ref = InterlockedIncrement(&This->ref); + nsEventListener *This = impl_from_nsIDOMEventListener(iface); + LONG ref = InterlockedIncrement(&This->This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%d\n", This->This, ref); return ref; } static nsrefcnt NSAPI nsDOMEventListener_Release(nsIDOMEventListener *iface) { - nsDocumentEventListener *This = NSEVENTLIST_THIS(iface)->This; + nsEventListener *This = impl_from_nsIDOMEventListener(iface); - return release_listener(This); + return release_listener(This->This); } static BOOL is_doc_child_focus(NSContainer *nscontainer) @@ -121,7 +124,8 @@ static BOOL is_doc_child_focus(NSContainer *nscontainer) static nsresult NSAPI handle_blur(nsIDOMEventListener *iface, nsIDOMEvent *event) { - HTMLDocumentNode *doc = NSEVENTLIST_THIS(iface)->This->doc; + nsEventListener *This = impl_from_nsIDOMEventListener(iface); + HTMLDocumentNode *doc = This->This->doc; HTMLDocumentObj *doc_obj; TRACE("(%p)\n", doc); @@ -140,7 +144,8 @@ static nsresult NSAPI handle_blur(nsIDOMEventListener *iface, nsIDOMEvent *event static nsresult NSAPI handle_focus(nsIDOMEventListener *iface, nsIDOMEvent *event) { - HTMLDocumentNode *doc = NSEVENTLIST_THIS(iface)->This->doc; + nsEventListener *This = impl_from_nsIDOMEventListener(iface); + HTMLDocumentNode *doc = This->This->doc; HTMLDocumentObj *doc_obj; TRACE("(%p)\n", doc); @@ -160,7 +165,8 @@ static nsresult NSAPI handle_focus(nsIDOMEventListener *iface, nsIDOMEvent *even static nsresult NSAPI handle_keypress(nsIDOMEventListener *iface, nsIDOMEvent *event) { - HTMLDocumentNode *doc = NSEVENTLIST_THIS(iface)->This->doc; + nsEventListener *This = impl_from_nsIDOMEventListener(iface); + HTMLDocumentNode *doc = This->This->doc; HTMLDocumentObj *doc_obj; if(!doc) @@ -220,7 +226,8 @@ static void handle_docobj_load(HTMLDocumentObj *doc) static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event) { - HTMLDocumentNode *doc = NSEVENTLIST_THIS(iface)->This->doc; + nsEventListener *This = impl_from_nsIDOMEventListener(iface); + HTMLDocumentNode *doc = This->This->doc; nsIDOMHTMLElement *nsbody = NULL; HTMLDocumentObj *doc_obj = NULL; @@ -263,7 +270,8 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent *event) { - HTMLDocumentNode *doc = NSEVENTLIST_THIS(iface)->This->doc; + nsEventListener *This = impl_from_nsIDOMEventListener(iface); + HTMLDocumentNode *doc = This->This->doc; const PRUnichar *type; nsIDOMEventTarget *event_target; nsIDOMNode *nsnode; @@ -299,8 +307,6 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * return NS_OK; } -#undef NSEVENTLIST_THIS - #define EVENTLISTENER_VTBL(handler) \ { \ nsDOMEventListener_QueryInterface, \ @@ -332,7 +338,7 @@ static void init_event(nsIDOMEventTarget *target, const PRUnichar *type, static void init_listener(nsEventListener *This, nsDocumentEventListener *listener, const nsIDOMEventListenerVtbl *vtbl) { - This->lpDOMEventListenerVtbl = vtbl; + This->nsIDOMEventListener_iface.lpVtbl = vtbl; This->This = listener; } @@ -350,7 +356,8 @@ void add_nsevent_listener(HTMLDocumentNode *doc, nsIDOMNode *nsnode, LPCWSTR typ return; } - init_event(target, type, NSEVENTLIST(&doc->nsevent_listener->htmlevent_listener), TRUE); + init_event(target, type, &doc->nsevent_listener->htmlevent_listener.nsIDOMEventListener_iface, + TRUE); nsIDOMEventTarget_Release(target); } @@ -395,10 +402,10 @@ void init_nsevents(HTMLDocumentNode *doc) return; } - init_event(target, wsz_blur, NSEVENTLIST(&listener->blur_listener), TRUE); - init_event(target, wsz_focus, NSEVENTLIST(&listener->focus_listener), TRUE); - init_event(target, wsz_keypress, NSEVENTLIST(&listener->keypress_listener), FALSE); - init_event(target, wsz_load, NSEVENTLIST(&listener->load_listener), TRUE); + init_event(target, wsz_blur, &listener->blur_listener.nsIDOMEventListener_iface, TRUE); + init_event(target, wsz_focus, &listener->focus_listener.nsIDOMEventListener_iface, TRUE); + init_event(target, wsz_keypress, &listener->keypress_listener.nsIDOMEventListener_iface, FALSE); + init_event(target, wsz_load, &listener->load_listener.nsIDOMEventListener_iface, TRUE); nsIDOMEventTarget_Release(target); }

1 0

Damian Dixon : advapi32: Implement SetEntriesInAclA by calling SetEntriesInAclW.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: a9bbd7dc86aff14308e0a5491e0f660fe3c49a2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9bbd7dc86aff14308e0a5491… Author: Damian Dixon <damian.dixon(a)gmail.com> Date: Sat Jan 1 20:19:55 2011 +0000 advapi32: Implement SetEntriesInAclA by calling SetEntriesInAclW. --- dlls/advapi32/security.c | 57 +++++++++++++++- dlls/advapi32/tests/security.c | 138 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 189 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9bbd7dc86aff14308e0a…

1 0

Hwang YunSong : serialui: Update Korean resource.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 91dac8deacdc268908c39ad8554f2ec430cca3a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91dac8deacdc268908c39ad85… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Jan 3 10:37:55 2011 +0900 serialui: Update Korean resource. --- dlls/serialui/Ko.rc | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/serialui/Ko.rc b/dlls/serialui/Ko.rc index ade2735..481bdcd 100644 --- a/dlls/serialui/Ko.rc +++ b/dlls/serialui/Ko.rc @@ -1,5 +1,5 @@ /* - * Copyright 2005 YunSong Hwang + * Copyright 2005,2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,25 +18,27 @@ #include "serialui.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_SERIALUICONFIG DIALOG 0, 0, 160, 159 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "�� " +CAPTION "속 " FONT 9, "MS Shell Dlg" BEGIN - LTEXT "��ӵ�", -1,5,20,55,10 + LTEXT "보드속도", -1,5,20,55,10 COMBOBOX IDC_BAUD, 60, 20, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "�и�Ƽ", -1,5,40,55,10 + LTEXT "패리티", -1,5,40,55,10 COMBOBOX IDC_PARITY, 60, 40, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "�帧 ��", -1,5,60,55,10 + LTEXT "흐름 제어", -1,5,60,55,10 COMBOBOX IDC_FLOW, 60, 60, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "��Ÿ ��Ʈ", -1,5,80,55,10 + LTEXT "데이타 비트", -1,5,80,55,10 COMBOBOX IDC_DATA, 60, 80, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "�� Ʈ", -1,5,100,55,10 + LTEXT "정지 비트", -1,5,100,55,10 COMBOBOX IDC_STOP, 60, 100, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Ȯ��", IDOK,30,138,50,14 - PUSHBUTTON "��", IDCANCEL,85,138,50,14 + DEFPUSHBUTTON "확인", IDOK,30,138,50,14 + PUSHBUTTON "취소", IDCANCEL,85,138,50,14 /* these two buttons are for testing Get/SetDefaultCommConfig */ /* PUSHBUTTON "GetDefault", ID_GETDEFAULT,30,115,50,14 */ /* PUSHBUTTON "SetDefault", ID_SETDEFAULT,85,115,50,14 */

1 0

Hwang YunSong : regedit: Update Korean resource.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 9d3c1aa9251c822da6c00e35b03f7c12657bc3e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d3c1aa9251c822da6c00e35b… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Jan 3 10:36:32 2011 +0900 regedit: Update Korean resource. --- programs/regedit/Ko.rc | 288 ++++++++++++++++++++++++------------------------ 1 files changed, 145 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d3c1aa9251c822da6c00…

1 0

Andrew Nguyen : kernel32/tests: Avoid an input buffer overrun in the empty console write test.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: ab8b2cfaa17e5c70d3a0d75a0258805996ef7dac URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8b2cfaa17e5c70d3a0d75a0… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Jan 2 21:18:36 2011 -0600 kernel32/tests: Avoid an input buffer overrun in the empty console write test. --- dlls/kernel32/tests/console.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 2f8cf84..da446a1 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -171,9 +171,9 @@ static void testCursorInfo(HANDLE hCon) static void testEmptyWrite(HANDLE hCon) { + static const char emptybuf[16]; COORD c; DWORD len; - const char* mytest = ""; c.X = c.Y = 0; ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left\n"); @@ -197,13 +197,13 @@ static void testEmptyWrite(HANDLE hCon) } len = -1; - ok(WriteConsole(hCon, mytest, 0, &len, NULL) != 0 && len == 0, "WriteConsole\n"); + ok(WriteConsole(hCon, emptybuf, 0, &len, NULL) != 0 && len == 0, "WriteConsole\n"); okCURSOR(hCon, c); /* WriteConsole does not halt on a null terminator and is happy to write * memory contents beyond the actual size of the buffer. */ len = -1; - ok(WriteConsole(hCon, mytest, 16, &len, NULL) != 0 && len == 16, "WriteConsole\n"); + ok(WriteConsole(hCon, emptybuf, 16, &len, NULL) != 0 && len == 16, "WriteConsole\n"); c.X += 16; okCURSOR(hCon, c); }

1 0

Greg Geldorp : msi/tests: Fix some failures on Wow64.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 536876afc3228606bfadd9ae42621d0a7cee3915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=536876afc3228606bfadd9ae4… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Mon Jan 3 01:06:08 2011 +0100 msi/tests: Fix some failures on Wow64. --- dlls/msi/tests/action.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 1db7845..86abecc 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -3428,6 +3428,8 @@ static void test_publish(void) else { res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey); + if (is_wow64 && res == ERROR_FILE_NOT_FOUND) /* XP - Vista, Wow64 */ + res = RegOpenKeyExA(uninstall, prodcode, 0, KEY_ALL_ACCESS, &prodkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); }

1 0

Thomas Mullaly : include: Added IDN support functions and types.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 148b38d9237c61029f7ca022aeb9269a00012a50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=148b38d9237c61029f7ca022a… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jan 2 16:20:20 2011 -0500 include: Added IDN support functions and types. --- include/winnls.h | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/include/winnls.h b/include/winnls.h index adefcee..6ce50e1 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -24,6 +24,12 @@ extern "C" { #endif +#ifndef _NORMALIZE_ +# define WINNORMALIZEAPI DECLSPEC_IMPORT +#else +# define WINNORMALIZEAPI +#endif + /* Country codes */ #define CTRY_DEFAULT (0) #define CTRY_ALBANIA (355) @@ -532,9 +538,21 @@ extern "C" { #define LGRPID_GEORGIAN 0x10 #define LGRPID_ARMENIAN 0x11 +/* IDN defines. */ +#define IDN_ALLOW_UNASSIGNED 0x1 +#define IDN_USE_STD3_ASCII_RULES 0x2 + /* Types */ +typedef enum _NORM_FORM { + NormalizationOther = 0, + NormalizationC = 0x1, + NormalizationD = 0x2, + NormalizationKC = 0x5, + NormalizationKD = 0x6 +} NORM_FORM; + typedef DWORD CALID; typedef DWORD CALTYPE; typedef LONG GEOID; @@ -790,8 +808,12 @@ WINBASEAPI LCID WINAPI GetUserDefaultLCID(void); WINBASEAPI INT WINAPI GetUserDefaultLocaleName(LPWSTR,int); WINBASEAPI LANGID WINAPI GetUserDefaultUILanguage(void); WINBASEAPI GEOID WINAPI GetUserGeoID(GEOCLASS); +WINNORMALIZEAPI INT WINAPI IdnToAscii(DWORD,LPCWSTR,INT,LPWSTR,INT); +WINNORMALIZEAPI INT WINAPI IdnToNameprepUnicode(DWORD,LPCWSTR,INT,LPWSTR,INT); +WINNORMALIZEAPI INT WINAPI IdnToUnicode(DWORD,LPCWSTR,INT,LPWSTR,INT); WINBASEAPI BOOL WINAPI IsDBCSLeadByte(BYTE); WINBASEAPI BOOL WINAPI IsDBCSLeadByteEx(UINT,BYTE); +WINNORMALIZEAPI BOOL WINAPI IsNormalizedString(NORM_FORM,LPCWSTR,INT); WINBASEAPI BOOL WINAPI IsValidCodePage(UINT); WINBASEAPI BOOL WINAPI IsValidLocale(LCID,DWORD); WINBASEAPI BOOL WINAPI IsValidLanguageGroup(LGRPID,DWORD); @@ -801,6 +823,7 @@ WINBASEAPI INT WINAPI LCMapStringW(LCID,DWORD,LPCWSTR,INT,LPWSTR,INT); #define LCMapString WINELIB_NAME_AW(LCMapString) WINBASEAPI LCID WINAPI LocaleNameToLCID(LPCWSTR,DWORD); WINBASEAPI INT WINAPI MultiByteToWideChar(UINT,DWORD,LPCSTR,INT,LPWSTR,INT); +WINNORMALIZEAPI INT WINAPI NormalizeString(NORM_FORM,LPCWSTR,INT,LPWSTR,INT); WINBASEAPI INT WINAPI SetCalendarInfoA(LCID,CALID,CALTYPE,LPCSTR); WINBASEAPI INT WINAPI SetCalendarInfoW(LCID,CALID,CALTYPE,LPCWSTR); #define SetCalendarInfo WINELIB_NAME_AW(SetCalendarInfo)

1 0

David Hedberg : urlmon: Add new on_error function to protocol vtbl.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 4121ac12243ba94e6a320df9d450976dc06678e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4121ac12243ba94e6a320df9d… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Mon Jan 3 03:47:38 2011 +0100 urlmon: Add new on_error function to protocol vtbl. --- dlls/urlmon/ftp.c | 8 +++++++- dlls/urlmon/gopher.c | 8 +++++++- dlls/urlmon/http.c | 8 +++++++- dlls/urlmon/protocol.c | 40 ++++++++++++++++++++++++---------------- dlls/urlmon/urlmon_main.h | 2 ++ 5 files changed, 47 insertions(+), 19 deletions(-) diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c index deb611b..854f169 100644 --- a/dlls/urlmon/ftp.c +++ b/dlls/urlmon/ftp.c @@ -99,13 +99,19 @@ static void FtpProtocol_close_connection(Protocol *prot) { } +static void FtpProtocol_on_error(Protocol *prot, DWORD error) +{ + FIXME("(%p) %d - stub\n", prot, error); +} + #undef ASYNCPROTOCOL_THIS static const ProtocolVtbl AsyncProtocolVtbl = { FtpProtocol_open_request, FtpProtocol_end_request, FtpProtocol_start_downloading, - FtpProtocol_close_connection + FtpProtocol_close_connection, + FtpProtocol_on_error }; static HRESULT WINAPI FtpProtocol_QueryInterface(IInternetProtocolEx *iface, REFIID riid, void **ppv) diff --git a/dlls/urlmon/gopher.c b/dlls/urlmon/gopher.c index da241e9..5964882 100644 --- a/dlls/urlmon/gopher.c +++ b/dlls/urlmon/gopher.c @@ -70,13 +70,19 @@ static void GopherProtocol_close_connection(Protocol *prot) { } +static void GopherProtocol_on_error(Protocol *prot, DWORD error) +{ + FIXME("(%p) %d - stub\n", prot, error); +} + #undef ASYNCPROTOCOL_THIS static const ProtocolVtbl AsyncProtocolVtbl = { GopherProtocol_open_request, GopherProtocol_end_request, GopherProtocol_start_downloading, - GopherProtocol_close_connection + GopherProtocol_close_connection, + GopherProtocol_on_error }; #define PROTOCOL_THIS(iface) DEFINE_THIS(GopherProtocol, IInternetProtocol, iface) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index cfa2fc6..a62323b 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -388,13 +388,19 @@ static void HttpProtocol_close_connection(Protocol *prot) } } +static void HttpProtocol_on_error(Protocol *prot, DWORD error) +{ + FIXME("(%p) %d - stub\n", prot, error); +} + #undef ASYNCPROTOCOL_THIS static const ProtocolVtbl AsyncProtocolVtbl = { HttpProtocol_open_request, HttpProtocol_end_request, HttpProtocol_start_downloading, - HttpProtocol_close_connection + HttpProtocol_close_connection, + HttpProtocol_on_error }; static HRESULT WINAPI HttpProtocol_QueryInterface(IInternetProtocolEx *iface, REFIID riid, void **ppv) diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index 2ca1629..1b8b5e3 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -76,25 +76,27 @@ static void request_complete(Protocol *protocol, INTERNET_ASYNC_RESULT *ar) TRACE("(%p)->(%p)\n", protocol, ar); - if(!ar->dwResult) { - WARN("request failed: %d\n", ar->dwError); - return; - } - - protocol->flags |= FLAG_REQUEST_COMPLETE; - - if(!protocol->request) { - TRACE("setting request handle %p\n", (HINTERNET)ar->dwResult); - protocol->request = (HINTERNET)ar->dwResult; - } - /* PROTOCOLDATA same as native */ memset(&data, 0, sizeof(data)); data.dwState = 0xf1000000; - if(protocol->flags & FLAG_FIRST_CONTINUE_COMPLETE) - data.pData = (LPVOID)BINDSTATUS_ENDDOWNLOADCOMPONENTS; - else - data.pData = (LPVOID)BINDSTATUS_DOWNLOADINGDATA; + + if(ar->dwResult) { + protocol->flags |= FLAG_REQUEST_COMPLETE; + + if(!protocol->request) { + TRACE("setting request handle %p\n", (HINTERNET)ar->dwResult); + protocol->request = (HINTERNET)ar->dwResult; + } + + if(protocol->flags & FLAG_FIRST_CONTINUE_COMPLETE) + data.pData = (LPVOID)BINDSTATUS_ENDDOWNLOADCOMPONENTS; + else + data.pData = (LPVOID)BINDSTATUS_DOWNLOADINGDATA; + + }else { + protocol->flags |= FLAG_ERROR; + data.pData = (LPVOID)ar->dwError; + } if (protocol->bindf & BINDF_FROMURLMON) IInternetProtocolSink_Switch(protocol->protocol_sink, &data); @@ -301,6 +303,12 @@ HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data) return S_OK; } + if(protocol->flags & FLAG_ERROR) { + protocol->flags &= ~FLAG_ERROR; + protocol->vtbl->on_error(protocol, (DWORD)data->pData); + return S_OK; + } + if(protocol->post_stream) return write_post_stream(protocol); diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index dc6d3fc..719c2eb 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -113,6 +113,7 @@ struct ProtocolVtbl { HRESULT (*end_request)(Protocol*); HRESULT (*start_downloading)(Protocol*); void (*close_connection)(Protocol*); + void (*on_error)(Protocol*,DWORD); }; /* Flags are needed for, among other things, return HRESULTs from the Read function @@ -144,6 +145,7 @@ struct ProtocolVtbl { #define FLAG_ALL_DATA_READ 0x0008 #define FLAG_LAST_DATA_REPORTED 0x0010 #define FLAG_RESULT_REPORTED 0x0020 +#define FLAG_ERROR 0x0040 HRESULT protocol_start(Protocol*,IInternetProtocol*,IUri*,IInternetProtocolSink*,IInternetBindInfo*); HRESULT protocol_continue(Protocol*,PROTOCOLDATA*);

1 0

David Hedberg : urlmon: Move protocol flags for wininet based protocols into a common header.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 2b5c18c35b913482c58d060001178fbf11ef19ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5c18c35b913482c58d06000… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Mon Jan 3 03:47:37 2011 +0100 urlmon: Move protocol flags for wininet based protocols into a common header. --- dlls/urlmon/protocol.c | 30 ------------------------------ dlls/urlmon/urlmon_main.h | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index 669343b..2ca1629 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -23,36 +23,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); -/* Flags are needed for, among other things, return HRESULTs from the Read function - * to conform to native. For example, Read returns: - * - * 1. E_PENDING if called before the request has completed, - * (flags = 0) - * 2. S_FALSE after all data has been read and S_OK has been reported, - * (flags = FLAG_REQUEST_COMPLETE | FLAG_ALL_DATA_READ | FLAG_RESULT_REPORTED) - * 3. INET_E_DATA_NOT_AVAILABLE if InternetQueryDataAvailable fails. The first time - * this occurs, INET_E_DATA_NOT_AVAILABLE will also be reported to the sink, - * (flags = FLAG_REQUEST_COMPLETE) - * but upon subsequent calls to Read no reporting will take place, yet - * InternetQueryDataAvailable will still be called, and, on failure, - * INET_E_DATA_NOT_AVAILABLE will still be returned. - * (flags = FLAG_REQUEST_COMPLETE | FLAG_RESULT_REPORTED) - * - * FLAG_FIRST_DATA_REPORTED and FLAG_LAST_DATA_REPORTED are needed for proper - * ReportData reporting. For example, if OnResponse returns S_OK, Continue will - * report BSCF_FIRSTDATANOTIFICATION, and when all data has been read Read will - * report BSCF_INTERMEDIATEDATANOTIFICATION|BSCF_LASTDATANOTIFICATION. However, - * if OnResponse does not return S_OK, Continue will not report data, and Read - * will report BSCF_FIRSTDATANOTIFICATION|BSCF_LASTDATANOTIFICATION when all - * data has been read. - */ -#define FLAG_REQUEST_COMPLETE 0x0001 -#define FLAG_FIRST_CONTINUE_COMPLETE 0x0002 -#define FLAG_FIRST_DATA_REPORTED 0x0004 -#define FLAG_ALL_DATA_READ 0x0008 -#define FLAG_LAST_DATA_REPORTED 0x0010 -#define FLAG_RESULT_REPORTED 0x0020 - static inline HRESULT report_progress(Protocol *protocol, ULONG status_code, LPCWSTR status_text) { return IInternetProtocolSink_ReportProgress(protocol->protocol_sink, status_code, status_text); diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index ea33f15..dc6d3fc 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -115,6 +115,36 @@ struct ProtocolVtbl { void (*close_connection)(Protocol*); }; +/* Flags are needed for, among other things, return HRESULTs from the Read function + * to conform to native. For example, Read returns: + * + * 1. E_PENDING if called before the request has completed, + * (flags = 0) + * 2. S_FALSE after all data has been read and S_OK has been reported, + * (flags = FLAG_REQUEST_COMPLETE | FLAG_ALL_DATA_READ | FLAG_RESULT_REPORTED) + * 3. INET_E_DATA_NOT_AVAILABLE if InternetQueryDataAvailable fails. The first time + * this occurs, INET_E_DATA_NOT_AVAILABLE will also be reported to the sink, + * (flags = FLAG_REQUEST_COMPLETE) + * but upon subsequent calls to Read no reporting will take place, yet + * InternetQueryDataAvailable will still be called, and, on failure, + * INET_E_DATA_NOT_AVAILABLE will still be returned. + * (flags = FLAG_REQUEST_COMPLETE | FLAG_RESULT_REPORTED) + * + * FLAG_FIRST_DATA_REPORTED and FLAG_LAST_DATA_REPORTED are needed for proper + * ReportData reporting. For example, if OnResponse returns S_OK, Continue will + * report BSCF_FIRSTDATANOTIFICATION, and when all data has been read Read will + * report BSCF_INTERMEDIATEDATANOTIFICATION|BSCF_LASTDATANOTIFICATION. However, + * if OnResponse does not return S_OK, Continue will not report data, and Read + * will report BSCF_FIRSTDATANOTIFICATION|BSCF_LASTDATANOTIFICATION when all + * data has been read. + */ +#define FLAG_REQUEST_COMPLETE 0x0001 +#define FLAG_FIRST_CONTINUE_COMPLETE 0x0002 +#define FLAG_FIRST_DATA_REPORTED 0x0004 +#define FLAG_ALL_DATA_READ 0x0008 +#define FLAG_LAST_DATA_REPORTED 0x0010 +#define FLAG_RESULT_REPORTED 0x0020 + HRESULT protocol_start(Protocol*,IInternetProtocol*,IUri*,IInternetProtocolSink*,IInternetBindInfo*); HRESULT protocol_continue(Protocol*,PROTOCOLDATA*); HRESULT protocol_read(Protocol*,void*,ULONG,ULONG*);

1 0

Michael Stefaniuc : mshtml: Use ifaces instead of vtbl pointers in BSCallback.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: fb92f979dd9fa4427eafc4018df9bb47901de33f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb92f979dd9fa4427eafc4018… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 3 01:13:16 2011 +0100 mshtml: Use ifaces instead of vtbl pointers in BSCallback. --- dlls/mshtml/mshtml_private.h | 4 - dlls/mshtml/navigate.c | 143 ++++++++++++++++++++++-------------------- 2 files changed, 74 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb92f979dd9fa4427eafc…

1 0

← Newer
1
...
81
82
83
84
85
86
87
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2011