wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Alexandre Julliard : wininet: Don't free name before the IPv6 lookup.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 2329f91998c6c61ba6960e9d6dfd62a7a014a640 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2329f91998c6c61ba6960e9d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 11 20:09:42 2012 +0100 wininet: Don't free name before the IPv6 lookup. --- dlls/wininet/utility.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 96b8d31..9a70e62 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -184,17 +184,17 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, hints.ai_family = AF_INET; ret = getaddrinfo( name, NULL, &hints, &res ); - heap_free( name ); if (ret != 0) { TRACE("failed to get IPv4 address of %s (%s), retrying with IPv6\n", debugstr_w(lpszServerName), gai_strerror(ret)); hints.ai_family = AF_INET6; ret = getaddrinfo( name, NULL, &hints, &res ); - if (ret != 0) - { - TRACE("failed to get address of %s (%s)\n", debugstr_w(lpszServerName), gai_strerror(ret)); - return FALSE; - } + } + heap_free( name ); + if (ret != 0) + { + TRACE("failed to get address of %s (%s)\n", debugstr_w(lpszServerName), gai_strerror(ret)); + return FALSE; } if (*sa_len < res->ai_addrlen) {

1 0

Jörg Höhle : winmm: GetCurrentPadding is superfluous while recording.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: d8d4aed8453aa56c091485e89958e6082d83800e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8d4aed8453aa56c091485e89… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Jan 9 18:40:51 2012 +0100 winmm: GetCurrentPadding is superfluous while recording. --- dlls/winmm/waveform.c | 38 +++++++++++++------------------------- 1 files changed, 13 insertions(+), 25 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index fe07e9e..383c75f 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1453,19 +1453,11 @@ static void WID_PullACMData(WINMM_Device *device) MMRESULT mr; if(device->acm_hdr.cbDstLength == 0){ - hr = IAudioClient_GetCurrentPadding(device->client, &packet); - if(FAILED(hr)){ - ERR("GetCurrentPadding failed: %08x\n", hr); - return; - } - - if(packet == 0) - return; - hr = IAudioCaptureClient_GetBuffer(device->capture, &data, &packet, &flags, NULL, NULL); - if(FAILED(hr)){ - ERR("GetBuffer failed: %08x\n", hr); + if(hr != S_OK){ + if(FAILED(hr)) + ERR("GetBuffer failed: %08x\n", hr); return; } @@ -1566,26 +1558,20 @@ static void WID_PullData(WINMM_Device *device) while(device->first){ BYTE *data; - UINT32 pad, packet_len, packet; + UINT32 packet_len, packet; DWORD flags; - hr = IAudioClient_GetCurrentPadding(device->client, &pad); - if(FAILED(hr)){ - ERR("GetCurrentPadding failed: %08x\n", hr); - goto exit; - } - - if(pad == 0) - goto exit; - - hr = IAudioCaptureClient_GetBuffer(device->capture, &data, &packet, + hr = IAudioCaptureClient_GetBuffer(device->capture, &data, &packet_len, &flags, NULL, NULL); - if(FAILED(hr)){ - ERR("GetBuffer failed: %08x\n", hr); + if(hr != S_OK){ + if(FAILED(hr)) + ERR("GetBuffer failed: %08x\n", hr); + else /* AUDCLNT_S_BUFFER_EMPTY success code */ + IAudioCaptureClient_ReleaseBuffer(device->capture, 0); goto exit; } - packet_len = packet; + packet = packet_len; queue = device->first; while(queue && packet > 0){ UINT32 to_copy_bytes; @@ -1612,6 +1598,8 @@ static void WID_PullData(WINMM_Device *device) if(FAILED(hr)) ERR("ReleaseBuffer failed: %08x\n", hr); + if(packet > 0) + WARN("losing %u frames\n", packet); device->played_frames += packet_len; }

1 0

Jacek Caban : mshtml: Get rid of wrapped nsurl.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 88d75f1107f03a5b8ccc8304ba846fb81865788f URL: http://source.winehq.org/git/wine.git/?a=commit;h=88d75f1107f03a5b8ccc8304b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 11 19:41:42 2012 +0100 mshtml: Get rid of wrapped nsurl. --- dlls/mshtml/nsio.c | 61 ++++----------------------------------------------- 1 files changed, 5 insertions(+), 56 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 4ef2752..2ea7efd 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -59,7 +59,6 @@ struct nsWineURI { LONG ref; nsIURI *nsuri; - nsIURL *nsurl; NSContainer *container; windowref_t *window_ref; nsChannelBSC *channel_bsc; @@ -1792,8 +1791,6 @@ static nsrefcnt NSAPI nsURI_Release(nsIURL *iface) windowref_release(This->window_ref); if(This->container) nsIWebBrowserChrome_Release(&This->container->nsIWebBrowserChrome_iface); - if(This->nsurl) - nsIURL_Release(This->nsurl); if(This->nsuri) nsIURI_Release(This->nsuri); if(This->uri) @@ -2644,18 +2641,7 @@ static nsresult NSAPI nsURL_GetFileName(nsIURL *iface, nsACString *aFileName) static nsresult NSAPI nsURL_SetFileName(nsIURL *iface, const nsACString *aFileName) { nsWineURI *This = impl_from_nsIURL(iface); - - TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aFileName)); - - if(!This->is_mutable) - return NS_ERROR_UNEXPECTED; - - if(This->nsurl) { - invalidate_uri(This); - return nsIURL_SetFileName(This->nsurl, aFileName); - } - - FIXME("default action not implemented\n"); + FIXME("(%p)->(%s)\n", This, debugstr_nsacstr(aFileName)); return NS_ERROR_NOT_IMPLEMENTED; } @@ -2680,18 +2666,7 @@ static nsresult NSAPI nsURL_GetFileBaseName(nsIURL *iface, nsACString *aFileBase static nsresult NSAPI nsURL_SetFileBaseName(nsIURL *iface, const nsACString *aFileBaseName) { nsWineURI *This = impl_from_nsIURL(iface); - - TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aFileBaseName)); - - if(!This->is_mutable) - return NS_ERROR_UNEXPECTED; - - if(This->nsurl) { - invalidate_uri(This); - return nsIURL_SetFileBaseName(This->nsurl, aFileBaseName); - } - - FIXME("default action not implemented\n"); + FIXME("(%p)->(%s)\n", This, debugstr_nsacstr(aFileBaseName)); return NS_ERROR_NOT_IMPLEMENTED; } @@ -2707,44 +2682,21 @@ static nsresult NSAPI nsURL_GetFileExtension(nsIURL *iface, nsACString *aFileExt static nsresult NSAPI nsURL_SetFileExtension(nsIURL *iface, const nsACString *aFileExtension) { nsWineURI *This = impl_from_nsIURL(iface); - - TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aFileExtension)); - - if(!This->is_mutable) - return NS_ERROR_UNEXPECTED; - - if(This->nsurl) { - invalidate_uri(This); - return nsIURL_SetFileExtension(This->nsurl, aFileExtension); - } - - FIXME("default action not implemented\n"); + FIXME("(%p)->(%s)\n", This, debugstr_nsacstr(aFileExtension)); return NS_ERROR_NOT_IMPLEMENTED; } static nsresult NSAPI nsURL_GetCommonBaseSpec(nsIURL *iface, nsIURI *aURIToCompare, nsACString *_retval) { nsWineURI *This = impl_from_nsIURL(iface); - - TRACE("(%p)->(%p %p)\n", This, aURIToCompare, _retval); - - if(This->nsurl) - return nsIURL_GetCommonBaseSpec(This->nsurl, aURIToCompare, _retval); - - FIXME("default action not implemented\n"); + FIXME("(%p)->(%p %p)\n", This, aURIToCompare, _retval); return NS_ERROR_NOT_IMPLEMENTED; } static nsresult NSAPI nsURL_GetRelativeSpec(nsIURL *iface, nsIURI *aURIToCompare, nsACString *_retval) { nsWineURI *This = impl_from_nsIURL(iface); - - TRACE("(%p)->(%p %p)\n", This, aURIToCompare, _retval); - - if(This->nsurl) - return nsIURL_GetRelativeSpec(This->nsurl, aURIToCompare, _retval); - - FIXME("default action not implemented\n"); + FIXME("(%p)->(%p %p)\n", This, aURIToCompare, _retval); return NS_ERROR_NOT_IMPLEMENTED; } @@ -2879,9 +2831,6 @@ static nsresult create_nsuri(IUri *iuri, nsIURI *nsuri, HTMLWindow *window, NSCo IUri_AddRef(iuri); ret->uri = iuri; - if(nsuri) - nsIURI_QueryInterface(nsuri, &IID_nsIURL, (void**)&ret->nsurl); - TRACE("retval=%p\n", ret); *_retval = ret; return NS_OK;

1 0

Jacek Caban : mshtml: Reimplement nsIURL::GetFileBaseName on top of IUri.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: fc899dfa995bce1deb5de783d18c9d737572c546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc899dfa995bce1deb5de783d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 11 19:41:28 2012 +0100 mshtml: Reimplement nsIURL::GetFileBaseName on top of IUri. --- dlls/mshtml/nsio.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 09ee17b..4ef2752 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2662,14 +2662,19 @@ static nsresult NSAPI nsURL_SetFileName(nsIURL *iface, const nsACString *aFileNa static nsresult NSAPI nsURL_GetFileBaseName(nsIURL *iface, nsACString *aFileBaseName) { nsWineURI *This = impl_from_nsIURL(iface); + const WCHAR *file, *ext; + BSTR path; + nsresult nsres; TRACE("(%p)->(%p)\n", This, aFileBaseName); - if(This->nsurl) - return nsIURL_GetFileBaseName(This->nsurl, aFileBaseName); + nsres = get_uri_path(This, &path, &file, &ext); + if(NS_FAILED(nsres)) + return nsres; - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + nsres = return_wstr_nsacstr(aFileBaseName, file, ext-file); + SysFreeString(path); + return nsres; } static nsresult NSAPI nsURL_SetFileBaseName(nsIURL *iface, const nsACString *aFileBaseName)

1 0

Jacek Caban : mshtml: Reimplement nsIURL::GetFileName on top of IUri.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: b24b06a7cb1b89f82897a73f95105571b938342f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b24b06a7cb1b89f82897a73f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 11 19:41:18 2012 +0100 mshtml: Reimplement nsIURL::GetFileName on top of IUri. --- dlls/mshtml/nsio.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 1c69a64..09ee17b 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2626,14 +2626,19 @@ static nsresult NSAPI nsURL_SetDirectory(nsIURL *iface, const nsACString *aDirec static nsresult NSAPI nsURL_GetFileName(nsIURL *iface, nsACString *aFileName) { nsWineURI *This = impl_from_nsIURL(iface); + const WCHAR *file; + BSTR path; + nsresult nsres; TRACE("(%p)->(%p)\n", This, aFileName); - if(This->nsurl) - return nsIURL_GetFileName(This->nsurl, aFileName); + nsres = get_uri_path(This, &path, &file, NULL); + if(NS_FAILED(nsres)) + return nsres; - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + nsres = return_wstr_nsacstr(aFileName, file, -1); + SysFreeString(path); + return nsres; } static nsresult NSAPI nsURL_SetFileName(nsIURL *iface, const nsACString *aFileName)

1 0

Jacek Caban : mshtml: Reimplement nsIURL:: GetDirectory using new helper functions.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 5458e5f6def93ff302814458fb779f7c4fe35d28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5458e5f6def93ff302814458f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 11 19:41:02 2012 +0100 mshtml: Reimplement nsIURL::GetDirectory using new helper functions. --- dlls/mshtml/nsio.c | 77 +++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 56 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 4e31534..1c69a64 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -151,6 +151,31 @@ static const char *debugstr_nsacstr(const nsACString *nsstr) return debugstr_a(data); } +static nsresult return_wstr_nsacstr(nsACString *ret_str, const WCHAR *str, int len) +{ + char *stra; + int lena; + + TRACE("returning %s\n", debugstr_wn(str, len)); + + if(!*str) { + nsACString_SetData(ret_str, ""); + return NS_OK; + } + + lena = WideCharToMultiByte(CP_ACP, 0, str, len, NULL, 0, NULL, NULL); + stra = heap_alloc(lena+1); + if(!stra) + return NS_ERROR_OUT_OF_MEMORY; + + WideCharToMultiByte(CP_ACP, 0, str, len, stra, lena, NULL, NULL); + stra[lena] = 0; + + nsACString_SetData(ret_str, stra); + heap_free(stra); + return NS_OK; +} + HRESULT nsuri_to_url(LPCWSTR nsuri, BOOL ret_empty, BSTR *ret) { const WCHAR *ptr = nsuri; @@ -2543,41 +2568,51 @@ static nsresult NSAPI nsURL_SetQuery(nsIURL *iface, const nsACString *aQuery) return NS_OK; } -static nsresult NSAPI nsURL_GetDirectory(nsIURL *iface, nsACString *aDirectory) +static nsresult get_uri_path(nsWineURI *This, BSTR *path, const WCHAR **file, const WCHAR **ext) { - nsWineURI *This = impl_from_nsIURL(iface); - char *dir = NULL; - WCHAR *ptr; - BSTR path; + const WCHAR *ptr; HRESULT hres; - TRACE("(%p)->(%p)\n", This, aDirectory); - if(!ensure_uri(This)) return NS_ERROR_UNEXPECTED; - hres = IUri_GetPath(This->uri, &path); + hres = IUri_GetPath(This->uri, path); if(FAILED(hres)) return NS_ERROR_FAILURE; - ptr = strrchrW(path, '/'); - if(ptr) { - if(ptr[1]) - *ptr = 0; - dir = heap_strdupWtoA(path); - if(!dir) { - SysFreeString(path); - return NS_ERROR_OUT_OF_MEMORY; - } + for(ptr = *path + SysStringLen(*path)-1; ptr > *path && *ptr != '/' && *ptr != '\\'; ptr--); + if(*ptr == '/' || *ptr == '\\') + ptr++; + *file = ptr; + + if(ext) { + ptr = strrchrW(ptr, '.'); + if(!ptr) + ptr = *path + SysStringLen(*path); + *ext = ptr; } - SysFreeString(path); - TRACE("ret %s\n", debugstr_a(dir)); - nsACString_SetData(aDirectory, dir ? dir : ""); - heap_free(dir); return NS_OK; } +static nsresult NSAPI nsURL_GetDirectory(nsIURL *iface, nsACString *aDirectory) +{ + nsWineURI *This = impl_from_nsIURL(iface); + const WCHAR *file; + BSTR path; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, aDirectory); + + nsres = get_uri_path(This, &path, &file, NULL); + if(NS_FAILED(nsres)) + return nsres; + + nsres = return_wstr_nsacstr(aDirectory, path, file-path); + SysFreeString(path); + return nsres; +} + static nsresult NSAPI nsURL_SetDirectory(nsIURL *iface, const nsACString *aDirectory) { nsWineURI *This = impl_from_nsIURL(iface);

1 0

Diego Nieto Cid : wined3d: Convert rtInternal and glGammaInternal.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 759bad0202463f5588f6e534eca0c95a48d72b3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=759bad0202463f5588f6e534e… Author: Diego Nieto Cid <dnietoc(a)gmail.com> Date: Sat Jan 7 12:23:47 2012 -0300 wined3d: Convert rtInternal and glGammaInternal. --- dlls/wined3d/surface.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f2a09dc..bf379f1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4531,6 +4531,12 @@ HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_c break; } + if (*convert != NO_CONVERSION) + { + format->rtInternal = format->glInternal; + format->glGammaInternal = format->glInternal; + } + return WINED3D_OK; }

1 0

Kusanagi Kouichi : winex11.drv: Fix IME status handling.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: dc02e4d1a7c35b4205f6109ad71deee5fdddd750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc02e4d1a7c35b4205f6109ad… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Mon Jan 9 16:36:10 2012 +0900 winex11.drv: Fix IME status handling. --- dlls/winex11.drv/ime.c | 60 ++++++++++++++++++-------------------------- dlls/winex11.drv/x11drv.h | 5 ++- dlls/winex11.drv/xim.c | 45 ++++++++++----------------------- 3 files changed, 42 insertions(+), 68 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index a2b1121..b343a64 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -719,32 +719,21 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) case IMC_SETOPENSTATUS: TRACE("IMC_SETOPENSTATUS\n"); - /* Indirectly called from XIM callbacks */ - if (ImmGetIMCCLockCount(lpIMC->hPrivate) > 0) + bRet = TRUE; + X11DRV_SetPreeditState(lpIMC->hWnd, lpIMC->fOpen); + if (!lpIMC->fOpen) { - bRet = TRUE; - break; - } + LPIMEPRIVATE myPrivate; - bRet = X11DRV_SetPreeditState(lpIMC->hWnd, lpIMC->fOpen); - if (bRet) - { - if (!lpIMC->fOpen) + myPrivate = ImmLockIMCC(lpIMC->hPrivate); + if (myPrivate->bInComposition) { - 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); + X11DRV_ForceXIMReset(lpIMC->hWnd); + GenerateIMEMessage(hIMC, WM_IME_ENDCOMPOSITION, 0, 0); + myPrivate->bInComposition = FALSE; } + ImmUnlockIMCC(lpIMC->hPrivate); } - else - lpIMC->fOpen = !lpIMC->fOpen; break; default: FIXME("Unknown\n"); break; @@ -957,7 +946,15 @@ DWORD WINAPI ImeGetImeMenuItems(HIMC hIMC, DWORD dwFlags, DWORD dwType, /* Interfaces to XIM and other parts of winex11drv */ -void IME_SetOpenStatus(BOOL fOpen, BOOL force) +void IME_SetOpenStatus(BOOL fOpen) +{ + HIMC imc; + + imc = RealIMC(FROM_X11); + ImmSetOpenStatus(imc, fOpen); +} + +void IME_SetCompositionStatus(BOOL fOpen) { HIMC imc; LPINPUTCONTEXT lpIMC; @@ -970,20 +967,18 @@ void IME_SetOpenStatus(BOOL fOpen, BOOL force) myPrivate = ImmLockIMCC(lpIMC->hPrivate); - if (!fOpen && myPrivate->bInComposition) + if (fOpen && !myPrivate->bInComposition) + { + GenerateIMEMessage(imc, WM_IME_STARTCOMPOSITION, 0, 0); + } + else 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); } - - if (lpIMC->fOpen && fOpen) - ImmSetOpenStatus(imc, FALSE); - - if (fOpen || force) - ImmSetOpenStatus(imc, fOpen); + myPrivate->bInComposition = fOpen; ImmUnlockIMCC(lpIMC->hPrivate); ImmUnlockIMC(imc); @@ -1059,7 +1054,6 @@ void IME_SetResultString(LPWSTR lpResult, DWORD dwResultLen) LPINPUTCONTEXT lpIMC; HIMCC newCompStr; LPIMEPRIVATE myPrivate; - BOOL fOpen; imc = RealIMC(FROM_X11); lpIMC = ImmLockIMC(imc); @@ -1071,15 +1065,11 @@ void IME_SetResultString(LPWSTR lpResult, DWORD dwResultLen) lpIMC->hCompStr = newCompStr; myPrivate = ImmLockIMCC(lpIMC->hPrivate); - fOpen = lpIMC->fOpen; - ImmSetOpenStatus(imc, TRUE); if (!myPrivate->bInComposition) GenerateIMEMessage(imc, WM_IME_STARTCOMPOSITION, 0, 0); GenerateIMEMessage(imc, WM_IME_COMPOSITION, 0, GCS_RESULTSTR); if (!myPrivate->bInComposition) GenerateIMEMessage(imc, WM_IME_ENDCOMPOSITION, 0, 0); - if (!fOpen) - ImmSetOpenStatus(imc, FALSE); ImmUnlockIMCC(lpIMC->hPrivate); ImmUnlockIMC(imc); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f3ffe6b..0f155ee 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -289,7 +289,8 @@ extern BOOL destroy_glxpixmap(Display *display, XID glxpixmap) DECLSPEC_HIDDEN; /* IME support */ extern void IME_UnregisterClasses(void) DECLSPEC_HIDDEN; -extern void IME_SetOpenStatus(BOOL fOpen, BOOL force) DECLSPEC_HIDDEN; +extern void IME_SetOpenStatus(BOOL fOpen) DECLSPEC_HIDDEN; +extern void IME_SetCompositionStatus(BOOL fOpen) DECLSPEC_HIDDEN; extern INT IME_GetCursorPos(void) DECLSPEC_HIDDEN; extern void IME_SetCursorPos(DWORD pos) DECLSPEC_HIDDEN; extern void IME_UpdateAssociation(HWND focus) DECLSPEC_HIDDEN; @@ -716,7 +717,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) DECLSPEC_HIDDEN; +extern void X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen) DECLSPEC_HIDDEN; #define XEMBED_MAPPED (1 << 0) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 95032d4..786578e 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -129,10 +129,10 @@ static BOOL XIMPreEditStateNotifyCallback(XIC xic, XPointer p, XPointer data) switch (state) { case XIMPreeditEnable: - IME_SetOpenStatus(TRUE, TRUE); + IME_SetOpenStatus(TRUE); break; case XIMPreeditDisable: - IME_SetOpenStatus(FALSE, TRUE); + IME_SetOpenStatus(FALSE); break; default: break; @@ -143,7 +143,7 @@ static BOOL XIMPreEditStateNotifyCallback(XIC xic, XPointer p, XPointer data) static int XIMPreEditStartCallback(XIC ic, XPointer client_data, XPointer call_data) { TRACE("PreEditStartCallback %p\n",ic); - IME_SetOpenStatus(TRUE, FALSE); + IME_SetCompositionStatus(TRUE); ximInComposeMode = TRUE; return -1; } @@ -157,7 +157,7 @@ static void XIMPreEditDoneCallback(XIC ic, XPointer client_data, XPointer call_d dwCompStringSize = 0; dwCompStringLength = 0; CompositionString = NULL; - IME_SetOpenStatus(FALSE, FALSE); + IME_SetCompositionStatus(FALSE); } static void XIMPreEditDrawCallback(XIM ic, XPointer client_data, @@ -264,48 +264,31 @@ void X11DRV_ForceXIMReset(HWND hwnd) } } -BOOL X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen) +void X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen) { XIC ic; XIMPreeditState state; - XVaNestedList attr_set, attr_get; - BOOL ret; + XVaNestedList attr; ic = X11DRV_get_ic(hwnd); if (!ic) - return FALSE; + return; 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: + attr = XVaCreateNestedList(0, XNPreeditState, state, NULL); + if (attr != NULL) + { + XSetICValues(ic, XNPreeditAttributes, attr, NULL); + XFree(attr); + } + wine_tsx11_unlock(); - return ret; }

1 0

Kusanagi Kouichi : winex11.drv: Assign struct.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: f56e1fcf7c87ef05daf741259eaf35d49171cb0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f56e1fcf7c87ef05daf741259… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Wed Jan 11 21:58:11 2012 +0900 winex11.drv: Assign struct. --- dlls/winex11.drv/window.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 0411ddf..e6affcb 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2272,10 +2272,7 @@ void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, escape.dc_rect.top = win_rect->top - top_rect->top; escape.dc_rect.right = win_rect->right - top_rect->left; escape.dc_rect.bottom = win_rect->bottom - top_rect->top; - escape.drawable_rect.left = top_rect->left; - escape.drawable_rect.top = top_rect->top; - escape.drawable_rect.right = top_rect->right; - escape.drawable_rect.bottom = top_rect->bottom; + escape.drawable_rect = *top_rect; if (top == hwnd) {

1 0

Daniel Lehman : msvcp90: Add num_get<char> stubs.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: 4f9bc837d8d5b78fbdb6af73680d6c0588713b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f9bc837d8d5b78fbdb6af736… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jan 4 11:21:46 2012 -0800 msvcp90: Add num_get<char> stubs. --- dlls/msvcp90/locale.c | 343 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 132 +++++++++--------- 2 files changed, 409 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f9bc837d8d5b78fbdb6a…

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
98
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2012