Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[gvg] 17048: Sync to Wine-20050628:

by gvg＠svn.reactos.com

Sync to Wine-20050628: Robert Shearman <rob(a)codeweavers.com> - Improve tracing. - Implement FC_UP and partially FC_OP. - Don't needlessly marshal 4 bytes in NdrPointer*. - Fix an RPC server startup race introduced by me. - Don't pass the PROFILE_SERVER flag in to CreateNamedPipe as it is bogus. - Call FlushFileBuffers to make sure the other end of the pipe doesn't get cut off prematurely. - Don't call CancelIo as we should never have async I/O pending. - Make NdrInterfacePointer* more reliable. Dmitry Timoshkov <dmitry(a)codeweavers.com> - Make remaining OLE interface vtables const. Alexandre Julliard <julliard(a)winehq.org> - Sort entry points in the same order as Windows. Mike Hearn <mh(a)codeweavers.com> - Initialize DataRepresentation in NdrClientInitializeNew, not NdrSendReceive. Modified: trunk/reactos/lib/rpcrt4/cproxy.c Modified: trunk/reactos/lib/rpcrt4/cpsf.c Modified: trunk/reactos/lib/rpcrt4/ndr_marshall.c Modified: trunk/reactos/lib/rpcrt4/ndr_midl.c Modified: trunk/reactos/lib/rpcrt4/ndr_ole.c Modified: trunk/reactos/lib/rpcrt4/rpc_binding.c Modified: trunk/reactos/lib/rpcrt4/rpc_server.c Modified: trunk/reactos/lib/rpcrt4/rpcrt4.spec _____ Modified: trunk/reactos/lib/rpcrt4/cproxy.c --- trunk/reactos/lib/rpcrt4/cproxy.c 2005-08-04 18:11:03 UTC (rev 17047) +++ trunk/reactos/lib/rpcrt4/cproxy.c 2005-08-04 21:35:00 UTC (rev 17048) @@ -43,7 +43,7 @@ /* I don't know what MS's std proxy structure looks like, so this probably doesn't match, but that shouldn't matter */ typedef struct { - IRpcProxyBufferVtbl *lpVtbl; + const IRpcProxyBufferVtbl *lpVtbl; LPVOID *PVtbl; DWORD RefCount; const MIDL_STUBLESS_PROXY_INFO *stubless; @@ -55,7 +55,7 @@ struct StublessThunk *thunks; } StdProxyImpl; -static IRpcProxyBufferVtbl StdProxy_Vtbl; +static const IRpcProxyBufferVtbl StdProxy_Vtbl; #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) @@ -269,7 +269,7 @@ This->pChannel = NULL; } -static IRpcProxyBufferVtbl StdProxy_Vtbl = +static const IRpcProxyBufferVtbl StdProxy_Vtbl = { StdProxy_QueryInterface, StdProxy_AddRef, _____ Modified: trunk/reactos/lib/rpcrt4/cpsf.c --- trunk/reactos/lib/rpcrt4/cpsf.c 2005-08-04 18:11:03 UTC (rev 17047) +++ trunk/reactos/lib/rpcrt4/cpsf.c 2005-08-04 21:35:00 UTC (rev 17048) @@ -116,7 +116,7 @@ ProxyInfo->pStubVtblList[Index], iface, ppStub); } -static IPSFactoryBufferVtbl CStdPSFactory_Vtbl = +static const IPSFactoryBufferVtbl CStdPSFactory_Vtbl = { CStdPSFactory_QueryInterface, CStdPSFactory_AddRef, _____ Modified: trunk/reactos/lib/rpcrt4/ndr_marshall.c --- trunk/reactos/lib/rpcrt4/ndr_marshall.c 2005-08-04 18:11:03 UTC (rev 17047) +++ trunk/reactos/lib/rpcrt4/ndr_marshall.c 2005-08-04 21:35:00 UTC (rev 17048) @@ -562,6 +562,21 @@ return NULL; /* FIXME: is this always right? */ } +static inline void dump_pointer_attr(unsigned char attr) +{ + if (attr & RPC_FC_P_ALLOCALLNODES) + TRACE(" RPC_FC_P_ALLOCALLNODES"); + if (attr & RPC_FC_P_DONTFREE) + TRACE(" RPC_FC_P_DONTFREE"); + if (attr & RPC_FC_P_ONSTACK) + TRACE(" RPC_FC_P_ONSTACK"); + if (attr & RPC_FC_P_SIMPLEPOINTER) + TRACE(" RPC_FC_P_SIMPLEPOINTER"); + if (attr & RPC_FC_P_DEREF) + TRACE(" RPC_FC_P_DEREF"); + TRACE("\n"); +} + /*********************************************************************** * PointerMarshall */ @@ -575,7 +590,7 @@ NDR_MARSHALL m; TRACE("(%p,%p,%p,%p)\n", pStubMsg, Buffer, Pointer, pFormat); - TRACE("type=%d, attr=%d\n", type, attr); + TRACE("type=0x%x, attr=", type); dump_pointer_attr(attr); pFormat += 2; if (attr & RPC_FC_P_SIMPLEPOINTER) desc = pFormat; else desc = pFormat + *(const SHORT*)pFormat; @@ -584,21 +599,33 @@ TRACE("deref => %p\n", Pointer); } - *(LPVOID*)Buffer = 0; - switch (type) { case RPC_FC_RP: /* ref pointer (always non-null) */ +#if 0 /* this causes problems for InstallShield so is disabled - we need more tests */ + if (!Pointer) + RpcRaiseException(RPC_X_NULL_REF_POINTER); +#endif break; case RPC_FC_UP: /* unique pointer */ + case RPC_FC_OP: /* object pointer - same as unique here */ + TRACE("writing %p to buffer\n", Pointer); + NDR_LOCAL_UINT32_WRITE(pStubMsg->Buffer, (unsigned long)Pointer); + pStubMsg->Buffer += 4; break; + case RPC_FC_FP: default: FIXME("unhandled ptr type=%02x\n", type); + RpcRaiseException(RPC_X_BAD_STUB_DATA); } - m = NdrMarshaller[*desc & NDR_TABLE_MASK]; - if (m) m(pStubMsg, Pointer, desc); - else FIXME("no marshaller for data type=%02x\n", *desc); + TRACE("calling marshaller for type 0x%x\n", (int)*desc); + if (Pointer) { + m = NdrMarshaller[*desc & NDR_TABLE_MASK]; + if (m) m(pStubMsg, Pointer, desc); + else FIXME("no marshaller for data type=%02x\n", *desc); + } + STD_OVERFLOW_CHECK(pStubMsg); } @@ -614,9 +641,10 @@ unsigned type = pFormat[0], attr = pFormat[1]; PFORMAT_STRING desc; NDR_UNMARSHALL m; + DWORD pointer_id = 0; TRACE("(%p,%p,%p,%p,%d)\n", pStubMsg, Buffer, pPointer, pFormat, fMustAlloc); - TRACE("type=%d, attr=%d\n", type, attr); + TRACE("type=0x%x, attr=", type); dump_pointer_attr(attr); pFormat += 2; if (attr & RPC_FC_P_SIMPLEPOINTER) desc = pFormat; else desc = pFormat + *(const SHORT*)pFormat; @@ -627,18 +655,27 @@ switch (type) { case RPC_FC_RP: /* ref pointer (always non-null) */ + pointer_id = ~0UL; break; case RPC_FC_UP: /* unique pointer */ + pointer_id = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); + pStubMsg->Buffer += 4; break; + case RPC_FC_OP: /* object pointer - we must free data before overwriting it */ + case RPC_FC_FP: default: FIXME("unhandled ptr type=%02x\n", type); + RpcRaiseException(RPC_X_BAD_STUB_DATA); } *pPointer = NULL; - m = NdrUnmarshaller[*desc & NDR_TABLE_MASK]; - if (m) m(pStubMsg, pPointer, desc, fMustAlloc); - else FIXME("no unmarshaller for data type=%02x\n", *desc); + if (pointer_id) { + m = NdrUnmarshaller[*desc & NDR_TABLE_MASK]; + if (m) m(pStubMsg, pPointer, desc, fMustAlloc); + else FIXME("no unmarshaller for data type=%02x\n", *desc); + } + TRACE("pointer=%p\n", *pPointer); } @@ -666,10 +703,17 @@ switch (type) { case RPC_FC_RP: /* ref pointer (always non-null) */ break; - case RPC_FC_UP: /* unique pointer */ + case RPC_FC_OP: + case RPC_FC_UP: + pStubMsg->BufferLength += 4; + /* NULL pointer has no further representation */ + if (!Pointer) + return; break; + case RPC_FC_FP: default: FIXME("unhandled ptr type=%02x\n", type); + RpcRaiseException(RPC_X_BAD_STUB_DATA); } m = NdrBufferSizer[*desc & NDR_TABLE_MASK]; @@ -689,7 +733,7 @@ NDR_MEMORYSIZE m; FIXME("(%p,%p,%p): stub\n", pStubMsg, Buffer, pFormat); - TRACE("type=%d, attr=%d\n", type, attr); + TRACE("type=%d, attr=", type); dump_pointer_attr(attr); pFormat += 2; if (attr & RPC_FC_P_SIMPLEPOINTER) desc = pFormat; else desc = pFormat + *(const SHORT*)pFormat; @@ -702,6 +746,7 @@ break; default: FIXME("unhandled ptr type=%02x\n", type); + RpcRaiseException(RPC_X_BAD_STUB_DATA); } m = NdrMemorySizer[*desc & NDR_TABLE_MASK]; @@ -723,7 +768,7 @@ NDR_FREE m; TRACE("(%p,%p,%p)\n", pStubMsg, Pointer, pFormat); - TRACE("type=%d, attr=%d\n", type, attr); + TRACE("type=%d, attr=", type); dump_pointer_attr(attr); if (attr & RPC_FC_P_DONTFREE) return; pFormat += 2; if (attr & RPC_FC_P_SIMPLEPOINTER) desc = pFormat; @@ -1085,7 +1130,6 @@ pStubMsg->BufferMark = pStubMsg->Buffer; PointerMarshall(pStubMsg, pStubMsg->Buffer, pMemory, pFormat); - pStubMsg->Buffer += 4; STD_OVERFLOW_CHECK(pStubMsg); @@ -1104,7 +1148,6 @@ pStubMsg->BufferMark = pStubMsg->Buffer; PointerUnmarshall(pStubMsg, pStubMsg->Buffer, ppMemory, pFormat, fMustAlloc); - pStubMsg->Buffer += 4; return NULL; } @@ -1117,7 +1160,6 @@ PFORMAT_STRING pFormat) { TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); - pStubMsg->BufferLength += 4; PointerBufferSize(pStubMsg, pMemory, pFormat); } _____ Modified: trunk/reactos/lib/rpcrt4/ndr_midl.c --- trunk/reactos/lib/rpcrt4/ndr_midl.c 2005-08-04 18:11:03 UTC (rev 17047) +++ trunk/reactos/lib/rpcrt4/ndr_midl.c 2005-08-04 21:35:00 UTC (rev 17048) @@ -185,6 +185,7 @@ assert( pRpcMessage && pStubMsg && pStubDesc ); memset(pRpcMessage, 0, sizeof(RPC_MESSAGE)); + pRpcMessage->DataRepresentation = NDR_LOCAL_DATA_REPRESENTATION; /* not everyone allocates stack space for w2kReserved */ memset(pStubMsg, 0, FIELD_OFFSET(MIDL_STUB_MESSAGE,pCSInfo)); @@ -277,9 +278,6 @@ return NULL; } - /* FIXME: Seems wrong. Where should this really come from, and when? */ - pStubMsg->RpcMsg->DataRepresentation = NDR_LOCAL_DATA_REPRESENTATION; - if (I_RpcSendReceive(pStubMsg->RpcMsg) != RPC_S_OK) { WARN("I_RpcSendReceive did not return success.\n"); /* FIXME: raise exception? */ _____ Modified: trunk/reactos/lib/rpcrt4/ndr_ole.c --- trunk/reactos/lib/rpcrt4/ndr_ole.c 2005-08-04 18:11:03 UTC (rev 17047) +++ trunk/reactos/lib/rpcrt4/ndr_ole.c 2005-08-04 21:35:00 UTC (rev 17048) @@ -79,7 +79,7 @@ * (which also implements the MInterfacePointer structure) */ typedef struct RpcStreamImpl { - IStreamVtbl *lpVtbl; + const IStreamVtbl *lpVtbl; DWORD RefCount; PMIDL_STUB_MESSAGE pMsg; LPDWORD size; @@ -126,13 +126,18 @@ ULONG *pcbRead) { RpcStreamImpl *This = (RpcStreamImpl *)iface; - if (This->pos + cb > *This->size) cb = *This->size - This->pos; + HRESULT hr = S_OK; + if (This->pos + cb > *This->size) + { + cb = *This->size - This->pos; + hr = S_FALSE; + } if (cb) { memcpy(pv, This->data + This->pos, cb); This->pos += cb; } if (pcbRead) *pcbRead = cb; - return S_OK; + return hr; } static HRESULT WINAPI RpcStream_Write(LPSTREAM iface, @@ -141,6 +146,8 @@ ULONG *pcbWritten) { RpcStreamImpl *This = (RpcStreamImpl *)iface; + if (This->data + cb > (char *)This->pMsg->BufferEnd) + return STG_E_MEDIUMFULL; memcpy(This->data + This->pos, pv, cb); This->pos += cb; if (This->pos > *This->size) *This->size = This->pos; @@ -182,7 +189,7 @@ return S_OK; } -static IStreamVtbl RpcStream_Vtbl = +static const IStreamVtbl RpcStream_Vtbl = { RpcStream_QueryInterface, RpcStream_AddRef, @@ -247,11 +254,15 @@ TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); pStubMsg->MaxCount = 0; if (!LoadCOM()) return NULL; - stream = RpcStream_Create(pStubMsg, TRUE); - hr = COM_MarshalInterface(stream, riid, (LPUNKNOWN)pMemory, - pStubMsg->dwDestContext, pStubMsg->pvDestContext, - MSHLFLAGS_NORMAL); - IStream_Release(stream); + if (pStubMsg->Buffer + sizeof(DWORD) < pStubMsg->BufferEnd) { + stream = RpcStream_Create(pStubMsg, TRUE); + if (stream) { + hr = COM_MarshalInterface(stream, riid, (LPUNKNOWN)pMemory, + pStubMsg->dwDestContext, pStubMsg->pvDestContext, + MSHLFLAGS_NORMAL); + IStream_Release(stream); + } + } return NULL; } @@ -269,9 +280,13 @@ TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); if (!LoadCOM()) return NULL; *(LPVOID*)ppMemory = NULL; - stream = RpcStream_Create(pStubMsg, FALSE); - hr = COM_UnmarshalInterface(stream, &IID_NULL, (LPVOID*)ppMemory); - IStream_Release(stream); + if (pStubMsg->Buffer + sizeof(DWORD) < pStubMsg->BufferEnd) { + stream = RpcStream_Create(pStubMsg, FALSE); + if (stream) { + hr = COM_UnmarshalInterface(stream, &IID_NULL, (LPVOID*)ppMemory); + IStream_Release(stream); + } + } return NULL; } @@ -292,7 +307,7 @@ pStubMsg->dwDestContext, pStubMsg->pvDestContext, MSHLFLAGS_NORMAL); TRACE("size=%ld\n", size); - pStubMsg->BufferLength += sizeof(DWORD) + size; + if (size) pStubMsg->BufferLength += sizeof(DWORD) + size; } /*********************************************************************** _____ Modified: trunk/reactos/lib/rpcrt4/rpc_binding.c --- trunk/reactos/lib/rpcrt4/rpc_binding.c 2005-08-04 18:11:03 UTC (rev 17047) +++ trunk/reactos/lib/rpcrt4/rpc_binding.c 2005-08-04 21:35:00 UTC (rev 17048) @@ -142,7 +142,7 @@ pname = HeapAlloc(GetProcessHeap(), 0, strlen(prefix) + strlen(Connection->Endpoint) + 1); strcat(strcpy(pname, prefix), Connection->Endpoint); TRACE("listening on %s\n", pname); - Connection->conn = CreateNamedPipeA(pname, PROFILE_SERVER | PIPE_ACCESS_DUPLEX, + Connection->conn = CreateNamedPipeA(pname, PIPE_ACCESS_DUPLEX, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, PIPE_UNLIMITED_INSTANCES, RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); HeapFree(GetProcessHeap(), 0, pname); @@ -167,7 +167,7 @@ pname = HeapAlloc(GetProcessHeap(), 0, strlen(prefix) + strlen(Connection->Endpoint) + 1); strcat(strcpy(pname, prefix), Connection->Endpoint); TRACE("listening on %s\n", pname); - Connection->conn = CreateNamedPipeA(pname, PROFILE_SERVER | PIPE_ACCESS_DUPLEX, + Connection->conn = CreateNamedPipeA(pname, PIPE_ACCESS_DUPLEX, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); HeapFree(GetProcessHeap(), 0, pname); @@ -278,7 +278,7 @@ { TRACE("(Connection == ^%p)\n", Connection); if (Connection->conn) { - CancelIo(Connection->conn); + FlushFileBuffers(Connection->conn); CloseHandle(Connection->conn); Connection->conn = 0; } _____ Modified: trunk/reactos/lib/rpcrt4/rpc_server.c --- trunk/reactos/lib/rpcrt4/rpc_server.c 2005-08-04 18:11:03 UTC (rev 17047) +++ trunk/reactos/lib/rpcrt4/rpc_server.c 2005-08-04 21:35:00 UTC (rev 17048) @@ -858,8 +858,11 @@ LeaveCriticalSection(&server_cs); if (sif->Flags & RPC_IF_AUTOLISTEN) { - /* well, start listening, I think... */ RPCRT4_start_listen(TRUE); + + /* make sure server is actually listening on the interface before + * returning */ + RPCRT4_sync_with_server_thread(); } return RPC_S_OK; _____ Modified: trunk/reactos/lib/rpcrt4/rpcrt4.spec --- trunk/reactos/lib/rpcrt4/rpcrt4.spec 2005-08-04 18:11:03 UTC (rev 17047) +++ trunk/reactos/lib/rpcrt4/rpcrt4.spec 2005-08-04 21:35:00 UTC (rev 17048) @@ -1,7 +1,131 @@ +@ stdcall CreateProxyFromTypeInfo(ptr ptr ptr ptr ptr) +@ stub CreateStubFromTypeInfo +@ stdcall CStdStubBuffer_AddRef(ptr) +@ stdcall CStdStubBuffer_Connect(ptr ptr) +@ stdcall CStdStubBuffer_CountRefs(ptr) +@ stdcall CStdStubBuffer_DebugServerQueryInterface(ptr ptr) +@ stdcall CStdStubBuffer_DebugServerRelease(ptr ptr) +@ stdcall CStdStubBuffer_Disconnect(ptr) +@ stdcall CStdStubBuffer_Invoke(ptr ptr ptr) +@ stdcall CStdStubBuffer_IsIIDSupported(ptr ptr) +@ stdcall CStdStubBuffer_QueryInterface(ptr ptr ptr) +@ stub CreateServerInterfaceFromStub # wxp @ stdcall DceErrorInqTextA (long ptr) @ stdcall DceErrorInqTextW (long ptr) @ stdcall -private DllRegisterServer() RPCRT4_DllRegisterServer - +@ stub GlobalMutexClearExternal +@ stub GlobalMutexRequestExternal +@ stdcall IUnknown_AddRef_Proxy(ptr) +@ stdcall IUnknown_QueryInterface_Proxy(ptr ptr ptr) +@ stdcall IUnknown_Release_Proxy(ptr) +@ stub I_RpcAbortAsyncCall +@ stub I_RpcAllocate +@ stub I_RpcAsyncAbortCall +@ stub I_RpcAsyncSendReceive # NT4 +@ stub I_RpcAsyncSetHandle +@ stub I_RpcBCacheAllocate +@ stub I_RpcBCacheFree +@ stub I_RpcBindingCopy +@ stub I_RpcBindingInqConnId +@ stub I_RpcBindingInqDynamicEndPoint +@ stub I_RpcBindingInqDynamicEndPointA +@ stub I_RpcBindingInqDynamicEndPointW +@ stub I_RpcBindingInqLocalClientPID # wxp +@ stub I_RpcBindingInqSecurityContext +@ stub I_RpcBindingInqTransportType +@ stub I_RpcBindingInqWireIdForSnego +@ stub I_RpcBindingIsClientLocal +# 9x version of I_RpcBindingSetAsync has 3 arguments, not 2 +@ stdcall I_RpcBindingSetAsync(ptr ptr) +@ stub I_RpcBindingToStaticStringBindingW +@ stub I_RpcClearMutex +@ stub I_RpcConnectionInqSockBuffSize2 +@ stub I_RpcConnectionInqSockBuffSize +@ stub I_RpcConnectionSetSockBuffSize +@ stub I_RpcDeleteMutex +@ stub I_RpcEnableWmiTrace # wxp +@ stub I_RpcExceptionFilter # wxp +@ stub I_RpcFree +@ stdcall I_RpcFreeBuffer(ptr) +@ stub I_RpcFreePipeBuffer +@ stub I_RpcGetAssociationContext +@ stdcall I_RpcGetBuffer(ptr) +@ stub I_RpcGetBufferWithObject +@ stub I_RpcGetCurrentCallHandle +@ stub I_RpcGetExtendedError +@ stub I_RpcGetServerContextList +@ stub I_RpcGetThreadEvent # win9x +@ stub I_RpcGetThreadWindowHandle # win9x +@ stub I_RpcIfInqTransferSyntaxes +@ stub I_RpcLaunchDatagramReceiveThread # win9x +@ stub I_RpcLogEvent +@ stub I_RpcMapWin32Status +@ stub I_RpcMonitorAssociation +@ stub I_RpcNegotiateTransferSyntax # wxp +@ stub I_RpcNsBindingSetEntryName +@ stub I_RpcNsBindingSetEntryNameA +@ stub I_RpcNsBindingSetEntryNameW +@ stub I_RpcNsInterfaceExported +@ stub I_RpcNsInterfaceUnexported +@ stub I_RpcParseSecurity +@ stub I_RpcPauseExecution +@ stub I_RpcProxyNewConnection # wxp +@ stub I_RpcReallocPipeBuffer +@ stdcall I_RpcReceive(ptr) +@ stub I_RpcRequestMutex +@ stdcall I_RpcSend(ptr) +@ stdcall I_RpcSendReceive(ptr) +@ stub I_RpcServerAllocateIpPort +@ stub I_RpcServerInqAddressChangeFn +@ stub I_RpcServerInqLocalConnAddress # wxp +@ stub I_RpcServerInqTransportType +@ stub I_RpcServerRegisterForwardFunction +@ stub I_RpcServerSetAddressChangeFn +@ stdcall I_RpcServerStartListening(ptr) # win9x +@ stdcall I_RpcServerStopListening() # win9x +@ stub I_RpcServerUnregisterEndpointA # win9x +@ stub I_RpcServerUnregisterEndpointW # win9x +@ stub I_RpcServerUseProtseq2A +@ stub I_RpcServerUseProtseq2W +@ stub I_RpcServerUseProtseqEp2A +@ stub I_RpcServerUseProtseqEp2W +@ stub I_RpcSetAssociationContext # win9x +@ stub I_RpcSetAsyncHandle +@ stub I_RpcSetServerContextList +@ stub I_RpcSetThreadParams # win9x +@ stub I_RpcSetWMsgEndpoint # NT4 +@ stub I_RpcSsDontSerializeContext +@ stub I_RpcStopMonitorAssociation +@ stub I_RpcSystemFunction001 # wxp (oh, brother!) +@ stub I_RpcTransCancelMigration # win9x +@ stub I_RpcTransClientMaxFrag # win9x +@ stub I_RpcTransClientReallocBuffer # win9x +@ stub I_RpcTransConnectionAllocatePacket +@ stub I_RpcTransConnectionFreePacket +@ stub I_RpcTransConnectionReallocPacket +@ stub I_RpcTransDatagramAllocate2 +@ stub I_RpcTransDatagramAllocate +@ stub I_RpcTransDatagramFree +@ stub I_RpcTransGetAddressList +@ stub I_RpcTransGetThreadEvent +@ stub I_RpcTransIoCancelled +@ stub I_RpcTransMaybeMakeReceiveAny # win9x +@ stub I_RpcTransMaybeMakeReceiveDirect # win9x +@ stub I_RpcTransPingServer # win9x +@ stub I_RpcTransServerFindConnection # win9x +@ stub I_RpcTransServerFreeBuffer # win9x +@ stub I_RpcTransServerMaxFrag # win9x +@ stub I_RpcTransServerNewConnection +@ stub I_RpcTransServerProtectThread # win9x +@ stub I_RpcTransServerReallocBuffer # win9x +@ stub I_RpcTransServerReceiveDirectReady # win9x +@ stub I_RpcTransServerUnprotectThread # win9x +@ stub I_RpcTurnOnEEInfoPropagation # wxp +@ stdcall I_RpcWindowProc(ptr long long long) # win9x +@ stub I_RpcltDebugSetPDUFilter +@ stub I_UuidCreate +@ stub MIDL_wchar_strcpy +@ stub MIDL_wchar_strlen @ stub MesBufferHandleReset @ stub MesDecodeBufferHandleCreate @ stub MesDecodeIncrementalHandleCreate @@ -11,10 +135,233 @@ @ stub MesHandleFree @ stub MesIncrementalHandleReset @ stub MesInqProcEncodingId - @ stub MqGetContext # win9x @ stub MqRegisterQueue # win9x - +@ stub NDRCContextBinding +@ stub NDRCContextMarshall +@ stub NDRCContextUnmarshall +@ stub NDRSContextMarshall2 +@ stub NDRSContextMarshall +@ stub NDRSContextMarshallEx +@ stub NDRSContextUnmarshall2 +@ stub NDRSContextUnmarshall +@ stub NDRSContextUnmarshallEx +@ stub NDRcopy +@ stdcall NdrAllocate(ptr long) +@ stub NdrAsyncClientCall +@ stub NdrAsyncServerCall +@ stub NdrByteCountPointerBufferSize +@ stub NdrByteCountPointerFree +@ stub NdrByteCountPointerMarshall +@ stub NdrByteCountPointerUnmarshall +@ stub NdrCStdStubBuffer2_Release +@ stdcall NdrCStdStubBuffer_Release(ptr ptr) +@ stdcall NdrClearOutParameters(ptr ptr ptr) +@ varargs NdrClientCall2(ptr ptr) +@ stub NdrClientCall +@ stub NdrClientContextMarshall +@ stub NdrClientContextUnmarshall +@ stub NdrClientInitialize +@ stdcall NdrClientInitializeNew(ptr ptr ptr long) +@ stdcall NdrComplexArrayBufferSize(ptr ptr ptr) +@ stdcall NdrComplexArrayFree(ptr ptr ptr) +@ stdcall NdrComplexArrayMarshall(ptr ptr ptr) +@ stdcall NdrComplexArrayMemorySize(ptr ptr) +@ stdcall NdrComplexArrayUnmarshall(ptr ptr ptr long) +@ stdcall NdrComplexStructBufferSize(ptr ptr ptr) +@ stdcall NdrComplexStructFree(ptr ptr ptr) +@ stdcall NdrComplexStructMarshall(ptr ptr ptr) +@ stdcall NdrComplexStructMemorySize(ptr ptr) +@ stdcall NdrComplexStructUnmarshall(ptr ptr ptr long) +@ stdcall NdrConformantArrayBufferSize(ptr ptr ptr) +@ stdcall NdrConformantArrayFree(ptr ptr ptr) +@ stdcall NdrConformantArrayMarshall(ptr ptr ptr) +@ stdcall NdrConformantArrayMemorySize(ptr ptr) +@ stdcall NdrConformantArrayUnmarshall(ptr ptr ptr long) +@ stdcall NdrConformantStringBufferSize(ptr ptr ptr) +@ stdcall NdrConformantStringMarshall(ptr ptr ptr) +@ stdcall NdrConformantStringMemorySize(ptr ptr) +@ stdcall NdrConformantStringUnmarshall(ptr ptr ptr long) +@ stub NdrConformantStructBufferSize +@ stub NdrConformantStructFree +@ stub NdrConformantStructMarshall +@ stub NdrConformantStructMemorySize +@ stub NdrConformantStructUnmarshall +@ stdcall NdrConformantVaryingArrayBufferSize(ptr ptr ptr) +@ stdcall NdrConformantVaryingArrayFree(ptr ptr ptr) +@ stdcall NdrConformantVaryingArrayMarshall(ptr ptr ptr) +@ stdcall NdrConformantVaryingArrayMemorySize(ptr ptr) +@ stdcall NdrConformantVaryingArrayUnmarshall(ptr ptr ptr long) +@ stub NdrConformantVaryingStructBufferSize +@ stub NdrConformantVaryingStructFree +@ stub NdrConformantVaryingStructMarshall +@ stub NdrConformantVaryingStructMemorySize +@ stub NdrConformantVaryingStructUnmarshall +@ stub NdrContextHandleInitialize +@ stub NdrContextHandleSize +@ stdcall NdrConvert2(ptr ptr long) +@ stdcall NdrConvert(ptr ptr) +@ stub NdrCorrelationFree +@ stub NdrCorrelationInitialize +@ stub NdrCorrelationPass +@ stub NdrDcomAsyncClientCall +@ stub NdrDcomAsyncStubCall +@ stdcall NdrDllCanUnloadNow(ptr) +@ stdcall NdrDllGetClassObject(ptr ptr ptr ptr ptr ptr) +@ stdcall NdrDllRegisterProxy(long ptr ptr) +@ stdcall NdrDllUnregisterProxy(long ptr ptr) +@ stub NdrEncapsulatedUnionBufferSize +@ stub NdrEncapsulatedUnionFree +@ stub NdrEncapsulatedUnionMarshall +@ stub NdrEncapsulatedUnionMemorySize +@ stub NdrEncapsulatedUnionUnmarshall +@ stub NdrFixedArrayBufferSize +@ stub NdrFixedArrayFree +@ stub NdrFixedArrayMarshall +@ stub NdrFixedArrayMemorySize +@ stub NdrFixedArrayUnmarshall +@ stdcall NdrFreeBuffer(ptr) +@ stub NdrFullPointerFree +@ stub NdrFullPointerInsertRefId +@ stub NdrFullPointerQueryPointer +@ stub NdrFullPointerQueryRefId +@ stub NdrFullPointerXlatFree +@ stub NdrFullPointerXlatInit +@ stdcall NdrGetBuffer(ptr long ptr) +@ stub NdrGetDcomProtocolVersion +@ stub NdrGetPartialBuffer +@ stub NdrGetPipeBuffer +@ stub NdrGetSimpleTypeBufferAlignment # wxp +@ stub NdrGetSimpleTypeBufferSize # wxp +@ stub NdrGetSimpleTypeMemorySize # wxp +@ stub NdrGetTypeFlags # wxp +@ stub NdrGetUserMarshallInfo +@ stub NdrHardStructBufferSize +@ stub NdrHardStructFree +@ stub NdrHardStructMarshall +@ stub NdrHardStructMemorySize +@ stub NdrHardStructUnmarshall +@ stdcall NdrInterfacePointerBufferSize(ptr ptr ptr) +@ stdcall NdrInterfacePointerFree(ptr ptr ptr) +@ stdcall NdrInterfacePointerMarshall(ptr ptr ptr) +@ stdcall NdrInterfacePointerMemorySize(ptr ptr) +@ stdcall NdrInterfacePointerUnmarshall(ptr ptr ptr long) +@ stub NdrIsAppDoneWithPipes +@ stub NdrMapCommAndFaultStatus +@ stub NdrMarkNextActivePipe +@ stub NdrMesProcEncodeDecode2 +@ stub NdrMesProcEncodeDecode +@ stub NdrMesSimpleTypeAlignSize +@ stub NdrMesSimpleTypeDecode +@ stub NdrMesSimpleTypeEncode +@ stub NdrMesTypeAlignSize2 +@ stub NdrMesTypeAlignSize +@ stub NdrMesTypeDecode2 +@ stub NdrMesTypeDecode +@ stub NdrMesTypeEncode2 +@ stub NdrMesTypeEncode +@ stub NdrMesTypeFree2 +@ stub NdrNonConformantStringBufferSize +@ stub NdrNonConformantStringMarshall +@ stub NdrNonConformantStringMemorySize +@ stub NdrNonConformantStringUnmarshall +@ stub NdrNonEncapsulatedUnionBufferSize +@ stub NdrNonEncapsulatedUnionFree +@ stub NdrNonEncapsulatedUnionMarshall +@ stub NdrNonEncapsulatedUnionMemorySize +@ stub NdrNonEncapsulatedUnionUnmarshall +@ stub NdrNsGetBuffer +@ stub NdrNsSendReceive +@ stdcall NdrOleAllocate(long) +@ stdcall NdrOleFree(ptr) +@ stub NdrOutInit # wxp +@ stub NdrPartialIgnoreClientBufferSize # wxp +@ stub NdrPartialIgnoreClientMarshall # wxp +@ stub NdrPartialIgnoreServerInitialize # wxp +@ stub NdrPartialIgnoreServerUnmarshall # wxp +@ stub NdrPipePull +@ stub NdrPipePush +@ stub NdrPipeSendReceive +@ stub NdrPipesDone +@ stub NdrPipesInitialize +@ stdcall NdrPointerBufferSize(ptr ptr ptr) +@ stdcall NdrPointerFree(ptr ptr ptr) +@ stdcall NdrPointerMarshall(ptr ptr ptr) +@ stdcall NdrPointerMemorySize(ptr ptr) +@ stdcall NdrPointerUnmarshall(ptr ptr ptr long) +@ stdcall NdrProxyErrorHandler(long) +@ stdcall NdrProxyFreeBuffer(ptr ptr) +@ stdcall NdrProxyGetBuffer(ptr ptr) +@ stdcall NdrProxyInitialize(ptr ptr ptr ptr long) +@ stdcall NdrProxySendReceive(ptr ptr) +@ stub NdrRangeUnmarshall +@ stub NdrRpcSmClientAllocate +@ stub NdrRpcSmClientFree +@ stub NdrRpcSmSetClientToOsf +@ stub NdrRpcSsDefaultAllocate +@ stub NdrRpcSsDefaultFree +@ stub NdrRpcSsDisableAllocate +@ stub NdrRpcSsEnableAllocate +@ stdcall NdrSendReceive(ptr ptr) +@ stub NdrServerCall2 +@ stub NdrServerCall +@ stub NdrServerContextMarshall +@ stub NdrServerContextNewMarshall # wxp +@ stub NdrServerContextNewUnmarshall # wxp +@ stub NdrServerContextUnmarshall +@ stub NdrServerInitialize +@ stub NdrServerInitializeMarshall +@ stdcall NdrServerInitializeNew(ptr ptr ptr) +@ stub NdrServerInitializePartial # wxp +@ stub NdrServerInitializeUnmarshall +@ stub NdrServerMarshall +@ stub NdrServerUnmarshall +@ stdcall NdrSimpleStructBufferSize(ptr ptr ptr) +@ stdcall NdrSimpleStructFree(ptr ptr ptr) +@ stdcall NdrSimpleStructMarshall(ptr ptr ptr) +@ stdcall NdrSimpleStructMemorySize(ptr ptr) +@ stdcall NdrSimpleStructUnmarshall(ptr ptr ptr long) +@ stdcall NdrSimpleTypeMarshall(ptr ptr long) +@ stdcall NdrSimpleTypeUnmarshall(ptr ptr long) +@ stub NdrStubCall2 +@ stub NdrStubCall +@ stub NdrStubForwardingFunction +@ stdcall NdrStubGetBuffer(ptr ptr ptr) +@ stdcall NdrStubInitialize(ptr ptr ptr ptr) +@ stub NdrStubInitializeMarshall +@ stub NdrTypeFlags # wxp +@ stub NdrTypeFree # wxp +@ stub NdrTypeMarshall # wxp +@ stub NdrTypeSize # wxp +@ stub NdrTypeUnmarshall # wxp +@ stub NdrUnmarshallBasetypeInline # wxp +@ stdcall NdrUserMarshalBufferSize(ptr ptr ptr) +@ stdcall NdrUserMarshalFree(ptr ptr ptr) +@ stdcall NdrUserMarshalMarshall(ptr ptr ptr) +@ stdcall NdrUserMarshalMemorySize(ptr ptr) +@ stub NdrUserMarshalSimpleTypeConvert +@ stdcall NdrUserMarshalUnmarshall(ptr ptr ptr long) +@ stub NdrVaryingArrayBufferSize +@ stub NdrVaryingArrayFree +@ stub NdrVaryingArrayMarshall +@ stub NdrVaryingArrayMemorySize +@ stub NdrVaryingArrayUnmarshall +@ stub NdrXmitOrRepAsBufferSize +@ stub NdrXmitOrRepAsFree +@ stub NdrXmitOrRepAsMarshall +@ stub NdrXmitOrRepAsMemorySize +@ stub NdrXmitOrRepAsUnmarshall +@ stub NdrpCreateProxy # wxp +@ stub NdrpCreateStub # wxp +@ stub NdrpGetProcFormatString # wxp +@ stub NdrpGetTypeFormatString # wxp +@ stub NdrpGetTypeGenCookie # wxp +@ stub NdrpMemoryIncrement # wxp +@ stub NdrpReleaseTypeFormatString # wxp +@ stub NdrpReleaseTypeGenCookie # wxp +@ stub NdrpSetRpcSsDefaults +@ stub NdrpVarVtOfTypeDesc # wxp +@ stub PerformRpcInitialization @ stub RpcAbortAsyncCall @ stub RpcAsyncAbortCall @ stub RpcAsyncCancelCall @@ -27,21 +374,21 @@ @ stdcall RpcBindingFromStringBindingA(str ptr) @ stdcall RpcBindingFromStringBindingW(wstr ptr) @ stub RpcBindingInqAuthClientA -@ stub RpcBindingInqAuthClientW @ stub RpcBindingInqAuthClientExA @ stub RpcBindingInqAuthClientExW +@ stub RpcBindingInqAuthClientW @ stub RpcBindingInqAuthInfoA -@ stub RpcBindingInqAuthInfoW @ stub RpcBindingInqAuthInfoExA @ stub RpcBindingInqAuthInfoExW +@ stub RpcBindingInqAuthInfoW @ stdcall RpcBindingInqObject(ptr ptr) @ stub RpcBindingInqOption @ stub RpcBindingReset @ stub RpcBindingServerFromClient @ stub RpcBindingSetAuthInfoA -@ stub RpcBindingSetAuthInfoW @ stub RpcBindingSetAuthInfoExA @ stub RpcBindingSetAuthInfoExW +@ stub RpcBindingSetAuthInfoW @ stdcall RpcBindingSetObject(ptr ptr) @ stub RpcBindingSetOption @ stdcall RpcBindingToStringBindingA(ptr ptr) @@ -54,17 +401,17 @@ @ stub RpcCertGeneratePrincipalNameW @ stub RpcCompleteAsyncCall @ stdcall RpcEpRegisterA(ptr ptr ptr str) -@ stub RpcEpRegisterW @ stub RpcEpRegisterNoReplaceA @ stub RpcEpRegisterNoReplaceW +@ stub RpcEpRegisterW @ stdcall RpcEpResolveBinding(ptr ptr) @ stdcall RpcEpUnregister(ptr ptr ptr) @ stub RpcErrorAddRecord # wxp @ stub RpcErrorClearInformation # wxp @ stub RpcErrorEndEnumeration # wxp @ stub RpcErrorGetNextRecord # wxp -@ stub RpcErrorNumberOfRecords # wxp @ stub RpcErrorLoadErrorInfo # wxp +@ stub RpcErrorNumberOfRecords # wxp @ stub RpcErrorResetEnumeration # wxp @ stub RpcErrorSaveErrorInfo # wxp @ stub RpcErrorStartEnumeration # wxp @@ -122,9 +469,9 @@ @ stdcall RpcServerListen(long long long) @ stdcall RpcServerRegisterAuthInfoA(str long ptr ptr) @ stdcall RpcServerRegisterAuthInfoW(wstr long ptr ptr) +@ stdcall RpcServerRegisterIf2(ptr ptr ptr long long long ptr) @ stdcall RpcServerRegisterIf(ptr ptr ptr) @ stdcall RpcServerRegisterIfEx(ptr ptr ptr long long ptr) -@ stdcall RpcServerRegisterIf2(ptr ptr ptr long long long ptr) @ stub RpcServerTestCancel @ stdcall RpcServerUnregisterIf(ptr ptr long) @ stdcall RpcServerUnregisterIfEx(ptr ptr long) @@ -133,17 +480,17 @@ @ stub RpcServerUseAllProtseqsIf @ stub RpcServerUseAllProtseqsIfEx @ stdcall RpcServerUseProtseqA(str long ptr) -@ stdcall RpcServerUseProtseqW(wstr long ptr) -@ stub RpcServerUseProtseqExA -@ stub RpcServerUseProtseqExW @ stdcall RpcServerUseProtseqEpA(str long str ptr) -@ stdcall RpcServerUseProtseqEpW(wstr long wstr ptr) @ stdcall RpcServerUseProtseqEpExA(str long str ptr ptr) @ stdcall RpcServerUseProtseqEpExW(wstr long wstr ptr ptr) +@ stdcall RpcServerUseProtseqEpW(wstr long wstr ptr) +@ stub RpcServerUseProtseqExA +@ stub RpcServerUseProtseqExW @ stub RpcServerUseProtseqIfA -@ stub RpcServerUseProtseqIfW @ stub RpcServerUseProtseqIfExA @ stub RpcServerUseProtseqIfExW +@ stub RpcServerUseProtseqIfW +@ stdcall RpcServerUseProtseqW(wstr long ptr) @ stub RpcServerYield @ stub RpcSmAllocate @ stub RpcSmClientFree @@ -176,23 +523,16 @@ @ stdcall RpcStringFreeW(ptr) @ stub RpcTestCancel @ stub RpcUserFree # wxp - -@ stub TowerConstruct -@ stub TowerExplode - @ stub SimpleTypeAlignment # wxp @ stub SimpleTypeBufferSize # wxp @ stub SimpleTypeMemorySize # wxp - -@ stub pfnFreeRoutines # wxp -@ stub pfnMarshallRouteines # wxp -@ stub pfnSizeRoutines # wxp -@ stub pfnUnmarshallRouteines # wxp - +@ stub StartServiceIfNecessary # win9x +@ stub TowerConstruct +@ stub TowerExplode @ stdcall UuidCompare(ptr ptr ptr) @ stdcall UuidCreate(ptr) -@ stdcall UuidCreateSequential(ptr) # win 2000 @ stdcall UuidCreateNil(ptr) +@ stdcall UuidCreateSequential(ptr) # win 2000 @ stdcall UuidEqual(ptr ptr ptr) @ stdcall UuidFromStringA(str ptr) @ stdcall UuidFromStringW(wstr ptr) @@ -200,252 +540,6 @@ @ stdcall UuidIsNil(ptr ptr) @ stdcall UuidToStringA(ptr ptr) @ stdcall UuidToStringW(ptr ptr) - -@ stdcall CStdStubBuffer_QueryInterface(ptr ptr ptr) -@ stdcall CStdStubBuffer_AddRef(ptr) -@ stdcall CStdStubBuffer_Connect(ptr ptr) -@ stdcall CStdStubBuffer_Disconnect(ptr) -@ stdcall CStdStubBuffer_Invoke(ptr ptr ptr) -@ stdcall CStdStubBuffer_IsIIDSupported(ptr ptr) -@ stdcall CStdStubBuffer_CountRefs(ptr) -@ stdcall CStdStubBuffer_DebugServerQueryInterface(ptr ptr) -@ stdcall CStdStubBuffer_DebugServerRelease(ptr ptr) -@ stdcall NdrCStdStubBuffer_Release(ptr ptr) -@ stub NdrCStdStubBuffer2_Release - -@ stdcall IUnknown_QueryInterface_Proxy(ptr ptr ptr) -@ stdcall IUnknown_AddRef_Proxy(ptr) -@ stdcall IUnknown_Release_Proxy(ptr) - -@ stdcall NdrDllCanUnloadNow(ptr) -@ stdcall NdrDllGetClassObject(ptr ptr ptr ptr ptr ptr) -@ stdcall NdrDllRegisterProxy(long ptr ptr) -@ stdcall NdrDllUnregisterProxy(long ptr ptr) - -@ stdcall NdrAllocate(ptr long) -@ stub NdrAsyncClientCall -@ stub NdrAsyncServerCall -@ stdcall NdrClearOutParameters(ptr ptr ptr) -@ stub NdrClientCall -@ varargs NdrClientCall2(ptr ptr) -@ stub NdrClientInitialize -@ stdcall NdrClientInitializeNew(ptr ptr ptr long) -@ stub NdrContextHandleInitialize -@ stub NdrContextHandleSize -@ stdcall NdrConvert(ptr ptr) -@ stdcall NdrConvert2(ptr ptr long) -@ stub NdrCorrelationFree -@ stub NdrCorrelationInitialize -@ stub NdrCorrelationPass -@ stub CreateServerInterfaceFromStub # wxp -@ stub NdrDcomAsyncClientCall -@ stub NdrDcomAsyncStubCall -@ stdcall NdrFreeBuffer(ptr) -@ stub NdrFullPointerFree -@ stub NdrFullPointerInsertRefId -@ stub NdrFullPointerQueryPointer -@ stub NdrFullPointerQueryRefId -@ stub NdrFullPointerXlatFree -@ stub NdrFullPointerXlatInit -@ stdcall NdrGetBuffer(ptr long ptr) -@ stub NdrGetDcomProtocolVersion -@ stub NdrGetSimpleTypeBufferAlignment # wxp -@ stub NdrGetSimpleTypeBufferSize # wxp -@ stub NdrGetSimpleTypeMemorySize # wxp -@ stub NdrGetTypeFlags # wxp -@ stub NdrGetPartialBuffer -@ stub NdrGetPipeBuffer -@ stub NdrGetUserMarshallInfo -@ stub NdrIsAppDoneWithPipes -@ stub NdrMapCommAndFaultStatus -@ stub NdrMarkNextActivePipe -@ stub NdrMesProcEncodeDecode -@ stub NdrMesProcEncodeDecode2 -@ stub NdrMesSimpleTypeAlignSize -@ stub NdrMesSimpleTypeDecode -@ stub NdrMesSimpleTypeEncode -@ stub NdrMesTypeAlignSize -@ stub NdrMesTypeAlignSize2 -@ stub NdrMesTypeDecode -@ stub NdrMesTypeDecode2 -@ stub NdrMesTypeEncode -@ stub NdrMesTypeEncode2 -@ stub NdrMesTypeFree2 -@ stub NdrNsGetBuffer -@ stub NdrNsSendReceive -@ stdcall NdrOleAllocate(long) -@ stdcall NdrOleFree(ptr) -@ stub NdrOutInit # wxp -@ stub NdrPartialIgnoreClientBufferSize # wxp -@ stub NdrPartialIgnoreClientMarshall # wxp -@ stub NdrPartialIgnoreServerInitialize # wxp -@ stub NdrPartialIgnoreServerUnmarshall # wxp -@ stub NdrPipePull -@ stub NdrPipePush -@ stub NdrPipeSendReceive -@ stub NdrPipesDone -@ stub NdrPipesInitialize -@ stdcall NdrProxyErrorHandler(long) -@ stdcall NdrProxyFreeBuffer(ptr ptr) -@ stdcall NdrProxyGetBuffer(ptr ptr) -@ stdcall NdrProxyInitialize(ptr ptr ptr ptr long) -@ stdcall NdrProxySendReceive(ptr ptr) -@ stub NdrRangeUnmarshall -@ stub NdrRpcSmClientAllocate -@ stub NdrRpcSmClientFree -@ stub NdrRpcSmSetClientToOsf -@ stub NdrRpcSsDefaultAllocate -@ stub NdrRpcSsDefaultFree -@ stub NdrRpcSsDisableAllocate -@ stub NdrRpcSsEnableAllocate -@ stdcall NdrSendReceive(ptr ptr) -@ stub NdrServerCall -@ stub NdrServerCall2 -@ stub NdrStubCall -@ stub NdrStubCall2 -@ stub NdrStubForwardingFunction -@ stdcall NdrStubGetBuffer(ptr ptr ptr) -@ stdcall NdrStubInitialize(ptr ptr ptr ptr) -@ stub NdrStubInitializeMarshall -@ stub NdrpCreateProxy # wxp -@ stub NdrpCreateStub # wxp -@ stub NdrpGetProcFormatString # wxp -@ stub NdrpGetTypeFormatString # wxp -@ stub NdrpGetTypeGenCookie # wxp -@ stub NdrpMemoryIncrement # wxp -@ stub NdrpReleaseTypeFormatString # wxp -@ stub NdrpReleaseTypeGenCookie # wxp -@ stub NdrpSetRpcSsDefaults -@ stub NdrpVarVtOfTypeDesc # wxp [truncated at 1000 lines; 260 more skipped]

