May 2006 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Implement IWineD3DSurface:: Flip.
by Alexandre Julliard 10 May '06

10 May '06

Module: wine Branch: refs/heads/master Commit: cd05f9c10c2f83c6d0be117b1827ed04be4619a9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cd05f9c10c2f83c6d0be117… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 9 19:49:24 2006 +0200 wined3d: Implement IWineD3DSurface::Flip. --- dlls/wined3d/surface.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 497b22a..dbd9958 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1678,8 +1678,23 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetPB } HRESULT WINAPI IWineD3DSurfaceImpl_Flip(IWineD3DSurface *iface, IWineD3DSurface *override, DWORD Flags) { - FIXME("This is unimplemented for now(d3d7 merge)\n"); - return WINED3DERR_INVALIDCALL; + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; + IWineD3DDevice *D3D = (IWineD3DDevice *) This->resource.wineD3DDevice; + TRACE("(%p)->(%p,%lx)\n", This, override, Flags); + + /* Flipping is only supported on RenderTargets */ + if( !(This->resource.usage & WINED3DUSAGE_RENDERTARGET) ) return DDERR_NOTFLIPPABLE; + + if(override) { + /* DDraw sets this for the X11 surfaces, so don't confuse the user + * FIXME("(%p) Target override is not supported by now\n", This); + * Additionally, it isn't really possible to support triple-buffering + * properly on opengl at all + */ + } + + /* Flipping a OpenGL surface -> Use WineD3DDevice::Present */ + return IWineD3DDevice_Present(D3D, NULL, NULL, 0, NULL); } HRESULT WINAPI IWineD3DSurfaceImpl_Blt(IWineD3DSurface *iface, RECT *DestRect, IWineD3DSurface *SrcSurface, RECT *SrcRect, DWORD Flags, DDBLTFX *DDBltFx) {

1 0

Stefan Dösinger : wined3d: Implement GetFlipStatus and GetBltStatus.
by Alexandre Julliard 10 May '06

10 May '06

Module: wine Branch: refs/heads/master Commit: f8e8646fccd7bda285dab5339ae661d847d61b15 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f8e8646fccd7bda285dab53… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 9 20:07:40 2006 +0200 wined3d: Implement GetFlipStatus and GetBltStatus. --- dlls/wined3d/surface.c | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dbd9958..254d225 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6,6 +6,7 @@ * Copyright 2002-2003 Raphael Junqueira * Copyright 2004 Christian Costa * Copyright 2005 Oliver Stieber + * Copyright 2006 Stefan D�singer for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1703,13 +1704,32 @@ HRESULT WINAPI IWineD3DSurfaceImpl_Blt(I } HRESULT WINAPI IWineD3DSurfaceImpl_GetBltStatus(IWineD3DSurface *iface, DWORD Flags) { - FIXME("This is unimplemented for now(d3d7 merge)\n"); - return WINED3DERR_INVALIDCALL; + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; + TRACE("(%p)->(%lx)\n", This, Flags); + + switch (Flags) + { + case DDGBS_CANBLT: + case DDGBS_ISBLTDONE: + return DD_OK; + + default: + return DDERR_INVALIDPARAMS; + } } HRESULT WINAPI IWineD3DSurfaceImpl_GetFlipStatus(IWineD3DSurface *iface, DWORD Flags) { - FIXME("This is unimplemented for now(d3d7 merge)\n"); - return WINED3DERR_INVALIDCALL; + /* XXX: DDERR_INVALIDSURFACETYPE */ + + TRACE("(%p)->(%08lx)\n",iface,Flags); + switch (Flags) { + case DDGFS_CANFLIP: + case DDGFS_ISFLIPDONE: + return DD_OK; + + default: + return DDERR_INVALIDPARAMS; + } } HRESULT WINAPI IWineD3DSurfaceImpl_IsLost(IWineD3DSurface *iface) {

1 0

Juan Lang : crypt32: Implement CRYPT_VERIFY_CERT_SIGN_ISSUER_CERT in CryptVerifyCertificateSignatureEx .
by Alexandre Julliard 10 May '06

10 May '06

Module: wine Branch: refs/heads/master Commit: 9adcf560aef29cbdfa0d9c884b5bb697c082d499 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9adcf560aef29cbdfa0d9c8… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue May 9 23:21:44 2006 -0700 crypt32: Implement CRYPT_VERIFY_CERT_SIGN_ISSUER_CERT in CryptVerifyCertificateSignatureEx. --- dlls/crypt32/cert.c | 83 +++++++++++++++++++++++++++------------------------ 1 files changed, 44 insertions(+), 39 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index f44cc63..ca0505d 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -193,6 +193,41 @@ BOOL WINAPI CryptVerifyCertificateSignat CRYPT_VERIFY_CERT_SIGN_ISSUER_PUBKEY, pPublicKey, 0, NULL); } +static BOOL CRYPT_VerifyCertSignatureFromPublicKeyInfo(HCRYPTPROV hCryptProv, + DWORD dwCertEncodingType, PCERT_PUBLIC_KEY_INFO pubKeyInfo, + PCERT_SIGNED_CONTENT_INFO signedCert) +{ + BOOL ret; + ALG_ID algID = CertOIDToAlgId(pubKeyInfo->Algorithm.pszObjId); + HCRYPTKEY key; + + /* Load the default provider if necessary */ + if (!hCryptProv) + hCryptProv = CRYPT_GetDefaultProvider(); + ret = CryptImportPublicKeyInfoEx(hCryptProv, dwCertEncodingType, + pubKeyInfo, algID, 0, NULL, &key); + if (ret) + { + HCRYPTHASH hash; + + /* Some key algorithms aren't hash algorithms, so map them */ + if (algID == CALG_RSA_SIGN || algID == CALG_RSA_KEYX) + algID = CALG_SHA1; + ret = CryptCreateHash(hCryptProv, algID, 0, 0, &hash); + if (ret) + { + ret = CryptHashData(hash, signedCert->ToBeSigned.pbData, + signedCert->ToBeSigned.cbData, 0); + if (ret) + ret = CryptVerifySignatureW(hash, signedCert->Signature.pbData, + signedCert->Signature.cbData, key, NULL, 0); + CryptDestroyHash(hash); + } + CryptDestroyKey(key); + } + return ret; +} + BOOL WINAPI CryptVerifyCertificateSignatureEx(HCRYPTPROV hCryptProv, DWORD dwCertEncodingType, DWORD dwSubjectType, void *pvSubject, DWORD dwIssuerType, void *pvIssuer, DWORD dwFlags, void *pvReserved) @@ -249,48 +284,18 @@ BOOL WINAPI CryptVerifyCertificateSignat switch (dwIssuerType) { case CRYPT_VERIFY_CERT_SIGN_ISSUER_PUBKEY: - { - PCERT_PUBLIC_KEY_INFO pubKeyInfo = - (PCERT_PUBLIC_KEY_INFO)pvIssuer; - ALG_ID algID = CertOIDToAlgId(pubKeyInfo->Algorithm.pszObjId); - - if (algID) - { - HCRYPTKEY key; - - ret = CryptImportPublicKeyInfoEx(hCryptProv, - dwCertEncodingType, pubKeyInfo, algID, 0, NULL, &key); - if (ret) - { - HCRYPTHASH hash; - - ret = CryptCreateHash(hCryptProv, algID, 0, 0, &hash); - if (ret) - { - ret = CryptHashData(hash, - signedCert->ToBeSigned.pbData, - signedCert->ToBeSigned.cbData, 0); - if (ret) - { - ret = CryptVerifySignatureW(hash, - signedCert->Signature.pbData, - signedCert->Signature.cbData, key, NULL, 0); - } - CryptDestroyHash(hash); - } - CryptDestroyKey(key); - } - } - else - { - SetLastError(NTE_BAD_ALGID); - ret = FALSE; - } + ret = CRYPT_VerifyCertSignatureFromPublicKeyInfo(hCryptProv, + dwCertEncodingType, (PCERT_PUBLIC_KEY_INFO)pvIssuer, + signedCert); break; - } case CRYPT_VERIFY_CERT_SIGN_ISSUER_CERT: + ret = CRYPT_VerifyCertSignatureFromPublicKeyInfo(hCryptProv, + dwCertEncodingType, + &((PCCERT_CONTEXT)pvIssuer)->pCertInfo->SubjectPublicKeyInfo, + signedCert); + break; case CRYPT_VERIFY_CERT_SIGN_ISSUER_CHAIN: - FIXME("issuer type %ld: stub\n", dwIssuerType); + FIXME("CRYPT_VERIFY_CERT_SIGN_ISSUER_CHAIN: stub\n"); ret = FALSE; break; case CRYPT_VERIFY_CERT_SIGN_ISSUER_NULL:

1 0

Alexandre Julliard : x11drv: We really need to flush the display when destroying a window.
by Alexandre Julliard 10 May '06

10 May '06

Module: wine Branch: refs/heads/master Commit: 975f1b2a6188509e0e99ae5ea71364755bd54cee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=975f1b2a6188509e0e99ae5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 9 17:32:40 2006 +0200 x11drv: We really need to flush the display when destroying a window. --- dlls/x11drv/window.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/x11drv/window.c b/dlls/x11drv/window.c index 4e010e6..faaa471 100644 --- a/dlls/x11drv/window.c +++ b/dlls/x11drv/window.c @@ -736,6 +736,8 @@ static void destroy_whole_window( Displa XUnsetICFocus( data->xic ); XDestroyIC( data->xic ); } + /* Outlook stops processing messages after destroying a dialog, so we need an explicit flush */ + XFlush( display ); wine_tsx11_unlock(); RemovePropA( data->hwnd, whole_window_prop ); }

