September 2006 - Wine-Commits

Robert Shearman : rpcrt4: Fix NdrStubGetBuffer to use the IRpcChannelBuffer object since
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 3e01da183864acd14c4cfaa659fd8b7fa7cf61fe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3e01da183864acd14c4cfaa… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Aug 29 21:14:42 2006 +0100 rpcrt4: Fix NdrStubGetBuffer to use the IRpcChannelBuffer object since IRpcChannelBuffer_GetBuffer may put extra data onto the wire for ORPC calls. --- dlls/rpcrt4/cstub.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 5b61da4..259956a 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -280,14 +280,24 @@ void WINAPI NdrStubInitialize(PRPC_MESSA /*********************************************************************** * NdrStubGetBuffer [RPCRT4.@] */ -void WINAPI NdrStubGetBuffer(LPRPCSTUBBUFFER This, +void WINAPI NdrStubGetBuffer(LPRPCSTUBBUFFER iface, LPRPCCHANNELBUFFER pRpcChannelBuffer, PMIDL_STUB_MESSAGE pStubMsg) { - TRACE("(%p,%p)\n", This, pStubMsg); - pStubMsg->pRpcChannelBuffer = pRpcChannelBuffer; + CStdStubBuffer *This = (CStdStubBuffer *)iface; + HRESULT hr; + + TRACE("(%p, %p, %p)\n", This, pRpcChannelBuffer, pStubMsg); + pStubMsg->RpcMsg->BufferLength = pStubMsg->BufferLength; - I_RpcGetBuffer(pStubMsg->RpcMsg); /* ? */ + hr = IRpcChannelBuffer_GetBuffer(pRpcChannelBuffer, + (RPCOLEMESSAGE *)pStubMsg->RpcMsg, STUB_HEADER(This).piid); + if (FAILED(hr)) + { + RpcRaiseException(hr); + return; + } + pStubMsg->BufferStart = pStubMsg->RpcMsg->Buffer; pStubMsg->BufferEnd = pStubMsg->BufferStart + pStubMsg->BufferLength; pStubMsg->Buffer = pStubMsg->BufferStart;

1 0

Robert Shearman : rpcrt4: Remove some unused code.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 3535b70a0b8f36bc8c6f4d9c081b8e5ff5900de3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3535b70a0b8f36bc8c6f4d9… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Aug 29 21:14:05 2006 +0100 rpcrt4: Remove some unused code. --- dlls/rpcrt4/cproxy.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 6a97d50..70f0556 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * TODO: Handle non-i386 architectures - * Get rid of #if 0'ed code. */ #include <stdarg.h> @@ -318,26 +317,14 @@ ULONG WINAPI IUnknown_AddRef_Proxy(LPUNK { ICOM_THIS_MULTI(StdProxyImpl,PVtbl,iface); TRACE("(%p)->AddRef() %s\n",This,This->name); -#if 0 /* interface refcounting */ - return ++(This->RefCount); -#else /* object refcounting */ return IUnknown_AddRef(This->pUnkOuter); -#endif } ULONG WINAPI IUnknown_Release_Proxy(LPUNKNOWN iface) { ICOM_THIS_MULTI(StdProxyImpl,PVtbl,iface); TRACE("(%p)->Release() %s\n",This,This->name); -#if 0 /* interface refcounting */ - if (!--(This->RefCount)) { - StdProxy_Destruct((LPRPCPROXYBUFFER)&This->lpVtbl); - return 0; - } - return This->RefCount; -#else /* object refcounting */ return IUnknown_Release(This->pUnkOuter); -#endif } /***********************************************************************

1 0

Robert Shearman : rpcrt4: Rename ndr_midl.c to ndr_clientserver. c to more accurately
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 551563351739c3a841134690468167d9dc8c5ca8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=551563351739c3a84113469… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Aug 29 21:13:19 2006 +0100 rpcrt4: Rename ndr_midl.c to ndr_clientserver.c to more accurately idenitfy what the code contained does - it is a number of helpers for generated client/server code. --- dlls/rpcrt4/Makefile.in | 2 dlls/rpcrt4/ndr_clientserver.c | 208 ++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/ndr_midl.c | 208 ---------------------------------------- 3 files changed, 209 insertions(+), 209 deletions(-) create mode 100644 dlls/rpcrt4/ndr_clientserver.c delete mode 100644 dlls/rpcrt4/ndr_midl.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=551563351739c3a8411…

1 0

Robert Shearman : server: Translate errnos ENFILE and EMFILE to STATUS_TOO_MANY_OPENED_FILES,
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 4d7b23069b33fcd0ceaeac4c12a8e339fdc0a4c2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4d7b23069b33fcd0ceaeac4… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Aug 29 21:11:28 2006 +0100 server: Translate errnos ENFILE and EMFILE to STATUS_TOO_MANY_OPENED_FILES, which seems to be more appropriate and matches the errno translation in ntdll. --- server/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/file.c b/server/file.c index b315425..0f90019 100644 --- a/server/file.c +++ b/server/file.c @@ -291,7 +291,7 @@ void file_set_error(void) case ENOENT: set_error( STATUS_NO_SUCH_FILE ); break; case EISDIR: set_error( STATUS_FILE_IS_A_DIRECTORY ); break; case ENFILE: - case EMFILE: set_error( STATUS_NO_MORE_FILES ); break; + case EMFILE: set_error( STATUS_TOO_MANY_OPENED_FILES ); break; case EEXIST: set_error( STATUS_OBJECT_NAME_COLLISION ); break; case EINVAL: set_error( STATUS_INVALID_PARAMETER ); break; case ESPIPE: set_win32_error( ERROR_SEEK ); break;

1 0

Robert Shearman : rpcrt4: Move NdrStub* functions to cstub. c and move NdrProxy*
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 583ae122336a84e75c9960e6001e5af2e620d495 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=583ae122336a84e75c9960e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Aug 29 21:12:42 2006 +0100 rpcrt4: Move NdrStub* functions to cstub.c and move NdrProxy* functions to cproxy.c since both sets of functions depend on the implementations of the standard stubs and proxies. --- dlls/rpcrt4/cproxy.c | 110 +++++++++++++++++++++++++++++++++++++++- dlls/rpcrt4/cpsf.h | 4 - dlls/rpcrt4/cstub.c | 29 +++++++++++ dlls/rpcrt4/ndr_midl.c | 132 ------------------------------------------------ 4 files changed, 135 insertions(+), 140 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=583ae122336a84e75c9…

1 0

Robert Shearman : oleaut32: Delay the creation of the stub object for IDispatch until it is actually used .
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 4d0b1e3d074e3507465d226ce0948f12dfd2e6c6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4d0b1e3d074e3507465d226… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Aug 29 21:12:16 2006 +0100 oleaut32: Delay the creation of the stub object for IDispatch until it is actually used. --- dlls/oleaut32/tmarshal.c | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 396cca3..a9d0b32 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -1630,6 +1630,7 @@ typedef struct _TMStubImpl { ITypeInfo *tinfo; IID iid; IRpcStubBuffer *dispatch_stub; + BOOL dispatch_derivative; } TMStubImpl; static HRESULT WINAPI @@ -1667,6 +1668,8 @@ TMStubImpl_Release(LPRPCSTUBBUFFER iface { IRpcStubBuffer_Disconnect(iface); ITypeInfo_Release(This->tinfo); + if (This->dispatch_stub) + IRpcStubBuffer_Release(This->dispatch_stub); CoTaskMemFree(This); } return refCount; @@ -1727,8 +1730,20 @@ TMStubImpl_Invoke( return E_UNEXPECTED; } - if (This->dispatch_stub && xmsg->iMethod < sizeof(IDispatchVtbl)/sizeof(void *)) + if (This->dispatch_derivative && xmsg->iMethod < sizeof(IDispatchVtbl)/sizeof(void *)) + { + IPSFactoryBuffer *factory_buffer; + hres = get_facbuf_for_iid(&IID_IDispatch, &factory_buffer); + if (hres == S_OK) + { + hres = IPSFactoryBuffer_CreateStub(factory_buffer, &IID_IDispatch, + This->pUnk, &This->dispatch_stub); + IPSFactoryBuffer_Release(factory_buffer); + } + if (hres != S_OK) + return hres; return IRpcStubBuffer_Invoke(This->dispatch_stub, xmsg, rpcchanbuf); + } memset(&buf,0,sizeof(buf)); buf.size = xmsg->cbBuffer; @@ -1915,6 +1930,7 @@ PSFacBuf_CreateStub( stub->ref = 1; stub->tinfo = tinfo; stub->dispatch_stub = NULL; + stub->dispatch_derivative = FALSE; memcpy(&(stub->iid),riid,sizeof(*riid)); hres = IRpcStubBuffer_Connect((LPRPCSTUBBUFFER)stub,pUnkServer); *ppStub = (LPRPCSTUBBUFFER)stub; @@ -1927,16 +1943,7 @@ PSFacBuf_CreateStub( if (hres == S_OK) { if (typeattr->wTypeFlags & TYPEFLAG_FDISPATCHABLE) - { - IPSFactoryBuffer *factory_buffer; - hres = get_facbuf_for_iid(&IID_IDispatch, &factory_buffer); - if (hres == S_OK) - { - hres = IPSFactoryBuffer_CreateStub(factory_buffer, &IID_IDispatch, - pUnkServer, &stub->dispatch_stub); - IPSFactoryBuffer_Release(factory_buffer); - } - } + stub->dispatch_derivative = TRUE; ITypeInfo_ReleaseTypeAttr(tinfo, typeattr); }

1 0

Robert Shearman : oleaut32: Fix a leak of the module reference count.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: b7e88d8f8b378974760a2516b9acd50782892afa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b7e88d8f8b378974760a251… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Aug 29 21:11:12 2006 +0100 oleaut32: Fix a leak of the module reference count. --- dlls/oleaut32/typelib.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b680fac..07da88f 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2210,6 +2210,7 @@ static int TLB_ReadTypeLib(LPCWSTR pszFi *ppTypeLib = (ITypeLib2*)entry; ITypeLib_AddRef(*ppTypeLib); LeaveCriticalSection(&cache_section); + FreeLibrary(hinstDLL); return S_OK; } }

1 0

Andrew Talbot : comctl32: Cast-qual warnings fix.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: cc90540c9b60bc30849abd04a552adf8bca595aa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cc90540c9b60bc30849abd0… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Aug 30 19:40:52 2006 +0100 comctl32: Cast-qual warnings fix. --- dlls/comctl32/propsheet.c | 4 ++-- dlls/comctl32/toolbar.c | 2 +- dlls/comctl32/trackbar.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 972f862..185b843 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -448,7 +448,7 @@ static BOOL PROPSHEET_CollectPageInfo(LP else { HRSRC hResource = FindResourceA(lppsp->hInstance, - (LPSTR)lppsp->u.pszTemplate, + (LPCSTR)lppsp->u.pszTemplate, (LPSTR)RT_DIALOG); HGLOBAL hTemplate = LoadResource(lppsp->hInstance, hResource); @@ -1424,7 +1424,7 @@ static BOOL PROPSHEET_CreatePage(HWND hw HANDLE hTemplate; hResource = FindResourceA(ppshpage->hInstance, - (LPSTR)ppshpage->u.pszTemplate, + (LPCSTR)ppshpage->u.pszTemplate, (LPSTR)RT_DIALOG); if(!hResource) return FALSE; diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 108bf04..6fb200c 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3301,7 +3301,7 @@ TOOLBAR_Customize (HWND hwnd) return FALSE; ret = DialogBoxIndirectParamW ((HINSTANCE)GetWindowLongPtrW(hwnd, GWLP_HINSTANCE), - (LPDLGTEMPLATEW)template, + (LPCDLGTEMPLATEW)template, hwnd, TOOLBAR_CustomizeDialogProc, (LPARAM)&custInfo); diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 1acccc4..615df57 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1048,8 +1048,8 @@ TRACKBAR_GetNumTics (TRACKBAR_INFO *info static int comp_tics(const void *ap, const void *bp) { - DWORD a = *((DWORD *)ap); - DWORD b = *((DWORD *)bp); + const DWORD a = *(const DWORD *)ap; + const DWORD b = *(const DWORD *)bp; TRACE("(a=%ld, b=%ld)\n", a, b); if (a < b) return -1;

1 0

Andrew Talbot : advpack: Cast-qual warnings fix.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 2429d1b634b07c6fdf3daf8cea45463d5b6425ed URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2429d1b634b07c6fdf3daf8… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Aug 29 20:12:39 2006 +0100 advpack: Cast-qual warnings fix. --- dlls/advpack/files.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 86cf70f..0e3637e 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -116,7 +116,7 @@ HRESULT WINAPI AddDelBackupEntryW(LPCWST LPCWSTR lpcszBaseName, DWORD dwFlags) { WCHAR szIniPath[MAX_PATH]; - LPWSTR szString = NULL; + LPCWSTR szString = NULL; static const WCHAR szBackupEntry[] = { '-','1',',','0',',','0',',','0',',','0',',','0',',','-','1',0 @@ -144,7 +144,7 @@ HRESULT WINAPI AddDelBackupEntryW(LPCWST SetFileAttributesW(szIniPath, FILE_ATTRIBUTE_NORMAL); if (dwFlags & AADBE_ADD_ENTRY) - szString = (LPWSTR)szBackupEntry; + szString = szBackupEntry; else if (dwFlags & AADBE_DEL_ENTRY) szString = NULL; @@ -249,7 +249,8 @@ HRESULT WINAPI AdvInstallFileW(HWND hwnd DWORD dwFlags, DWORD dwReserved) { PSP_FILE_CALLBACK_W pFileCallback; - LPWSTR szPath, szDestFilename; + LPWSTR szDestFilename; + LPCWSTR szPath; WCHAR szRootPath[ROOT_LENGTH]; DWORD dwLen, dwLastError; HSPFILEQ fileQueue; @@ -270,7 +271,7 @@ HRESULT WINAPI AdvInstallFileW(HWND hwnd dwLastError = ERROR_SUCCESS; lstrcpynW(szRootPath, lpszSourceDir, ROOT_LENGTH); - szPath = (LPWSTR)lpszSourceDir + ROOT_LENGTH; + szPath = lpszSourceDir + ROOT_LENGTH; /* use lpszSourceFile as destination filename if lpszDestFile is NULL */ if (lpszDestFile)

1 0

Renu Rajput : comdlg: Send missing CDN_FOLDERCHANGE.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: c8106fe754fb26f77ff6c081d1c067835d4b2502 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c8106fe754fb26f77ff6c08… Author: Renu Rajput <renu.rajput(a)gmail.com> Date: Tue Aug 29 14:08:16 2006 +0530 comdlg: Send missing CDN_FOLDERCHANGE. --- dlls/comdlg32/filedlg.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 8cd9c60..d2bb63c 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2011,7 +2011,10 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) IPersistFolder2_Release(ppf2); if( ! COMDLG32_PIDL_ILIsEqual(pidlCurrent, fodInfos->ShellInfos.pidlAbsCurrent)) { - IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser, pidlCurrent, SBSP_ABSOLUTE); + if (SUCCEEDED(IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser, pidlCurrent, SBSP_ABSOLUTE))) + { + SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); + } } else if( nOpenAction == ONOPEN_SEARCH ) {

1 0