19 years, 4 months

[navaraf] 17047: You would think that two commits are enough for fixing formulations in the document, but I can easily prove you wrong...

by navaraf＠svn.reactos.com

You would think that two commits are enough for fixing formulations in the document, but I can easily prove you wrong... Modified: branches/win32k rewrite attempt/win32k/docs/refs.txt _____ Modified: branches/win32k rewrite attempt/win32k/docs/refs.txt --- branches/win32k rewrite attempt/win32k/docs/refs.txt 2005-08-04 18:01:47 UTC (rev 17046) +++ branches/win32k rewrite attempt/win32k/docs/refs.txt 2005-08-04 18:11:03 UTC (rev 17047) @@ -18,7 +18,7 @@ So if you want the queue to hang around, you reference the thread instead. ^ This is wrong, one can attach message queue to different thread using -AttachThreadInput. The number of thread sharing a queue is stored in the +AttachThreadInput. The number of threads sharing a queue is stored in the message queue structure and can be considered a reference count. Also on Windows systems there is maintained a global list of thread attachments. @@ -36,12 +36,13 @@ NtUser/NtGdi/win32k syscalls ---------------------------- -A process and/or thread automatically gets converted to a GUI thread when -the first syscall from the shadow service table is called (ie. any NtUser* -or NtGdi* call). GUI threads have bigger kernel stack (FIXME: not the case -on ReactOS yet) and have associated storage for the Win32 structures. The -conversion itself happens in the syscall handler and the win32k callbacks -(registered with PsEstablishWin32Callouts) are called accordingly. +A process and/or thread automatically gets converted to a GUI thread / +process when the first syscall from the shadow service table is called (ie. +any NtUser* or NtGdi* call). GUI threads have bigger kernel stack (FIXME: +not the case on ReactOS yet) and have associated storage for the Win32 +structures. The conversion itself happens in the syscall handler and the +win32k callbacks (registered with PsEstablishWin32Callouts) are called +accordingly. A process automatically establishes a connection to a window station on the GUI thread conversion. The Win32 process initialization callback routine