1 0

Uwe Bonnes : kernel: Comm_CheckEvents: Only warn for non-empty transmitter with EV_TXEMPTY flag set.
by Alexandre Julliard 10 May '06

10 May '06

Module: wine Branch: refs/heads/master Commit: 5b4c15c5d3c254e41114191c8182a7cf7df05e89 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5b4c15c5d3c254e41114191… Author: Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> Date: Tue May 9 22:02:39 2006 +0200 kernel: Comm_CheckEvents: Only warn for non-empty transmitter with EV_TXEMPTY flag set. Noticed by Dan Armbrust. --- dlls/kernel/comm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/comm.c b/dlls/kernel/comm.c index 8f5b9fd..2a1cb8b 100644 --- a/dlls/kernel/comm.c +++ b/dlls/kernel/comm.c @@ -1232,8 +1232,8 @@ #elif defined(TIOCINQ) if (!queue) #endif ret |= EV_TXEMPTY; + TRACE("OUTQUEUE %ld, Transmitter %sempty\n", queue, (ret & EV_TXEMPTY)?"":"not "); } - TRACE("OUTQUEUE %ld, Transmitter %sempty\n", queue, (ret & EV_TXEMPTY)?"":"not "); return ret; }

1 0

Michael Jung : shell32: Support BFFM_SETSELECTION[AW] and BFFM_SETEXPANDED for SHBrowseForFolder.
by Alexandre Julliard 10 May '06

