March 2008 - Wine-commits - list.winehq.org

Michael Stefaniuc : credui: Update the German translation.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: aa754a70f04d6127fa2aa6bdc1510f2970ce70bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa754a70f04d6127fa2aa6bdc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Mar 23 22:02:55 2008 +0100 credui: Update the German translation. --- dlls/credui/credui_De.rc | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/credui/credui_De.rc b/dlls/credui/credui_De.rc index 3c9fcd2..7214d04 100644 --- a/dlls/credui/credui_De.rc +++ b/dlls/credui/credui_De.rc @@ -31,10 +31,20 @@ BEGIN LTEXT "&Benutzername:",IDC_STATIC,8,62,72,12,SS_CENTERIMAGE CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 - LTEXT "&Passwort:",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE + LTEXT "&Kennwort:",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "&Remember my password",IDC_SAVE,"Button", + CONTROL "Kennwort &merken",IDC_SAVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 DEFPUSHBUTTON "OK",IDOK,97,128,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,156,128,50,14 END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "Mit %s verbinden" + IDS_MESSAGEFORMAT "Verbindung mit %s wird hergestellt" + IDS_INCORRECTPASSWORDTITLE "Anmeldung fehlgeschlagen" + IDS_INCORRECTPASSWORD "Bitte �berpr�fen Sie Ihren Benutzernamen\nund geben Sie das Kennwort neu ein." + IDS_CAPSLOCKONTITLE "Die Feststelltaste ist aktiviert" + IDS_CAPSLOCKON "Mit aktivierter Feststelltaste k�nnte das Kennwort falsch eingeben werden.\n\nVor der Eingabe des Kennworts sollten Sie die Feststelltaste deaktivieren." +}

1 0