19 years, 4 months

[navaraf] 17046: Fix grammar...

by navaraf＠svn.reactos.com

Fix grammar... Modified: branches/win32k rewrite attempt/win32k/docs/refs.txt _____ Modified: branches/win32k rewrite attempt/win32k/docs/refs.txt --- branches/win32k rewrite attempt/win32k/docs/refs.txt 2005-08-04 17:49:53 UTC (rev 17045) +++ branches/win32k rewrite attempt/win32k/docs/refs.txt 2005-08-04 18:01:47 UTC (rev 17046) @@ -20,7 +20,7 @@ ^ This is wrong, one can attach message queue to different thread using AttachThreadInput. The number of thread sharing a queue is stored in the message queue structure and can be considered a reference count. Also on -Windows systems the a global list of thread attachments is maintained. +Windows systems there is maintained a global list of thread attachments. Above references create following dependencies: -----------------------------------------------

19 years, 4 months

[navaraf] 17045: Update comments.

by navaraf＠svn.reactos.com

Update comments. Modified: branches/win32k rewrite attempt/win32k/docs/refs.txt _____ Modified: branches/win32k rewrite attempt/win32k/docs/refs.txt --- branches/win32k rewrite attempt/win32k/docs/refs.txt 2005-08-04 16:32:18 UTC (rev 17044) +++ branches/win32k rewrite attempt/win32k/docs/refs.txt 2005-08-04 17:49:53 UTC (rev 17045) @@ -17,6 +17,11 @@ -If the (w32)thread exist, so does the message queue. So if you want the queue to hang around, you reference the thread instead. +^ This is wrong, one can attach message queue to different thread using +AttachThreadInput. The number of thread sharing a queue is stored in the +message queue structure and can be considered a reference count. Also on +Windows systems the a global list of thread attachments is maintained. + Above references create following dependencies: ----------------------------------------------- @@ -28,33 +33,46 @@ process -> winsta -> session - - NtUser/NtGdi/win32k syscalls ---------------------------- -A process automatically establishes a connection to a window station and desktop -when it first calls a USER32 or GDI32 function (other than the window station or -desktop functions). The process also get a Win32Proccess. +A process and/or thread automatically gets converted to a GUI thread when +the first syscall from the shadow service table is called (ie. any NtUser* +or NtGdi* call). GUI threads have bigger kernel stack (FIXME: not the case +on ReactOS yet) and have associated storage for the Win32 structures. The +conversion itself happens in the syscall handler and the win32k callbacks +(registered with PsEstablishWin32Callouts) are called accordingly. -A thread is automatically assigned a desktop when it first calls a USER32 or GDI32 -function (other than the window station or desktop functions). The thread also get -a Win32Thread, a message queue and a thread input. +A process automatically establishes a connection to a window station on the +GUI thread conversion. The Win32 process initialization callback routine +also creates and initializes the W32PROCESS structure and associates it with +the process. -This means that when you are in a win32k syscall function (other than the window station -or desktop functions) you can be 100% sure that the following exists: --the process WinSta --the win32process --the win32thread --the thread message queue --the thread input --the thread desktop --the process desktop (if there is such a thing) +Similary for thread the callback routine automatically assigns a desktop +when the thread is converted to GUI thread. The thread also gets a W32THREAD +structure, a message queue and a thread input structures. +Beware that there is an exception to these rules and that's WinLogon. Since +at the time the process starts no window stations or desktops exist, none +are assigned to the the initial thread / process. The first Win32k calls +the thread does are to create the window station and desktop and to associate +them with itself. -There is no need to validate any of these values, because they MUST EXIST! +FIXME: At the time of this writing there's a second exception, a "primitive +message queue" thread in CSRSS that is created before any window stations +exist and is used to capture keyboard input in console mode. Eventually we +should get rid of it and replace is with hidden window w/ focus or something +similar. - !!!!!NOTE!!!! -Reactos is currently wrong on the thread desktop, process desktop and process WinSta, -since they can be NULL!! +Generally this means that when you are in a Win32k syscall function (other +than the window station or desktop functions) you can be 100% sure that the +following exists: +- Process window station +- Win32 process structure +- Win32 thread structure +- Thread message queue +- Thread input +- Thread desktop + +There is no need to validate any of these values, because they MUST EXIST!

