February 2010 - Wine-Commits

Jacek Caban : mshtml: Moved OnStartURIOpen implementation to nsio.c.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: 61121cefcbafe20dabe4e035067a91d0ceb36a2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=61121cefcbafe20dabe4e0350… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Feb 21 21:05:59 2010 +0100 mshtml: Moved OnStartURIOpen implementation to nsio.c. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsembed.c | 48 ++------------------------------------- dlls/mshtml/nsio.c | 50 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 45 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 019f66f..827b812 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -437,6 +437,7 @@ struct NSContainer { typedef struct nsWineURI nsWineURI; HRESULT set_wine_url(nsWineURI*,LPCWSTR); +nsresult on_start_uri_open(NSContainer*,nsIURI*,PRBool*); typedef struct { const nsIHttpChannelVtbl *lpHttpChannelVtbl; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 3415657..fa8aa41 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1124,41 +1124,12 @@ static nsrefcnt NSAPI nsURIContentListener_Release(nsIURIContentListener *iface) return nsIWebBrowserChrome_Release(NSWBCHROME(This)); } -static BOOL translate_url(HTMLDocumentObj *doc, nsIWineURI *nsuri) -{ - OLECHAR *new_url = NULL, *url; - BOOL ret = FALSE; - LPCWSTR wine_url; - HRESULT hres; - - if(!doc->hostui) - return FALSE; - - nsIWineURI_GetWineURL(nsuri, &wine_url); - - url = heap_strdupW(wine_url); - hres = IDocHostUIHandler_TranslateUrl(doc->hostui, 0, url, &new_url); - heap_free(url); - if(hres != S_OK || !new_url) - return FALSE; - - if(strcmpW(url, new_url)) { - FIXME("TranslateUrl returned new URL %s -> %s\n", debugstr_w(url), debugstr_w(new_url)); - ret = TRUE; - } - - CoTaskMemFree(new_url); - return ret; -} - static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener *iface, nsIURI *aURI, PRBool *_retval) { NSContainer *This = NSURICL_THIS(iface); - nsIWineURI *wine_uri; nsACString spec_str; const char *spec; - BOOL is_doc_uri; nsresult nsres; nsACString_Init(&spec_str, NULL); @@ -1169,22 +1140,9 @@ static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener nsACString_Finish(&spec_str); - nsres = nsIURI_QueryInterface(aURI, &IID_nsIWineURI, (void**)&wine_uri); - if(NS_FAILED(nsres)) { - WARN("Could not get nsIWineURI interface: %08x\n", nsres); - return NS_ERROR_NOT_IMPLEMENTED; - } - - nsIWineURI_GetIsDocumentURI(wine_uri, &is_doc_uri); - - if(!is_doc_uri) { - nsIWineURI_SetNSContainer(wine_uri, This); - nsIWineURI_SetIsDocumentURI(wine_uri, TRUE); - - *_retval = translate_url(This->doc->basedoc.doc_obj, wine_uri); - } - - nsIWineURI_Release(wine_uri); + nsres = on_start_uri_open(This, aURI, _retval); + if(NS_FAILED(nsres)) + return nsres; return !*_retval && This->content_listener ? nsIURIContentListener_OnStartURIOpen(This->content_listener, aURI, _retval) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index b9e1e60..c286673 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -150,6 +150,56 @@ static BOOL before_async_open(nsChannel *channel, NSContainer *container) return hres != S_OK; } +static BOOL translate_url(HTMLDocumentObj *doc, nsWineURI *uri) +{ + OLECHAR *new_url = NULL, *url; + BOOL ret = FALSE; + HRESULT hres; + + if(!doc->hostui) + return FALSE; + + url = heap_strdupW(uri->wine_url); + hres = IDocHostUIHandler_TranslateUrl(doc->hostui, 0, url, &new_url); + heap_free(url); + if(hres != S_OK || !new_url) + return FALSE; + + if(strcmpW(url, new_url)) { + FIXME("TranslateUrl returned new URL %s -> %s\n", debugstr_w(url), debugstr_w(new_url)); + ret = TRUE; + } + + CoTaskMemFree(new_url); + return ret; +} + +nsresult on_start_uri_open(NSContainer *nscontainer, nsIURI *uri, PRBool *_retval) +{ + nsWineURI *wine_uri; + nsresult nsres; + + *_retval = FALSE; + + nsres = nsIURI_QueryInterface(uri, &IID_nsIWineURI, (void**)&wine_uri); + if(NS_FAILED(nsres)) { + WARN("Could not get nsWineURI: %08x\n", nsres); + return NS_ERROR_NOT_IMPLEMENTED; + } + + if(!wine_uri->is_doc_uri) { + if(!wine_uri->container) { + nsIWebBrowserChrome_AddRef(NSWBCHROME(nscontainer)); + wine_uri->container = nscontainer; + } + + wine_uri->is_doc_uri = TRUE; + *_retval = translate_url(nscontainer->doc->basedoc.doc_obj, wine_uri); + } + + nsIURI_Release(NSURI(wine_uri)); + return NS_OK; +} HRESULT set_wine_url(nsWineURI *This, LPCWSTR url) { nsIWineURI_SetWineURL(NSWINEURI(This), url);

1 0

Jacek Caban : mshtml: Get rid of nsIWineURI::[GS]etWindow.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: a42bc25d554aef412135af589897b1f0eb6c2f65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a42bc25d554aef412135af589… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Feb 21 21:08:39 2010 +0100 mshtml: Get rid of nsIWineURI::[GS]etWindow. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsiface.idl | 3 - dlls/mshtml/nsio.c | 90 +++++++++++++++++------------------------- 3 files changed, 37 insertions(+), 57 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c22c89a..604c80a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -172,6 +172,7 @@ BOOL dispex_query_interface(DispatchEx*,REFIID,void**); HRESULT dispex_get_dprop_ref(DispatchEx*,const WCHAR*,BOOL,VARIANT**); HRESULT get_dispids(tid_t,DWORD*,DISPID**); +typedef struct HTMLWindow HTMLWindow; typedef struct HTMLDocumentNode HTMLDocumentNode; typedef struct HTMLDocumentObj HTMLDocumentObj; typedef struct HTMLFrameBase HTMLFrameBase; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 26e9ae1..a2bee26 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -2835,10 +2835,7 @@ interface nsIDocumentObserver : nsIMutationObserver interface nsIWineURI : nsIURL { typedef struct NSContainer NSContainer; - typedef struct HTMLWindow HTMLWindow; nsresult GetNSContainer(NSContainer **aNSContainer); nsresult SetNSContainer(NSContainer *aNSContainer); - nsresult GetWindow(HTMLWindow **aHTMLWindow); - nsresult SetWindow(HTMLWindow *aHTMLWindow); } diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 081019a..c2652c5 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -268,6 +268,26 @@ HRESULT set_wine_url(nsWineURI *This, LPCWSTR url) return S_OK; } +static void set_uri_window(nsWineURI *This, HTMLWindow *window) +{ + if(This->window_ref) { + if(This->window_ref->window == window) + return; + TRACE("Changing %p -> %p\n", This->window_ref->window, window); + windowref_release(This->window_ref); + } + + if(window) { + windowref_addref(window->window_ref); + This->window_ref = window->window_ref; + + if(window->doc_obj) + nsIWineURI_SetNSContainer(NSWINEURI(This), window->doc_obj->nscontainer); + }else { + This->window_ref = NULL; + } +} + static inline BOOL is_http_channel(nsChannel *This) { return This->url_scheme == URL_SCHEME_HTTP || This->url_scheme == URL_SCHEME_HTTP; @@ -676,7 +696,7 @@ static HTMLWindow *get_window_from_load_group(nsChannel *This) HTMLWindow *window; nsIChannel *channel; nsIRequest *req; - nsIWineURI *wine_uri; + nsWineURI *wine_uri; nsIURI *uri; nsresult nsres; @@ -710,8 +730,10 @@ static HTMLWindow *get_window_from_load_group(nsChannel *This) return NULL; } - nsIWineURI_GetWindow(wine_uri, &window); - nsIWineURI_Release(wine_uri); + window = wine_uri->window_ref ? wine_uri->window_ref->window : NULL; + if(window) + IHTMLWindow2_AddRef(HTMLWINDOW2(window)); + nsIURI_Release(NSURI(wine_uri)); return window; } @@ -838,7 +860,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen if(This->uri->is_doc_uri) { window = get_channel_window(This); if(window) { - nsIWineURI_SetWindow(NSWINEURI(This->uri), window); + set_uri_window(This->uri, window); }else if(This->uri->container) { BOOL b; @@ -854,12 +876,13 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen } if(!window) { - nsIWineURI_GetWindow(NSWINEURI(This->uri), &window); - - if(!window && This->load_group) { + if(This->uri->window_ref && This->uri->window_ref->window) { + window = This->uri->window_ref->window; + IHTMLWindow2_AddRef(HTMLWINDOW2(window)); + }else if(This->load_group) { window = get_window_from_load_group(This); if(window) - nsIWineURI_SetWindow(NSWINEURI(This->uri), window); + set_uri_window(This->uri, window); } } @@ -2106,48 +2129,6 @@ static nsresult NSAPI nsURI_SetNSContainer(nsIWineURI *iface, NSContainer *aCont return NS_OK; } -static nsresult NSAPI nsURI_GetWindow(nsIWineURI *iface, HTMLWindow **aHTMLWindow) -{ - nsWineURI *This = NSURI_THIS(iface); - - TRACE("(%p)->(%p)\n", This, aHTMLWindow); - - if(This->window_ref && This->window_ref->window) { - IHTMLWindow2_AddRef(HTMLWINDOW2(This->window_ref->window)); - *aHTMLWindow = This->window_ref->window; - }else { - *aHTMLWindow = NULL; - } - - return NS_OK; -} - -static nsresult NSAPI nsURI_SetWindow(nsIWineURI *iface, HTMLWindow *aHTMLWindow) -{ - nsWineURI *This = NSURI_THIS(iface); - - TRACE("(%p)->(%p)\n", This, aHTMLWindow); - - if(This->window_ref) { - if(This->window_ref->window == aHTMLWindow) - return NS_OK; - TRACE("Changing %p -> %p\n", This->window_ref->window, aHTMLWindow); - windowref_release(This->window_ref); - } - - if(aHTMLWindow) { - windowref_addref(aHTMLWindow->window_ref); - This->window_ref = aHTMLWindow->window_ref; - - if(aHTMLWindow->doc_obj) - nsIWineURI_SetNSContainer(NSWINEURI(This), aHTMLWindow->doc_obj->nscontainer); - }else { - This->window_ref = NULL; - } - - return NS_OK; -} - #undef NSURI_THIS static const nsIWineURIVtbl nsWineURIVtbl = { @@ -2200,8 +2181,6 @@ static const nsIWineURIVtbl nsWineURIVtbl = { nsURL_GetRelativeSpec, nsURI_GetNSContainer, nsURI_SetNSContainer, - nsURI_GetWindow, - nsURI_SetWindow, }; static nsresult create_uri(nsIURI *uri, HTMLWindow *window, NSContainer *container, nsWineURI **_retval) @@ -2213,7 +2192,7 @@ static nsresult create_uri(nsIURI *uri, HTMLWindow *window, NSContainer *contain ret->uri = uri; nsIWineURI_SetNSContainer(NSWINEURI(ret), container); - nsIWineURI_SetWindow(NSWINEURI(ret), window); + set_uri_window(ret, window); if(uri) nsIURI_QueryInterface(uri, &IID_nsIURL, (void**)&ret->nsurl); @@ -2492,7 +2471,10 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * nsres = nsIURI_QueryInterface(aBaseURI, &IID_nsIWineURI, (void**)&base_wine_uri); if(NS_SUCCEEDED(nsres)) { base_wine_url = base_wine_uri->wine_url; - nsIWineURI_GetWindow(NSWINEURI(base_wine_uri), &window); + if(base_wine_uri->window_ref && base_wine_uri->window_ref->window) { + window = base_wine_uri->window_ref->window; + IHTMLWindow2_AddRef(HTMLWINDOW2(window)); + } TRACE("base url: %s window: %p\n", debugstr_w(base_wine_url), window); }else if(FAILED(ParseURLA(spec, &parsed_url))) { TRACE("not wraping\n");

1 0

Kusanagi Kouichi : winex11.drv: Keep the state of XIM and IME consistent.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: f7b18148d4787adbd9b0993da366e09c1230e53b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7b18148d4787adbd9b0993da… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Feb 18 23:06:31 2010 +0900 winex11.drv: Keep the state of XIM and IME consistent. --- dlls/winex11.drv/ime.c | 67 ++++++++++++++++++++++------------------ dlls/winex11.drv/x11drv.h | 3 +- dlls/winex11.drv/xim.c | 75 +++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 111 insertions(+), 34 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 0f99ad6..4e821ad 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -717,30 +717,36 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) } break; case IMC_SETOPENSTATUS: - { - LPIMEPRIVATE myPrivate; TRACE("IMC_SETOPENSTATUS\n"); - myPrivate = ImmLockIMCC(lpIMC->hPrivate); - if (lpIMC->fOpen != myPrivate->bInternalState && - myPrivate->bInComposition) + /* Indirectly called from XIM callbacks */ + if (ImmGetIMCCLockCount(lpIMC->hPrivate) > 0) { - if(lpIMC->fOpen == FALSE) - { - X11DRV_ForceXIMReset(lpIMC->hWnd); - GenerateIMEMessage(hIMC,WM_IME_ENDCOMPOSITION,0,0); - myPrivate->bInComposition = FALSE; - } - else + bRet = TRUE; + break; + } + + bRet = X11DRV_SetPreeditState(lpIMC->hWnd, lpIMC->fOpen); + if (bRet) + { + if (!lpIMC->fOpen) { - GenerateIMEMessage(hIMC,WM_IME_STARTCOMPOSITION,0,0); - GenerateIMEMessage(hIMC, WM_IME_COMPOSITION, 0, 0); + LPIMEPRIVATE myPrivate; + + myPrivate = ImmLockIMCC(lpIMC->hPrivate); + if (myPrivate->bInComposition) + { + X11DRV_ForceXIMReset(lpIMC->hWnd); + GenerateIMEMessage(hIMC, WM_IME_ENDCOMPOSITION, 0, 0); + myPrivate->bInComposition = FALSE; + } + ImmUnlockIMCC(lpIMC->hPrivate); } } - myPrivate->bInternalState = lpIMC->fOpen; - bRet = TRUE; - } - break; + else + lpIMC->fOpen = !lpIMC->fOpen; + + break; default: FIXME("Unknown\n"); break; } break; @@ -951,35 +957,36 @@ DWORD WINAPI ImeGetImeMenuItems(HIMC hIMC, DWORD dwFlags, DWORD dwType, /* Interfaces to XIM and other parts of winex11drv */ -void IME_SetOpenStatus(BOOL fOpen) +void IME_SetOpenStatus(BOOL fOpen, BOOL force) { + HIMC imc; LPINPUTCONTEXT lpIMC; LPIMEPRIVATE myPrivate; - lpIMC = LockRealIMC(FROM_X11); + imc = RealIMC(FROM_X11); + lpIMC = ImmLockIMC(imc); if (lpIMC == NULL) return; myPrivate = ImmLockIMCC(lpIMC->hPrivate); - if (myPrivate->bInternalState && fOpen == FALSE) + if (!fOpen && myPrivate->bInComposition) { ShowWindow(myPrivate->hwndDefault, SW_HIDE); ImmDestroyIMCC(lpIMC->hCompStr); lpIMC->hCompStr = ImeCreateBlankCompStr(); + myPrivate->bInComposition = FALSE; + GenerateIMEMessage(imc, WM_IME_ENDCOMPOSITION, 0, 0); } - ImmUnlockIMCC(lpIMC->hPrivate); - UnlockRealIMC(FROM_X11); + if (lpIMC->fOpen && fOpen) + ImmSetOpenStatus(imc, FALSE); - if (myPrivate->bInComposition && fOpen == FALSE) - { - GenerateIMEMessage(FROM_X11, WM_IME_ENDCOMPOSITION, 0, 0); - myPrivate->bInComposition = FALSE; - } + if (fOpen || force) + ImmSetOpenStatus(imc, fOpen); - if (!myPrivate->bInternalState && fOpen == TRUE) - ImmSetOpenStatus(RealIMC(FROM_X11), fOpen); + ImmUnlockIMCC(lpIMC->hPrivate); + ImmUnlockIMC(imc); } INT IME_GetCursorPos(void) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 1173d31..6db410a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -300,7 +300,7 @@ extern BOOL destroy_glxpixmap(Display *display, XID glxpixmap); /* IME support */ extern void IME_UnregisterClasses(void); -extern void IME_SetOpenStatus(BOOL fOpen); +extern void IME_SetOpenStatus(BOOL fOpen, BOOL force); extern INT IME_GetCursorPos(void); extern void IME_SetCursorPos(DWORD pos); extern void IME_UpdateAssociation(HWND focus); @@ -809,6 +809,7 @@ extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) DECLSPEC_HIDDE extern void X11DRV_SetupXIM(void) DECLSPEC_HIDDEN; extern void X11DRV_XIMLookupChars( const char *str, DWORD count ) DECLSPEC_HIDDEN; extern void X11DRV_ForceXIMReset(HWND hwnd) DECLSPEC_HIDDEN; +extern BOOL X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen); /* FIXME: private functions imported from user32 */ extern LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode ); diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 0e32513..ee2bd15 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -120,10 +120,30 @@ void X11DRV_XIMLookupChars( const char *str, DWORD count ) HeapFree(GetProcessHeap(), 0, wcOutput); } +static BOOL XIMPreEditStateNotifyCallback(XIC xic, XPointer p, XPointer data) +{ + const struct x11drv_win_data * const win_data = (struct x11drv_win_data *)p; + const XIMPreeditState state = ((XIMPreeditStateNotifyCallbackStruct *)data)->state; + + TRACE("xic = %p, win = %lx, state = %lu\n", xic, win_data->whole_window, state); + switch (state) + { + case XIMPreeditEnable: + IME_SetOpenStatus(TRUE, TRUE); + break; + case XIMPreeditDisable: + IME_SetOpenStatus(FALSE, TRUE); + break; + default: + break; + } + return TRUE; +} + static int XIMPreEditStartCallback(XIC ic, XPointer client_data, XPointer call_data) { TRACE("PreEditStartCallback %p\n",ic); - IME_SetOpenStatus(TRUE); + IME_SetOpenStatus(TRUE, FALSE); ximInComposeMode = TRUE; return -1; } @@ -137,7 +157,7 @@ static void XIMPreEditDoneCallback(XIC ic, XPointer client_data, XPointer call_d dwCompStringSize = 0; dwCompStringLength = 0; CompositionString = NULL; - IME_SetOpenStatus(FALSE); + IME_SetOpenStatus(FALSE, FALSE); } static void XIMPreEditDrawCallback(XIM ic, XPointer client_data, @@ -244,6 +264,51 @@ void X11DRV_ForceXIMReset(HWND hwnd) } } +BOOL X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen) +{ + XIC ic; + XIMPreeditState state; + XVaNestedList attr_set, attr_get; + BOOL ret; + + ic = X11DRV_get_ic(hwnd); + if (!ic) + return FALSE; + + if (fOpen) + state = XIMPreeditEnable; + else + state = XIMPreeditDisable; + + ret = FALSE; + wine_tsx11_lock(); + + attr_set = XVaCreateNestedList(0, XNPreeditState, state, NULL); + if (attr_set == NULL) + goto error1; + + attr_get = XVaCreateNestedList(0, XNPreeditState, &state, NULL); + if (attr_get == NULL) + goto error2; + + if (XSetICValues(ic, XNPreeditAttributes, attr_set, NULL) != NULL) + goto error3; + + /* SCIM claims it supports XNPreeditState, but seems to ignore */ + state = XIMPreeditUnKnown; + ret = XGetICValues(ic, XNPreeditAttributes, attr_get, NULL) == NULL && + ((fOpen && state == XIMPreeditEnable) || + (!fOpen && state == XIMPreeditDisable)); +error3: + XFree(attr_get); +error2: + XFree(attr_set); +error1: + wine_tsx11_unlock(); + return ret; +} + + /*********************************************************************** * X11DRV_InitXIM * @@ -446,7 +511,7 @@ XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) XVaNestedList status = NULL; XIC xic; XICCallback destroy = {(XPointer)data, (XICProc)X11DRV_DestroyIC}; - XICCallback P_StartCB, P_DoneCB, P_DrawCB, P_CaretCB; + XICCallback P_StateNotifyCB, P_StartCB, P_DoneCB, P_DrawCB, P_CaretCB; LANGID langid = PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())); Window win = data->whole_window; XFontSet fontSet = x11drv_thread_data()->font_set; @@ -472,10 +537,12 @@ XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) } /* create callbacks */ + P_StateNotifyCB.client_data = (XPointer)data; P_StartCB.client_data = NULL; P_DoneCB.client_data = NULL; P_DrawCB.client_data = NULL; P_CaretCB.client_data = NULL; + P_StateNotifyCB.callback = (XICProc)XIMPreEditStateNotifyCallback; P_StartCB.callback = (XICProc)XIMPreEditStartCallback; P_DoneCB.callback = (XICProc)XIMPreEditDoneCallback; P_DrawCB.callback = (XICProc)XIMPreEditDrawCallback; @@ -486,6 +553,7 @@ XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) preedit = XVaCreateNestedList(0, XNFontSet, fontSet, XNSpotLocation, &spot, + XNPreeditStateNotifyCallback, &P_StateNotifyCB, XNPreeditStartCallback, &P_StartCB, XNPreeditDoneCallback, &P_DoneCB, XNPreeditDrawCallback, &P_DrawCB, @@ -496,6 +564,7 @@ XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) else { preedit = XVaCreateNestedList(0, + XNPreeditStateNotifyCallback, &P_StateNotifyCB, XNPreeditStartCallback, &P_StartCB, XNPreeditDoneCallback, &P_DoneCB, XNPreeditDrawCallback, &P_DrawCB,

1 0

Ken Thomases : kernel32: Mac: If language is less specific variant of locale, keep locale.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: 8c2b290d11f404aed5f461192769b3ec1b28e9fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c2b290d11f404aed5f461192… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Feb 19 09:44:26 2010 -0600 kernel32: Mac: If language is less specific variant of locale, keep locale. For a Mac user in Australia, for example, the out-of-the-box configuration is that the preferred language is generic English ("en"). Their formats locale should be Australia ("en_AU"). Detect that case and don't override LC_MESSAGES. --- dlls/kernel32/locale.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index d6a8492..6f965e3 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2945,8 +2945,6 @@ void LOCALE_Init(void) } CFStringGetCString( user_locale_string_ref, user_locale, sizeof(user_locale), kCFStringEncodingUTF8 ); - CFRelease( user_locale_ref ); - CFRelease( user_locale_string_ref ); unix_cp = CP_UTF8; /* default to utf-8 even if we don't get a valid locale */ setenv( "LANG", user_locale, 0 ); @@ -2963,11 +2961,14 @@ void LOCALE_Init(void) if (!getenv("LC_ALL") && !getenv("LC_MESSAGES")) { /* Retrieve the preferred language as chosen in System Preferences. */ + /* If language is a less specific variant of locale (e.g. 'en' vs. 'en_US'), + leave things be. */ CFArrayRef all_locales = CFLocaleCopyAvailableLocaleIdentifiers(); CFArrayRef preferred_locales = CFBundleCopyLocalizationsForPreferences( all_locales, NULL ); CFStringRef user_language_string_ref; if (preferred_locales && CFArrayGetCount( preferred_locales ) && - (user_language_string_ref = CFArrayGetValueAtIndex( preferred_locales, 0 ))) + (user_language_string_ref = CFArrayGetValueAtIndex( preferred_locales, 0 )) && + !CFEqual(user_language_string_ref, user_locale_lang_ref)) { struct locale_name locale_name; WCHAR buffer[128]; @@ -2981,6 +2982,9 @@ void LOCALE_Init(void) if (preferred_locales) CFRelease( preferred_locales ); } + + CFRelease( user_locale_ref ); + CFRelease( user_locale_string_ref ); #endif NtSetDefaultUILanguage( LANGIDFROMLCID(lcid_LC_MESSAGES) );

1 0

Erich Hoover : ntdll: Allow 'all processors' flag used in Vista and newer.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: fda39b207c5b000219dc15c6971a8a6e81310551 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fda39b207c5b000219dc15c69… Author: Erich Hoover <ehoover(a)mines.edu> Date: Fri Feb 19 19:07:41 2010 -0700 ntdll: Allow 'all processors' flag used in Vista and newer. --- dlls/ntdll/tests/info.c | 17 +++++++++++++++++ dlls/ntdll/thread.c | 11 +++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 6414cac..c7d451c 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -927,11 +927,28 @@ static void test_affinity(void) status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); ok( tbi.AffinityMask == 1, "Unexpected thread affinity\n" ); + /* NOTE: Pre-Vista does not recognize the "all processors" flag (all bits set) */ + thread_affinity = ~0UL; + status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); + ok( broken(status == STATUS_INVALID_PARAMETER) || status == STATUS_SUCCESS, + "Expected STATUS_SUCCESS, got %08x\n", status); + if (si.dwNumberOfProcessors <= 1) { skip("only one processor, skipping affinity testing\n"); return; } + + /* Test thread affinity mask resulting from "all processors" flag */ + if (status == STATUS_SUCCESS) + { + status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); + ok( broken(tbi.AffinityMask == 1) || tbi.AffinityMask == (1 << si.dwNumberOfProcessors) - 1, + "Unexpected thread affinity\n" ); + } + else + skip("Cannot test thread affinity mask for 'all processors' flag\n"); + proc_affinity = 2; status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 65fc737..d632f39 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1134,14 +1134,17 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, case ThreadAffinityMask: { const ULONG_PTR affinity_mask = ((ULONG_PTR)1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1; - const ULONG_PTR *paff = data; + ULONG_PTR req_aff; + if (length != sizeof(ULONG_PTR)) return STATUS_INVALID_PARAMETER; - if (*paff & ~affinity_mask) return STATUS_INVALID_PARAMETER; - if (!*paff) return STATUS_INVALID_PARAMETER; + req_aff = *(const ULONG_PTR *)data; + if (req_aff == ~0UL) req_aff = affinity_mask; + else if (req_aff & ~affinity_mask) return STATUS_INVALID_PARAMETER; + else if (!req_aff) return STATUS_INVALID_PARAMETER; SERVER_START_REQ( set_thread_info ) { req->handle = wine_server_obj_handle( handle ); - req->affinity = *paff; + req->affinity = req_aff; req->mask = SET_THREAD_INFO_AFFINITY; status = wine_server_call( req ); }

1 0

Erich Hoover : kernel32/tests: Add test for 'all processors' flag on Vista and newer.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: 2902d8090a62efd464e6c26a9996cfe4059935b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2902d8090a62efd464e6c26a9… Author: Erich Hoover <ehoover(a)mines.edu> Date: Fri Feb 19 19:07:57 2010 -0700 kernel32/tests: Add test for 'all processors' flag on Vista and newer. --- dlls/kernel32/tests/thread.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 69203fe..83d13c5 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -780,7 +780,7 @@ static VOID test_GetThreadTimes(void) static VOID test_thread_processor(void) { HANDLE curthread,curproc; - DWORD_PTR processMask,systemMask; + DWORD_PTR processMask,systemMask,retMask; SYSTEM_INFO sysInfo; int error=0; BOOL is_wow64; @@ -803,6 +803,10 @@ static VOID test_thread_processor(void) "SetThreadAffinityMask failed\n"); ok(SetThreadAffinityMask(curthread,processMask+1)==0, "SetThreadAffinityMask passed for an illegal processor\n"); +/* NOTE: Pre-Vista does not recognize the "all processors" flag (all bits set) */ + retMask = SetThreadAffinityMask(curthread,~0UL); + ok(broken(retMask==0) || retMask==processMask, + "SetThreadAffinityMask(thread,-1) failed to request all processors.\n"); /* NOTE: This only works on WinNT/2000/XP) */ if (pSetThreadIdealProcessor) { SetLastError(0xdeadbeef);

1 0

André Hentschel : oleaut32: Fix rounding.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: 77acdcc016cd8954b07bbed1dca337323d368097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77acdcc016cd8954b07bbed1d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Feb 21 19:46:38 2010 +0100 oleaut32: Fix rounding. --- dlls/oleaut32/tests/varformat.c | 10 ++++++++-- dlls/oleaut32/varformat.c | 11 ++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 9d15fd9..d0975ed 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -381,8 +381,14 @@ static void test_VarFormat(void) VARFMT(VT_R8,V_R8,-0.1,".#",S_OK,"-.1"); VARFMT(VT_R8,V_R8,0.099,"#.#",S_OK,".1"); VARFMT(VT_R8,V_R8,0.0999,"#.##",S_OK,".1"); - /* for large negative exponents, wine truncates instead of rounding */ - todo_wine VARFMT(VT_R8,V_R8,0.099,"#.##",S_OK,".1"); + VARFMT(VT_R8,V_R8,0.099,"#.##",S_OK,".1"); + VARFMT(VT_R8,V_R8,0.0099,"#.##",S_OK,".01"); + VARFMT(VT_R8,V_R8,0.0049,"#.##",S_OK,"."); + VARFMT(VT_R8,V_R8,0.0094,"#.##",S_OK,".01"); + VARFMT(VT_R8,V_R8,0.00099,"#.##",S_OK,"."); + VARFMT(VT_R8,V_R8,0.0995,"#.##",S_OK,".1"); + VARFMT(VT_R8,V_R8,8.0995,"#.##",S_OK,"8.1"); + VARFMT(VT_R8,V_R8,0.0994,"#.##",S_OK,".1"); /* 'out' is not cleared */ diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index f6c142d..370b4f0 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -1285,12 +1285,21 @@ static HRESULT VARIANT_FormatNumber(LPVARIANT pVarIn, LPOLESTR lpszFormat, have_frac = -pad; pad = 0; } + if(exponent < 0 && exponent > (-256 + have_int + have_frac)) + { + /* Remove exponent notation */ + memmove(rgbDig - exponent, rgbDig, have_int + have_frac); + ZeroMemory(rgbDig, -exponent); + have_frac -= exponent; + exponent = 0; + } } /* Rounding the number */ if (have_frac > need_frac) { - prgbDig = &rgbDig[have_int + need_frac]; + prgbDig = &rgbDig[have_int + need_frac ? need_frac + 1 : 0]; + if (*prgbDig < 5) prgbDig--; have_frac = need_frac; if (*prgbDig >= 5) {

1 0

Kusanagi Kouichi : winex11.drv: Check XDND version.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: 10789142fcf639b8b6b290f317e5a12810ad1d4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=10789142fcf639b8b6b290f31… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Sat Feb 20 17:57:07 2010 +0900 winex11.drv: Check XDND version. --- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/xdnd.c | 12 ++++++++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index e46a06b..1f40eba 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -917,7 +917,7 @@ static void set_initial_wm_hints( Display *display, struct x11drv_win_data *data { long i; Atom protocols[3]; - Atom dndVersion = 4; + Atom dndVersion = WINE_XDND_VERSION; XClassHint *class_hints; char *process_name = get_process_name(); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 6db410a..001836f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -64,6 +64,8 @@ typedef int Status; #define MAX_PIXELFORMATS 8 #define MAX_DASHLEN 16 +#define WINE_XDND_VERSION 4 + struct tagCURSORICONINFO; extern void CDECL wine_tsx11_lock(void); diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 38687ec..fe36e0c 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -87,14 +87,22 @@ static CRITICAL_SECTION xdnd_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; */ void X11DRV_XDND_EnterEvent( HWND hWnd, XClientMessageEvent *event ) { + int version; Atom *xdndtypes; unsigned long count = 0; - TRACE("ver(%ld) check-XdndTypeList(%ld) data=%ld,%ld,%ld,%ld,%ld\n", - (event->data.l[1] & 0xFF000000) >> 24, (event->data.l[1] & 1), + version = (event->data.l[1] & 0xFF000000) >> 24; + TRACE("ver(%d) check-XdndTypeList(%ld) data=%ld,%ld,%ld,%ld,%ld\n", + version, (event->data.l[1] & 1), event->data.l[0], event->data.l[1], event->data.l[2], event->data.l[3], event->data.l[4]); + if (version > WINE_XDND_VERSION) + { + TRACE("Ignores unsupported version\n"); + return; + } + /* If the source supports more than 3 data types we retrieve * the entire list. */ if (event->data.l[1] & 1)

1 0

Nikolay Sivov : msxml3: Simplify IXMLDOMElement_get_tagName(), add null check.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: d013991d55956dc9d624ccc63b44129bb7d7714e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d013991d55956dc9d624ccc63… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Feb 19 18:06:17 2010 +0300 msxml3: Simplify IXMLDOMElement_get_tagName(), add null check. --- dlls/msxml3/element.c | 28 ++++++++++------------------ dlls/msxml3/tests/domdoc.c | 3 +++ 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 0154770..b6caf73 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -489,32 +489,24 @@ static HRESULT WINAPI domelem_get_tagName( { domelem *This = impl_from_IXMLDOMElement( iface ); xmlNodePtr element; - DWORD len; - DWORD offset = 0; - LPWSTR str; + const xmlChar *prefix; + xmlChar *qname; TRACE("(%p)->(%p)\n", This, p ); + if (!p) return E_INVALIDARG; + element = get_element( This ); if ( !element ) return E_FAIL; - len = MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) element->name, -1, NULL, 0 ); - if (element->ns) - len += MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) element->ns->prefix, -1, NULL, 0 ); - str = heap_alloc( len * sizeof (WCHAR) ); - if ( !str ) - return E_OUTOFMEMORY; - if (element->ns) - { - offset = MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) element->ns->prefix, -1, str, len ); - str[offset - 1] = ':'; - } - MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) element->name, -1, str + offset, len - offset ); - *p = SysAllocString( str ); - heap_free( str ); + prefix = element->ns ? element->ns->prefix : NULL; + qname = xmlBuildQName(element->name, prefix, NULL, 0); - return S_OK; + *p = bstr_from_xmlChar(qname); + if (qname != element->name) xmlFree(qname); + + return *p ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI domelem_getAttribute( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index e2de5df..929a35f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -639,6 +639,9 @@ static void test_domdoc( void ) r = IXMLDOMElement_QueryInterface( element, &IID_IObjectIdentity, (LPVOID*)&ident ); ok( r == E_NOINTERFACE, "ret %08x\n", r); + r = IXMLDOMElement_get_tagName( element, NULL ); + ok( r == E_INVALIDARG, "ret %08x\n", r); + /* check if the tag is correct */ r = IXMLDOMElement_get_tagName( element, &tag ); ok( r == S_OK, "couldn't get tag name\n");

1 0

Mikołaj Zalewski : include: Add a strcmpW-equivalent function usable in tests.
by Alexandre Julliard Feb. 22, 2010

Feb. 22, 2010

Module: wine Branch: master Commit: bc07b48b38ced3d1cae5fa4b9e4d03c575d7f1af URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc07b48b38ced3d1cae5fa4b9… Author: Mikołaj Zalewski <mikolajz(a)tygrys.dom> Date: Sat Feb 20 22:41:31 2010 +0100 include: Add a strcmpW-equivalent function usable in tests. --- include/wine/test.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 42a56c0..5d371c5 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -65,6 +65,14 @@ extern void winetest_wait_child_process( HANDLE process ); extern const char *wine_dbgstr_wn( const WCHAR *str, int n ); static inline const char *wine_dbgstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); } +/* strcmpW is avaiable for tests compiled under Wine, but not in standalone + * builds under Windows, so we reimplement it under a different name. */ +static inline int winetest_strcmpW( const WCHAR *str1, const WCHAR *str2 ) +{ + while (*str1 && (*str1 == *str2)) { str1++; str2++; } + return *str1 - *str2; +} + #ifdef STANDALONE #define START_TEST(name) \ static void func_##name(void); \

1 0