Jacek Caban : mshtml: Added new nsChannelBSC type.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: 5a04f526ad21ccf5bb4d3f323805172003cdaadf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a04f526ad21ccf5bb4d3f323… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 23 02:16:03 2008 +0100 mshtml: Added new nsChannelBSC type. --- dlls/mshtml/mshtml_private.h | 19 +++++++++++-------- dlls/mshtml/navigate.c | 6 +++--- dlls/mshtml/nsio.c | 4 ++-- dlls/mshtml/persist.c | 12 ++++++------ 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2936f76..a21eee3 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -54,6 +54,7 @@ typedef struct HTMLDOMNode HTMLDOMNode; typedef struct ConnectionPoint ConnectionPoint; typedef struct BSCallback BSCallback; +typedef struct BSCallback nsChannelBSC; typedef struct { const IHTMLWindow2Vtbl *lpHTMLWindow2Vtbl; @@ -138,7 +139,7 @@ struct HTMLDocument { IOleUndoManager *undomgr; - BSCallback *bscallback; + nsChannelBSC *bscallback; IMoniker *mon; LPOLESTR url; struct list bindings; @@ -211,7 +212,7 @@ struct NSContainer { HWND hwnd; - BSCallback *bscallback; /* hack */ + nsChannelBSC *bscallback; /* hack */ HWND reset_focus; /* hack */ }; @@ -428,14 +429,16 @@ void get_editor_controller(NSContainer*); void init_nsevents(NSContainer*); nsresult get_nsinterface(nsISupports*,REFIID,void**); -BSCallback *create_bscallback(IMoniker*); -HRESULT start_binding(HTMLDocument*,BSCallback*,IBindCtx*); -HRESULT load_stream(BSCallback*,IStream*); -void set_document_bscallback(HTMLDocument*,BSCallback*); +void set_document_bscallback(HTMLDocument*,nsChannelBSC*); void set_current_mon(HTMLDocument*,IMoniker*); +HRESULT start_binding(HTMLDocument*,BSCallback*,IBindCtx*); + +HRESULT bind_mon_to_buffer(HTMLDocument*,IMoniker*,void**); -void channelbsc_set_channel(BSCallback*,nsChannel*,nsIStreamListener*,nsISupports*); -IMoniker *get_channelbsc_mon(BSCallback*); +nsChannelBSC *create_channelbsc(IMoniker*); +HRESULT channelbsc_load_stream(nsChannelBSC*,IStream*); +void channelbsc_set_channel(nsChannelBSC*,nsChannel*,nsIStreamListener*,nsISupports*); +IMoniker *get_channelbsc_mon(nsChannelBSC*); IHTMLSelectionObject *HTMLSelectionObject_Create(HTMLDocument*,nsISelection*); IHTMLTxtRange *HTMLTxtRange_Create(HTMLDocument*,nsIDOMRange*); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index e3ac735..ebeca3d 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -660,7 +660,7 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { BSCServiceProvider_QueryService }; -BSCallback *create_bscallback(IMoniker *mon) +BSCallback *create_channelbsc(IMoniker *mon) { BSCallback *ret = heap_alloc(sizeof(BSCallback)); @@ -789,7 +789,7 @@ void hlink_frame_navigate(HTMLDocument *doc, IHlinkFrame *hlink_frame, IHlink *hlink; HRESULT hr; - callback = create_bscallback(NULL); + callback = create_channelbsc(NULL); if(post_data_stream) { parse_post_data(post_data_stream, &callback->headers, &callback->post_data, @@ -897,7 +897,7 @@ void set_document_bscallback(HTMLDocument *doc, BSCallback *callback) } } -HRESULT load_stream(BSCallback *bscallback, IStream *stream) +HRESULT channelbsc_load_stream(BSCallback *bscallback, IStream *stream) { HRESULT hres; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 8c996b8..b45bb08 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -727,7 +727,7 @@ static nsresult async_open_doc_uri(nsChannel *This, NSContainer *container, static nsresult async_open(nsChannel *This, NSContainer *container, nsIStreamListener *listener, nsISupports *context) { - BSCallback *bscallback; + nsChannelBSC *bscallback; IMoniker *mon = NULL; nsresult nsres; task_t *task; @@ -769,7 +769,7 @@ static nsresult async_open(nsChannel *This, NSContainer *container, nsIStreamLis if(FAILED(hres)) return NS_ERROR_UNEXPECTED; - bscallback = create_bscallback(mon); + bscallback = create_channelbsc(mon); IMoniker_Release(mon); channelbsc_set_channel(bscallback, This, listener, context); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 8c0cb3b..a094dc1 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -185,7 +185,7 @@ void set_current_mon(HTMLDocument *This, IMoniker *mon) static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BOOL *bind_complete) { - BSCallback *bscallback; + nsChannelBSC *bscallback; LPOLESTR url = NULL; task_t *task; HRESULT hres; @@ -271,7 +271,7 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO } } - bscallback = create_bscallback(mon); + bscallback = create_channelbsc(mon); if(This->frame) { task = heap_alloc(sizeof(task_t)); @@ -305,7 +305,7 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO if(NS_SUCCEEDED(nsres)) { /* FIXME: don't return here (URL Moniker needs to be good enough) */ - IBindStatusCallback_Release(STATUSCLB(bscallback)); + IUnknown_Release((IUnknown*)bscallback); CoTaskMemFree(url); if(bind_complete) @@ -317,7 +317,7 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO } set_document_bscallback(This, bscallback); - IBindStatusCallback_Release(STATUSCLB(bscallback)); + IUnknown_Release((IUnknown*)bscallback); CoTaskMemFree(url); if(bind_complete) @@ -422,7 +422,7 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva return hres; if(!bind_complete) - return start_binding(This, This->bscallback, pibc); + return start_binding(This, (BSCallback*)This->bscallback, pibc); return S_OK; } @@ -687,7 +687,7 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM if(FAILED(hres)) return hres; - return load_stream(This->bscallback, pStm); + return channelbsc_load_stream(This->bscallback, pStm); } static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, LPSTREAM pStm,

1 0

Jacek Caban : mshtml: Move BSCallback declaration to navigate.c.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: a7caae954015c45debc762934161e9211c765c71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7caae954015c45debc762934… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 23 02:16:18 2008 +0100 mshtml: Move BSCallback declaration to navigate.c. --- dlls/mshtml/mshtml_private.h | 36 ------------------------------------ dlls/mshtml/navigate.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a21eee3..17a1219 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -235,42 +235,6 @@ typedef struct { } nsChannel; typedef struct { - const nsIInputStreamVtbl *lpInputStreamVtbl; - - LONG ref; - - char buf[1024]; - DWORD buf_size; -} nsProtocolStream; - -struct BSCallback { - const IBindStatusCallbackVtbl *lpBindStatusCallbackVtbl; - const IServiceProviderVtbl *lpServiceProviderVtbl; - const IHttpNegotiate2Vtbl *lpHttpNegotiate2Vtbl; - const IInternetBindInfoVtbl *lpInternetBindInfoVtbl; - - LONG ref; - - LPWSTR headers; - HGLOBAL post_data; - ULONG post_data_len; - ULONG readed; - - nsChannel *nschannel; - nsIStreamListener *nslistener; - nsISupports *nscontext; - - IMoniker *mon; - IBinding *binding; - - HTMLDocument *doc; - - nsProtocolStream *nsstream; - - struct list entry; -}; - -typedef struct { HRESULT (*qi)(HTMLDOMNode*,REFIID,void**); void (*destructor)(HTMLDOMNode*); } NodeImplVtbl; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index ebeca3d..2349178 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -41,8 +41,44 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define CONTENT_LENGTH "Content-Length" #define UTF16_STR "utf-16" +typedef struct { + const nsIInputStreamVtbl *lpInputStreamVtbl; + + LONG ref; + + char buf[1024]; + DWORD buf_size; +} nsProtocolStream; + #define NSINSTREAM(x) ((nsIInputStream*) &(x)->lpInputStreamVtbl) +struct BSCallback { + const IBindStatusCallbackVtbl *lpBindStatusCallbackVtbl; + const IServiceProviderVtbl *lpServiceProviderVtbl; + const IHttpNegotiate2Vtbl *lpHttpNegotiate2Vtbl; + const IInternetBindInfoVtbl *lpInternetBindInfoVtbl; + + LONG ref; + + LPWSTR headers; + HGLOBAL post_data; + ULONG post_data_len; + ULONG readed; + + nsChannel *nschannel; + nsIStreamListener *nslistener; + nsISupports *nscontext; + + IMoniker *mon; + IBinding *binding; + + HTMLDocument *doc; + + nsProtocolStream *nsstream; + + struct list entry; +}; + #define NSINSTREAM_THIS(iface) DEFINE_THIS(nsProtocolStream, InputStream, iface) static nsresult NSAPI nsInputStream_QueryInterface(nsIInputStream *iface, nsIIDRef riid,

1 0

Jacek Caban : mshtml: Move hlink_frame_navigate function.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: 6738db5af2dcdc4c61d9f20f9d889f8965537121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6738db5af2dcdc4c61d9f20f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 23 02:16:36 2008 +0100 mshtml: Move hlink_frame_navigate function. --- dlls/mshtml/navigate.c | 98 ++++++++++++++++++++++++------------------------ 1 files changed, 49 insertions(+), 49 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 2349178..2f15313 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -816,55 +816,6 @@ static void parse_post_data(nsIInputStream *post_data_stream, LPWSTR *headers_re *post_data_len_ret = post_data_len; } -void hlink_frame_navigate(HTMLDocument *doc, IHlinkFrame *hlink_frame, - LPCWSTR uri, nsIInputStream *post_data_stream, DWORD hlnf) -{ - BSCallback *callback; - IBindCtx *bindctx; - IMoniker *mon; - IHlink *hlink; - HRESULT hr; - - callback = create_channelbsc(NULL); - - if(post_data_stream) { - parse_post_data(post_data_stream, &callback->headers, &callback->post_data, - &callback->post_data_len); - TRACE("headers = %s post_data = %s\n", debugstr_w(callback->headers), - debugstr_an(callback->post_data, callback->post_data_len)); - } - - hr = CreateAsyncBindCtx(0, STATUSCLB(callback), NULL, &bindctx); - if (FAILED(hr)) { - IBindStatusCallback_Release(STATUSCLB(callback)); - return; - } - - hr = CoCreateInstance(&CLSID_StdHlink, NULL, CLSCTX_INPROC_SERVER, &IID_IHlink, (LPVOID*)&hlink); - if (FAILED(hr)) { - IBindCtx_Release(bindctx); - IBindStatusCallback_Release(STATUSCLB(callback)); - return; - } - - hr = CreateURLMoniker(NULL, uri, &mon); - if (SUCCEEDED(hr)) { - IHlink_SetMonikerReference(hlink, 0, mon, NULL); - - if(hlnf & HLNF_OPENINNEWWINDOW) { - static const WCHAR wszBlank[] = {'_','b','l','a','n','k',0}; - IHlink_SetTargetFrameName(hlink, wszBlank); /* FIXME */ - } - - IHlinkFrame_Navigate(hlink_frame, hlnf, bindctx, STATUSCLB(callback), hlink); - - IMoniker_Release(mon); - } - - IBindCtx_Release(bindctx); - IBindStatusCallback_Release(STATUSCLB(callback)); -} - HRESULT start_binding(HTMLDocument *doc, BSCallback *bscallback, IBindCtx *bctx) { IStream *str = NULL; @@ -965,3 +916,52 @@ void channelbsc_set_channel(BSCallback *This, nsChannel *channel, nsIStreamListe This->nscontext = context; } } + +void hlink_frame_navigate(HTMLDocument *doc, IHlinkFrame *hlink_frame, + LPCWSTR uri, nsIInputStream *post_data_stream, DWORD hlnf) +{ + BSCallback *callback; + IBindCtx *bindctx; + IMoniker *mon; + IHlink *hlink; + HRESULT hr; + + callback = create_channelbsc(NULL); + + if(post_data_stream) { + parse_post_data(post_data_stream, &callback->headers, &callback->post_data, + &callback->post_data_len); + TRACE("headers = %s post_data = %s\n", debugstr_w(callback->headers), + debugstr_an(callback->post_data, callback->post_data_len)); + } + + hr = CreateAsyncBindCtx(0, STATUSCLB(callback), NULL, &bindctx); + if (FAILED(hr)) { + IBindStatusCallback_Release(STATUSCLB(callback)); + return; + } + + hr = CoCreateInstance(&CLSID_StdHlink, NULL, CLSCTX_INPROC_SERVER, &IID_IHlink, (LPVOID*)&hlink); + if (FAILED(hr)) { + IBindCtx_Release(bindctx); + IBindStatusCallback_Release(STATUSCLB(callback)); + return; + } + + hr = CreateURLMoniker(NULL, uri, &mon); + if (SUCCEEDED(hr)) { + IHlink_SetMonikerReference(hlink, 0, mon, NULL); + + if(hlnf & HLNF_OPENINNEWWINDOW) { + static const WCHAR wszBlank[] = {'_','b','l','a','n','k',0}; + IHlink_SetTargetFrameName(hlink, wszBlank); /* FIXME */ + } + + IHlinkFrame_Navigate(hlink_frame, hlnf, bindctx, STATUSCLB(callback), hlink); + + IMoniker_Release(mon); + } + + IBindCtx_Release(bindctx); + IBindStatusCallback_Release(STATUSCLB(callback)); +}

1 0

Andrew Talbot : wininet: Assign to structs instead of using memcpy.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: 7b380e0aeb8a506a03be4950ab44cd6a9893aab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b380e0aeb8a506a03be4950a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 22 17:10:04 2008 +0000 wininet: Assign to structs instead of using memcpy. --- dlls/wininet/internet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index be1ee16..a8ae808 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2979,7 +2979,7 @@ static DWORD CALLBACK INTERNET_WorkerThreadFunc(LPVOID lpvParam) TRACE("\n"); - memcpy(&workRequest, lpRequest, sizeof(WORKREQUEST)); + workRequest = *lpRequest; HeapFree(GetProcessHeap(), 0, lpRequest); workRequest.asyncproc(&workRequest); @@ -3008,7 +3008,7 @@ BOOL INTERNET_AsyncCall(LPWORKREQUEST lpWorkRequest) if (!lpNewRequest) return FALSE; - memcpy(lpNewRequest, lpWorkRequest, sizeof(WORKREQUEST)); + *lpNewRequest = *lpWorkRequest; bSuccess = QueueUserWorkItem(INTERNET_WorkerThreadFunc, lpNewRequest, WT_EXECUTELONGFUNCTION); if (!bSuccess)

1 0

Andrew Talbot : winex11.drv: Assign to structs instead of using memcpy.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: 5d038523e9fde8b866706b99896c917656b61fec URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d038523e9fde8b866706b998… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 22 17:10:01 2008 +0000 winex11.drv: Assign to structs instead of using memcpy. --- dlls/winex11.drv/clipboard.c | 2 +- dlls/winex11.drv/wintab.c | 2 +- dlls/winex11.drv/xrender.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 5e85998..0dba308 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2900,7 +2900,7 @@ static Atom X11DRV_SelectionRequest_MULTIPLE( HWND hWnd, XSelectionRequestEvent } /* Set up an XSelectionRequestEvent for this (target,property) pair */ - memcpy( &event, pevent, sizeof(XSelectionRequestEvent) ); + event = *pevent; event.target = targetPropList[i]; event.property = targetPropList[i+1]; diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 47376c0..16e369b 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -984,7 +984,7 @@ int X11DRV_AttachEventQueueToTablet(HWND hOwner) */ int X11DRV_GetCurrentPacket(LPWTPACKET packet) { - memcpy(packet,&gMsgPacket,sizeof(WTPACKET)); + *packet = gMsgPacket; return 1; } diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index d39938c..554ce25 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -806,7 +806,7 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format) formatEntry->bitmaps[glyph] = buf; } - memcpy(&formatEntry->gis[glyph], &gi, sizeof(gi)); + formatEntry->gis[glyph] = gi; return TRUE; }

1 0

Vitaliy Margolen : user32: Fix F1 message sequence.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: d8391a4a463675a5690b4fc720349801550c314d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8391a4a463675a5690b4fc72… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Mar 22 13:09:21 2008 -0600 user32: Fix F1 message sequence. --- dlls/user32/defwnd.c | 23 +++++++++++++++++++++++ dlls/user32/message.c | 12 ++---------- dlls/user32/tests/msg.c | 6 +++--- include/winuser.h | 1 + 4 files changed, 29 insertions(+), 13 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index b1dc739..43ae405 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -723,6 +723,29 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa SendMessageW( parent, msg, wParam, lParam ); break; } + case WM_KEYF1: + { + HELPINFO hi; + + hi.cbSize = sizeof(HELPINFO); + GetCursorPos( &hi.MousePos ); + if (MENU_IsMenuActive()) + { + hi.iContextType = HELPINFO_MENUITEM; + hi.hItemHandle = MENU_IsMenuActive(); + hi.iCtrlId = MenuItemFromPoint( hwnd, hi.hItemHandle, hi.MousePos ); + hi.dwContextId = GetMenuContextHelpId( hi.hItemHandle ); + } + else + { + hi.iContextType = HELPINFO_WINDOW; + hi.hItemHandle = hwnd; + hi.iCtrlId = GetWindowLongPtrA( hwnd, GWLP_ID ); + hi.dwContextId = GetWindowContextHelpId( hwnd ); + } + SendMessageW( hwnd, WM_HELP, 0, (LPARAM)&hi ); + break; + } } return 0; diff --git a/dlls/user32/message.c b/dlls/user32/message.c index eb0168f..ed5a2a8 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1702,17 +1702,9 @@ static BOOL process_keyboard_message( MSG *msg, UINT hw_id, HWND hwnd_filter, (msg->hwnd != GetDesktopWindow())) { /* Handle F1 key by sending out WM_HELP message */ - if(msg->wParam == VK_F1 && - !MENU_IsMenuActive()) + if (msg->wParam == VK_F1) { - HELPINFO hi; - hi.cbSize = sizeof(HELPINFO); - hi.iContextType = HELPINFO_WINDOW; - hi.iCtrlId = GetWindowLongPtrA( msg->hwnd, GWLP_ID ); - hi.hItemHandle = msg->hwnd; - hi.dwContextId = GetWindowContextHelpId( msg->hwnd ); - hi.MousePos = msg->pt; - SendMessageW( msg->hwnd, WM_HELP, 0, (LPARAM)&hi ); + PostMessageW( msg->hwnd, WM_KEYF1, 0, 0 ); } else if(msg->wParam >= VK_BROWSER_BACK && msg->wParam <= VK_LAUNCH_APP2) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 69bba8b..7aa99b4 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5891,8 +5891,8 @@ static const struct message WmF1Seq[] = { { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F1, 1 }, /* XP */ { WM_KEYDOWN, wparam|lparam, VK_F1, 1 }, { WM_KEYDOWN, sent|wparam|lparam, VK_F1, 0x00000001 }, - { 0x4d, wparam|lparam, 0, 0 }, - { 0x4d, sent|wparam|lparam, 0, 0 }, + { WM_KEYF1, wparam|lparam, 0, 0 }, + { WM_KEYF1, sent|wparam|lparam, 0, 0 }, { WM_HELP, sent|defwinproc }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F1, 0xc0000001 }, /* XP */ { WM_KEYUP, wparam|lparam, VK_F1, 0xc0000001 }, @@ -6123,7 +6123,7 @@ static void test_accelerators(void) keybd_event(VK_F1, 0, 0, 0); keybd_event(VK_F1, 0, KEYEVENTF_KEYUP, 0); pump_msg_loop(hwnd, 0); - ok_sequence(WmF1Seq, "F1 press/release", TRUE); + ok_sequence(WmF1Seq, "F1 press/release", FALSE); trace("testing VK_APPS press/release\n"); keybd_event(VK_APPS, 0, 0, 0); diff --git a/include/winuser.h b/include/winuser.h index d5d0086..f7bf196 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -1160,6 +1160,7 @@ WINUSERAPI BOOL WINAPI SetSysColors(INT,const INT*,const COLORREF*); /* Win32 4.0 messages */ #define WM_COPYDATA 0x004a #define WM_CANCELJOURNAL 0x004b +#define WM_KEYF1 0x004d #define WM_NOTIFY 0x004e #define WM_INPUTLANGCHANGEREQUEST 0x0050 #define WM_INPUTLANGCHANGE 0x0051

1 0

Eric Pouech : richedit: Added missing fields to be reinitialized for the RTF \pard token.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: 2870f21d06d06e1d785a652c66f5222a5d43d8d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2870f21d06d06e1d785a652c6… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 22 21:36:13 2008 +0100 richedit: Added missing fields to be reinitialized for the RTF \pard token. --- dlls/riched20/editor.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 39980bd..54fd4a3 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -459,8 +459,10 @@ static void ME_RTFParAttrHook(RTF_Info *info) fmt.cTabCount = 0; fmt.dxOffset = fmt.dxStartIndent = fmt.dxRightIndent = 0; fmt.wBorderWidth = fmt.wBorders = 0; + fmt.wBorderSpace = 0; fmt.bLineSpacingRule = 0; fmt.dySpaceBefore = fmt.dySpaceAfter = 0; + fmt.dyLineSpacing = 0; RTFFlushOutputBuffer(info); ME_GetParagraph(info->editor->pCursors[0].pRun)->member.para.bTable = FALSE; break;

1 0

Jacek Caban : mshtml: Don't access BSCallback directly in nsio.c.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: f792ada40fcbb755f09f3497277fa11adcf79233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f792ada40fcbb755f09f34972… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 23 02:15:20 2008 +0100 mshtml: Don't access BSCallback directly in nsio.c. --- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/navigate.c | 14 ++++++++++++++ dlls/mshtml/nsio.c | 22 ++-------------------- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d26250e..66bb11d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -434,6 +434,8 @@ HRESULT load_stream(BSCallback*,IStream*); void set_document_bscallback(HTMLDocument*,BSCallback*); void set_current_mon(HTMLDocument*,IMoniker*); +void channelbsc_set_channel(BSCallback*,nsChannel*,nsIStreamListener*,nsISupports*); + IHTMLSelectionObject *HTMLSelectionObject_Create(HTMLDocument*,nsISelection*); IHTMLTxtRange *HTMLTxtRange_Create(HTMLDocument*,nsIDOMRange*); IHTMLStyle *HTMLStyle_Create(nsIDOMCSSStyleDeclaration*); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index cc48b93..66cea25 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -908,3 +908,17 @@ HRESULT load_stream(BSCallback *bscallback, IStream *stream) return hres; } + +void channelbsc_set_channel(BSCallback *This, nsChannel *channel, nsIStreamListener *listener, nsISupports *context) +{ + nsIChannel_AddRef(NSCHANNEL(channel)); + This->nschannel = channel; + + nsIStreamListener_AddRef(listener); + This->nslistener = listener; + + if(context) { + nsISupports_AddRef(context); + This->nscontext = context; + } +} diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index d55546d..8c996b8 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -685,16 +685,7 @@ static nsresult async_open_doc_uri(nsChannel *This, NSContainer *container, *open = FALSE; if(container->bscallback) { - nsIChannel_AddRef(NSCHANNEL(This)); - container->bscallback->nschannel = This; - - nsIStreamListener_AddRef(listener); - container->bscallback->nslistener = listener; - - if(context) { - nsISupports_AddRef(context); - container->bscallback->nscontext = context; - } + channelbsc_set_channel(container->bscallback, This, listener, context); if(container->doc && container->doc->mime) { DWORD len; @@ -781,16 +772,7 @@ static nsresult async_open(nsChannel *This, NSContainer *container, nsIStreamLis bscallback = create_bscallback(mon); IMoniker_Release(mon); - nsIChannel_AddRef(NSCHANNEL(This)); - bscallback->nschannel = This; - - nsIStreamListener_AddRef(listener); - bscallback->nslistener = listener; - - if(context) { - nsISupports_AddRef(context); - bscallback->nscontext = context; - } + channelbsc_set_channel(bscallback, This, listener, context); task = heap_alloc(sizeof(task_t));

1 0

Jacek Caban : mshtml: Don't access BSCallback directly in nsembed.c.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: 979b42d749d89f021bdc5554f542d27c47d5572a URL: http://source.winehq.org/git/wine.git/?a=commit;h=979b42d749d89f021bdc5554f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 23 02:15:39 2008 +0100 mshtml: Don't access BSCallback directly in nsembed.c. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 7 +++++++ dlls/mshtml/nsembed.c | 26 ++++++++++++++++---------- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 66bb11d..2936f76 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -435,6 +435,7 @@ void set_document_bscallback(HTMLDocument*,BSCallback*); void set_current_mon(HTMLDocument*,IMoniker*); void channelbsc_set_channel(BSCallback*,nsChannel*,nsIStreamListener*,nsISupports*); +IMoniker *get_channelbsc_mon(BSCallback*); IHTMLSelectionObject *HTMLSelectionObject_Create(HTMLDocument*,nsISelection*); IHTMLTxtRange *HTMLTxtRange_Create(HTMLDocument*,nsIDOMRange*); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 66cea25..e3ac735 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -866,6 +866,13 @@ HRESULT start_binding(HTMLDocument *doc, BSCallback *bscallback, IBindCtx *bctx) return S_OK; } +IMoniker *get_channelbsc_mon(BSCallback *This) +{ + if(This->mon) + IMoniker_AddRef(This->mon); + return This->mon; +} + void set_document_bscallback(HTMLDocument *doc, BSCallback *callback) { BSCallback *iter; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index efdad04..5d9b247 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1138,16 +1138,22 @@ static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener nsIWineURI_SetNSContainer(wine_uri, This); nsIWineURI_SetIsDocumentURI(wine_uri, TRUE); - if(This->bscallback && This->bscallback->mon) { - LPWSTR wine_url; - HRESULT hres; - - hres = IMoniker_GetDisplayName(This->bscallback->mon, NULL, 0, &wine_url); - if(SUCCEEDED(hres)) { - nsIWineURI_SetWineURL(wine_uri, wine_url); - CoTaskMemFree(wine_url); - }else { - WARN("GetDisplayName failed: %08x\n", hres); + if(This->bscallback) { + IMoniker *mon = get_channelbsc_mon(This->bscallback); + + if(mon) { + LPWSTR wine_url; + HRESULT hres; + + hres = IMoniker_GetDisplayName(mon, NULL, 0, &wine_url); + if(SUCCEEDED(hres)) { + nsIWineURI_SetWineURL(wine_uri, wine_url); + CoTaskMemFree(wine_url); + }else { + WARN("GetDisplayName failed: %08x\n", hres); + } + + IMoniker_Release(mon); } }

1 0