19 years, 4 months

[gdalsnes] 17044: -fix timerbug (abiword splash)

by gdalsnes＠svn.reactos.com

-fix timerbug (abiword splash) -misc Somewhat works now (thanks to filip), but closing gui consoles makes ros go 100% cpu Modified: branches/win32k rewrite attempt/win32k/docs/refs.txt Modified: branches/win32k rewrite attempt/win32k/include/caret.h Modified: branches/win32k rewrite attempt/win32k/include/msgqueue.h Modified: branches/win32k rewrite attempt/win32k/include/userfuncs.h Modified: branches/win32k rewrite attempt/win32k/include/window.h Modified: branches/win32k rewrite attempt/win32k/main/dllmain.c Modified: branches/win32k rewrite attempt/win32k/ntuser/accelerator.c Modified: branches/win32k rewrite attempt/win32k/ntuser/caret.c Modified: branches/win32k rewrite attempt/win32k/ntuser/class.c Modified: branches/win32k rewrite attempt/win32k/ntuser/clipboard.c Modified: branches/win32k rewrite attempt/win32k/ntuser/csr.c Modified: branches/win32k rewrite attempt/win32k/ntuser/cursoricon.c Modified: branches/win32k rewrite attempt/win32k/ntuser/desktop.c Modified: branches/win32k rewrite attempt/win32k/ntuser/focus.c Modified: branches/win32k rewrite attempt/win32k/ntuser/guicheck.c Modified: branches/win32k rewrite attempt/win32k/ntuser/handle.c Modified: branches/win32k rewrite attempt/win32k/ntuser/hook.c Modified: branches/win32k rewrite attempt/win32k/ntuser/hotkey.c Modified: branches/win32k rewrite attempt/win32k/ntuser/input.c Modified: branches/win32k rewrite attempt/win32k/ntuser/menu.c Modified: branches/win32k rewrite attempt/win32k/ntuser/message.c Modified: branches/win32k rewrite attempt/win32k/ntuser/misc.c Modified: branches/win32k rewrite attempt/win32k/ntuser/monitor.c Modified: branches/win32k rewrite attempt/win32k/ntuser/msgqueue.c Modified: branches/win32k rewrite attempt/win32k/ntuser/ntuser.c Modified: branches/win32k rewrite attempt/win32k/ntuser/painting.c Modified: branches/win32k rewrite attempt/win32k/ntuser/prop.c Modified: branches/win32k rewrite attempt/win32k/ntuser/timer.c Modified: branches/win32k rewrite attempt/win32k/ntuser/vis.c Modified: branches/win32k rewrite attempt/win32k/ntuser/window.c Modified: branches/win32k rewrite attempt/win32k/ntuser/winpos.c Modified: branches/win32k rewrite attempt/win32k/ntuser/winsta.c _____ Modified: branches/win32k rewrite attempt/win32k/docs/refs.txt --- branches/win32k rewrite attempt/win32k/docs/refs.txt 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/docs/refs.txt 2005-08-04 16:32:18 UTC (rev 17044) @@ -4,8 +4,7 @@ window -> desktop window -> class -window -> queue/thread_input ????????? -thread -> queue/thread_input ????????? +thread_input -> thread thread -> process process -> winsta @@ -13,6 +12,10 @@ desktop -> winsta winsta -> session +NOTE: Message queue has 1:1 relationship with (w32)thread and need no ref. count. + -If the (w32)thread is destroyed, so is the message queue. + -If the (w32)thread exist, so does the message queue. + So if you want the queue to hang around, you reference the thread instead. Above references create following dependencies: ----------------------------------------------- @@ -24,3 +27,34 @@ thread -> desktop -> winsta -> session process -> winsta -> session + + + +NtUser/NtGdi/win32k syscalls +---------------------------- + +A process automatically establishes a connection to a window station and desktop +when it first calls a USER32 or GDI32 function (other than the window station or +desktop functions). The process also get a Win32Proccess. + +A thread is automatically assigned a desktop when it first calls a USER32 or GDI32 +function (other than the window station or desktop functions). The thread also get +a Win32Thread, a message queue and a thread input. + +This means that when you are in a win32k syscall function (other than the window station +or desktop functions) you can be 100% sure that the following exists: +-the process WinSta +-the win32process +-the win32thread +-the thread message queue +-the thread input +-the thread desktop +-the process desktop (if there is such a thing) + + +There is no need to validate any of these values, because they MUST EXIST! + + !!!!!NOTE!!!! +Reactos is currently wrong on the thread desktop, process desktop and process WinSta, +since they can be NULL!! + _____ Modified: branches/win32k rewrite attempt/win32k/include/caret.h --- branches/win32k rewrite attempt/win32k/include/caret.h 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/include/caret.h 2005-08-04 16:32:18 UTC (rev 17044) @@ -9,8 +9,6 @@ BOOL FASTCALL UserSetCaretBlinkTime(UINT uMSeconds); -BOOL FASTCALL -UserSwitchCaretShowing(PVOID Info); VOID FASTCALL UserDrawCaret(HWND hWnd); _____ Modified: branches/win32k rewrite attempt/win32k/include/msgqueue.h --- branches/win32k rewrite attempt/win32k/include/msgqueue.h 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/include/msgqueue.h 2005-08-04 16:32:18 UTC (rev 17044) @@ -39,8 +39,39 @@ LIST_ENTRY ListEntry; } USER_SENT_MESSAGE_NOTIFY, *PUSER_SENT_MESSAGE_NOTIFY; +typedef struct _USER_THREAD_INPUT +{ +#if 0 + struct desktop *desktop; /* desktop that this thread input belongs to */ + user_handle_t focus; /* focus window */ + user_handle_t capture; /* capture window */ + user_handle_t active; /* active window */ + user_handle_t menu_owner; /* current menu owner window */ + user_handle_t move_size; /* current moving/resizing window */ + user_handle_t caret; /* caret window */ + rectangle_t caret_rect; /* caret rectangle */ + int caret_hide; /* caret hide count */ + int caret_state; /* caret on/off state */ + struct list msg_list; /* list of hardware messages */ + unsigned char keystate[256]; /* state of each key */ +#endif + /* Current window with focus (ie. receives keyboard input) for this queue. */ + HWND FocusWindow; + /* Current capture window for this queue. */ + HWND CaptureWindow; + /* Current active window for this queue. */ + HWND ActiveWindow; + /* Current menu owner window for this queue */ + HWND MenuOwner; + /* Current move/size window for this queue */ + HWND MoveSize; + /* Caret information for this queue */ + THRDCARETINFO CaretInfo; + +} USER_THREAD_INPUT, *PUSER_THREAD_INPUT; + typedef struct _USER_MESSAGE_QUEUE { /* Reference counter, only access this variable with interlocked functions! */ @@ -73,24 +104,12 @@ HANDLE NewMessagesHandle; /* Last time PeekMessage() was called. */ ULONG LastMsgRead; - /* Current window with focus (ie. receives keyboard input) for this queue. */ - HWND FocusWindow; /* True if a window needs painting. */ BOOLEAN PaintPosted; /* Count of paints pending. */ LONG PaintCount; - /* Current active window for this queue. */ - HWND ActiveWindow; - /* Current capture window for this queue. */ - HWND CaptureWindow; - /* Current move/size window for this queue */ - HWND MoveSize; - /* Current menu owner window for this queue */ - HWND MenuOwner; /* Identifes the menu state */ BYTE MenuState; - /* Caret information for this queue */ - PTHRDCARETINFO CaretInfo; /* Window hooks */ PHOOKTABLE Hooks; @@ -104,14 +123,15 @@ /* extra message information */ LPARAM ExtraInfo; - /* messages that are currently dispatched by other threads */ LIST_ENTRY DispatchingMessagesHead; /* messages that are currently dispatched by this message queue, required for cleanup */ LIST_ENTRY LocalDispatchingMessagesHead; - /* Desktop that the message queue is attached to */ struct _DESKTOP_OBJECT *Desktop; + + PUSER_THREAD_INPUT Input; + } USER_MESSAGE_QUEUE, *PUSER_MESSAGE_QUEUE; BOOL FASTCALL @@ -144,8 +164,6 @@ MsqCleanupMessageQueue(PUSER_MESSAGE_QUEUE MessageQueue); PUSER_MESSAGE_QUEUE FASTCALL MsqCreateMessageQueue(struct _ETHREAD *Thread); -VOID FASTCALL -MsqDestroyMessageQueue(PUSER_MESSAGE_QUEUE MessageQueue); PUSER_MESSAGE_QUEUE FASTCALL MsqGetHardwareMessageQueue(VOID); NTSTATUS FASTCALL @@ -198,8 +216,6 @@ MsqInsertSystemMessage(MSG* Msg); BOOL FASTCALL MsqIsDblClk(LPMSG Msg, BOOL Remove); -HWND FASTCALL -MsqSetStateWindow(PUSER_MESSAGE_QUEUE MessageQueue, ULONG Type, HWND hWnd); inline BOOL MsqIsSignaled( PUSER_MESSAGE_QUEUE queue ); inline VOID MsqSetQueueBits( PUSER_MESSAGE_QUEUE queue, WORD bits ); @@ -223,8 +239,6 @@ #define IntReferenceMessageQueue(MsgQueue) \ InterlockedIncrement(&(MsgQueue)->References) -VOID FASTCALL -IntDereferenceMessageQueue(PUSER_MESSAGE_QUEUE MsgQueue); #define IS_BTN_MESSAGE(message,code) \ _____ Modified: branches/win32k rewrite attempt/win32k/include/userfuncs.h --- branches/win32k rewrite attempt/win32k/include/userfuncs.h 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/include/userfuncs.h 2005-08-04 16:32:18 UTC (rev 17044) @@ -111,6 +111,10 @@ BOOL FASTCALL UserHideCaret(PWINDOW_OBJECT Wnd); +BOOL FASTCALL +UserSwitchCaretShowing(PTHRDCARETINFO Info); + + /************************* WINPOS.C ****************************/ @@ -188,10 +192,21 @@ PMONITOR_OBJECT UserGetMonitorObject(HANDLE hCursor); -/* msgqueue.c */ +/******************* MSGQUEUE.C ********************/ +VOID FASTCALL +UserDereferenceQueue(PUSER_MESSAGE_QUEUE MsgQueue); + +VOID FASTCALL +MsqDestroyMessageQueue(PW32THREAD WThread); + +HWND FASTCALL +MsqSetStateWindow(PUSER_THREAD_INPUT Input, ULONG Type, HWND hWnd); + +inline PUSER_THREAD_INPUT FASTCALL UserGetCurrentInput(); + VOID FASTCALL -MsqRemoveWindowMessagesFromQueue(PWINDOW_OBJECT pWindow); +MsqCleanupWindow(PWINDOW_OBJECT pWindow); inline BOOL FASTCALL UserMessageFilter(UINT Message, UINT FilterMin, UINT FilterMax); @@ -218,6 +233,16 @@ UINT Message ); +/**************************** NTUSER.C ************************/ + +inline PVOID FASTCALL UserAlloc(SIZE_T bytes); +inline PVOID FASTCALL UserAllocTag(SIZE_T bytes, ULONG tag); +inline PVOID FASTCALL UserAllocZero(SIZE_T bytes); +inline PVOID FASTCALL UserAllocZeroTag(SIZE_T bytes, ULONG tag); +inline VOID FASTCALL UserFree(PVOID mem); + + + /* windc.c */ HDC FASTCALL _____ Modified: branches/win32k rewrite attempt/win32k/include/window.h --- branches/win32k rewrite attempt/win32k/include/window.h 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/include/window.h 2005-08-04 16:32:18 UTC (rev 17044) @@ -64,7 +64,7 @@ /* Handle of the window region. */ HANDLE WindowRegion; /* Lock to be held when manipulating (NC)UpdateRegion */ - FAST_MUTEX UpdateLock; + // FAST_MUTEX UpdateLock; /* Pointer to the owning thread's message queue. */ PUSER_MESSAGE_QUEUE MessageQueue; struct _WINDOW_OBJECT* FirstChild; _____ Modified: branches/win32k rewrite attempt/win32k/main/dllmain.c --- branches/win32k rewrite attempt/win32k/main/dllmain.c 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/main/dllmain.c 2005-08-04 16:32:18 UTC (rev 17044) @@ -47,6 +47,8 @@ DPRINT("Enter Win32kProcessCallback\n"); UserEnterExclusive(); +CHECKPOINT1; + /* Get the Win32 Process */ Win32Process = PsGetProcessWin32Process(Process); @@ -71,7 +73,7 @@ DPRINT("Creating W32 process PID:%d at IRQ level: %lu\n", Process->UniqueProcessId, KeGetCurrentIrql()); InitializeListHead(&Win32Process->ClassListHead); - ExInitializeFastMutex(&Win32Process->ClassListLock); +// ExInitializeFastMutex(&Win32Process->ClassListLock); InitializeListHead(&Win32Process->MenuListHead); ExInitializeFastMutex(&Win32Process->MenuListLock); @@ -139,6 +141,8 @@ DPRINT("Enter Win32kThreadCallback\n"); UserEnterExclusive(); +CHECKPOINT1; + Process = Thread->ThreadsProcess; /* Get the Win32 Thread */ @@ -229,7 +233,6 @@ Win32Thread->KeyboardLayout = W32kGetDefaultKeyLayout(); Win32Thread->MessagePumpHookValue = 0; InitializeListHead(&Win32Thread->WindowListHead); - ExInitializeFastMutex(&Win32Thread->WindowListLock); InitializeListHead(&Win32Thread->W32CallbackListHead); } else @@ -238,15 +241,26 @@ Win32Thread->IsExiting = TRUE; HOOK_DestroyThreadHooks(Thread); +CHECKPOINT1; UnregisterThreadHotKeys(Thread); +CHECKPOINT1; DestroyThreadWindows(Thread); +CHECKPOINT1; IntBlockInput(Win32Thread, FALSE); - MsqDestroyMessageQueue(Win32Thread->MessageQueue); +CHECKPOINT1; + /* all windows for this thread must de totally destroyed at this point. */ + ASSERT(IsListEmpty(&Win32Thread->WindowListHead)); + MsqDestroyMessageQueue(Win32Thread); +CHECKPOINT1; IntCleanupThreadCallbacks(Win32Thread); +CHECKPOINT1; + /* FIXME: having a thresd desktop is mandatory!! */ if(Win32Thread->Desktop != NULL) { + CHECKPOINT1; ObDereferenceObject(Win32Thread->Desktop); } +CHECKPOINT1; } RETURN( STATUS_SUCCESS); @@ -316,6 +330,7 @@ BOOLEAN Result; W32_CALLOUT_DATA CalloutData; +CHECKPOINT1; /* * Register user mode call interface * (system service table index = 1) @@ -330,7 +345,7 @@ DPRINT1("Adding system services failed!\n"); return STATUS_UNSUCCESSFUL; } - +CHECKPOINT1; /* * Register Object Manager Callbacks */ @@ -342,14 +357,15 @@ CalloutData.DesktopDelete = IntDesktopObjectDelete; CalloutData.W32ProcessCallout = Win32kProcessCallback; CalloutData.W32ThreadCallout = Win32kThreadCallback; - + CHECKPOINT1; /* * Register our per-process and per-thread structures. */ PsEstablishWin32Callouts(&CalloutData); - +CHECKPOINT1; Status = IntUserCreateSharedSectionPool(48 * 1024 * 1024, /* 48 MB by default */ &SessionSharedSectionPool); + CHECKPOINT1; if (!NT_SUCCESS(Status)) { DPRINT1("Failed to initialize the shared section pool: Status 0x%x\n", Status); _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/accelerator.c --- branches/win32k rewrite attempt/win32k/ntuser/accelerator.c 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/ntuser/accelerator.c 2005-08-04 16:32:18 UTC (rev 17044) @@ -51,7 +51,7 @@ #include <w32k.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> /* FUNCTIONS *****************************************************************/ @@ -203,41 +203,36 @@ BOOLEAN STDCALL -NtUserDestroyAcceleratorTable(HACCEL Table) +NtUserDestroyAcceleratorTable(HACCEL hAccel) { - PACCELERATOR_TABLE AcceleratorTable; + PACCELERATOR_TABLE Accel; DECLARE_RETURN(BOOLEAN); /* FIXME: If the handle table is from a call to LoadAcceleratorTable, decrement it's usage count (and return TRUE). FIXME: Destroy only tables created using CreateAcceleratorTable. */ - DPRINT("Enter NtUserDestroyAcceleratorTable(Table %x)\n", Table); + DPRINT("Enter NtUserDestroyAcceleratorTable(Table %x)\n", Accel); UserEnterExclusive(); - //FIXME - AcceleratorTable = UserGetAccelObject(Table); + Accel = UserGetAccelObject(hAccel); - if (!AcceleratorTable) + if (!Accel) { SetLastWin32Error(ERROR_INVALID_ACCEL_HANDLE); DPRINT1("E2\n"); RETURN(FALSE); } -// ObmCloseHandle(WindowStation->HandleTable, Table); - - if (AcceleratorTable->Table != NULL) + if (Accel->Table != NULL) { - ExFreePool(AcceleratorTable->Table); + ExFreePool(Accel->Table); } -// ObDereferenceObject(WindowStation); - RETURN(TRUE); CLEANUP: - DPRINT("Leave NtUserDestroyAcceleratorTable(Table %x) = %i\n", Table,_ret_); + DPRINT("Leave NtUserDestroyAcceleratorTable(Table %x) = %i\n", Accel,_ret_); UserLeave(); END_CLEANUP; } @@ -443,7 +438,6 @@ HACCEL Table, LPMSG Message) { - PWINSTATION_OBJECT WindowStation; PACCELERATOR_TABLE AcceleratorTable; ULONG i; DECLARE_RETURN(int); @@ -490,7 +484,6 @@ AcceleratorTable->Table[i].fVirt, AcceleratorTable->Table[i].key, AcceleratorTable->Table[i].cmd)) { - ObDereferenceObject(WindowStation); DPRINT("NtUserTranslateAccelerator(hWnd %x, Table %x, Message %p) = %i end\n", hWnd, Table, Message, 1); RETURN(1); _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/caret.c --- branches/win32k rewrite attempt/win32k/ntuser/caret.c 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/ntuser/caret.c 2005-08-04 16:32:18 UTC (rev 17044) @@ -11,7 +11,7 @@ #include <w32k.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> #define MIN_CARETBLINKRATE 100 @@ -35,19 +35,20 @@ BOOL FASTCALL UserDestroyCaret(PW32THREAD Win32Thread /* unused param!!!*/) { - PUSER_MESSAGE_QUEUE ThreadQueue; + PUSER_MESSAGE_QUEUE Queue; - ThreadQueue = UserGetCurrentQueue(); + Queue = UserGetCurrentQueue(); - if(!ThreadQueue || !ThreadQueue->CaretInfo) + //FIXME: can queue be NULL? + if(!Queue) return FALSE; - IntHideCaret(ThreadQueue->CaretInfo); - ThreadQueue->CaretInfo->Bitmap = (HBITMAP)0; - ThreadQueue->CaretInfo->hWnd = (HWND)0; - ThreadQueue->CaretInfo->Size.cx = ThreadQueue->CaretInfo->Size.cy = 0; - ThreadQueue->CaretInfo->Showing = 0; - ThreadQueue->CaretInfo->Visible = 0; + IntHideCaret(&Queue->Input->CaretInfo); + Queue->Input->CaretInfo.Bitmap = (HBITMAP)0; + Queue->Input->CaretInfo.hWnd = (HWND)0; + Queue->Input->CaretInfo.Size.cx = Queue->Input->CaretInfo.Size.cy = 0; + Queue->Input->CaretInfo.Showing = 0; + Queue->Input->CaretInfo.Visible = 0; return TRUE; } @@ -162,20 +163,20 @@ BOOL FASTCALL UserSetCaretPos(int X, int Y) { - PUSER_MESSAGE_QUEUE ThreadQueue; + PUSER_THREAD_INPUT Input; + + Input = UserGetCurrentInput(); - ThreadQueue = UserGetCurrentQueue(); - - if(ThreadQueue->CaretInfo->hWnd) + if(Input->CaretInfo.hWnd) { - if(ThreadQueue->CaretInfo->Pos.x != X || ThreadQueue->CaretInfo->Pos.y != Y) + if(Input->CaretInfo.Pos.x != X || Input->CaretInfo.Pos.y != Y) { - IntHideCaret(ThreadQueue->CaretInfo); - ThreadQueue->CaretInfo->Showing = 0; - ThreadQueue->CaretInfo->Pos.x = X; - ThreadQueue->CaretInfo->Pos.y = Y; - IntSendMessage(ThreadQueue->CaretInfo->hWnd, WM_SYSTIMER, IDCARETTIMER, 0); - UserSetTimer(GetWnd(ThreadQueue->CaretInfo->hWnd), IDCARETTIMER, UserGetCaretBlinkTime(), NULL, TRUE); + IntHideCaret(&Input->CaretInfo); + Input->CaretInfo.Showing = 0; + Input->CaretInfo.Pos.x = X; + Input->CaretInfo.Pos.y = Y; + IntSendMessage(Input->CaretInfo.hWnd, WM_SYSTIMER, IDCARETTIMER, 0); + UserSetTimer(GetWnd(Input->CaretInfo.hWnd), IDCARETTIMER, UserGetCaretBlinkTime(), NULL, TRUE); } return TRUE; } @@ -184,17 +185,18 @@ } BOOL FASTCALL -UserSwitchCaretShowing(PVOID Info) +UserSwitchCaretShowing(PTHRDCARETINFO Info) { - PUSER_MESSAGE_QUEUE ThreadQueue; + PUSER_THREAD_INPUT Input; - ThreadQueue = UserGetCurrentQueue(); + Input = UserGetCurrentInput(); - if(ThreadQueue->CaretInfo->hWnd) + if(Input->CaretInfo.hWnd) { - ThreadQueue->CaretInfo->Showing = (ThreadQueue->CaretInfo->Showing ? 0 : 1); + Input->CaretInfo.Showing = !Input->CaretInfo.Showing; //FIXME: internal. no SEH here! - MmCopyToCaller(Info, ThreadQueue->CaretInfo, sizeof(THRDCARETINFO)); + MmCopyToCaller(Info, &Input->CaretInfo, sizeof(THRDCARETINFO)); + //*Info = Input->CaretInfo; return TRUE; } @@ -204,15 +206,15 @@ VOID FASTCALL UserDrawCaret(HWND hWnd /* FIXME: Unused param?!?! */) { - PUSER_MESSAGE_QUEUE ThreadQueue; + PUSER_THREAD_INPUT Input; - ThreadQueue = UserGetCurrentQueue(); + Input = UserGetCurrentInput(); - if(ThreadQueue->CaretInfo->hWnd && ThreadQueue->CaretInfo->Visible && - ThreadQueue->CaretInfo->Showing) + if(Input->CaretInfo.hWnd && Input->CaretInfo.Visible && + Input->CaretInfo.Showing) { - IntSendMessage(ThreadQueue->CaretInfo->hWnd, WM_SYSTIMER, IDCARETTIMER, 0); - ThreadQueue->CaretInfo->Showing = 1; + IntSendMessage(Input->CaretInfo.hWnd, WM_SYSTIMER, IDCARETTIMER, 0); + Input->CaretInfo.Showing = 1; } } @@ -227,7 +229,7 @@ int nHeight) { PWINDOW_OBJECT WindowObject; - PUSER_MESSAGE_QUEUE ThreadQueue; + PUSER_THREAD_INPUT Input; DECLARE_RETURN(BOOL); DPRINT("Enter NtUserCreateCaret\n"); @@ -246,28 +248,28 @@ RETURN(FALSE); } - ThreadQueue = UserGetCurrentQueue(); + Input = UserGetCurrentInput(); - if (ThreadQueue->CaretInfo->Visible) + if (Input->CaretInfo.Visible) { UserKillTimer(WindowObject, IDCARETTIMER, TRUE); - IntHideCaret(ThreadQueue->CaretInfo); + IntHideCaret(&Input->CaretInfo); } - ThreadQueue->CaretInfo->hWnd = hWnd; + Input->CaretInfo.hWnd = hWnd; if(hBitmap) { - ThreadQueue->CaretInfo->Bitmap = hBitmap; - ThreadQueue->CaretInfo->Size.cx = ThreadQueue->CaretInfo->Size.cy = 0; + Input->CaretInfo.Bitmap = hBitmap; + Input->CaretInfo.Size.cx = Input->CaretInfo.Size.cy = 0; } else { - ThreadQueue->CaretInfo->Bitmap = (HBITMAP)0; - ThreadQueue->CaretInfo->Size.cx = nWidth; - ThreadQueue->CaretInfo->Size.cy = nHeight; + Input->CaretInfo.Bitmap = (HBITMAP)0; + Input->CaretInfo.Size.cx = nWidth; + Input->CaretInfo.Size.cy = nHeight; } - ThreadQueue->CaretInfo->Visible = 0; - ThreadQueue->CaretInfo->Showing = 0; + Input->CaretInfo.Visible = 0; + Input->CaretInfo.Showing = 0; RETURN(TRUE); @@ -300,16 +302,16 @@ NtUserGetCaretPos( LPPOINT lpPoint) { - PUSER_MESSAGE_QUEUE ThreadQueue; + PUSER_THREAD_INPUT Input; NTSTATUS Status; DECLARE_RETURN(BOOL); DPRINT("Enter NtUserGetCaretPos\n"); UserEnterExclusive(); - ThreadQueue = UserGetCurrentQueue(); + Input = UserGetCurrentInput(); - Status = MmCopyToCaller(lpPoint, &(ThreadQueue->CaretInfo->Pos), sizeof(POINT)); + Status = MmCopyToCaller(lpPoint, &(Input->CaretInfo.Pos), sizeof(POINT)); if(!NT_SUCCESS(Status)) { SetLastNtError(Status); @@ -331,7 +333,7 @@ HWND hWnd) { PWINDOW_OBJECT WindowObject; - PUSER_MESSAGE_QUEUE ThreadQueue; + PUSER_THREAD_INPUT Input; DECLARE_RETURN(BOOL); DPRINT1("Enter NtUserHideCaret\n"); @@ -350,21 +352,21 @@ RETURN(FALSE); } - ThreadQueue = UserGetCurrentQueue(); + Input = UserGetCurrentInput(); - if(ThreadQueue->CaretInfo->hWnd != hWnd) + if(Input->CaretInfo.hWnd != hWnd) { SetLastWin32Error(ERROR_ACCESS_DENIED); RETURN(FALSE); } - if(ThreadQueue->CaretInfo->Visible) + if(Input->CaretInfo.Visible) { UserKillTimer(WindowObject, IDCARETTIMER, TRUE); - IntHideCaret(ThreadQueue->CaretInfo); - ThreadQueue->CaretInfo->Visible = 0; - ThreadQueue->CaretInfo->Showing = 0; + IntHideCaret(&Input->CaretInfo); + Input->CaretInfo.Visible = 0; + Input->CaretInfo.Showing = 0; } RETURN(TRUE); @@ -380,7 +382,7 @@ BOOL FASTCALL UserHideCaret(PWINDOW_OBJECT Wnd) { - PUSER_MESSAGE_QUEUE ThreadQueue; + PUSER_THREAD_INPUT Input; ASSERT(Wnd); @@ -390,22 +392,22 @@ return(FALSE); } - ThreadQueue = UserGetCurrentQueue(); + Input = UserGetCurrentInput(); - if(ThreadQueue->CaretInfo->hWnd != GetHwnd(Wnd)) + if(Input->CaretInfo.hWnd != GetHwnd(Wnd)) { SetLastWin32Error(ERROR_ACCESS_DENIED); return(FALSE); } - if(ThreadQueue->CaretInfo->Visible) + if(Input->CaretInfo.Visible) { UserKillTimer(Wnd, IDCARETTIMER, TRUE); //FIXME: fix IntHideCaret vs. NtHideCaret vs. UserHideCaret mess - IntHideCaret(ThreadQueue->CaretInfo); - ThreadQueue->CaretInfo->Visible = 0; - ThreadQueue->CaretInfo->Showing = 0; + IntHideCaret(&Input->CaretInfo); + Input->CaretInfo.Visible = 0; + Input->CaretInfo.Showing = 0; } return(TRUE); @@ -443,7 +445,7 @@ BOOL FASTCALL UserShowCaret(PWINDOW_OBJECT Wnd) { - PUSER_MESSAGE_QUEUE ThreadQueue; + PUSER_THREAD_INPUT Input; ASSERT(Wnd); @@ -453,20 +455,20 @@ return(FALSE); } - ThreadQueue = UserGetCurrentQueue(); + Input = UserGetCurrentInput(); - if(ThreadQueue->CaretInfo->hWnd != GetHwnd(Wnd)) + if(Input->CaretInfo.hWnd != GetHwnd(Wnd)) { SetLastWin32Error(ERROR_ACCESS_DENIED); return(FALSE); } - if(!ThreadQueue->CaretInfo->Visible) + if(!Input->CaretInfo.Visible) { - ThreadQueue->CaretInfo->Visible = 1; - if(!ThreadQueue->CaretInfo->Showing) + Input->CaretInfo.Visible = 1; + if(!Input->CaretInfo.Showing) { - IntSendMessage(ThreadQueue->CaretInfo->hWnd, WM_SYSTIMER, IDCARETTIMER, 0); + IntSendMessage(Input->CaretInfo.hWnd, WM_SYSTIMER, IDCARETTIMER, 0); } UserSetTimer(Wnd, IDCARETTIMER, UserGetCaretBlinkTime(), NULL, TRUE); } _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/class.c --- branches/win32k rewrite attempt/win32k/ntuser/class.c 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/ntuser/class.c 2005-08-04 16:32:18 UTC (rev 17044) @@ -30,7 +30,7 @@ #include <w32k.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> /* FUNCTIONS *****************************************************************/ _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/clipboard.c --- branches/win32k rewrite attempt/win32k/ntuser/clipboard.c 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/ntuser/clipboard.c 2005-08-04 16:32:18 UTC (rev 17044) @@ -26,7 +26,7 @@ #include <w32k.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> #define CHECK_LOCK \ _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/csr.c --- branches/win32k rewrite attempt/win32k/ntuser/csr.c 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/ntuser/csr.c 2005-08-04 16:32:18 UTC (rev 17044) @@ -9,7 +9,7 @@ #include <w32k.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> static HANDLE WindowsApiPort = NULL; _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/cursoricon.c --- branches/win32k rewrite attempt/win32k/ntuser/cursoricon.c 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/ntuser/cursoricon.c 2005-08-04 16:32:18 UTC (rev 17044) @@ -38,12 +38,11 @@ #include <w32k.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> static PAGED_LOOKASIDE_LIST ProcessLookasideList; static LIST_ENTRY CurIconList; -//static FAST_MUTEX CurIconListLock; /* Look up the location of the cursor in the GDIDEVICE structure * when all we know is the window station object _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/desktop.c --- branches/win32k rewrite attempt/win32k/ntuser/desktop.c 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/ntuser/desktop.c 2005-08-04 16:32:18 UTC (rev 17044) @@ -31,12 +31,17 @@ #include <w32k.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> /* GLOBALS *******************************************************************/ /* Currently active desktop */ + +/* + FIXME: this is not global data. this belongs in the (inter)active window station + (current input desktop = interactive desktop = InputDesktop = active desktop on interactive winsta) +*/ PDESKTOP_OBJECT InputDesktop = NULL; HDESK InputDesktopHandle = NULL; HDC ScreenDeviceContext = NULL; _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/focus.c --- branches/win32k rewrite attempt/win32k/ntuser/focus.c 2005-08-04 12:41:42 UTC (rev 17043) +++ branches/win32k rewrite attempt/win32k/ntuser/focus.c 2005-08-04 16:32:18 UTC (rev 17044) @@ -21,21 +21,21 @@ #include <w32k.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> PWINDOW_OBJECT FASTCALL UserGetCaptureWindow() { PUSER_MESSAGE_QUEUE ForegroundQueue = UserGetFocusMessageQueue(); - return ForegroundQueue != NULL ? GetWnd(ForegroundQueue->CaptureWindow) : 0; + return ForegroundQueue != NULL ? GetWnd(ForegroundQueue->Input->CaptureWindow) : 0; } PWINDOW_OBJECT FASTCALL UserGetFocusWindow() { PUSER_MESSAGE_QUEUE ForegroundQueue = UserGetFocusMessageQueue(); - return ForegroundQueue != NULL ? GetWnd(ForegroundQueue->FocusWindow) : 0; + return ForegroundQueue != NULL ? GetWnd(ForegroundQueue->Input->FocusWindow) : 0; } PWINDOW_OBJECT FASTCALL @@ -43,7 +43,7 @@ { PUSER_MESSAGE_QUEUE ThreadQueue; ThreadQueue = UserGetCurrentQueue(); - return ThreadQueue != NULL ? GetWnd(ThreadQueue->FocusWindow) : 0; + return ThreadQueue != NULL ? GetWnd(ThreadQueue->Input->FocusWindow) : 0; } VOID FASTCALL @@ -169,7 +169,7 @@ if (PrevForegroundQueue != 0) { //FIXME uhm... focus er ikke samme som active window... er UserGetFocusMessageQueue riktig? - hWndPrev = PrevForegroundQueue->ActiveWindow; + hWndPrev = PrevForegroundQueue->Input->ActiveWindow; } if (hWndPrev == hWnd) @@ -179,7 +179,7 @@ } hWndFocusPrev = (PrevForegroundQueue == FocusWindow->MessageQueue - ? FocusWindow->MessageQueue->FocusWindow : NULL); + ? FocusWindow->MessageQueue->Input->FocusWindow : NULL); /* FIXME: Call hooks. */ @@ -189,11 +189,11 @@ IntSetFocusMessageQueue(Window->MessageQueue); if (Window->MessageQueue) { - Window->MessageQueue->ActiveWindow = hWnd; + Window->MessageQueue->Input->ActiveWindow = hWnd; } if (FocusWindow->MessageQueue) { - FocusWindow->MessageQueue->FocusWindow = hWndFocus; + FocusWindow->MessageQueue->Input->FocusWindow = hWndFocus; } if (PrevForegroundQueue != Window->MessageQueue) @@ -277,14 +277,14 @@ // return 0; // else // { - WndPrev = IntGetWindowObject(ThreadQueue->ActiveWindow); + WndPrev = IntGetWindowObject(ThreadQueue->Input->ActiveWindow); return( WndPrev ? WndPrev->Self : NULL ); // } } } - WndPrev = IntGetWindowObject(ThreadQueue->ActiveWindow); + WndPrev = IntGetWindowObject(ThreadQueue->Input->ActiveWindow); if (WndPrev == Wnd) { return WndPrev; @@ -294,7 +294,7 @@ /* FIXME: Call hooks. */ - ThreadQueue->ActiveWindow = GetHwnd(Wnd); + ThreadQueue->Input->ActiveWindow = GetHwnd(Wnd); //FIXME!!! hva hvis prev active var invalid dvs. NULL? //FIXME!!! hva hvis Wnd er NULL? @@ -315,13 +315,13 @@ ThreadQueue = UserGetCurrentQueue(); ASSERT(ThreadQueue != 0); - hWndPrev = ThreadQueue->FocusWindow; + hWndPrev = ThreadQueue->Input->FocusWindow; if (hWndPrev == GetHwnd(Wnd)) { return GetWnd(hWndPrev); } - ThreadQueue->FocusWindow = GetHwnd(Wnd); + ThreadQueue->Input->FocusWindow = GetHwnd(Wnd); IntSendKillFocusMessages(GetWnd(hWndPrev), Wnd); IntSendSetFocusMessages(GetWnd(hWndPrev), Wnd); @@ -357,8 +357,8 @@ { PUSER_MESSAGE_QUEUE ForegroundQueue = UserGetFocusMessageQueue(); - if (ForegroundQueue && ForegroundQueue->ActiveWindow) - return IntGetWindowObject(ForegroundQueue->ActiveWindow); + if (ForegroundQueue && ForegroundQueue->Input->ActiveWindow) + return IntGetWindowObject(ForegroundQueue->Input->ActiveWindow); return NULL; } @@ -390,18 +390,18 @@ PUSER_MESSAGE_QUEUE ThreadQueue; ThreadQueue = UserGetCurrentQueue(); - if (ThreadQueue && ThreadQueue->ActiveWindow) + if (ThreadQueue && ThreadQueue->Input->ActiveWindow) { PWINDOW_OBJECT ActiveWnd; - if ((ActiveWnd = IntGetWindowObject(ThreadQueue->ActiveWindow))) + if ((ActiveWnd = IntGetWindowObject(ThreadQueue->Input->ActiveWindow))) { return ActiveWnd; } else { /* active hwnd not valid. set to NULL */ - ThreadQueue->ActiveWindow = NULL; + ThreadQueue->Input->ActiveWindow = NULL; } } return NULL; @@ -466,7 +466,7 @@ UserEnterExclusive(); ThreadQueue = UserGetCurrentQueue();//FIXME??? current?? - RETURN(ThreadQueue ? ThreadQueue->CaptureWindow : 0); + RETURN(ThreadQueue ? ThreadQueue->Input->CaptureWindow : 0); CLEANUP: DPRINT("Leave NtUserGetCapture, ret=%i\n",_ret_); @@ -496,17 +496,17 @@ RETURN(NULL); } } - hWndPrev = MsqSetStateWindow(ThreadQueue, MSQ_STATE_CAPTURE, hWnd); + hWndPrev = MsqSetStateWindow(ThreadQueue->Input, MSQ_STATE_CAPTURE, hWnd); /* also remove other windows if not capturing anymore */ if(hWnd == NULL) { - MsqSetStateWindow(ThreadQueue, MSQ_STATE_MENUOWNER, NULL); - MsqSetStateWindow(ThreadQueue, MSQ_STATE_MOVESIZE, NULL); + MsqSetStateWindow(ThreadQueue->Input, MSQ_STATE_MENUOWNER, NULL); + MsqSetStateWindow(ThreadQueue->Input, MSQ_STATE_MOVESIZE, NULL); } IntPostOrSendMessage(hWndPrev, WM_CAPTURECHANGED, 0, (LPARAM)hWnd); - ThreadQueue->CaptureWindow = hWnd; + ThreadQueue->Input->CaptureWindow = hWnd; RETURN(hWndPrev); @@ -544,7 +544,7 @@ if (Wnd->Style & (WS_MINIMIZE | WS_DISABLED)) { - RETURN(ThreadQueue ? ThreadQueue->FocusWindow : 0); [truncated at 1000 lines; 1198 more skipped]

19 years, 4 months

[greatlrd] 17043: Windows TAB complete style instead for unix style patch by Brandon Turner. Thuse does people do not like windows tab complete, the can always change in config.h to unix/linux tab complete code again.

by greatlrd＠svn.reactos.com

Windows TAB complete style instead for unix style patch by Brandon Turner. Thuse does people do not like windows tab complete, the can always change in config.h to unix/linux tab complete code again. Modified: trunk/reactos/subsys/system/cmd/cmd.h Modified: trunk/reactos/subsys/system/cmd/cmdinput.c Modified: trunk/reactos/subsys/system/cmd/config.h Modified: trunk/reactos/subsys/system/cmd/filecomp.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.h --- trunk/reactos/subsys/system/cmd/cmd.h 2005-08-04 10:41:58 UTC (rev 17042) +++ trunk/reactos/subsys/system/cmd/cmd.h 2005-08-04 12:41:42 UTC (rev 17043) @@ -228,6 +228,7 @@ INT ShowCompletionMatches (LPTSTR, INT); #endif #ifdef FEATURE_4NT_FILENAME_COMPLETION +VOID CompleteFilename (LPTSTR, BOOL, LPTSTR, INT); #endif _____ Modified: trunk/reactos/subsys/system/cmd/cmdinput.c --- trunk/reactos/subsys/system/cmd/cmdinput.c 2005-08-04 10:41:58 UTC (rev 17042) +++ trunk/reactos/subsys/system/cmd/cmdinput.c 2005-08-04 12:41:42 UTC (rev 17043) @@ -98,6 +98,7 @@ */ #include <precomp.h> +#include "resource.h" SHORT maxx; @@ -314,10 +315,6 @@ charcount = _tcslen (str); current = charcount; - if (current > 0 && - str[current-1] == _T('"')) - current--; - SetCursorXY (orgx, orgy); ConOutPrintf (_T("%s"), str); @@ -366,17 +363,50 @@ } #endif #ifdef FEATURE_4NT_FILENAME_COMPLETION - /* this is not implemented yet */ - if (ir.Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED) + + /* used to later see if we went down to the next line */ + tempscreen = charcount; + TCHAR szPath[MAX_PATH]; + szPath[0]=_T('\0'); + + /* str is the whole things that is on the current line + that is and and out. arg 2 is weather it goes back + one file or forward one file */ + CompleteFilename(str, !(ir.Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED), szPath, current); + /* Attempt to clear the line */ + ClearCommandLine (str, maxlen, orgx, orgy); + curx = orgx; + cury = orgy; + current = charcount = 0; + //str[0]=_T('\0'); + + /* Everything is deleted, lets add it back in */ + _tcscpy(str,szPath); + + /* Figure out where cusor is going to be after we print it */ + charcount = _tcslen (str); + current = charcount; + + SetCursorXY (orgx, orgy); + /* Print out what we have now */ + ConOutPrintf (_T("%s"), str); + + /* Move cursor accordingly */ + if(tempscreen > charcount) { - /* get previous match */ - + GetCursorXY (&curx, &cury); + for(count = tempscreen - charcount; count--; ) + ConOutChar (_T(' ')); + SetCursorXY (curx, cury); } else { - /* get next match */ + if(((charcount + orgx) / maxx) + orgy > maxy - 1) + orgy += maxy - ((charcount + orgx) / maxx + orgy + 1); + } + SetCursorXY((orgx + current) % maxx, orgy + (orgx + current) / maxx); + GetCursorXY(&curx, &cury); - } #endif break; _____ Modified: trunk/reactos/subsys/system/cmd/config.h --- trunk/reactos/subsys/system/cmd/config.h 2005-08-04 10:41:58 UTC (rev 17042) +++ trunk/reactos/subsys/system/cmd/config.h 2005-08-04 12:41:42 UTC (rev 17043) @@ -37,8 +37,8 @@ /* Define one of these to enable filename completion */ -#define FEATURE_UNIX_FILENAME_COMPLETION -/* #define FEATURE_4NT_FILENAME_COMPLETION */ +//#define FEATURE_UNIX_FILENAME_COMPLETION +#define FEATURE_4NT_FILENAME_COMPLETION /* Define to enable the directory stack */ _____ Modified: trunk/reactos/subsys/system/cmd/filecomp.c --- trunk/reactos/subsys/system/cmd/filecomp.c 2005-08-04 10:41:58 UTC (rev 17042) +++ trunk/reactos/subsys/system/cmd/filecomp.c 2005-08-04 12:41:42 UTC (rev 17043) @@ -21,8 +21,8 @@ */ #include <precomp.h> +#include "cmd.h" - #ifdef FEATURE_UNIX_FILENAME_COMPLETION VOID CompleteFilename (LPTSTR str, INT charcount) @@ -169,18 +169,8 @@ _tcscat (&str[start], maxmatch); } - /* append a space if last word is not a directory */ - if(perfectmatch) + if(!perfectmatch) { - curplace = _tcslen(&str[start]); - if(str[start+curplace-1] == _T('"')) - curplace--; - - if(str[start+curplace-1] != _T('\\')) - _tcscat(&str[start], _T(" ")); - } - else - { #ifdef __REACTOS__ Beep (440, 50); #else @@ -370,11 +360,377 @@ #ifdef FEATURE_4NT_FILENAME_COMPLETION -//static VOID BuildFilenameMatchList (...) +typedef struct _FileName +{ + TCHAR Name[MAX_PATH]; +} FileName; -// VOID CompleteFilenameNext (LPTSTR, INT) -// VOID CompleteFilenamePrev (LPTSTR, INT) +VOID FindPrefixAndSuffix(LPTSTR strIN, LPTSTR szPrefix, LPTSTR szSuffix) +{ + /* String that is to be examined */ + TCHAR str[MAX_PATH]; + /* temp pointers to used to find needed parts */ + TCHAR * szSearch; + TCHAR * szSearch1; + TCHAR * szSearch2; + /* number of quotes in the string */ + INT nQuotes = 0; + /* used in for loops */ + INT i; + /* Char number to break the string at */ + INT PBreak = 0; + INT SBreak = 0; + /* when phrasing a string, this tells weather + you are inside quotes ot not. */ + BOOL bInside = FALSE; + + szPrefix[0] = _T('\0'); + szSuffix[0] = _T('\0'); -// VOID RemoveFilenameMatchList (VOID) + /* Copy over the string to later be edited */ + _tcscpy(str,strIN); + /* Count number of " */ + for(i = 0; i < _tcslen(str); i++) + if(str[i] == _T('\"')) + nQuotes++; + + /* Find the prefix and suffix */ + if(nQuotes % 2 && nQuotes) + { + /* Odd number of quotes. Just start from the last " */ + /* THis is the way MS does it, and is an easy way out */ + szSearch = _tcsrchr(str, _T('\"')); + /* Move to the next char past the " */ + szSearch++; + _tcscpy(szSuffix,szSearch); + /* Find the one closest to end */ + szSearch1 = _tcsrchr(str, _T('\"')); + szSearch2 = _tcsrchr(str, _T('\\')); + if(szSearch2 != NULL && _tcslen(szSearch1) > _tcslen(szSearch2)) + szSearch = szSearch2; + else + szSearch = szSearch1; + /* Move one char past */ + szSearch++; + szSearch[0] = _T('\0'); + _tcscpy(szPrefix,str); + return; + + } + + if(!_tcschr(str, _T(' '))) + { + /* No spaces, everything goes to Suffix */ + _tcscpy(szSuffix,str); + /* look for a slash just in case */ + szSearch = _tcsrchr(str, _T('\\')); + if(szSearch) + { + szSearch++; + szSearch[0] = _T('\0'); + _tcscpy(szPrefix,str); + } + else + { + szPrefix[0] = _T('\0'); + } + return; + } + + if(!nQuotes) + { + /* No quotes, and there is a space*/ + /* Take it after the last space */ + szSearch = _tcsrchr(str, _T(' ')); + szSearch++; + _tcscpy(szSuffix,szSearch); + /* Find the closest to the end space or \ */ + _tcscpy(str,strIN); + szSearch1 = _tcsrchr(str, _T(' ')); + szSearch2 = _tcsrchr(str, _T('\\')); + if(szSearch2 != NULL && _tcslen(szSearch1) > _tcslen(szSearch2)) + szSearch = szSearch2; + else + szSearch = szSearch1; + szSearch++; + szSearch[0] = _T('\0'); + _tcscpy(szPrefix,str); + return; + } + + /* All else fails and there is a lot of quotes, spaces and | + Then we search through and find the last space or \ that is + not inside a quotes */ + for(i = 0; i < _tcslen(str); i++) + { + if(str[i] == _T('\"')) + bInside = !bInside; + if(str[i] == _T(' ') && !bInside) + SBreak = i; + if((!_tcsncmp(&str[i], _T(" "),1) || !_tcsncmp(&str[i], _T("\\"),1)) && !bInside) + PBreak = i; + + } + SBreak++; + PBreak++; + _tcscpy(szSuffix,&strIN[SBreak]); + strIN[PBreak] = _T('\0'); + _tcscpy(szPrefix,strIN); + if(!_tcsncmp(&szPrefix[_tcslen(szPrefix) - 2],_T("\""),1)) + { + /* need to remove the " right before a \ at the end to + allow the next stuff to stay inside one set of quotes + otherwise you would have multiple sets of quotes*/ + _tcscpy(&szPrefix[_tcslen(szPrefix) - 2],_T("\\")); + + } + +} + int compare(const void *arg1,const void *arg2) + { + FileName * File1; + FileName * File2; + INT ret; + + File1 = malloc(sizeof(FileName)); + File2 = malloc(sizeof(FileName)); + if(!File1 || !File2) + return 0; + + memcpy(File1,arg1,sizeof(FileName)); + memcpy(File2,arg2,sizeof(FileName)); + + ret = _tcsicmp(File1->Name, File2->Name); + + free(File1); + free(File2); + return ret; + } + +VOID CompleteFilename (LPTSTR strIN, BOOL bNext, LPTSTR strOut, INT cusor) +{ + /* Length of string before we complete it */ + INT StartLength; + /* Length of string after completed */ + INT EndLength; + /* The number of chars added too it */ + static INT DiffLength = 0; + /* Used to find and assemble the string that is returned */ + TCHAR szBaseWord[MAX_PATH]; + TCHAR szPrefix[MAX_PATH]; + TCHAR szOrginal[MAX_PATH]; + TCHAR szSearchPath[MAX_PATH]; + /* Save the strings used last time, so if they hit tab again */ + static TCHAR LastReturned[MAX_PATH]; + static TCHAR LastSearch[MAX_PATH]; + static TCHAR LastPrefix[MAX_PATH]; + /* Used to search for files */ + HANDLE hFile; + WIN32_FIND_DATA file; + /* List of all the files */ + FileName * FileList = NULL; + /* Number of files */ + INT FileListSize = 0; + /* Used for loops */ + INT i; + INT ii; + /* Editable string of what was passed in */ + TCHAR str[MAX_PATH]; + /* Keeps track of what element was last selected */ + static INT Sel; + BOOL NeededQuote = FALSE; + + strOut[0] = _T('\0'); + + /* Copy the string, str can be edited and orginal should not be */ + _tcscpy(str,strIN); + _tcscpy(szOrginal,strIN); + + /* Look to see if the cusor is not at the end of the string */ + if((cusor + 1) < _tcslen(str)) + str[cusor] = _T('\0'); + + /* Look to see if they hit tab again, if so cut off the diff length */ + if(_tcscmp(str,LastReturned)) + { + /* We need to know how many chars we added from the start */ + StartLength = _tcslen(str); + + /* no string, we need all files in that directory */ + if(!StartLength) + _tcscat(str,_T("*")); + + /* Zero it out first */ + szBaseWord[0] = _T('\0'); + szPrefix[0] = _T('\0'); + + /*What comes out of this needs to be: + szBaseWord = path no quotes to the object + szPrefix = what leads up to the filename + no quote at the END of the full name */ + FindPrefixAndSuffix(str,szPrefix,szBaseWord); + /* Strip quotes */ + for(i = 0; i < _tcslen(szBaseWord); i++) + { + if(!_tcsncmp(&szBaseWord[i], _T("\""),1)) + { + for(ii = i; ii < (_tcslen(szBaseWord)); ii++) + szBaseWord[ii] = szBaseWord[ii + 1]; + } + } + + /* clear it out */ + memset(szSearchPath, 0, sizeof(szSearchPath)); + + /* Start the search for all the files */ + GetFullPathName(szBaseWord, MAX_PATH, szSearchPath, NULL); + if(StartLength > 0) + _tcscat(szSearchPath,_T("*")); + _tcscpy(LastSearch,szSearchPath); + _tcscpy(LastPrefix,szPrefix); + } + else + { + _tcscpy(szSearchPath, LastSearch); + _tcscpy(szPrefix, LastPrefix); + } + /* search for the files it might be */ + hFile = FindFirstFile (szSearchPath, &file); + + /* aseemble a list of all files names */ + do + { + if(hFile == INVALID_HANDLE_VALUE) + { + /* Assemble the orginal string and return */ + _tcscpy(strOut,szOrginal); + CloseHandle(hFile); + if(FileList != NULL) + free(FileList); + return; + } + + if(!_tcscmp (file.cFileName, _T(".")) || + !_tcscmp (file.cFileName, _T(".."))) + continue; + /* Add the file to the list of files */ + if(FileList == NULL) + { + FileListSize = 1; + FileList = malloc(FileListSize * sizeof(FileName)); + } + else + { + FileListSize++; + FileList = realloc(FileList, FileListSize * sizeof(FileName)); + } + + if(FileList == NULL) + { + /* Assemble the orginal string and return */ + _tcscpy(strOut,szOrginal); + CloseHandle(hFile); + ConOutFormatMessage (GetLastError()); + return; + } + /* Copies the file name into the struct */ + _tcscpy(FileList[FileListSize-1].Name,file.cFileName); + + }while(FindNextFile(hFile,&file)); + + + /* Sort the files */ + qsort(FileList,FileListSize,sizeof(FileName), compare); + + /* Find the next/previous */ + if(!_tcscmp(szOrginal,LastReturned)) + { + if(bNext) + { + if(FileListSize - 1 == Sel) + Sel = 0; + else + Sel++; + } + else + { + if(!Sel) + Sel = FileListSize - 1; + else + Sel--; + } + } + else + { + Sel = 0; + } + + /* nothing found that matched last time + so return the first thing in the list */ + strOut[0] = _T('\0'); + + /* space in the name */ + if(_tcschr(FileList[Sel].Name, _T(' '))) + { + /* It needs a " at the end */ + NeededQuote = TRUE; + INT LastSpace = -1; + BOOL bInside = FALSE; + /* Find the place to put the " at the start */ + for(i = 0; i < _tcslen(szPrefix); i++) + { + if(szPrefix[i] == _T('\"')) + bInside = !bInside; + if(szPrefix[i] == _T(' ') && !bInside) + LastSpace = i; + + } + /* insert the space and move things around */ + if(_tcsncmp(&szPrefix[LastSpace + 1],_T("\""),1) && LastSpace != -1) + { + /* add another char or you will lose a null char ending */ + _tcsncat(szPrefix,&szPrefix[_tcslen(szPrefix) - 1],1); + for(i = _tcslen(szPrefix) - 1; i > LastSpace; i--) + { + szPrefix[i] = szPrefix[i - 1]; + } + + if(LastSpace + 1 == _tcslen(szPrefix)) + { + _tcscat(szPrefix,_T("\"")); + } + szPrefix[LastSpace + 1] = _T('\"'); + } + else if(LastSpace == -1) + { + _tcscpy(szBaseWord,_T("\"")); + _tcscat(szBaseWord,szPrefix); + _tcscpy(szPrefix,szBaseWord); + + } + } + + _tcscpy(strOut,szPrefix); + _tcscat(strOut,FileList[Sel].Name); + + /* check for odd number of quotes means we need to close them */ + if(!NeededQuote) + { + for(i = 0; i < _tcslen(strOut); i++) + if(strOut[i] == _T('\"')) + NeededQuote = !NeededQuote; + } + + if(szPrefix[_tcslen(szPrefix) - 1] == _T('\"') || NeededQuote) + _tcscat(strOut,_T("\"")); + + _tcscpy(LastReturned,strOut); + EndLength = _tcslen(strOut); + DiffLength = EndLength - StartLength; + CloseHandle(hFile); + if(FileList != NULL) + free(FileList); + +} #endif

19 years, 4 months

[weiden] 17042: compile welcome.exe as unicode application by default

by weiden＠svn.reactos.com

compile welcome.exe as unicode application by default Modified: trunk/reactos/subsys/system/welcome/welcome.c Modified: trunk/reactos/subsys/system/welcome/welcome.xml _____ Modified: trunk/reactos/subsys/system/welcome/welcome.c --- trunk/reactos/subsys/system/welcome/welcome.c 2005-08-04 06:52:58 UTC (rev 17041) +++ trunk/reactos/subsys/system/welcome/welcome.c 2005-08-04 10:41:58 UTC (rev 17042) @@ -176,7 +176,7 @@ rcRightPanel.right = ulInnerWidth - 1; if (!LoadString(hInstance, (UINT)MAKEINTRESOURCE(IDS_APPTITLE), szAppTitle, 80)) - lstrcpy(szAppTitle, TEXT("ReactOS Welcome")); + _tcscpy(szAppTitle, TEXT("ReactOS Welcome")); /* Create main window */ hwndMain = CreateWindow(szFrameClass, @@ -248,13 +248,13 @@ if (nLength == 0) return TRUE; - if (!lstrcmpi(AppName, TEXT("<exit>"))) + if (!_tcsicmp(AppName, TEXT("<exit>"))) return FALSE; - if (lstrcmpi(AppName, TEXT("explorer.exe")) == 0) + if (_tcsicmp(AppName, TEXT("explorer.exe")) == 0) { - lstrcat(AppName, TEXT(" ")); - lstrcat(AppName, CurrentDir); + _tcscat(AppName, TEXT(" ")); + _tcscat(AppName, CurrentDir); } memset(&StartupInfo, 0, sizeof(STARTUPINFO)); @@ -285,7 +285,7 @@ static DWORD GetButtonHeight(HDC hDC, HFONT hFont, - PSZ szText, + LPCTSTR szText, DWORD dwWidth) { HFONT hOldFont; @@ -324,7 +324,7 @@ CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE, - "Arial"); + TEXT("Arial")); /* Topic description font */ hfontTopicDescription = CreateFont(-11,0,0,0,FW_THIN, @@ -333,7 +333,7 @@ CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE, - "Arial"); + TEXT("Arial")); /* Topic button font */ hfontTopicButton = CreateFont(-11,0,0,0,FW_BOLD, @@ -342,7 +342,7 @@ CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE, - "Arial"); + TEXT("Arial")); /* Load title bitmap */ if (hTitleBitmap != 0) _____ Modified: trunk/reactos/subsys/system/welcome/welcome.xml --- trunk/reactos/subsys/system/welcome/welcome.xml 2005-08-04 06:52:58 UTC (rev 17041) +++ trunk/reactos/subsys/system/welcome/welcome.xml 2005-08-04 10:41:58 UTC (rev 17042) @@ -4,6 +4,8 @@ <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> <library>kernel32</library> <library>gdi32</library> <library>user32</library>