10 May '06

Module: wine Branch: refs/heads/master Commit: b3e6faa7840d0f235db13fd452136294bd42045b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b3e6faa7840d0f235db13fd… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Tue May 9 22:24:58 2006 +0200 shell32: Support BFFM_SETSELECTION[AW] and BFFM_SETEXPANDED for SHBrowseForFolder. --- dlls/shell32/brsfolder.c | 124 ++++++++++++++++++++++++++++++++++++++++------ dlls/shell32/pidl.h | 8 +++ 2 files changed, 117 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 6d5afe1..150b661 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -540,6 +540,112 @@ static BOOL BrsFolder_OnCommand( browse_ return FALSE; } +static BOOL BrsFolder_OnSetExpanded(browse_info *info, LPVOID selection, + BOOL is_str, HTREEITEM *pItem) +{ + LPITEMIDLIST pidlSelection = (LPITEMIDLIST)selection; + LPCITEMIDLIST pidlCurrent, pidlRoot; + TVITEMEXW item; + BOOL bResult = FALSE; + + /* If 'selection' is a string, convert to a Shell ID List. */ + if (is_str) { + IShellFolder *psfDesktop; + HRESULT hr; + + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED(hr)) + goto done; + + hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, + (LPOLESTR)selection, NULL, &pidlSelection, NULL); + IShellFolder_Release(psfDesktop); + if (FAILED(hr)) + goto done; + } + + /* Move pidlCurrent behind the SHITEMIDs in pidlSelection, which are the root of + * the sub-tree currently displayed. */ + pidlRoot = info->lpBrowseInfo->pidlRoot; + pidlCurrent = pidlSelection; + while (!_ILIsEmpty(pidlRoot) && _ILIsEqualSimple(pidlRoot, pidlCurrent)) { + pidlRoot = ILGetNext(pidlRoot); + pidlCurrent = ILGetNext(pidlCurrent); + } + + /* The given ID List is not part of the SHBrowseForFolder's current sub-tree. */ + if (!_ILIsEmpty(pidlRoot)) + goto done; + + /* Initialize item to point to the first child of the root folder. */ + memset(&item, 0, sizeof(item)); + item.mask = TVIF_PARAM; + item.hItem = TreeView_GetRoot(info->hwndTreeView); + if (item.hItem) + item.hItem = TreeView_GetChild(info->hwndTreeView, item.hItem); + + /* Walk the tree along the nodes corresponding to the remaining ITEMIDLIST */ + while (item.hItem && !_ILIsEmpty(pidlCurrent)) { + LPTV_ITEMDATA pItemData; + + TreeView_GetItemW(info->hwndTreeView, &item); + pItemData = (LPTV_ITEMDATA)item.lParam; + + if (_ILIsEqualSimple(pItemData->lpi, pidlCurrent)) { + pidlCurrent = ILGetNext(pidlCurrent); + if (!_ILIsEmpty(pidlCurrent)) { + /* Only expand current node and move on to it's first child, + * if we didn't already reach the last SHITEMID */ + TreeView_Expand(info->hwndTreeView, item.hItem, TVE_EXPAND); + item.hItem = TreeView_GetChild(info->hwndTreeView, item.hItem); + } + } else { + item.hItem = TreeView_GetNextSibling(info->hwndTreeView, item.hItem); + } + } + + if (_ILIsEmpty(pidlCurrent) && item.hItem) + bResult = TRUE; + +done: + if (pidlSelection && pidlSelection != (LPITEMIDLIST)selection) + ILFree(pidlSelection); + + if (pItem) + *pItem = item.hItem; + + return bResult; +} + +static BOOL BrsFolder_OnSetSelectionW(browse_info *info, LPVOID selection, BOOL is_str) { + HTREEITEM hItem; + BOOL bResult; + + bResult = BrsFolder_OnSetExpanded(info, selection, is_str, &hItem); + if (bResult) + TreeView_Select(info->hwndTreeView, hItem, TVGN_CARET); + return bResult; +} + +static BOOL BrsFolder_OnSetSelectionA(browse_info *info, LPVOID selection, BOOL is_str) { + LPWSTR selectionW = NULL; + BOOL result = FALSE; + int length; + + if (!is_str) + return BrsFolder_OnSetSelectionW(info, selection, is_str); + + if ((length = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)selection, -1, NULL, 0)) && + (selectionW = HeapAlloc(GetProcessHeap(), 0, length)) && + MultiByteToWideChar(CP_ACP, 0, (LPCSTR)selection, -1, selectionW, length)) + { + result = BrsFolder_OnSetSelectionW(info, selectionW, is_str); + } + + HeapFree(GetProcessHeap(), 0, selectionW); + return result; +} + /************************************************************************* * BrsFolderDlgProc32 (not an exported API function) */ @@ -584,25 +690,13 @@ static INT_PTR CALLBACK BrsFolderDlgProc break; case BFFM_SETSELECTIONA: - if (wParam) - FIXME("Set selection %s\n", debugstr_a((LPSTR)lParam)); - else - FIXME("Set selection %p\n", (void*)lParam); - break; + return BrsFolder_OnSetSelectionA(info, (LPVOID)lParam, (BOOL)wParam); case BFFM_SETSELECTIONW: - if (wParam) - FIXME("Set selection %s\n", debugstr_w((LPWSTR)lParam)); - else - FIXME("Set selection %p\n", (void*)lParam); - break; + return BrsFolder_OnSetSelectionW(info, (LPVOID)lParam, (BOOL)wParam); case BFFM_SETEXPANDED: /* unicode only */ - if (wParam) - FIXME("Set expanded %s\n", debugstr_w((LPWSTR)lParam)); - else - FIXME("Set expanded %p\n", (void*)lParam); - break; + return BrsFolder_OnSetExpanded(info, (LPVOID)lParam, (BOOL)wParam, NULL); } return FALSE; } diff --git a/dlls/shell32/pidl.h b/dlls/shell32/pidl.h index e80ceaa..d033987 100644 --- a/dlls/shell32/pidl.h +++ b/dlls/shell32/pidl.h @@ -209,6 +209,14 @@ BOOL _ILIsValue (LPCITEMIDLIST pidl); BOOL _ILIsSpecialFolder (LPCITEMIDLIST pidl); BOOL _ILIsPidlSimple (LPCITEMIDLIST pidl); BOOL _ILIsCPanelStruct (LPCITEMIDLIST pidl); +static inline +BOOL _ILIsEqualSimple (LPCITEMIDLIST pidlA, LPCITEMIDLIST pidlB) +{ + return (pidlA->mkid.cb > 0 && !memcmp(pidlA, pidlB, pidlA->mkid.cb)) || + (!pidlA->mkid.cb && !pidlB->mkid.cb); +} +static inline +BOOL _ILIsEmpty (LPCITEMIDLIST pidl) { return _ILIsDesktop(pidl); } /* * simple pidls

1 0

James Hawkins : ntdll: Return STATUS_NOT_IMPLEMENTED for the unimplemented port functions.
by Alexandre Julliard 10 May '06

10 May '06

Module: wine Branch: refs/heads/master Commit: 31f29ffcc8c3ae5f3a098f7fd8de7fe287d0f125 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=31f29ffcc8c3ae5f3a098f7… Author: James Hawkins <truiken(a)gmail.com> Date: Tue May 9 21:18:07 2006 -0500 ntdll: Return STATUS_NOT_IMPLEMENTED for the unimplemented port functions. --- dlls/ntdll/nt.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 5ee757d..8057dec 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -406,7 +406,7 @@ NTSTATUS WINAPI NtCreatePort(PHANDLE Por { FIXME("(%p,%p,%lu,%lu,%p),stub!\n",PortHandle,ObjectAttributes, MaxConnectInfoLength,MaxDataLength,reserved); - return 0; + return STATUS_NOT_IMPLEMENTED; } /****************************************************************************** @@ -429,7 +429,7 @@ NTSTATUS WINAPI NtConnectPort( pConnectInfoLength); if (ConnectInfo && pConnectInfoLength) TRACE("\tMessage = %s\n",debugstr_an(ConnectInfo,*pConnectInfoLength)); - return 0; + return STATUS_NOT_IMPLEMENTED; } /****************************************************************************** @@ -439,7 +439,7 @@ NTSTATUS WINAPI NtConnectPort( NTSTATUS WINAPI NtListenPort(HANDLE PortHandle,PLPC_MESSAGE pLpcMessage) { FIXME("(%p,%p),stub!\n",PortHandle,pLpcMessage); - return 0; + return STATUS_NOT_IMPLEMENTED; } /****************************************************************************** @@ -456,7 +456,7 @@ NTSTATUS WINAPI NtAcceptConnectPort( { FIXME("(%p,%lu,%p,%d,%p,%p),stub!\n", PortHandle,PortIdentifier,pLpcMessage,Accept,WriteSection,ReadSection); - return 0; + return STATUS_NOT_IMPLEMENTED; } /****************************************************************************** @@ -466,7 +466,7 @@ NTSTATUS WINAPI NtAcceptConnectPort( NTSTATUS WINAPI NtCompleteConnectPort(HANDLE PortHandle) { FIXME("(%p),stub!\n",PortHandle); - return 0; + return STATUS_NOT_IMPLEMENTED; } /****************************************************************************** @@ -476,7 +476,7 @@ NTSTATUS WINAPI NtCompleteConnectPort(HA NTSTATUS WINAPI NtRegisterThreadTerminatePort(HANDLE PortHandle) { FIXME("(%p),stub!\n",PortHandle); - return 0; + return STATUS_NOT_IMPLEMENTED; } /****************************************************************************** @@ -503,7 +503,7 @@ NTSTATUS WINAPI NtRequestWaitReplyPort( TRACE("\tData = %s\n", debugstr_an((const char*)pLpcMessageIn->Data,pLpcMessageIn->DataSize)); } - return 0; + return STATUS_NOT_IMPLEMENTED; } /****************************************************************************** @@ -517,7 +517,7 @@ NTSTATUS WINAPI NtReplyWaitReceivePort( PLPC_MESSAGE Message) { FIXME("(%p,%p,%p,%p),stub!\n",PortHandle,PortIdentifier,ReplyMessage,Message); - return 0; + return STATUS_NOT_IMPLEMENTED; } /*

1 0

Eric Pouech : ntdll/kernel32: EscapeCommFunction & associated IOCTLs
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: 5f9e9836cf2d183a7645ef6d4badc362fef15f56 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5f9e9836cf2d183a7645ef6… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun May 7 14:11:05 2006 +0200 ntdll/kernel32: EscapeCommFunction & associated IOCTLs - implemented ntdll's serial IOCTL: CLR_DTR, CLR_RTS, SET_DTR, SET_RTS, SET_XOFF, SET_XON, RESET_DEVICE - implemented kernel32.EscapeCommFunction on top of them --- dlls/kernel/comm.c | 134 +++++++++------------------------------------------ dlls/ntdll/serial.c | 75 +++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 110 deletions(-) diff --git a/dlls/kernel/comm.c b/dlls/kernel/comm.c index 8f5c18d..8f5b9fd 100644 --- a/dlls/kernel/comm.c +++ b/dlls/kernel/comm.c @@ -146,19 +146,6 @@ #endif return -1; } -static int COMM_WhackModem(int fd, unsigned int andy, unsigned int orrie) -{ -#ifdef TIOCMGET - unsigned int mstat, okay; - okay = ioctl(fd, TIOCMGET, &mstat); - if (okay) return okay; - if (andy) mstat &= andy; - mstat |= orrie; - return ioctl(fd, TIOCMSET, &mstat); -#else - return 0; -#endif -} /*********************************************************************** * COMM_Parse* (Internal) @@ -699,111 +686,38 @@ BOOL WINAPI ClearCommBreak(HANDLE handle * * Directs a communication device to perform an extended function. * + * PARAMS + * + * handle [in] The communication device to perform the extended function + * nFunction [in] The extended function to be performed + * * RETURNS * * True or requested data on successful completion of the command, * false if the device is not present cannot execute the command * or the command failed. */ -BOOL WINAPI EscapeCommFunction( - HANDLE handle, /* [in] The communication device to perform the extended function. */ - UINT nFunction) /* [in] The extended function to be performed. */ +BOOL WINAPI EscapeCommFunction(HANDLE handle, UINT func) { - int fd,direct=FALSE,result=FALSE; - struct termios port; - - TRACE("handle %p, function=%d\n", handle, nFunction); - fd = get_comm_fd( handle, FILE_READ_DATA ); - if(fd<0) return FALSE; - - if (tcgetattr(fd,&port) == -1) { - release_comm_fd( handle, fd ); - return FALSE; - } - - switch (nFunction) { - case RESETDEV: - TRACE("\n"); - break; - - case CLRDTR: - TRACE("CLRDTR\n"); -#ifdef TIOCM_DTR - direct=TRUE; - result= COMM_WhackModem(fd, ~TIOCM_DTR, 0); - break; -#endif - - case CLRRTS: - TRACE("CLRRTS\n"); -#ifdef TIOCM_RTS - direct=TRUE; - result= COMM_WhackModem(fd, ~TIOCM_RTS, 0); - break; -#endif + DWORD ioc; - case SETDTR: - TRACE("SETDTR\n"); -#ifdef TIOCM_DTR - direct=TRUE; - result= COMM_WhackModem(fd, 0, TIOCM_DTR); - break; -#endif - - case SETRTS: - TRACE("SETRTS\n"); -#ifdef TIOCM_RTS - direct=TRUE; - result= COMM_WhackModem(fd, 0, TIOCM_RTS); - break; -#endif - - case SETXOFF: - TRACE("SETXOFF\n"); - port.c_iflag |= IXOFF; - break; - - case SETXON: - TRACE("SETXON\n"); - port.c_iflag |= IXON; - break; - case SETBREAK: - TRACE("setbreak\n"); -#ifdef TIOCSBRK - direct=TRUE; - result = ioctl(fd,TIOCSBRK,0); - break; -#endif - case CLRBREAK: - TRACE("clrbreak\n"); -#ifdef TIOCSBRK - direct=TRUE; - result = ioctl(fd,TIOCCBRK,0); - break; -#endif - default: - WARN("(handle=%p,nFunction=%d): Unknown function\n", - handle, nFunction); - break; - } - - if (!direct) - if (tcsetattr(fd, TCSADRAIN, &port) == -1) { - release_comm_fd( handle, fd ); - return FALSE; - } else - result= TRUE; - else - { - if (result == -1) - { - result= FALSE; - } - else - result = TRUE; - } - release_comm_fd( handle, fd ); - return result; + switch (func) + { + case CLRDTR: ioc = IOCTL_SERIAL_CLR_DTR; break; + case CLRRTS: ioc = IOCTL_SERIAL_CLR_RTS; break; + case SETDTR: ioc = IOCTL_SERIAL_SET_DTR; break; + case SETRTS: ioc = IOCTL_SERIAL_SET_RTS; break; + case SETXOFF: ioc = IOCTL_SERIAL_SET_XOFF; break; + case SETXON: ioc = IOCTL_SERIAL_SET_XON; break; + case SETBREAK: ioc = IOCTL_SERIAL_SET_BREAK_ON; break; + case CLRBREAK: ioc = IOCTL_SERIAL_SET_BREAK_OFF; break; + case RESETDEV: ioc = IOCTL_SERIAL_RESET_DEVICE; break; + default: + ERR("Unknown function code (%u)\n", func); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + return DeviceIoControl(handle, ioc, NULL, 0, NULL, 0, NULL, NULL); } /******************************************************************** diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 15d1941..64e181a 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -823,6 +823,44 @@ static NTSTATUS set_wait_mask(HANDLE hDe return status; } +static NTSTATUS set_XOff(int fd) +{ + struct termios port; + + if (tcgetattr(fd,&port) == -1) + { + FIXME("tcgetattr on fd %d failed (%s)!\n", fd, strerror(errno)); + return FILE_GetNtStatus(); + + + } + port.c_iflag |= IXOFF; + if (tcsetattr(fd, TCSADRAIN, &port) == -1) + { + FIXME("tcsetattr on fd %d failed (%s)!\n", fd, strerror(errno)); + return FILE_GetNtStatus(); + } + return STATUS_SUCCESS; +} + +static NTSTATUS set_XOn(int fd) +{ + struct termios port; + + if (tcgetattr(fd,&port) == -1) + { + FIXME("tcgetattr on fd %d failed (%s)!\n", fd, strerror(errno)); + return FILE_GetNtStatus(); + } + port.c_iflag |= IXON; + if (tcsetattr(fd, TCSADRAIN, &port) == -1) + { + FIXME("tcsetattr on fd %d failed (%s)!\n", fd, strerror(errno)); + return FILE_GetNtStatus(); + } + return STATUS_SUCCESS; +} + static NTSTATUS xmit_immediate(HANDLE hDevice, int fd, char* ptr) { /* FIXME: not perfect as it should bypass the in-queue */ @@ -861,6 +899,20 @@ NTSTATUS COMM_DeviceIoControl(HANDLE hDe switch (dwIoControlCode) { + case IOCTL_SERIAL_CLR_DTR: +#ifdef TIOCM_DTR + if (whack_modem(fd, ~TIOCM_DTR, 0) == -1) status = FILE_GetNtStatus(); +#else + status = STATUS_NOT_SUPPORTED; +#endif + break; + case IOCTL_SERIAL_CLR_RTS: +#ifdef TIOCM_RTS + if (whack_modem(fd, ~TIOCM_RTS, 0) == -1) status = FILE_GetNtStatus(); +#else + status = STATUS_NOT_SUPPORTED; +#endif + break; case IOCTL_SERIAL_GET_BAUD_RATE: if (lpOutBuffer && nOutBufferSize == sizeof(SERIAL_BAUD_RATE)) { @@ -943,6 +995,9 @@ NTSTATUS COMM_DeviceIoControl(HANDLE hDe else status = STATUS_INVALID_PARAMETER; break; + case IOCTL_SERIAL_RESET_DEVICE: + FIXME("Unsupported\n"); + break; case IOCTL_SERIAL_SET_BAUD_RATE: if (lpInBuffer && nInBufferSize == sizeof(SERIAL_BAUD_RATE)) status = set_baud_rate(fd, (const SERIAL_BAUD_RATE*)lpInBuffer); @@ -979,6 +1034,13 @@ #endif else status = STATUS_INVALID_PARAMETER; break; + case IOCTL_SERIAL_SET_DTR: +#ifdef TIOCM_DTR + if (whack_modem(fd, 0, TIOCM_DTR) == -1) status = FILE_GetNtStatus(); +#else + status = STATUS_NOT_SUPPORTED; +#endif + break; case IOCTL_SERIAL_SET_HANDFLOW: if (lpInBuffer && nInBufferSize == sizeof(SERIAL_HANDFLOW)) status = set_handflow(fd, (const SERIAL_HANDFLOW*)lpInBuffer); @@ -997,6 +1059,13 @@ #endif else status = STATUS_INVALID_PARAMETER; break; + case IOCTL_SERIAL_SET_RTS: +#ifdef TIOCM_RTS + if (whack_modem(fd, 0, TIOCM_RTS) == -1) status = FILE_GetNtStatus(); +#else + status = STATUS_NOT_SUPPORTED; +#endif + break; case IOCTL_SERIAL_SET_TIMEOUTS: if (lpInBuffer && nInBufferSize == sizeof(SERIAL_TIMEOUTS)) status = set_timeouts(hDevice, fd, (const SERIAL_TIMEOUTS*)lpInBuffer); @@ -1010,6 +1079,12 @@ #endif } else status = STATUS_INVALID_PARAMETER; break; + case IOCTL_SERIAL_SET_XOFF: + status = set_XOff(fd); + break; + case IOCTL_SERIAL_SET_XON: + status = set_XOn(fd); + break; default: FIXME("Unsupported IOCTL %lx (type=%lx access=%lx func=%lx meth=%lx)\n", dwIoControlCode, dwIoControlCode >> 16, (dwIoControlCode >> 14) & 3,

1 0

Eric Pouech : ntdll/kernel32: SetupComm & SET_QUEUE_SIZE
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: fcdc293bb08ab0d21f9fc48e58fde76e6b35b641 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fcdc293bb08ab0d21f9fc48… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun May 7 14:11:02 2006 +0200 ntdll/kernel32: SetupComm & SET_QUEUE_SIZE - stubbed out ntdll's serial IOCTL SET_QUEUE_SIZE - implemented kernel32.SetupComm on top of it --- dlls/kernel/comm.c | 21 +++++++++++---------- dlls/ntdll/serial.c | 12 ++++++++++++ 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/kernel/comm.c b/dlls/kernel/comm.c index f12043d..8f5c18d 100644 --- a/dlls/kernel/comm.c +++ b/dlls/kernel/comm.c @@ -883,6 +883,11 @@ BOOL WINAPI ClearCommError(HANDLE handle * Called after CreateFile to hint to the communication resource to use * specified sizes for input and output buffers rather than the default values. * + * PARAMS + * handle [in] The just created communication resource handle + * insize [in] The suggested size of the communication resources input buffer in bytes + * outsize [in] The suggested size of the communication resources output buffer in bytes + * * RETURNS * * True if successful, false if the communications resource handle is bad. @@ -891,18 +896,14 @@ BOOL WINAPI ClearCommError(HANDLE handle * * Stub. */ -BOOL WINAPI SetupComm( - HANDLE handle, /* [in] The just created communication resource handle. */ - DWORD insize, /* [in] The suggested size of the communication resources input buffer in bytes. */ - DWORD outsize) /* [in] The suggested size of the communication resources output buffer in bytes. */ +BOOL WINAPI SetupComm(HANDLE handle, DWORD insize, DWORD outsize) { - int fd; + SERIAL_QUEUE_SIZE sqs; - FIXME("insize %ld outsize %ld unimplemented stub\n", insize, outsize); - fd=get_comm_fd( handle, FILE_READ_DATA ); - if(0>fd) return FALSE; - release_comm_fd( handle, fd ); - return TRUE; + sqs.InSize = insize; + sqs.OutSize = outsize; + return DeviceIoControl(handle, IOCTL_SERIAL_SET_QUEUE_SIZE, + &sqs, sizeof(sqs), NULL, 0, NULL, NULL); } /***************************************************************************** diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 1b45a10..15d1941 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -729,6 +729,12 @@ #endif return STATUS_SUCCESS; } +static NTSTATUS set_queue_size(int fd, const SERIAL_QUEUE_SIZE* sqs) +{ + FIXME("insize %ld outsize %ld unimplemented stub\n", sqs->InSize, sqs->OutSize); + return STATUS_SUCCESS; +} + static NTSTATUS set_special_chars(int fd, const SERIAL_CHARS* sc) { struct termios port; @@ -985,6 +991,12 @@ #endif else status = STATUS_INVALID_PARAMETER; break; + case IOCTL_SERIAL_SET_QUEUE_SIZE: + if (lpInBuffer && nInBufferSize == sizeof(SERIAL_QUEUE_SIZE)) + status = set_queue_size(fd, (const SERIAL_QUEUE_SIZE*)lpInBuffer); + else + status = STATUS_INVALID_PARAMETER; + break; case IOCTL_SERIAL_SET_TIMEOUTS: if (lpInBuffer && nInBufferSize == sizeof(SERIAL_TIMEOUTS)) status = set_timeouts(hDevice, fd, (const SERIAL_TIMEOUTS*)lpInBuffer);

1 0

Eric Pouech : ntdll/kernel32: GetCommState & IOCTL_GET_CHARS
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: 28cd4fae3b200a3880c9f430703cc90d8efa8c1e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=28cd4fae3b200a3880c9f43… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun May 7 14:10:55 2006 +0200 ntdll/kernel32: GetCommState & IOCTL_GET_CHARS - implemented SERIAL_GET_CHARS ioctl - made use of it in kernel32.GetCommState --- dlls/kernel/comm.c | 14 +++++++++----- dlls/ntdll/serial.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/kernel/comm.c b/dlls/kernel/comm.c index de17f34..7d8e6da 100644 --- a/dlls/kernel/comm.c +++ b/dlls/kernel/comm.c @@ -1080,6 +1080,7 @@ BOOL WINAPI GetCommState(HANDLE handle, SERIAL_BAUD_RATE sbr; SERIAL_LINE_CONTROL slc; SERIAL_HANDFLOW shf; + SERIAL_CHARS sc; TRACE("handle %p, ptr %p\n", handle, lpdcb); @@ -1094,7 +1095,9 @@ BOOL WINAPI GetCommState(HANDLE handle, !DeviceIoControl(handle, IOCTL_SERIAL_GET_LINE_CONTROL, NULL, 0, &slc, sizeof(slc), NULL, NULL) || !DeviceIoControl(handle, IOCTL_SERIAL_GET_HANDFLOW, - NULL, 0, &shf, sizeof(shf), NULL, NULL)) + NULL, 0, &shf, sizeof(shf), NULL, NULL) || + !DeviceIoControl(handle, IOCTL_SERIAL_GET_CHARS, + NULL, 0, &sc, sizeof(sc), NULL, NULL)) return FALSE; memset(lpdcb, 0, sizeof(*lpdcb)); @@ -1137,10 +1140,11 @@ BOOL WINAPI GetCommState(HANDLE handle, if (shf.FlowReplace & SERIAL_AUTO_TRANSMIT) lpdcb->fOutX = 1; if (shf.FlowReplace & SERIAL_AUTO_RECEIVE) lpdcb->fInX = 1; -/* - lpdcb->XonChar = - lpdcb->XoffChar = - */ + lpdcb->EofChar = sc.EofChar; + lpdcb->ErrorChar = sc.ErrorChar; + lpdcb->EvtChar = sc.EventChar; + lpdcb->XonChar = sc.XonChar; + lpdcb->XoffChar = sc.XoffChar; TRACE("OK\n"); dump_dcb(lpdcb); diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 65eafd2..9b56c6b 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -319,6 +319,25 @@ #endif return status; } +static NTSTATUS get_special_chars(int fd, SERIAL_CHARS* sc) +{ + struct termios port; + + if (tcgetattr(fd, &port) == -1) + { + ERR("tcgetattr error '%s'\n", strerror(errno)); + return FILE_GetNtStatus(); + } + sc->EofChar = port.c_cc[VEOF]; + sc->ErrorChar = 0xFF; + sc->BreakChar = 0; /* FIXME */ + sc->EventChar = 0; /* FIXME */ + sc->XonChar = port.c_cc[VSTART]; + sc->XoffChar = port.c_cc[VSTOP]; + + return STATUS_SUCCESS; +} + static NTSTATUS get_status(int fd, SERIAL_STATUS* ss) { NTSTATUS status = STATUS_SUCCESS; @@ -779,6 +798,15 @@ NTSTATUS COMM_DeviceIoControl(HANDLE hDe else status = STATUS_INVALID_PARAMETER; break; + case IOCTL_SERIAL_GET_CHARS: + if (lpOutBuffer && nOutBufferSize == sizeof(SERIAL_CHARS)) + { + if (!(status = get_special_chars(fd, (SERIAL_CHARS*)lpOutBuffer))) + sz = sizeof(SERIAL_CHARS); + } + else + status = STATUS_INVALID_PARAMETER; + break; case IOCTL_SERIAL_GET_COMMSTATUS: if (lpOutBuffer && nOutBufferSize == sizeof(SERIAL_STATUS)) {

1 0