March 2007 - Wine-commits - list.winehq.org

Rob Shearman : rpcrt4: Make some parameters of non-exported functions const .
by Alexandre Julliard 27 Mar '07

27 Mar '07

Module: wine Branch: master Commit: 7e061e4f646653dbc6ee113dcfb38af361b1f135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e061e4f646653dbc6ee113dc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 26 18:14:27 2007 +0100 rpcrt4: Make some parameters of non-exported functions const. --- dlls/rpcrt4/rpc_binding.c | 24 ++++++++++++------------ dlls/rpcrt4/rpc_binding.h | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index b554e7f..807921b 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -110,7 +110,7 @@ static RPC_STATUS RPCRT4_AllocBinding(RpcBinding** Binding, BOOL server) return RPC_S_OK; } -static RPC_STATUS RPCRT4_CreateBindingA(RpcBinding** Binding, BOOL server, LPSTR Protseq) +static RPC_STATUS RPCRT4_CreateBindingA(RpcBinding** Binding, BOOL server, LPCSTR Protseq) { RpcBinding* NewBinding; @@ -123,7 +123,7 @@ static RPC_STATUS RPCRT4_CreateBindingA(RpcBinding** Binding, BOOL server, LPSTR return RPC_S_OK; } -static RPC_STATUS RPCRT4_CreateBindingW(RpcBinding** Binding, BOOL server, LPWSTR Protseq) +static RPC_STATUS RPCRT4_CreateBindingW(RpcBinding** Binding, BOOL server, LPCWSTR Protseq) { RpcBinding* NewBinding; @@ -136,8 +136,8 @@ static RPC_STATUS RPCRT4_CreateBindingW(RpcBinding** Binding, BOOL server, LPWST return RPC_S_OK; } -static RPC_STATUS RPCRT4_CompleteBindingA(RpcBinding* Binding, LPSTR NetworkAddr, - LPSTR Endpoint, LPSTR NetworkOptions) +static RPC_STATUS RPCRT4_CompleteBindingA(RpcBinding* Binding, LPCSTR NetworkAddr, + LPCSTR Endpoint, LPCSTR NetworkOptions) { RPC_STATUS status; @@ -165,8 +165,8 @@ static RPC_STATUS RPCRT4_CompleteBindingA(RpcBinding* Binding, LPSTR NetworkAddr return RPC_S_OK; } -static RPC_STATUS RPCRT4_CompleteBindingW(RpcBinding* Binding, LPWSTR NetworkAddr, - LPWSTR Endpoint, LPWSTR NetworkOptions) +static RPC_STATUS RPCRT4_CompleteBindingW(RpcBinding* Binding, LPCWSTR NetworkAddr, + LPCWSTR Endpoint, LPCWSTR NetworkOptions) { RPC_STATUS status; @@ -194,7 +194,7 @@ static RPC_STATUS RPCRT4_CompleteBindingW(RpcBinding* Binding, LPWSTR NetworkAdd return RPC_S_OK; } -RPC_STATUS RPCRT4_ResolveBinding(RpcBinding* Binding, LPSTR Endpoint) +RPC_STATUS RPCRT4_ResolveBinding(RpcBinding* Binding, LPCSTR Endpoint) { RPC_STATUS status; @@ -214,7 +214,7 @@ RPC_STATUS RPCRT4_ResolveBinding(RpcBinding* Binding, LPSTR Endpoint) return RPC_S_OK; } -RPC_STATUS RPCRT4_SetBindingObject(RpcBinding* Binding, UUID* ObjectUuid) +RPC_STATUS RPCRT4_SetBindingObject(RpcBinding* Binding, const UUID* ObjectUuid) { TRACE("(*RpcBinding == ^%p, UUID == %s)\n", Binding, debugstr_guid(ObjectUuid)); if (ObjectUuid) memcpy(&Binding->ObjectUuid, ObjectUuid, sizeof(UUID)); @@ -838,17 +838,17 @@ RPC_STATUS WINAPI RpcBindingToStringBindingA( RPC_BINDING_HANDLE Binding, RPC_CS { RPC_STATUS ret; RpcBinding* bind = (RpcBinding*)Binding; - LPSTR ObjectUuid; + RPC_CSTR ObjectUuid; TRACE("(%p,%p)\n", Binding, StringBinding); - ret = UuidToStringA(&bind->ObjectUuid, (unsigned char**)&ObjectUuid); + ret = UuidToStringA(&bind->ObjectUuid, &ObjectUuid); if (ret != RPC_S_OK) return ret; - ret = RpcStringBindingComposeA((unsigned char*) ObjectUuid, (unsigned char*)bind->Protseq, (unsigned char*) bind->NetworkAddr, + ret = RpcStringBindingComposeA(ObjectUuid, (unsigned char*)bind->Protseq, (unsigned char*) bind->NetworkAddr, (unsigned char*) bind->Endpoint, NULL, StringBinding); - RpcStringFreeA((unsigned char**)&ObjectUuid); + RpcStringFreeA(&ObjectUuid); return ret; } diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index 2ad90f8..5328ac0 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -144,8 +144,8 @@ RPC_STATUS RPCRT4_OpenClientConnection(RpcConnection* Connection); RPC_STATUS RPCRT4_CloseConnection(RpcConnection* Connection); RPC_STATUS RPCRT4_SpawnConnection(RpcConnection** Connection, RpcConnection* OldConnection); -RPC_STATUS RPCRT4_ResolveBinding(RpcBinding* Binding, LPSTR Endpoint); -RPC_STATUS RPCRT4_SetBindingObject(RpcBinding* Binding, UUID* ObjectUuid); +RPC_STATUS RPCRT4_ResolveBinding(RpcBinding* Binding, LPCSTR Endpoint); +RPC_STATUS RPCRT4_SetBindingObject(RpcBinding* Binding, const UUID* ObjectUuid); RPC_STATUS RPCRT4_MakeBinding(RpcBinding** Binding, RpcConnection* Connection); RPC_STATUS RPCRT4_ExportBinding(RpcBinding** Binding, RpcBinding* OldBinding); RPC_STATUS RPCRT4_DestroyBinding(RpcBinding* Binding);

1 0

Rob Shearman : ole32: Add a stubbed out implementation of IClientSecurity to the proxy manager.
by Alexandre Julliard 27 Mar '07

27 Mar '07

Module: wine Branch: master Commit: 061a29ee44988073cea1790b54539a9153381c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=061a29ee44988073cea1790b5… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 26 18:15:04 2007 +0100 ole32: Add a stubbed out implementation of IClientSecurity to the proxy manager. --- dlls/ole32/compobj_private.h | 1 + dlls/ole32/marshal.c | 87 +++++++++++++++++++++++++++++++++++++----- dlls/ole32/tests/marshal.c | 2 +- 3 files changed, 79 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index a85a72d..0d27922 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -121,6 +121,7 @@ struct proxy_manager { const IMultiQIVtbl *lpVtbl; const IMarshalVtbl *lpVtblMarshal; + const IClientSecurityVtbl *lpVtblCliSec; struct apartment *parent; /* owning apartment (RO) */ struct list entry; /* entry in apartment (CS parent->cs) */ OXID oxid; /* object exported ID (RO) */ diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 55afade..ded3a6a 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -335,6 +335,13 @@ static const IMultiQIVtbl ClientIdentity_Vtbl = ClientIdentity_QueryMultipleInterfaces }; +/* FIXME: remove these */ +static HRESULT WINAPI StdMarshalImpl_GetUnmarshalClass(LPMARSHAL iface, REFIID riid, void* pv, DWORD dwDestContext, void* pvDestContext, DWORD mshlflags, CLSID* pCid); +static HRESULT WINAPI StdMarshalImpl_GetMarshalSizeMax(LPMARSHAL iface, REFIID riid, void* pv, DWORD dwDestContext, void* pvDestContext, DWORD mshlflags, DWORD* pSize); +static HRESULT WINAPI StdMarshalImpl_UnmarshalInterface(LPMARSHAL iface, IStream *pStm, REFIID riid, void **ppv); +static HRESULT WINAPI StdMarshalImpl_ReleaseMarshalData(LPMARSHAL iface, IStream *pStm); +static HRESULT WINAPI StdMarshalImpl_DisconnectObject(LPMARSHAL iface, DWORD dwReserved); + static HRESULT WINAPI Proxy_QueryInterface(IMarshal *iface, REFIID riid, void **ppvObject) { ICOM_THIS_MULTI(struct proxy_manager, lpVtblMarshal, iface); @@ -347,13 +354,6 @@ static ULONG WINAPI Proxy_AddRef(IMarshal *iface) return IMultiQI_AddRef((IMultiQI *)&This->lpVtbl); } -/* FIXME: remove these */ -static HRESULT WINAPI StdMarshalImpl_GetUnmarshalClass(LPMARSHAL iface, REFIID riid, void* pv, DWORD dwDestContext, void* pvDestContext, DWORD mshlflags, CLSID* pCid); -static HRESULT WINAPI StdMarshalImpl_GetMarshalSizeMax(LPMARSHAL iface, REFIID riid, void* pv, DWORD dwDestContext, void* pvDestContext, DWORD mshlflags, DWORD* pSize); -static HRESULT WINAPI StdMarshalImpl_UnmarshalInterface(LPMARSHAL iface, IStream *pStm, REFIID riid, void **ppv); -static HRESULT WINAPI StdMarshalImpl_ReleaseMarshalData(LPMARSHAL iface, IStream *pStm); -static HRESULT WINAPI StdMarshalImpl_DisconnectObject(LPMARSHAL iface, DWORD dwReserved); - static ULONG WINAPI Proxy_Release(IMarshal *iface) { ICOM_THIS_MULTI(struct proxy_manager, lpVtblMarshal, iface); @@ -473,6 +473,72 @@ static const IMarshalVtbl ProxyMarshal_Vtbl = StdMarshalImpl_DisconnectObject }; +static HRESULT WINAPI ProxyCliSec_QueryInterface(IClientSecurity *iface, REFIID riid, void **ppvObject) +{ + ICOM_THIS_MULTI(struct proxy_manager, lpVtblCliSec, iface); + return IMultiQI_QueryInterface((IMultiQI *)&This->lpVtbl, riid, ppvObject); +} + +static ULONG WINAPI ProxyCliSec_AddRef(IClientSecurity *iface) +{ + ICOM_THIS_MULTI(struct proxy_manager, lpVtblCliSec, iface); + return IMultiQI_AddRef((IMultiQI *)&This->lpVtbl); +} + +static ULONG WINAPI ProxyCliSec_Release(IClientSecurity *iface) +{ + ICOM_THIS_MULTI(struct proxy_manager, lpVtblCliSec, iface); + return IMultiQI_Release((IMultiQI *)&This->lpVtbl); +} + +static HRESULT WINAPI ProxyCliSec_QueryBlanket(IClientSecurity *iface, + IUnknown *pProxy, + DWORD *pAuthnSvc, + DWORD *pAuthzSvc, + OLECHAR **pServerPrincName, + DWORD *pAuthnLevel, + DWORD *pImpLevel, + void **pAuthInfo, + DWORD *pCapabilities) +{ + FIXME("(%p, %p, %p, %p, %p, %p, %p, %p): stub\n", pProxy, pAuthnSvc, + pAuthzSvc, pServerPrincName, pAuthnLevel, pImpLevel, pAuthInfo, + pCapabilities); + return E_NOTIMPL; +} + +static HRESULT WINAPI ProxyCliSec_SetBlanket(IClientSecurity *iface, + IUnknown *pProxy, DWORD AuthnSvc, + DWORD AuthzSvc, + OLECHAR *pServerPrincName, + DWORD AuthnLevel, DWORD ImpLevel, + void *pAuthInfo, + DWORD Capabilities) +{ + FIXME("(%p, %d, %d, %s, %d, %d, %p, 0x%x): stub\n", pProxy, AuthnSvc, + AuthzSvc, debugstr_w(pServerPrincName), AuthnLevel, ImpLevel, + pAuthInfo, Capabilities); + return E_NOTIMPL; +} + +static HRESULT WINAPI ProxyCliSec_CopyProxy(IClientSecurity *iface, + IUnknown *pProxy, IUnknown **ppCopy) +{ + FIXME("(%p, %p): stub\n", pProxy, ppCopy); + *ppCopy = NULL; + return E_NOTIMPL; +} + +static const IClientSecurityVtbl ProxyCliSec_Vtbl = +{ + ProxyCliSec_QueryInterface, + ProxyCliSec_AddRef, + ProxyCliSec_Release, + ProxyCliSec_QueryBlanket, + ProxyCliSec_SetBlanket, + ProxyCliSec_CopyProxy +}; + static HRESULT ifproxy_get_public_ref(struct ifproxy * This) { HRESULT hr = S_OK; @@ -599,6 +665,7 @@ static HRESULT proxy_manager_construct( This->lpVtbl = &ClientIdentity_Vtbl; This->lpVtblMarshal = &ProxyMarshal_Vtbl; + This->lpVtblCliSec = &ProxyCliSec_Vtbl; list_init(&This->entry); list_init(&This->interfaces); @@ -723,9 +790,9 @@ static HRESULT proxy_manager_query_local_interface(struct proxy_manager * This, } if (IsEqualIID(riid, &IID_IClientSecurity)) { - FIXME("requesting IClientSecurity, but it is unimplemented\n"); - *ppv = NULL; - return E_NOINTERFACE; + *ppv = (void *)&This->lpVtblCliSec; + IUnknown_AddRef((IUnknown *)*ppv); + return S_OK; } hr = proxy_manager_find_ifproxy(This, riid, &ifproxy); diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 0c0dff7..0e588ba 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1405,7 +1405,7 @@ static void test_proxy_interfaces(void) if (hr == S_OK) IUnknown_Release(pOtherUnknown); hr = IUnknown_QueryInterface(pProxy, &IID_IClientSecurity, (LPVOID*)&pOtherUnknown); - todo_wine { ok_ole_success(hr, IUnknown_QueryInterface IID_IClientSecurity); } + ok_ole_success(hr, IUnknown_QueryInterface IID_IClientSecurity); if (hr == S_OK) IUnknown_Release(pOtherUnknown); hr = IUnknown_QueryInterface(pProxy, &IID_IMultiQI, (LPVOID*)&pOtherUnknown);

1 0

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard 27 Mar '07

27 Mar '07

Module: wine Branch: master Commit: 79205875f79ff434f7518f2a04896f9cacedb91a URL: http://source.winehq.org/git/wine.git/?a=commit;h=79205875f79ff434f7518f2a0… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Mar 26 18:57:43 2007 +0100 comctl32: Constify some variables. --- dlls/comctl32/datetime.c | 26 +++++++++++++------------- dlls/comctl32/header.c | 16 ++++++++-------- dlls/comctl32/hotkey.c | 14 +++++++------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 4f35b4f..faa1f72 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -129,8 +129,8 @@ extern int MONTHCAL_MonthLength(int month, int year); #define DTHT_MCPOPUP 0x300 /* & DTHT_DATEFIELD 0 when DATETIME_KeyDown */ #define DTHT_GOTFOCUS 0x400 /* tests for date-fields */ -static BOOL DATETIME_SendSimpleNotify (DATETIME_INFO *infoPtr, UINT code); -static BOOL DATETIME_SendDateTimeChangeNotify (DATETIME_INFO *infoPtr); +static BOOL DATETIME_SendSimpleNotify (const DATETIME_INFO *infoPtr, UINT code); +static BOOL DATETIME_SendDateTimeChangeNotify (const DATETIME_INFO *infoPtr); extern void MONTHCAL_CopyTime(const SYSTEMTIME *from, SYSTEMTIME *to); static const WCHAR allowedformatchars[] = {'d', 'h', 'H', 'm', 'M', 's', 't', 'y', 'X', '\'', 0}; static const int maxrepetition [] = {4,2,2,2,4,2,2,4,-1,-1}; @@ -152,7 +152,7 @@ DATETIME_GetSystemTime (DATETIME_INFO *infoPtr, SYSTEMTIME *lprgSysTimeArray) static BOOL -DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, SYSTEMTIME *lprgSysTimeArray) +DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, const SYSTEMTIME *lprgSysTimeArray) { if (!lprgSysTimeArray) return 0; @@ -304,7 +304,7 @@ DATETIME_SetFormatA (DATETIME_INFO *infoPtr, LPCSTR lpszFormat) static void -DATETIME_ReturnTxt (DATETIME_INFO *infoPtr, int count, LPWSTR result, int resultSize) +DATETIME_ReturnTxt (const DATETIME_INFO *infoPtr, int count, LPWSTR result, int resultSize) { static const WCHAR fmt_dW[] = { '%', 'd', 0 }; static const WCHAR fmt__2dW[] = { '%', '.', '2', 'd', 0 }; @@ -525,7 +525,7 @@ DATETIME_IncreaseField (DATETIME_INFO *infoPtr, int number, int delta) static void -DATETIME_ReturnFieldWidth (DATETIME_INFO *infoPtr, HDC hdc, int count, SHORT *fieldWidthPtr) +DATETIME_ReturnFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int count, SHORT *fieldWidthPtr) { /* fields are a fixed width, determined by the largest possible string */ /* presumably, these widths should be language dependent */ @@ -677,7 +677,7 @@ DATETIME_Refresh (DATETIME_INFO *infoPtr, HDC hdc) static INT -DATETIME_HitTest (DATETIME_INFO *infoPtr, POINT pt) +DATETIME_HitTest (const DATETIME_INFO *infoPtr, POINT pt) { int i; @@ -735,7 +735,7 @@ DATETIME_LButtonDown (DATETIME_INFO *infoPtr, WORD wKey, INT x, INT y) if(IsWindowVisible(infoPtr->hMonthCal)) { ShowWindow(infoPtr->hMonthCal, SW_HIDE); } else { - SYSTEMTIME *lprgSysTimeArray = &infoPtr->date; + const SYSTEMTIME *lprgSysTimeArray = &infoPtr->date; TRACE("update calendar %04d/%02d/%02d\n", lprgSysTimeArray->wYear, lprgSysTimeArray->wMonth, lprgSysTimeArray->wDay); SendMessageW(infoPtr->hMonthCal, MCM_SETCURSEL, 0, (LPARAM)(&infoPtr->date)); @@ -816,7 +816,7 @@ DATETIME_Enable (DATETIME_INFO *infoPtr, BOOL bEnable) static LRESULT -DATETIME_EraseBackground (DATETIME_INFO *infoPtr, HDC hdc) +DATETIME_EraseBackground (const DATETIME_INFO *infoPtr, HDC hdc) { HBRUSH hBrush, hSolidBrush = NULL; RECT rc; @@ -1044,7 +1044,7 @@ DATETIME_KillFocus (DATETIME_INFO *infoPtr, HWND lostFocus) static LRESULT -DATETIME_NCCreate (HWND hwnd, LPCREATESTRUCTW lpcs) +DATETIME_NCCreate (HWND hwnd, const CREATESTRUCTW *lpcs) { DWORD dwExStyle = GetWindowLongW(hwnd, GWL_EXSTYLE); /* force control to have client edge */ @@ -1072,7 +1072,7 @@ DATETIME_SetFocus (DATETIME_INFO *infoPtr, HWND lostFocus) static BOOL -DATETIME_SendDateTimeChangeNotify (DATETIME_INFO *infoPtr) +DATETIME_SendDateTimeChangeNotify (const DATETIME_INFO *infoPtr) { NMDATETIMECHANGE dtdtc; @@ -1089,7 +1089,7 @@ DATETIME_SendDateTimeChangeNotify (DATETIME_INFO *infoPtr) static BOOL -DATETIME_SendSimpleNotify (DATETIME_INFO *infoPtr, UINT code) +DATETIME_SendSimpleNotify (const DATETIME_INFO *infoPtr, UINT code) { NMHDR nmhdr; @@ -1142,7 +1142,7 @@ DATETIME_Size (DATETIME_INFO *infoPtr, WORD flags, INT width, INT height) static LRESULT -DATETIME_StyleChanged(DATETIME_INFO *infoPtr, WPARAM wStyleType, LPSTYLESTRUCT lpss) +DATETIME_StyleChanged(DATETIME_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lpss) { static const WCHAR buttonW[] = { 'b', 'u', 't', 't', 'o', 'n', 0 }; @@ -1187,7 +1187,7 @@ DATETIME_SetFont (DATETIME_INFO *infoPtr, HFONT font, BOOL repaint) static LRESULT -DATETIME_Create (HWND hwnd, LPCREATESTRUCTW lpcs) +DATETIME_Create (HWND hwnd, const CREATESTRUCTW *lpcs) { static const WCHAR SysMonthCal32W[] = { 'S', 'y', 's', 'M', 'o', 'n', 't', 'h', 'C', 'a', 'l', '3', '2', 0 }; DATETIME_INFO *infoPtr = (DATETIME_INFO *)Alloc (sizeof(DATETIME_INFO)); diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 93b2cb5..b9ea615 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -108,12 +108,12 @@ typedef struct static BOOL HEADER_PrepareCallbackItems(HWND hwnd, INT iItem, INT reqMask); static void HEADER_FreeCallbackItems(HEADER_ITEM *lpItem); static LRESULT HEADER_SendNotify(HWND hwnd, UINT code, NMHDR *hdr); -static LRESULT HEADER_SendCtrlCustomDraw(HWND hwnd, DWORD dwDrawStage, HDC hdc, RECT *rect); +static LRESULT HEADER_SendCtrlCustomDraw(HWND hwnd, DWORD dwDrawStage, HDC hdc, const RECT *rect); static const WCHAR themeClass[] = {'H','e','a','d','e','r',0}; static WCHAR emptyString[] = {0}; -static void HEADER_StoreHDItemInHeader(HEADER_ITEM *lpItem, UINT mask, HDITEMW *phdi, BOOL fUnicode) +static void HEADER_StoreHDItemInHeader(HEADER_ITEM *lpItem, UINT mask, const HDITEMW *phdi, BOOL fUnicode) { if (mask & HDI_UNSUPPORTED_FIELDS) FIXME("unsupported header fields %x\n", (mask & HDI_UNSUPPORTED_FIELDS)); @@ -182,7 +182,7 @@ HEADER_OrderToIndex(HWND hwnd, WPARAM wParam) } static void -HEADER_ChangeItemOrder(HEADER_INFO *infoPtr, INT iItem, INT iNewOrder) +HEADER_ChangeItemOrder(const HEADER_INFO *infoPtr, INT iItem, INT iNewOrder) { HEADER_ITEM *lpItem = &infoPtr->items[iItem]; INT i, nMin, nMax; @@ -257,7 +257,7 @@ HEADER_Size (HWND hwnd, WPARAM wParam) return 0; } -static void HEADER_GetHotDividerRect(HWND hwnd, HEADER_INFO *infoPtr, RECT *r) +static void HEADER_GetHotDividerRect(HWND hwnd, const HEADER_INFO *infoPtr, RECT *r) { INT iDivider = infoPtr->iHotDivider; if (infoPtr->uNumItem > 0) @@ -588,7 +588,7 @@ HEADER_RefreshItem (HWND hwnd, HDC hdc, INT iItem) static void -HEADER_InternalHitTest (HWND hwnd, LPPOINT lpPt, UINT *pFlags, INT *pItem) +HEADER_InternalHitTest (HWND hwnd, const POINT *lpPt, UINT *pFlags, INT *pItem) { HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); RECT rect, rcTest; @@ -794,7 +794,7 @@ HEADER_SendSimpleNotify (HWND hwnd, UINT code) } static LRESULT -HEADER_SendCtrlCustomDraw(HWND hwnd, DWORD dwDrawStage, HDC hdc, RECT *rect) +HEADER_SendCtrlCustomDraw(HWND hwnd, DWORD dwDrawStage, HDC hdc, const RECT *rect) { NMCUSTOMDRAW nm; nm.dwDrawStage = dwDrawStage; @@ -1262,7 +1262,7 @@ HEADER_HitTest (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -HEADER_InsertItemT (HWND hwnd, INT nItem, LPHDITEMW phdi, BOOL bUnicode) +HEADER_InsertItemT (HWND hwnd, INT nItem, const HDITEMW *phdi, BOOL bUnicode) { HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); HEADER_ITEM *lpItem; @@ -1532,7 +1532,7 @@ HEADER_GetFont (HWND hwnd) static BOOL -HEADER_IsDragDistance(HEADER_INFO *infoPtr, POINT *pt) +HEADER_IsDragDistance(const HEADER_INFO *infoPtr, const POINT *pt) { /* Windows allows for a mouse movement before starting the drag. We use the * SM_CXDOUBLECLICK/SM_CYDOUBLECLICK as that distance. diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c index b963ed7..a24a678 100644 --- a/dlls/comctl32/hotkey.c +++ b/dlls/comctl32/hotkey.c @@ -63,7 +63,7 @@ static LRESULT HOTKEY_SetFont (HOTKEY_INFO *infoPtr, HFONT hFont, BOOL redraw); #define IsOnlySet(flags) (infoPtr->CurrMod == (flags)) static BOOL -HOTKEY_IsCombInv(HOTKEY_INFO *infoPtr) +HOTKEY_IsCombInv(const HOTKEY_INFO *infoPtr) { TRACE("(infoPtr=%p)\n", infoPtr); if((infoPtr->InvComb & HKCOMB_NONE) && !infoPtr->CurrMod) @@ -197,7 +197,7 @@ HOTKEY_Paint(HOTKEY_INFO *infoPtr, HDC hdc) } static LRESULT -HOTKEY_GetHotKey(HOTKEY_INFO *infoPtr) +HOTKEY_GetHotKey(const HOTKEY_INFO *infoPtr) { TRACE("(infoPtr=%p) Modifiers: 0x%x, Virtual Key: %d\n", infoPtr, HIBYTE(infoPtr->HotKey), LOBYTE(infoPtr->HotKey)); @@ -226,7 +226,7 @@ HOTKEY_SetRules(HOTKEY_INFO *infoPtr, WORD invComb, WORD invMod) static LRESULT -HOTKEY_Create (HOTKEY_INFO *infoPtr, LPCREATESTRUCTW lpcs) +HOTKEY_Create (HOTKEY_INFO *infoPtr, const CREATESTRUCTW *lpcs) { infoPtr->hwndNotify = lpcs->hwndParent; @@ -248,7 +248,7 @@ HOTKEY_Destroy (HOTKEY_INFO *infoPtr) static LRESULT -HOTKEY_EraseBackground (HOTKEY_INFO *infoPtr, HDC hdc) +HOTKEY_EraseBackground (const HOTKEY_INFO *infoPtr, HDC hdc) { HBRUSH hBrush, hSolidBrush = NULL; RECT rc; @@ -275,7 +275,7 @@ HOTKEY_EraseBackground (HOTKEY_INFO *infoPtr, HDC hdc) static inline LRESULT -HOTKEY_GetFont (HOTKEY_INFO *infoPtr) +HOTKEY_GetFont (const HOTKEY_INFO *infoPtr) { return (LRESULT)infoPtr->hFont; } @@ -393,7 +393,7 @@ HOTKEY_KillFocus (HOTKEY_INFO *infoPtr, HWND receiveFocus) static LRESULT -HOTKEY_LButtonDown (HOTKEY_INFO *infoPtr) +HOTKEY_LButtonDown (const HOTKEY_INFO *infoPtr) { if (!(GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & WS_DISABLED)) SetFocus (infoPtr->hwndSelf); @@ -403,7 +403,7 @@ HOTKEY_LButtonDown (HOTKEY_INFO *infoPtr) static inline LRESULT -HOTKEY_NCCreate (HWND hwnd, LPCREATESTRUCTW lpcs) +HOTKEY_NCCreate (HWND hwnd, const CREATESTRUCTW *lpcs) { HOTKEY_INFO *infoPtr; DWORD dwExStyle = GetWindowLongW (hwnd, GWL_EXSTYLE);

1 0

Andrew Talbot : winelib: Replace inline static with static inline.
by Alexandre Julliard 27 Mar '07

27 Mar '07

Module: wine Branch: master Commit: 4125821a99262565afc68b2269a9955693caf71f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4125821a99262565afc68b226… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Mar 26 20:26:29 2007 +0100 winelib: Replace inline static with static inline. --- include/wine/debug.h | 10 +++++----- include/wine/library.h | 18 +++++++++--------- include/wine/list.h | 28 ++++++++++++++-------------- include/wine/server.h | 8 ++++---- libs/wine/config.c | 2 +- libs/wine/loader.c | 6 +++--- libs/wine/utf8.c | 2 +- 7 files changed, 37 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4125821a99262565afc68…

1 0

Mikołaj Zalewski : wrc: Change the format of the output of "wrc --verify-translation".
by Alexandre Julliard 27 Mar '07

27 Mar '07

Module: wine Branch: master Commit: c74f6d9d7a3806f1b63e60113f5dc5eed8767c4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c74f6d9d7a3806f1b63e60113… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Mar 26 12:53:28 2007 +0200 wrc: Change the format of the output of "wrc --verify-translation". --- tools/wrc/translation.c | 497 ++++++++++++++++++++++------------------------ 1 files changed, 238 insertions(+), 259 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c74f6d9d7a3806f1b63e6…

1 0

Piotr Caban : comctl32: Set label width after editting.
by Alexandre Julliard 27 Mar '07

27 Mar '07

Module: wine Branch: master Commit: 2b1f1093f0a1885dd1d199e241a88aace9ef05ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b1f1093f0a1885dd1d199e24… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Mar 26 16:34:48 2007 +0200 comctl32: Set label width after editting. --- dlls/comctl32/treeview.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 85e6f68..dce755b 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3806,6 +3806,7 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) editedItem->pszText = ptr; editedItem->cchTextMax = iLength + 1; strcpyW(editedItem->pszText, newText); + TREEVIEW_ComputeTextWidth(infoPtr, editedItem, 0); } } if(newText != tmpText) Free(newText);

1 0

Chris Robinson : quartz: Return proper CLSID for parser filters.
by Alexandre Julliard 27 Mar '07

27 Mar '07

Module: wine Branch: master Commit: a110e6e433e5e927b610514e9c6d0a419e9f7da8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a110e6e433e5e927b610514e9… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Mon Mar 26 01:18:17 2007 -0700 quartz: Return proper CLSID for parser filters. --- dlls/quartz/parser.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 15e01e8..e1f2c62 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -223,9 +223,11 @@ static ULONG WINAPI Parser_Release(IBaseFilter * iface) static HRESULT WINAPI Parser_GetClassID(IBaseFilter * iface, CLSID * pClsid) { + ParserImpl *This = (ParserImpl *)iface; + TRACE("(%p)\n", pClsid); - *pClsid = CLSID_AviSplitter; + *pClsid = This->clsid; return S_OK; }

1 0

Mikołaj Zalewski : user32: combobox: The text area height should be font_height+4.
by Alexandre Julliard 27 Mar '07

27 Mar '07

Module: wine Branch: master Commit: 4043b007fe761b8f0b77be9f0e81a5a1eb7add30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4043b007fe761b8f0b77be9f0… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Mar 26 11:25:21 2007 +0200 user32: combobox: The text area height should be font_height+4. The tests shows that CBGetTextAreaHeight was using a bad formula. --- dlls/user32/combo.c | 12 +--- dlls/user32/tests/Makefile.in | 1 + dlls/user32/tests/combo.c | 141 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 145 insertions(+), 9 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 7e54ea8..4be67cc 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -205,8 +205,9 @@ static LRESULT COMBO_NCDestroy( LPHEADCOMBO lphc ) * The height of the text area is set in two ways. * It can be set explicitly through a combobox message or through a * WM_MEASUREITEM callback. - * If this is not the case, the height is set to 13 dialog units. + * If this is not the case, the height is set to font height + 4px * This height was determined through experimentation. + * CBCalcPlacement will add 2*COMBO_YBORDERSIZE pixels for the border */ static INT CBGetTextAreaHeight( HWND hwnd, @@ -237,14 +238,7 @@ static INT CBGetTextAreaHeight( ReleaseDC(hwnd, hDC); - iTextItemHeight = ((13 * baseUnitY) / 8); - - /* - * This "formula" calculates the height of the complete control. - * To calculate the height of the text area, we have to remove the - * borders. - */ - iTextItemHeight -= 2*COMBO_YBORDERSIZE(); + iTextItemHeight = baseUnitY + 4; } /* diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index a50a8ee..505d62d 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -8,6 +8,7 @@ IMPORTS = user32 gdi32 advapi32 kernel32 CTESTS = \ class.c \ clipboard.c \ + combo.c \ cursoricon.c \ dce.c \ dde.c \ diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c new file mode 100644 index 0000000..bf777c7 --- /dev/null +++ b/dlls/user32/tests/combo.c @@ -0,0 +1,141 @@ +/* Unit test suite for combo boxes. + * + * Copyright 2007 Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> +#include <stdarg.h> +#include <stdio.h> + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +#include "wine/test.h" + +HWND hMainWnd; + +#define expect_eq(expr, value, type, fmt); { type val = expr; ok(val == (value), #expr " expected " #fmt " got " #fmt "\n", (value), val); } +#define expect_rect(r, _left, _top, _right, _bottom) ok(r.left == _left && r.top == _top && \ + r.bottom == _bottom && r.right == _right, "Invalid rect (%d,%d) (%d,%d) vs (%d,%d) (%d,%d)\n", \ + r.left, r.top, r.right, r.bottom, _left, _top, _right, _bottom); + +static HWND build_combo(DWORD style) +{ + return CreateWindow("ComboBox", "Combo", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, NULL, NULL, 0); +} + +static int font_height(HFONT hFont) +{ + TEXTMETRIC tm; + HFONT hFontOld; + HDC hDC; + + hDC = CreateCompatibleDC(NULL); + hFontOld = SelectObject(hDC, hFont); + GetTextMetrics(hDC, &tm); + SelectObject(hDC, hFontOld); + DeleteDC(hDC); + + return tm.tmHeight; +} + +static INT CALLBACK is_font_installed_proc(const LOGFONT *elf, const TEXTMETRIC *tm, DWORD type, LPARAM lParam) +{ + return 0; +} + +static int is_font_installed(const char *name) +{ + HDC hdc = GetDC(NULL); + BOOL ret = !EnumFontFamilies(hdc, name, is_font_installed_proc, 0); + ReleaseDC(NULL, hdc); + return ret; +} + +static void test_setfont(DWORD style) +{ + HWND hCombo = build_combo(style); + HFONT hFont1 = CreateFont(10, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH|FF_DONTCARE, "Marlett"); + HFONT hFont2 = CreateFont(8, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH|FF_DONTCARE, "Marlett"); + RECT r; + int i; + + trace("Style %x\n", style); + GetClientRect(hCombo, &r); + expect_rect(r, 0, 0, 100, 24); + SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r); + MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); + todo_wine expect_rect(r, 5, 5, 105, 105); + + if (!is_font_installed("Marlett")) + { + skip("Marlett font not available\n"); + return; + } + + if (font_height(hFont1) == 10 && font_height(hFont2) == 8) + { + SendMessage(hCombo, WM_SETFONT, (WPARAM)hFont1, FALSE); + GetClientRect(hCombo, &r); + expect_rect(r, 0, 0, 100, 18); + SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r); + MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); + todo_wine expect_rect(r, 5, 5, 105, 99); + + SendMessage(hCombo, WM_SETFONT, (WPARAM)hFont2, FALSE); + GetClientRect(hCombo, &r); + expect_rect(r, 0, 0, 100, 16); + SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r); + MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); + todo_wine expect_rect(r, 5, 5, 105, 97); + + SendMessage(hCombo, WM_SETFONT, (WPARAM)hFont1, FALSE); + GetClientRect(hCombo, &r); + expect_rect(r, 0, 0, 100, 18); + SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r); + MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); + todo_wine expect_rect(r, 5, 5, 105, 99); + } + else + skip("Invalid Marlett font heights\n"); + + for (i = 1; i < 30; i++) + { + HFONT hFont = CreateFont(i, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH|FF_DONTCARE, "Marlett"); + int height = font_height(hFont); + + SendMessage(hCombo, WM_SETFONT, (WPARAM)hFont, FALSE); + GetClientRect(hCombo, &r); + expect_eq(r.bottom - r.top, height + 8, int, "%d"); + SendMessage(hCombo, WM_SETFONT, 0, FALSE); + DeleteObject(hFont); + } + + DestroyWindow(hCombo); + DeleteObject(hFont1); + DeleteObject(hFont2); +} + +START_TEST(combo) +{ + hMainWnd = CreateWindow("static", "Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); + ShowWindow(hMainWnd, SW_SHOW); + + test_setfont(CBS_DROPDOWN); + test_setfont(CBS_DROPDOWNLIST); + DestroyWindow(hMainWnd); +}

1 0

Mikołaj Zalewski : wrc: Add HTML resources support to wrc --verify-translation.
by Alexandre Julliard 27 Mar '07

27 Mar '07

Module: wine Branch: master Commit: fbd25173a8c5edd1612a5277b59cbc43d0639399 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbd25173a8c5edd1612a5277b… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Mar 26 11:42:33 2007 +0200 wrc: Add HTML resources support to wrc --verify-translation. --- tools/wrc/translation.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/tools/wrc/translation.c b/tools/wrc/translation.c index be1cb7f..e332e2d 100644 --- a/tools/wrc/translation.c +++ b/tools/wrc/translation.c @@ -79,6 +79,9 @@ static int get_language_id(resource_t *resource) { case res_anicur: case res_aniico: return resource->res.ani->data->lvc.language->id; + case res_html: + return resource->res.html->data->lvc.language->id; + default: /* Not supposed to reach here */ fprintf(stderr, "Not supposed to reach here (get_language_id())\n"); @@ -614,6 +617,16 @@ static int compare_rcdata(rcdata_t *rcdata1, rcdata_t *rcdata2) { return different; } +static int compare_html(html_t *rcdata1, html_t *rcdata2) { + int different = 0; + if(!different && + ((rcdata1->memopt != rcdata2->memopt) || + (rcdata1->data->lvc.version != rcdata2->data->lvc.version) || + (rcdata1->data->lvc.characts != rcdata2->data->lvc.characts))) + different = 1; + return different; +} + static int compare_stringtable(stringtable_t *stringtable1, stringtable_t *stringtable2) { int different = 0; int i; @@ -917,6 +930,8 @@ static int compare(resource_t *resource1, resource_t *resource2) { return compare_stringtable(resource1->res.stt, resource2->res.stt); case res_usr: return compare_user(resource1->res.usr, resource2->res.usr); + case res_html: + return compare_html(resource1->res.html, resource2->res.html); case res_msg: return compare_messagetable(resource1->res.msg, resource2->res.msg); case res_ver: @@ -978,6 +993,7 @@ void verify_translations(resource_t *top) { case res_toolbar: case res_anicur: case res_aniico: + case res_html: add_resource(next); break; default: @@ -1027,6 +1043,8 @@ void verify_translations(resource_t *top) { res_names[res_anicur] = strdup("ani_cursor"); present_resources[res_aniico] = 1; res_names[res_aniico] = strdup("ani_icon"); + present_resources[res_html] = 1; + res_names[res_html] = strdup("html"); for(res_type = res_0; res_type <= res_usr; res_type++) { if(!present_resources[res_type]) {

1 0

Alexandre Julliard : server: Always return STATUS_PENDING when an async I/ O operation has been queued.
by Alexandre Julliard 27 Mar '07

27 Mar '07

Module: wine Branch: master Commit: 589ce2bb8d1b3c199d71dac7f07d98f49b6eae09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=589ce2bb8d1b3c199d71dac7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 26 19:13:21 2007 +0200 server: Always return STATUS_PENDING when an async I/O operation has been queued. --- dlls/ntdll/file.c | 13 ++++++------- dlls/ws2_32/socket.c | 20 ++++++++------------ server/fd.c | 5 ++--- server/serial.c | 1 + server/sock.c | 1 + 5 files changed, 18 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 45786b0..6873e0e 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -282,14 +282,13 @@ static ULONG fileio_queue_async(async_fileio* fileio, IO_STATUS_BLOCK* iosb, } SERVER_END_REQ; - if ( status ) iosb->u.Status = status; - if ( iosb->u.Status != STATUS_PENDING ) + if (status != STATUS_PENDING) { + iosb->u.Status = status; (apc)( fileio, iosb, iosb->u.Status ); - return iosb->u.Status; } - NtCurrentTeb()->num_async_io++; - return STATUS_SUCCESS; + else NtCurrentTeb()->num_async_io++; + return status; } /*********************************************************************** @@ -531,7 +530,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, io_status->u.Status = STATUS_PENDING; ret = fileio_queue_async(fileio, io_status, TRUE); - if (ret != STATUS_SUCCESS) + if (ret != STATUS_PENDING) { if (flags & FD_FLAG_TIMEOUT) NtClose(hEvent); return ret; @@ -762,7 +761,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, io_status->Information = 0; io_status->u.Status = STATUS_PENDING; ret = fileio_queue_async(fileio, io_status, FALSE); - if (ret != STATUS_SUCCESS) + if (ret != STATUS_PENDING) { if (flags & FD_FLAG_TIMEOUT) NtClose(hEvent); return ret; diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4ad025e..ce57f7d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1150,6 +1150,7 @@ static ULONG ws2_queue_async(struct ws2_async* wsa, IO_STATUS_BLOCK* iosb) default: FIXME("Unknown internal mode (%d)\n", wsa->mode); return STATUS_INVALID_PARAMETER; } + iosb->u.Status = STATUS_PENDING; SERVER_START_REQ( register_async ) { req->handle = wsa->hSocket; @@ -1163,18 +1164,13 @@ static ULONG ws2_queue_async(struct ws2_async* wsa, IO_STATUS_BLOCK* iosb) } SERVER_END_REQ; - if ( status ) iosb->u.Status = status; - if ( iosb->u.Status != STATUS_PENDING ) + if (status != STATUS_PENDING) { - /* Note: we get here a non zero status when we couldn't queue the async - * in the server. Therefore, we simply terminate the async. - */ - status = iosb->u.Status; + iosb->u.Status = status; ws2_async_terminate(wsa, iosb); - return status; } - NtCurrentTeb()->num_async_io++; - return STATUS_SUCCESS; + else NtCurrentTeb()->num_async_io++; + return status; } /*********************************************************************** @@ -1500,7 +1496,7 @@ static int WS2_register_async_shutdown( SOCKET s, enum ws2_mode mode ) /* Hack: this will cause ws2_async_terminate() to free the overlapped structure */ wsa->user_overlapped = NULL; - if ( (ret = ws2_queue_async( wsa, iosb )) ) + if ((ret = ws2_queue_async( wsa, iosb )) != STATUS_PENDING) { err = NtStatusToWSAError( ret ); goto out; @@ -2843,7 +2839,7 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, goto err_free; } - if ( ( ret = ws2_queue_async( wsa, iosb ) ) ) + if ((ret = ws2_queue_async( wsa, iosb )) != STATUS_PENDING) { err = NtStatusToWSAError( ret ); @@ -4349,7 +4345,7 @@ INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, goto err_free; } - if ( ( ret = ws2_queue_async( wsa, iosb )) ) + if ((ret = ws2_queue_async( wsa, iosb )) != STATUS_PENDING) { err = NtStatusToWSAError( ret ); diff --git a/server/fd.c b/server/fd.c index fba6907..bf5f2e0 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1742,6 +1742,7 @@ void fd_queue_async_timeout( struct fd *fd, const async_data_t *data, int type, } if (!create_async( current, timeout, queue, data )) return; + set_error( STATUS_PENDING ); /* Check if the new pending request can be served immediately */ events = check_fd_events( fd, fd->fd_ops->get_poll_events( fd ) ); @@ -1937,9 +1938,7 @@ DECL_HANDLER(register_async) * 3. Carry out any operations necessary to adjust the object's poll events * Usually: set_elect_events (obj, obj->ops->get_poll_events()). * 4. When the async request is triggered, then send back (with a proper APC) - * the trigger (STATUS_ALERTED) to the thread that posted the request. - * async_destroy() is to be called: it will both notify the sender about - * the trigger and destroy the request by itself + * the trigger (STATUS_ALERTED) to the thread that posted the request. * See also the implementations in file.c, serial.c, and sock.c. */ diff --git a/server/serial.c b/server/serial.c index d459426..7b92fac 100644 --- a/server/serial.c +++ b/server/serial.c @@ -273,6 +273,7 @@ static void serial_queue_async( struct fd *fd, const async_data_t *data, int typ add_timeout( &when, timeout ); if (!create_async( current, timeout ? &when : NULL, queue, data )) return; + set_error( STATUS_PENDING ); /* Check if the new pending request can be served immediately */ events = check_fd_events( fd, serial_get_poll_events( fd ) ); diff --git a/server/sock.c b/server/sock.c index f1b7255..009d37e 100644 --- a/server/sock.c +++ b/server/sock.c @@ -545,6 +545,7 @@ static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, else { if (!create_async( current, NULL, queue, data )) return; + set_error( STATUS_PENDING ); } pollev = sock_reselect( sock );

1 0