wine-commits February 2010

wine-commits@winehq.org

2 participants
783 discussions

Jacek Caban : mshtml: Store nsWineURI object instead of interface in nsChannel.
by Alexandre Julliard 22 Feb '10

22 Feb '10

Module: wine Branch: master Commit: d95a54aa575bed9a96eeccc62af6d3e4445bd3cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d95a54aa575bed9a96eeccc62… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Feb 21 21:05:15 2010 +0100 mshtml: Store nsWineURI object instead of interface in nsChannel. --- dlls/mshtml/mshtml_private.h | 6 ++- dlls/mshtml/navigate.c | 2 +- dlls/mshtml/nsio.c | 92 ++++++++++++++++-------------------------- 3 files changed, 41 insertions(+), 59 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c65bffa..019f66f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -434,6 +434,10 @@ struct NSContainer { HWND reset_focus; /* hack */ }; +typedef struct nsWineURI nsWineURI; + +HRESULT set_wine_url(nsWineURI*,LPCWSTR); + typedef struct { const nsIHttpChannelVtbl *lpHttpChannelVtbl; const nsIUploadChannelVtbl *lpUploadChannelVtbl; @@ -441,7 +445,7 @@ typedef struct { LONG ref; - nsIWineURI *uri; + nsWineURI *uri; nsIInputStream *post_data_stream; nsILoadGroup *load_group; nsIInterfaceRequestor *notif_callback; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index b85de92..b0620d5 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1087,7 +1087,7 @@ static HRESULT nsChannelBSC_on_progress(BSCallback *bsc, ULONG status_code, LPCW TRACE("redirect to %s\n", debugstr_w(status_text)); /* FIXME: We should find a better way to handle this */ - nsIWineURI_SetWineURL(This->nschannel->uri, status_text); + set_wine_url(This->nschannel->uri, status_text); } return S_OK; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 15bd0b2..b9e1e60 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -49,7 +49,7 @@ static nsINetUtil *net_util; static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; -typedef struct { +struct nsWineURI { const nsIWineURIVtbl *lpWineURIVtbl; LONG ref; @@ -62,7 +62,7 @@ typedef struct { LPWSTR wine_url; PRBool is_doc_uri; BOOL use_wine_url; -} nsWineURI; +}; #define NSURI(x) ((nsIURI*) &(x)->lpWineURIVtbl) #define NSWINEURI(x) ((nsIWineURI*) &(x)->lpWineURIVtbl) @@ -129,15 +129,8 @@ static BOOL before_async_open(nsChannel *channel, NSContainer *container) { HTMLDocumentObj *doc = container->doc; DWORD hlnf = 0; - LPCWSTR uri; HRESULT hres; - nsIWineURI_GetWineURL(channel->uri, &uri); - if(!uri) { - ERR("GetWineURL returned NULL\n"); - return TRUE; - } - if(!doc) { NSContainer *container_iter = container; @@ -150,13 +143,19 @@ static BOOL before_async_open(nsChannel *channel, NSContainer *container) if(!doc->client) return TRUE; - if(!hlnf && !exec_shldocvw_67(doc, uri)) + if(!hlnf && !exec_shldocvw_67(doc, channel->uri->wine_url)) return FALSE; - hres = hlink_frame_navigate(&doc->basedoc, uri, channel->post_data_stream, hlnf); + hres = hlink_frame_navigate(&doc->basedoc, channel->uri->wine_url, channel->post_data_stream, hlnf); return hres != S_OK; } +HRESULT set_wine_url(nsWineURI *This, LPCWSTR url) +{ + nsIWineURI_SetWineURL(NSWINEURI(This), url); + return S_OK; +} + static inline BOOL is_http_channel(nsChannel *This) { return This->url_scheme == URL_SCHEME_HTTP || This->url_scheme == URL_SCHEME_HTTP; @@ -215,7 +214,7 @@ static nsrefcnt NSAPI nsChannel_Release(nsIHttpChannel *iface) LONG ref = InterlockedDecrement(&This->ref); if(!ref) { - nsIWineURI_Release(This->uri); + nsIURI_Release(NSURI(This->uri)); if(This->owner) nsISupports_Release(This->owner); if(This->post_data_stream) @@ -369,7 +368,7 @@ static nsresult NSAPI nsChannel_GetURI(nsIHttpChannel *iface, nsIURI **aURI) TRACE("(%p)->(%p)\n", This, aURI); - nsIWineURI_AddRef(This->uri); + nsIURI_AddRef(NSURI(This->uri)); *aURI = (nsIURI*)This->uri; return NS_OK; @@ -720,51 +719,36 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen { nsChannel *This = NSCHANNEL_THIS(iface); HTMLWindow *window = NULL; - PRBool is_doc_uri; BOOL open = TRUE; nsresult nsres = NS_OK; - TRACE("(%p)->(%p %p)\n", This, aListener, aContext); - - if(TRACE_ON(mshtml)) { - LPCWSTR url; + TRACE("(%p)->(%p %p) opening %s\n", This, aListener, aContext, debugstr_w(This->uri->wine_url)); - nsIWineURI_GetWineURL(This->uri, &url); - TRACE("opening %s\n", debugstr_w(url)); - } - - nsIWineURI_GetIsDocumentURI(This->uri, &is_doc_uri); - if(is_doc_uri) { + if(This->uri->is_doc_uri) { window = get_channel_window(This); if(window) { - nsIWineURI_SetWindow(This->uri, window); - }else { - NSContainer *nscontainer; - - nsIWineURI_GetNSContainer(This->uri, &nscontainer); - if(nscontainer) { - BOOL b; - - /* nscontainer->doc should be NULL which means navigation to a new window */ - if(nscontainer->doc) - FIXME("nscontainer->doc = %p\n", nscontainer->doc); - - b = before_async_open(This, nscontainer); - nsIWebBrowserChrome_Release(NSWBCHROME(nscontainer)); - if(b) - FIXME("Navigation not cancelled\n"); - return NS_ERROR_UNEXPECTED; - } + nsIWineURI_SetWindow(NSWINEURI(This->uri), window); + }else if(This->uri->container) { + BOOL b; + + /* nscontainer->doc should be NULL which means navigation to a new window */ + if(This->uri->container->doc) + FIXME("nscontainer->doc = %p\n", This->uri->container->doc); + + b = before_async_open(This, This->uri->container); + if(b) + FIXME("Navigation not cancelled\n"); + return NS_ERROR_UNEXPECTED; } } if(!window) { - nsIWineURI_GetWindow(This->uri, &window); + nsIWineURI_GetWindow(NSWINEURI(This->uri), &window); if(!window && This->load_group) { window = get_window_from_load_group(This); if(window) - nsIWineURI_SetWindow(This->uri, window); + nsIWineURI_SetWindow(NSWINEURI(This->uri), window); } } @@ -773,13 +757,9 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen return NS_ERROR_UNEXPECTED; } - if(is_doc_uri && window == window->doc_obj->basedoc.window) { - nsChannelBSC *channel_bsc; - - nsIWineURI_GetChannelBSC(This->uri, &channel_bsc); - if(channel_bsc) { - channelbsc_set_channel(channel_bsc, This, aListener, aContext); - IUnknown_Release((IUnknown*)channel_bsc); + if(This->uri->is_doc_uri && window == window->doc_obj->basedoc.window) { + if(This->uri->channel_bsc) { + channelbsc_set_channel(This->uri->channel_bsc, This, aListener, aContext); if(window->doc_obj->mime) { heap_free(This->content_type); @@ -797,7 +777,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen } if(open) - nsres = async_open(This, window, is_doc_uri, aListener, aContext); + nsres = async_open(This, window, This->uri->is_doc_uri, aListener, aContext); IHTMLWindow2_Release(HTMLWINDOW2(window)); return nsres; @@ -2556,8 +2536,7 @@ static nsresult NSAPI nsIOService_NewChannelFromURI(nsIIOService *iface, nsIURI { PARSEDURLW parsed_url = {sizeof(PARSEDURLW)}; nsChannel *ret; - nsIWineURI *wine_uri; - const WCHAR *url; + nsWineURI *wine_uri; nsresult nsres; TRACE("(%p %p)\n", aURI, _retval); @@ -2578,9 +2557,8 @@ static nsresult NSAPI nsIOService_NewChannelFromURI(nsIIOService *iface, nsIURI nsIURI_AddRef(aURI); ret->original_uri = aURI; - - nsIWineURI_GetWineURL(wine_uri, &url); - ret->url_scheme = url && SUCCEEDED(ParseURLW(url, &parsed_url)) ? parsed_url.nScheme : URL_SCHEME_UNKNOWN; + ret->url_scheme = wine_uri->wine_url && SUCCEEDED(ParseURLW(wine_uri->wine_url, &parsed_url)) + ? parsed_url.nScheme : URL_SCHEME_UNKNOWN; *_retval = NSCHANNEL(ret); return NS_OK;

1 0

Jacek Caban : mshtml: Rename nsURI to nsWineURI.
by Alexandre Julliard 22 Feb '10

22 Feb '10

Module: wine Branch: master Commit: 4ab63f3ad8a2a84c4655567fa134d02b88b727a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ab63f3ad8a2a84c4655567fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Feb 21 21:04:29 2010 +0100 mshtml: Rename nsURI to nsWineURI. --- dlls/mshtml/nsio.c | 120 ++++++++++++++++++++++++++-------------------------- 1 files changed, 60 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ab63f3ad8a2a84c46555…

1 0

André Hentschel : oleaut32: Fix rounding.
by Alexandre Julliard 22 Feb '10

22 Feb '10

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

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

22 Feb '10

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

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

22 Feb '10

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

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

22 Feb '10

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

Kusanagi Kouichi : winex11.drv: Check XDND version.
by Alexandre Julliard 22 Feb '10

22 Feb '10

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

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

22 Feb '10

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

Eric Pouech : ntdll: Fix wrong marking for valgrind on 64bit systems.
by Alexandre Julliard 22 Feb '10

22 Feb '10

Module: wine Branch: master Commit: 10642e76dbcc223cd691b2e6cbd1d8a48dfd499a URL: http://source.winehq.org/git/wine.git/?a=commit;h=10642e76dbcc223cd691b2e6c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Feb 21 15:17:46 2010 +0100 ntdll: Fix wrong marking for valgrind on 64bit systems. --- dlls/ntdll/heap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index b440b61..e49e77a 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -596,7 +596,7 @@ static void HEAP_CreateFreeBlock( SUBHEAP *subheap, void *ptr, SIZE_T size ) { DWORD *pNext = (DWORD *)((char *)ptr + size); *pNext |= ARENA_FLAG_PREV_FREE; - mark_block_initialized( pNext - 1, sizeof( ARENA_FREE * ) ); + mark_block_initialized( (ARENA_FREE **)pNext - 1, sizeof( ARENA_FREE * ) ); *((ARENA_FREE **)pNext - 1) = pFree; }

1 0

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

22 Feb '10

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

← Newer
1
...
13
14
15
16
17
18
19
...
79
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 February 2010