19 years, 4 months

[gvg] 17041: Sync to Wine-20050628:

by gvg＠svn.reactos.com

Sync to Wine-20050628: Phil Krylov <phil(a)newstar.rinet.ru> - Implemented EM_GETTEXTLENGTHEX RichEdit message. Krzysztof Foltman <wdev(a)foltman.com> - added support for \ulnone (turning underline off) - support for basic subscript and superscript - untested support for text offset - Emit \tx for user-defined TABs. Dmitry Timoshkov <dmitry(a)codeweavers.com> - Make remaining OLE interface vtables const. Stefan Huehner <stefan(a)huehner.org> - Fix some more -Wstrict-prototypes warnings. Vitaly Lipatov <lav(a)etersoft.ru> - Allow null pointers for EM_GETSEL message (as MSDN says). Robert Shearman <rob(a)codeweavers.com> - Richedit classes should be global. Modified: trunk/reactos/lib/riched20/caret.c Modified: trunk/reactos/lib/riched20/editor.c Modified: trunk/reactos/lib/riched20/editor.h Modified: trunk/reactos/lib/riched20/paint.c Modified: trunk/reactos/lib/riched20/richole.c Modified: trunk/reactos/lib/riched20/style.c Modified: trunk/reactos/lib/riched20/writer.c _____ Modified: trunk/reactos/lib/riched20/caret.c --- trunk/reactos/lib/riched20/caret.c 2005-08-04 00:16:41 UTC (rev 17040) +++ trunk/reactos/lib/riched20/caret.c 2005-08-04 06:52:58 UTC (rev 17041) @@ -41,6 +41,38 @@ return ME_CharOfsFromRunOfs(editor, ME_FindItemBack(editor->pBuffer->pLast, diRun), 0); } + +int ME_GetTextLengthEx(ME_TextEditor *editor, GETTEXTLENGTHEX *how) +{ + int length; + + if (how->flags & GTL_PRECISE && how->flags & GTL_CLOSE) + return E_INVALIDARG; + if (how->flags & GTL_NUMCHARS && how->flags & GTL_NUMBYTES) + return E_INVALIDARG; + + length = ME_GetTextLength(editor); + + if (how->flags & GTL_USECRLF) + length += editor->nParagraphs; + + if (how->flags & GTL_NUMBYTES) + { + CPINFO cpinfo; + + if (how->codepage == 1200) + return length * 2; + if (how->flags & GTL_PRECISE) + FIXME("GTL_PRECISE flag unsupported. Using GTL_CLOSE\n"); + if (GetCPInfo(how->codepage, &cpinfo)) + return length * cpinfo.MaxCharSize; + ERR("Invalid codepage %u\n", how->codepage); + return E_INVALIDARG; + } + return length; +} + + void ME_SetSelection(ME_TextEditor *editor, int from, int to) { if (from == 0 && to == -1) _____ Modified: trunk/reactos/lib/riched20/editor.c --- trunk/reactos/lib/riched20/editor.c 2005-08-04 00:16:41 UTC (rev 17040) +++ trunk/reactos/lib/riched20/editor.c 2005-08-04 06:52:58 UTC (rev 17041) @@ -65,7 +65,7 @@ - EM_GETSCROLLPOS 3.0 ! - EM_GETTHUMB - EM_GETTEXTEX 2.0 - - EM_GETTEXTLENGTHEX + + EM_GETTEXTLENGTHEX (GTL_PRECISE unimplemented) - EM_GETTEXTMODE 2.0 ? + EM_GETTEXTRANGE (ANSI&Unicode) - EM_GETTYPOGRAPHYOPTIONS 3.0 @@ -231,7 +231,7 @@ int me_debug = 0; HANDLE me_heap = NULL; -ME_TextBuffer *ME_MakeText() { +ME_TextBuffer *ME_MakeText(void) { ME_TextBuffer *buf = ALLOC_OBJ(ME_TextBuffer); @@ -321,11 +321,26 @@ case rtfUnderline: fmt.dwMask = CFM_UNDERLINE; fmt.dwEffects = info->rtfParam ? fmt.dwMask : 0; + fmt.bUnderlineType = CFU_CF1UNDERLINE; break; + case rtfNoUnderline: + fmt.dwMask = CFM_UNDERLINE; + fmt.dwEffects = 0; + break; case rtfStrikeThru: fmt.dwMask = CFM_STRIKEOUT; fmt.dwEffects = info->rtfParam ? fmt.dwMask : 0; break; + case rtfSubScript: + case rtfSuperScript: + case rtfSubScrShrink: + case rtfSuperScrShrink: + case rtfNoSuperSub: + fmt.dwMask = CFM_SUBSCRIPT|CFM_SUPERSCRIPT; + if (info->rtfMinor == rtfSubScrShrink) fmt.dwEffects = CFE_SUBSCRIPT; + if (info->rtfMinor == rtfSuperScrShrink) fmt.dwEffects = CFE_SUPERSCRIPT; + if (info->rtfMinor == rtfNoSuperSub) fmt.dwEffects = 0; + break; case rtfBackColor: fmt.dwMask = CFM_BACKCOLOR; fmt.dwEffects = 0; @@ -831,7 +846,6 @@ UNSUPPORTED_MSG(EM_GETREDONAME) UNSUPPORTED_MSG(EM_GETSCROLLPOS) UNSUPPORTED_MSG(EM_GETTEXTEX) - UNSUPPORTED_MSG(EM_GETTEXTLENGTHEX) UNSUPPORTED_MSG(EM_GETTEXTMODE) UNSUPPORTED_MSG(EM_GETTYPOGRAPHYOPTIONS) UNSUPPORTED_MSG(EM_GETUNDONAME) @@ -901,10 +915,14 @@ return 0; case EM_GETSEL: { - ME_GetSelection(editor, (int *)wParam, (int *)lParam); - if (!((wParam|lParam) & 0xFFFF0000)) - return (lParam<<16)|wParam; - return -1; + /* Note: wParam/lParam can be NULL */ + UINT from, to; + PUINT pfrom = wParam ? (PUINT)wParam : &from; + PUINT pto = lParam ? (PUINT)lParam : &to; + ME_GetSelection(editor, pfrom, pto); + if ((*pfrom|*pto) & 0xFFFF0000) + return -1; + return MAKELONG(*pfrom,*pto); } case EM_EXGETSEL: { @@ -1156,6 +1174,8 @@ } case WM_GETTEXTLENGTH: return ME_GetTextLength(editor); + case EM_GETTEXTLENGTHEX: + return ME_GetTextLengthEx(editor, (GETTEXTLENGTHEX *)wParam); case WM_GETTEXT: { TEXTRANGEW tr; /* W and A differ only by rng->lpstrText */ @@ -1464,7 +1484,7 @@ WNDCLASSW wcW; WNDCLASSA wcA; - wcW.style = CS_HREDRAW | CS_VREDRAW; + wcW.style = CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS; wcW.lpfnWndProc = RichEditANSIWndProc; wcW.cbClsExtra = 0; wcW.cbWndExtra = 4; @@ -1480,7 +1500,7 @@ bResult = RegisterClassW(&wcW); assert(bResult); - wcA.style = CS_HREDRAW | CS_VREDRAW; + wcA.style = CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS; wcA.lpfnWndProc = RichEditANSIWndProc; wcA.cbClsExtra = 0; wcA.cbWndExtra = 4; _____ Modified: trunk/reactos/lib/riched20/editor.h --- trunk/reactos/lib/riched20/editor.h 2005-08-04 00:16:41 UTC (rev 17040) +++ trunk/reactos/lib/riched20/editor.h 2005-08-04 06:52:58 UTC (rev 17041) @@ -160,6 +160,7 @@ void ME_InsertGraphicsFromCursor(ME_TextEditor *editor, int nCursor); void ME_InternalDeleteText(ME_TextEditor *editor, int nOfs, int nChars); int ME_GetTextLength(ME_TextEditor *editor); +int ME_GetTextLengthEx(ME_TextEditor *editor, GETTEXTLENGTHEX *how); ME_Style *ME_GetSelectionInsertStyle(ME_TextEditor *editor); BOOL ME_UpdateSelection(ME_TextEditor *editor, ME_Cursor *pTempCursor); @@ -202,7 +203,7 @@ /* wintest.c */ /* editor.c */ -void ME_RegisterEditorClass(); +void ME_RegisterEditorClass(HINSTANCE hInstance); ME_TextEditor *ME_MakeEditor(HWND hWnd); void ME_DestroyEditor(ME_TextEditor *editor); void ME_SendOldNotify(ME_TextEditor *editor, int nCode); _____ Modified: trunk/reactos/lib/riched20/paint.c --- trunk/reactos/lib/riched20/paint.c 2005-08-04 00:16:41 UTC (rev 17040) +++ trunk/reactos/lib/riched20/paint.c 2005-08-04 06:52:58 UTC (rev 17041) @@ -178,13 +178,23 @@ HDC hDC = c->hDC; HGDIOBJ hOldFont; COLORREF rgbOld, rgbBack; + int yOffset = 0, yTwipsOffset = 0; hOldFont = ME_SelectStyleFont(c->editor, hDC, s); rgbBack = ME_GetBackColor(c->editor); if ((s->fmt.dwMask & CFM_COLOR) && (s->fmt.dwEffects & CFE_AUTOCOLOR)) rgbOld = SetTextColor(hDC, GetSysColor(COLOR_WINDOWTEXT)); else rgbOld = SetTextColor(hDC, s->fmt.crTextColor); - ExtTextOutW(hDC, x, y, 0, NULL, szText, nChars, NULL); + if ((s->fmt.dwMask & s->fmt.dwEffects) & CFM_OFFSET) { + yTwipsOffset = s->fmt.yOffset; + } + if ((s->fmt.dwMask & s->fmt.dwEffects) & (CFM_SUPERSCRIPT | CFM_SUBSCRIPT)) { + if (s->fmt.dwEffects & CFE_SUPERSCRIPT) yTwipsOffset = s->fmt.yHeight/3; + if (s->fmt.dwEffects & CFE_SUBSCRIPT) yTwipsOffset = -s->fmt.yHeight/12; + } + if (yTwipsOffset) + yOffset = yTwipsOffset*GetDeviceCaps(hDC, LOGPIXELSY)/1440; + ExtTextOutW(hDC, x, y-yOffset, 0, NULL, szText, nChars, NULL); if (width) { SIZE sz; GetTextExtentPoint32W(hDC, szText, nChars, &sz); _____ Modified: trunk/reactos/lib/riched20/richole.c --- trunk/reactos/lib/riched20/richole.c 2005-08-04 00:16:41 UTC (rev 17040) +++ trunk/reactos/lib/riched20/richole.c 2005-08-04 06:52:58 UTC (rev 17041) @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); typedef struct IRichEditOleImpl { - IRichEditOleVtbl *lpVtbl; + const IRichEditOleVtbl *lpVtbl; DWORD ref; } IRichEditOleImpl; @@ -228,7 +228,7 @@ return E_NOTIMPL; } -static IRichEditOleVtbl revt = { +static const IRichEditOleVtbl revt = { IRichEditOle_fnQueryInterface, IRichEditOle_fnAddRef, IRichEditOle_fnRelease, _____ Modified: trunk/reactos/lib/riched20/style.c --- trunk/reactos/lib/riched20/style.c 2005-08-04 00:16:41 UTC (rev 17040) +++ trunk/reactos/lib/riched20/style.c 2005-08-04 06:52:58 UTC (rev 17041) @@ -268,6 +268,8 @@ lf->lfUnderline = 1; if (s->fmt.dwEffects & s->fmt.dwMask & CFM_STRIKEOUT) lf->lfStrikeOut = 1; + if (s->fmt.dwEffects & s->fmt.dwMask & (CFM_SUBSCRIPT|CFM_SUPERSCRIPT)) + lf->lfHeight = (lf->lfHeight*2)/3; /*lf.lfQuality = PROOF_QUALITY; */ lf->lfPitchAndFamily = s->fmt.bPitchAndFamily; lf->lfCharSet = s->fmt.bCharSet; _____ Modified: trunk/reactos/lib/riched20/writer.c --- trunk/reactos/lib/riched20/writer.c 2005-08-04 00:16:41 UTC (rev 17040) +++ trunk/reactos/lib/riched20/writer.c 2005-08-04 06:52:58 UTC (rev 17041) @@ -45,11 +45,23 @@ { LONG nStart = 0; LONG nWritten = 0; + LONG nRemaining = 0; EDITSTREAM *stream = editor->pStream->stream; do { + TRACE("sending %lu bytes\n", editor->pStream->pos - nStart); + /* Some apps seem not to set *pcb unless a problem arises, relying + on initial random nWritten value, which is usually >STREAMOUT_BUFFER_SIZE */ + nRemaining = editor->pStream->pos - nStart; + nWritten = 0xDEADBEEF; stream->dwError = stream->pfnCallback(stream->dwCookie, editor->pStream->buffer + nStart, editor->pStream->pos - nStart, &nWritten); + TRACE("error=%lu written=%lu\n", stream->dwError, nWritten); + if (nWritten > (editor->pStream->pos - nStart) || nWritten<0) { + FIXME("Invalid returned written size *pcb: 0x%x (%ld) instead of %ld\n", + (unsigned)nWritten, nWritten, nRemaining); + nWritten = nRemaining; + } if (nWritten == 0 || stream->dwError) return FALSE; editor->pStream->written += nWritten; @@ -64,6 +76,7 @@ ME_StreamOutFree(ME_TextEditor *editor) { LONG written = editor->pStream->written; + TRACE("total length = %lu\n", written); FREE_OBJ(editor->pStream); editor->pStream = NULL; @@ -379,6 +392,7 @@ } if (fmt->rgxTabs[i] >> 28 <= 5) strcat(props, leader[fmt->rgxTabs[i] >> 28]); + sprintf(props+strlen(props), "\\tx%ld", fmt->rgxTabs[i]&0x00FFFFFF); } } @@ -781,7 +795,7 @@ ME_StreamOutRTF(editor, nStart, nTo - nStart, dwFormat); else if (dwFormat & SF_TEXT || dwFormat & SF_TEXTIZED) ME_StreamOutText(editor, nStart, nTo - nStart, dwFormat); - - ME_StreamOutFlush(editor); + if (!editor->pStream->stream->dwError) + ME_StreamOutFlush(editor); return ME_StreamOutFree(editor); }

19 years, 4 months

[weiden] 17040: properly implement scrolling

by weiden＠svn.reactos.com

properly implement scrolling Modified: trunk/reactos/lib/aclui/checklist.c _____ Modified: trunk/reactos/lib/aclui/checklist.c --- trunk/reactos/lib/aclui/checklist.c 2005-08-03 23:07:10 UTC (rev 17039) +++ trunk/reactos/lib/aclui/checklist.c 2005-08-04 00:16:41 UTC (rev 17040) @@ -352,23 +352,12 @@ OUT UINT *CheckBox, OUT BOOL *DirectlyInCheckBox) { - LONG Style; INT FirstVisible, Index; PCHECKITEM Item; - Style = GetWindowLong(infoPtr->hSelf, - GWL_STYLE); + FirstVisible = GetScrollPos(infoPtr->hSelf, + SB_VERT); - if (Style & WS_VSCROLL) - { - FirstVisible = GetScrollPos(infoPtr->hSelf, - SB_VERT); - } - else - { - FirstVisible = 0; - } - Index = FirstVisible + (ppt->y / infoPtr->ItemHeight); Item = FindCheckItemByIndex(infoPtr, @@ -535,12 +524,10 @@ } static VOID -UpdateControl(IN PCHECKLISTWND infoPtr, - IN BOOL AllowChangeStyle) +UpdateControl(IN PCHECKLISTWND infoPtr) { RECT rcClient; SCROLLINFO ScrollInfo; - LONG Style; INT VisibleItems; GetClientRect(infoPtr->hSelf, @@ -566,28 +553,6 @@ &ScrollInfo, TRUE); - if (AllowChangeStyle) - { - Style = GetWindowLong(infoPtr->hSelf, - GWL_STYLE); - - /* determine whether the vertical scrollbar has to be visible or not */ - if (ScrollInfo.nMax > VisibleItems && - !(Style & WS_VSCROLL)) - { - SetWindowLong(infoPtr->hSelf, - GWL_STYLE, - Style | WS_VSCROLL); - } - else if (ScrollInfo.nMax <= VisibleItems && - (Style & WS_VSCROLL)) - { - SetWindowLong(infoPtr->hSelf, - GWL_STYLE, - Style & ~WS_VSCROLL); - } - } - RedrawWindow(infoPtr->hSelf, NULL, NULL, @@ -598,25 +563,14 @@ UpdateCheckItem(IN PCHECKLISTWND infoPtr, IN PCHECKITEM Item) { - LONG Style; RECT rcClient; INT VisibleFirst, VisibleItems; INT Index = CheckItemToIndex(infoPtr, Item); if (Index != -1) { - Style = GetWindowLong(infoPtr->hSelf, - GWL_STYLE); - - if (Style & WS_VSCROLL) - { - VisibleFirst = GetScrollPos(infoPtr->hSelf, - SB_VERT); - } - else - { - VisibleFirst = 0; - } + VisibleFirst = GetScrollPos(infoPtr->hSelf, + SB_VERT); if (Index >= VisibleFirst) { @@ -647,69 +601,62 @@ MakeCheckItemVisible(IN PCHECKLISTWND infoPtr, IN PCHECKITEM Item) { - LONG Style; RECT rcClient; INT VisibleFirst, VisibleItems, NewPos; INT Index = CheckItemToIndex(infoPtr, Item); if (Index != -1) { - Style = GetWindowLong(infoPtr->hSelf, - GWL_STYLE); - - if (Style & WS_VSCROLL) + VisibleFirst = GetScrollPos(infoPtr->hSelf, + SB_VERT); + + if (Index <= VisibleFirst) { - VisibleFirst = GetScrollPos(infoPtr->hSelf, - SB_VERT); - - if (Index <= VisibleFirst) + NewPos = Index; + } + else + { + GetClientRect(infoPtr->hSelf, + &rcClient); + + VisibleItems = (rcClient.bottom - rcClient.top) / infoPtr->ItemHeight; + if (Index - VisibleItems + 1 > VisibleFirst) { - NewPos = Index; + NewPos = Index - VisibleItems + 1; } else { - GetClientRect(infoPtr->hSelf, - &rcClient); - - VisibleItems = (rcClient.bottom - rcClient.top) / infoPtr->ItemHeight; - if (Index - VisibleItems + 1 > VisibleFirst) - { - NewPos = Index - VisibleItems + 1; - } - else - { - NewPos = VisibleFirst; - } + NewPos = VisibleFirst; } + } + + if (VisibleFirst != NewPos) + { + SCROLLINFO ScrollInfo; + ScrollInfo.cbSize = sizeof(ScrollInfo); + ScrollInfo.fMask = SIF_POS; + ScrollInfo.nPos = NewPos; + NewPos = SetScrollInfo(infoPtr->hSelf, + SB_VERT, + &ScrollInfo, + TRUE); + if (VisibleFirst != NewPos) { - SCROLLINFO ScrollInfo; - - ScrollInfo.cbSize = sizeof(ScrollInfo); - ScrollInfo.fMask = SIF_POS; - ScrollInfo.nPos = NewPos; - NewPos = SetScrollInfo(infoPtr->hSelf, - SB_VERT, - &ScrollInfo, - TRUE); + ScrollWindowEx(infoPtr->hSelf, + 0, + (NewPos - VisibleFirst) * infoPtr->ItemHeight, + NULL, + NULL, + NULL, + NULL, + SW_INVALIDATE | SW_SCROLLCHILDREN); - if (VisibleFirst != NewPos) - { - ScrollWindowEx(infoPtr->hSelf, - 0, - (NewPos - VisibleFirst) * infoPtr->ItemHeight, - NULL, - NULL, - NULL, - NULL, - SW_INVALIDATE | SW_SCROLLCHILDREN); - - RedrawWindow(infoPtr->hSelf, - NULL, - NULL, - RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN); - } + RedrawWindow(infoPtr->hSelf, + NULL, + NULL, + RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN); } } } @@ -769,8 +716,7 @@ infoPtr->ItemHeight - (2 * CI_TEXT_MARGIN_HEIGHT)); } - UpdateControl(infoPtr, - TRUE); + UpdateControl(infoPtr); return hOldFont; } @@ -809,7 +755,6 @@ INT ScrollPos; PCHECKITEM FirstItem, Item; RECT rcClient; - LONG Style; UINT VisibleFirstIndex = rcUpdate->top / infoPtr->ItemHeight; UINT LastTouchedIndex = rcUpdate->bottom / infoPtr->ItemHeight; @@ -819,19 +764,9 @@ GetClientRect(infoPtr->hSelf, &rcClient); - Style = GetWindowLong(infoPtr->hSelf, - GWL_STYLE); + ScrollPos = GetScrollPos(infoPtr->hSelf, + SB_VERT); - if (Style & WS_VSCROLL) - { - ScrollPos = GetScrollPos(infoPtr->hSelf, - SB_VERT); - } - else - { - ScrollPos = 0; - } - FirstItem = FindCheckItemByIndex(infoPtr, ScrollPos + VisibleFirstIndex); if (FirstItem != NULL) @@ -1126,26 +1061,15 @@ IN PCHECKITEM Item, IN UINT ItemBox) { - LONG Style; RECT rcClient; INT VisibleFirst, VisibleItems; INT Index = CheckItemToIndex(infoPtr, Item); if (Index != -1) { - Style = GetWindowLong(infoPtr->hSelf, - GWL_STYLE); + VisibleFirst = GetScrollPos(infoPtr->hSelf, + SB_VERT); - if (Style & WS_VSCROLL) - { - VisibleFirst = GetScrollPos(infoPtr->hSelf, - SB_VERT); - } - else - { - VisibleFirst = 0; - } - if (Index >= VisibleFirst) { GetClientRect(infoPtr->hSelf, @@ -1278,23 +1202,12 @@ if (Index != -1) { RECT rcClient; - LONG Style; INT VisibleFirst; GetClientRect(infoPtr->hSelf, &rcClient); - Style = GetWindowLong(infoPtr->hSelf, - GWL_STYLE); - - if (Style & WS_VSCROLL) - { - VisibleFirst = GetScrollPos(infoPtr->hSelf, - SB_VERT); - } - else - { - VisibleFirst = 0; - } + VisibleFirst = GetScrollPos(infoPtr->hSelf, + SB_VERT); prcItem->left = rcClient.left; prcItem->right = rcClient.right; @@ -1774,8 +1687,7 @@ &Index); if (Item != NULL) { - UpdateControl(infoPtr, - TRUE); + UpdateControl(infoPtr); Ret = (LRESULT)Index; } else @@ -1795,8 +1707,7 @@ Item); if (Ret) { - UpdateControl(infoPtr, - TRUE); + UpdateControl(infoPtr); } } else @@ -1838,8 +1749,7 @@ } } - UpdateControl(infoPtr, - TRUE); + UpdateControl(infoPtr); } Ret = TRUE; } @@ -1859,8 +1769,7 @@ case CLM_CLEAR: { ClearCheckItems(infoPtr); - UpdateControl(infoPtr, - TRUE); + UpdateControl(infoPtr); break; } @@ -1882,8 +1791,7 @@ Ret = (LRESULT)ClearCheckBoxes(infoPtr); if (Ret) { - UpdateControl(infoPtr, - TRUE); + UpdateControl(infoPtr); } break; } @@ -1926,18 +1834,9 @@ case WM_STYLECHANGED: { - LPSTYLESTRUCT Style = (LPSTYLESTRUCT)lParam; - if (wParam == (WPARAM)GWL_STYLE) { - BOOL AllowChangeStyle; - - /* don't allow the control to enable/disable the vertical scrollbar - if this message was invoked due to such a window style change! */ - AllowChangeStyle = ((Style->styleNew & WS_VSCROLL) == (Style->styleOld & WS_VSCROLL)); - - UpdateControl(infoPtr, - AllowChangeStyle); + UpdateControl(infoPtr); } break; } @@ -1946,8 +1845,7 @@ { EscapeQuickSearch(infoPtr); - UpdateControl(infoPtr, - TRUE); + UpdateControl(infoPtr); break; } @@ -2449,8 +2347,7 @@ case WM_SIZE: { - UpdateControl(infoPtr, - TRUE); + UpdateControl(infoPtr); break; }

19 years, 4 months

[weiden] 17039: fail as documented when the pointer to the buffer equals the pointer to the string to be converted in MultiByteToWideChar and WideCharToMultiByte

by weiden＠svn.reactos.com

fail as documented when the pointer to the buffer equals the pointer to the string to be converted in MultiByteToWideChar and WideCharToMultiByte Modified: trunk/reactos/lib/kernel32/misc/nls.c _____ Modified: trunk/reactos/lib/kernel32/misc/nls.c --- trunk/reactos/lib/kernel32/misc/nls.c 2005-08-03 22:49:47 UTC (rev 17038) +++ trunk/reactos/lib/kernel32/misc/nls.c 2005-08-03 23:07:10 UTC (rev 17039) @@ -745,7 +745,8 @@ { /* Check the parameters. */ if (MultiByteString == NULL || - (WideCharString == NULL && WideCharCount > 0)) + (WideCharString == NULL && WideCharCount > 0) || + (PVOID)MultiByteString == (PVOID)WideCharString) { SetLastError(ERROR_INVALID_PARAMETER); return 0; @@ -823,7 +824,8 @@ { /* Check the parameters. */ if (WideCharString == NULL || - (MultiByteString == NULL && MultiByteCount > 0)) + (MultiByteString == NULL && MultiByteCount > 0) || + (PVOID)WideCharString == (PVOID)MultiByteString) { SetLastError(ERROR_INVALID_PARAMETER); return 0;

19 years, 4 months

← Newer
1
...
53
54
55
56
57
58
59
...
67
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2005