January 2012 - Wine-Commits

Kusanagi Kouichi : winex11.drv: Fix IME status handling.
by Alexandre Julliard Jan. 11, 2012

Jan. 11, 2012

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

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

Jan. 11, 2012

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

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

Jan. 11, 2012

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: Reimplement nsIURL::GetFileName on top of IUri.
by Alexandre Julliard Jan. 11, 2012

Jan. 11, 2012

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

Nikolay Sivov : shell32: Avoid casts when creating item menu.
by Alexandre Julliard Jan. 11, 2012

Jan. 11, 2012

Module: wine Branch: master Commit: 72a7c34109b9e30cbef4a53a0eb81725dcf278f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72a7c34109b9e30cbef4a53a0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 11 05:02:03 2012 +0300 shell32: Avoid casts when creating item menu. --- dlls/shell32/cpanelfolder.c | 3 +-- dlls/shell32/shell32_main.h | 2 +- dlls/shell32/shfldr_desktop.c | 5 +---- dlls/shell32/shfldr_fs.c | 4 +--- dlls/shell32/shfldr_mycomp.c | 4 +--- dlls/shell32/shfldr_netplaces.c | 3 +-- dlls/shell32/shfldr_unixfs.c | 5 ++--- dlls/shell32/shlmenu.c | 6 ++++-- dlls/shell32/shlview_cmenu.c | 17 +++++++++++------ 9 files changed, 23 insertions(+), 26 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index bbbd944..fbd1225 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -600,8 +600,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetUIObjectOf(IShellFolder2 *iface, HWN *ppvOut = NULL; if (IsEqualIID(riid, &IID_IContextMenu) &&(cidl >= 1)) { - pObj = (LPUNKNOWN) ItemMenu_Constructor((IShellFolder *) iface, This->pidlRoot, apidl, cidl); - hr = S_OK; + return ItemMenu_Constructor((IShellFolder*)iface, This->pidlRoot, apidl, cidl, riid, ppvOut); } else if (IsEqualIID(riid, &IID_IDataObject) &&(cidl >= 1)) { pObj = (LPUNKNOWN) IDataObject_Constructor(hwndOwner, This->pidlRoot, apidl, cidl); hr = S_OK; diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 3b0fb83..88a89a7 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -78,7 +78,7 @@ LPDATAOBJECT IDataObject_Constructor(HWND hwndOwner, LPCITEMIDLIST myPidl, LPCIT LPENUMFORMATETC IEnumFORMATETC_Constructor(UINT, const FORMATETC []) DECLSPEC_HIDDEN; LPCLASSFACTORY IClassFactory_Constructor(REFCLSID) DECLSPEC_HIDDEN; -IContextMenu2 * ItemMenu_Constructor(IShellFolder*, LPCITEMIDLIST, const LPCITEMIDLIST*, UINT) DECLSPEC_HIDDEN; +HRESULT ItemMenu_Constructor(IShellFolder*, LPCITEMIDLIST, const LPCITEMIDLIST*, UINT, REFIID, void**) DECLSPEC_HIDDEN; HRESULT BackgroundMenu_Constructor(IShellFolder*, BOOL, REFIID, void**) DECLSPEC_HIDDEN; LPSHELLVIEW IShellView_Constructor(LPSHELLFOLDER) DECLSPEC_HIDDEN; diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index ec9ba63..43d4108 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -530,10 +530,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetUIObjectOf (IShellFolder2 * iface, if (IsEqualIID (riid, &IID_IContextMenu)) { if (cidl > 0) - { - pObj = (LPUNKNOWN) ItemMenu_Constructor( (IShellFolder *) iface, This->pidlRoot, apidl, cidl); - hr = S_OK; - } + return ItemMenu_Constructor((IShellFolder*)iface, This->pidlRoot, apidl, cidl, riid, ppvOut); else return BackgroundMenu_Constructor((IShellFolder*)iface, TRUE, riid, ppvOut); } diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 49c4e7e..3bbe26e 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -744,9 +744,7 @@ IShellFolder_fnGetUIObjectOf (IShellFolder2 * iface, } if (IsEqualIID (riid, &IID_IContextMenu) && (cidl >= 1)) { - pObj = (LPUNKNOWN) ItemMenu_Constructor ((IShellFolder *) iface, - This->pidlRoot, apidl, cidl); - hr = S_OK; + return ItemMenu_Constructor((IShellFolder*)iface, This->pidlRoot, apidl, cidl, riid, ppvOut); } else if (IsEqualIID (riid, &IID_IDataObject) && (cidl >= 1)) { pObj = (LPUNKNOWN) IDataObject_Constructor (hwndOwner, This->pidlRoot, apidl, cidl); diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 2482223..200ad86 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -532,9 +532,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetUIObjectOf (IShellFolder2 * iface, if (IsEqualIID (riid, &IID_IContextMenu) && (cidl >= 1)) { - pObj = (LPUNKNOWN) ItemMenu_Constructor ((IShellFolder *) iface, - This->pidlRoot, apidl, cidl); - hr = S_OK; + return ItemMenu_Constructor((IShellFolder*) iface, This->pidlRoot, apidl, cidl, riid, ppvOut); } else if (IsEqualIID (riid, &IID_IDataObject) && (cidl >= 1)) { diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index f1fd0e7..39f748b 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -426,8 +426,7 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnGetUIObjectOf (IShellFolder2 * iface, if (IsEqualIID (riid, &IID_IContextMenu) && (cidl >= 1)) { - pObj = (LPUNKNOWN) ItemMenu_Constructor ((IShellFolder *) iface, This->pidlRoot, apidl, cidl); - hr = S_OK; + return ItemMenu_Constructor((IShellFolder*)iface, This->pidlRoot, apidl, cidl, riid, ppvOut); } else if (IsEqualIID (riid, &IID_IDataObject) && (cidl >= 1)) { diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 40d4c5c..d22327b 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1165,10 +1165,9 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_GetUIObjectOf(IShellFolder2* ifac if(hr != S_FALSE) return hr; } - + if (IsEqualIID(&IID_IContextMenu, riid)) { - *ppvOut = ItemMenu_Constructor((IShellFolder*)iface, This->m_pidlLocation, apidl, cidl); - return S_OK; + return ItemMenu_Constructor((IShellFolder*)iface, This->m_pidlLocation, apidl, cidl, riid, ppvOut); } else if (IsEqualIID(&IID_IDataObject, riid)) { *ppvOut = IDataObject_Constructor(hwndOwner, This->m_pidlLocation, apidl, cidl); return S_OK; diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index c3fd055..911feca 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -1275,7 +1275,8 @@ HRESULT WINAPI CDefFolderMenu_Create2(LPCITEMIDLIST pidlFolder, HWND hwnd, UINT } else folder_pidl=ILClone(pidlFolder); - system_menu = (IContextMenu*)ItemMenu_Constructor(psf,folder_pidl,(const LPCITEMIDLIST*)apidl,cidl); + + ItemMenu_Constructor(psf, folder_pidl, (const LPCITEMIDLIST*)apidl, cidl, &IID_IContextMenu, (void**)&system_menu); hres= SHELL_CreateContextMenu(hwnd,system_menu,psf,folder_pidl,apidl,cidl,ahkeys,nKeys,&IID_IContextMenu,(void**)ppcm); IContextMenu_Release(system_menu); ILFree(folder_pidl); @@ -1300,7 +1301,8 @@ HRESULT WINAPI SHCreateDefaultContextMenu(const DEFCONTEXTMENU *pdcm, REFIID rii folder_pidl=ILClone(pdcm->pidlFolder); if(pdcm->cKeys==0) FIXME("Loading shell extensions using IQueryAssociations not yet supported\n"); - system_menu = (IContextMenu*)ItemMenu_Constructor(folder,folder_pidl,(const LPCITEMIDLIST*)pdcm->apidl,pdcm->cidl); + + ItemMenu_Constructor(folder, folder_pidl, (const LPCITEMIDLIST*)pdcm->apidl, pdcm->cidl, &IID_IContextMenu, (void**)&system_menu); ret = SHELL_CreateContextMenu(pdcm->hwnd,system_menu,folder,folder_pidl,(LPCITEMIDLIST*)pdcm->apidl,pdcm->cidl,pdcm->aKeys,pdcm->cKeys,riid,ppv); IContextMenu_Release(system_menu); ILFree(folder_pidl); diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 7833efe..b46820c 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -569,12 +569,16 @@ static const IContextMenu3Vtbl ItemContextMenuVtbl = ContextMenu_HandleMenuMsg2 }; -IContextMenu2 *ItemMenu_Constructor(IShellFolder *parent, LPCITEMIDLIST pidl, const LPCITEMIDLIST *apidl, UINT cidl) +HRESULT ItemMenu_Constructor(IShellFolder *parent, LPCITEMIDLIST pidl, const LPCITEMIDLIST *apidl, UINT cidl, + REFIID riid, void **pObj) { ContextMenu* This; - UINT u; + HRESULT hr; + int i; This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) return E_OUTOFMEMORY; + This->IContextMenu3_iface.lpVtbl = &ItemContextMenuVtbl; This->ref = 1; This->verb_offset = 0; @@ -588,12 +592,13 @@ IContextMenu2 *ItemMenu_Constructor(IShellFolder *parent, LPCITEMIDLIST pidl, co This->desktop = FALSE; - for(u = 0; u < cidl; u++) - This->allvalues &= (_ILIsValue(apidl[u]) ? 1 : 0); + for (i = 0; i < cidl; i++) + This->allvalues &= (_ILIsValue(apidl[i]) ? 1 : 0); - TRACE("(%p)\n", This); + hr = IContextMenu3_QueryInterface(&This->IContextMenu3_iface, riid, pObj); + IContextMenu3_Release(&This->IContextMenu3_iface); - return (IContextMenu2*)&This->IContextMenu3_iface; + return hr; } /* Background menu implementation */

1 0

André Hentschel : xcopy: Fix a typo.
by Alexandre Julliard Jan. 11, 2012

Jan. 11, 2012

Module: wine Branch: master Commit: fd4afaf639e7a46fe1801fbfa7d59944ffcb32e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd4afaf639e7a46fe1801fbfa… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 10 23:40:09 2012 +0100 xcopy: Fix a typo. --- programs/xcopy/xcopy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index f1c011f..03eb899 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -787,7 +787,7 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, if (*pos++ != '-') isError = TRUE; } - /* Parse the arg : Day */ + /* Parse the arg : Year */ if (!isError) { st.wYear = _wtol(pos); while (*pos && isdigit(*pos)) pos++;

1 0

André Hentschel : kernel32: No need for WINE_ prefixed debug output macros.
by Alexandre Julliard Jan. 11, 2012

Jan. 11, 2012

Module: wine Branch: master Commit: 3a82d3b23a8d8de6b83d249d678cecc3ea9b11a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a82d3b23a8d8de6b83d249d6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 10 22:29:08 2012 +0100 kernel32: No need for WINE_ prefixed debug output macros. --- dlls/kernel32/term.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/term.c b/dlls/kernel32/term.c index 5123090..814b937 100644 --- a/dlls/kernel32/term.c +++ b/dlls/kernel32/term.c @@ -177,15 +177,14 @@ static BOOL TERM_bind_libcurses(void) if (!(nc_handle = wine_dlopen(ncname, RTLD_NOW, NULL, 0))) { - WINE_MESSAGE("Wine cannot find the " CURSES_NAME " library (%s).\n", - ncname); + MESSAGE("Wine cannot find the " CURSES_NAME " library (%s).\n", ncname); return FALSE; } #define LOAD_FUNCPTR(f) \ if((p_##f = wine_dlsym(nc_handle, #f, NULL, 0)) == NULL) \ { \ - WINE_WARN("Can't find symbol %s\n", #f); \ + WARN("Can't find symbol %s\n", #f); \ goto sym_not_found; \ } @@ -199,7 +198,7 @@ static BOOL TERM_bind_libcurses(void) return TRUE; sym_not_found: - WINE_MESSAGE( + MESSAGE( "Wine cannot find certain functions that it needs inside the " CURSES_NAME "\nlibrary. To enable Wine to use " CURSES_NAME " please upgrade your " CURSES_NAME "\nlibraries\n");

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DTEXTUREOP typedef.
by Alexandre Julliard Jan. 11, 2012

Jan. 11, 2012

Module: wine Branch: master Commit: b6431d9493204a471369688ba223cdba71d3a865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6431d9493204a471369688ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 10 20:37:01 2012 +0100 wined3d: Get rid of the WINED3DTEXTUREOP typedef. --- dlls/ddraw/device.c | 58 +++++------ dlls/wined3d/arb_program_shader.c | 144 ++++++++++++++----------- dlls/wined3d/ati_fragment_shader.c | 193 +++++++++++++++++++--------------- dlls/wined3d/device.c | 30 +++--- dlls/wined3d/nvidia_texture_shader.c | 106 ++++++++++--------- dlls/wined3d/state.c | 141 +++++++++++++------------ dlls/wined3d/stateblock.c | 6 +- dlls/wined3d/utils.c | 105 ++++++++++--------- dlls/wined3d/wined3d_private.h | 6 +- include/wine/wined3d.h | 57 +++++----- 10 files changed, 445 insertions(+), 401 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b6431d9493204a4713696…

1 0

Henri Verbeet : d3d8: Don' t expose wined3d internal flags to the application.
by Alexandre Julliard Jan. 11, 2012

Jan. 11, 2012

Module: wine Branch: master Commit: ef9be113e231d4a706f8ca49a1106c9329e6fe96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef9be113e231d4a706f8ca49a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 10 20:36:59 2012 +0100 d3d8: Don't expose wined3d internal flags to the application. --- dlls/d3d8/buffer.c | 4 ++-- dlls/d3d8/cubetexture.c | 2 +- dlls/d3d8/surface.c | 2 +- dlls/d3d8/texture.c | 2 +- dlls/d3d8/volume.c | 2 +- dlls/d3d8/volumetexture.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 6d9040d..3f0a657 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -243,7 +243,7 @@ static HRESULT WINAPI d3d8_vertexbuffer_GetDesc(IDirect3DVertexBuffer8 *iface, wined3d_mutex_unlock(); desc->Type = D3DRTYPE_VERTEXBUFFER; - desc->Usage = wined3d_desc.usage; + desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size; desc->FVF = buffer->fvf; @@ -539,7 +539,7 @@ static HRESULT WINAPI d3d8_indexbuffer_GetDesc(IDirect3DIndexBuffer8 *iface, desc->Format = d3dformat_from_wined3dformat(buffer->format); desc->Type = D3DRTYPE_INDEXBUFFER; - desc->Usage = wined3d_desc.usage; + desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size; diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 6b5f223..f092f35 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -268,7 +268,7 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetLevelDesc(IDirect3DCubeTextur wined3d_resource_get_desc(sub_resource, &wined3d_desc); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = wined3d_desc.resource_type; - desc->Usage = wined3d_desc.usage; + desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size; desc->MultiSampleType = wined3d_desc.multisample_type; diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 47258de..d60f820 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -226,7 +226,7 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetDesc(IDirect3DSurface8 *iface, D3 desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = wined3d_desc.resource_type; - desc->Usage = wined3d_desc.usage; + desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size; desc->MultiSampleType = wined3d_desc.multisample_type; diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 9e25f8f..f3f2b20 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -265,7 +265,7 @@ static HRESULT WINAPI IDirect3DTexture8Impl_GetLevelDesc(IDirect3DTexture8 *ifac wined3d_resource_get_desc(sub_resource, &wined3d_desc); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = wined3d_desc.resource_type; - desc->Usage = wined3d_desc.usage; + desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size; desc->MultiSampleType = wined3d_desc.multisample_type; diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 505e17b..71923f5 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -207,7 +207,7 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(IDirect3DVolume8 *iface, D3DV desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = wined3d_desc.resource_type; - desc->Usage = wined3d_desc.usage; + desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size; desc->Width = wined3d_desc.width; diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index f223462..a713f16 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -265,7 +265,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetLevelDesc(IDirect3DVolumeTe wined3d_resource_get_desc(sub_resource, &wined3d_desc); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = wined3d_desc.resource_type; - desc->Usage = wined3d_desc.usage; + desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Size = wined3d_desc.size; desc->Width = wined3d_desc.width;

1 0

André Hentschel : winex11.drv: No need for WINE_ prefixed debug output macros.
by Alexandre Julliard Jan. 11, 2012

Jan. 11, 2012

Module: wine Branch: master Commit: 4c6a20ce222422222b79c3c9358cc02a94f2306b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6a20ce222422222b79c3c93… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 10 22:31:28 2012 +0100 winex11.drv: No need for WINE_ prefixed debug output macros. --- dlls/winex11.drv/systray.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 7d5a0e9..0a581f3 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -367,7 +367,7 @@ static LRESULT WINAPI tray_icon_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR struct tray_icon *icon = NULL; BOOL ret; - WINE_TRACE("hwnd=%p, msg=0x%x\n", hwnd, msg); + TRACE("hwnd=%p, msg=0x%x\n", hwnd, msg); /* set the icon data for the window from the data passed into CreateWindow */ if (msg == WM_NCCREATE) @@ -661,17 +661,17 @@ static BOOL add_icon(NOTIFYICONDATAW *nid) { struct tray_icon *icon; - WINE_TRACE("id=0x%x, hwnd=%p\n", nid->uID, nid->hWnd); + TRACE("id=0x%x, hwnd=%p\n", nid->uID, nid->hWnd); if ((icon = get_icon(nid->hWnd, nid->uID))) { - WINE_WARN("duplicate tray icon add, buggy app?\n"); + WARN("duplicate tray icon add, buggy app?\n"); return FALSE; } if (!(icon = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*icon)))) { - WINE_ERR("out of memory\n"); + ERR("out of memory\n"); return FALSE; }

1 0