Ros-diffs March 2009

ros-diffs@reactos.org

28 participants
483 discussions

[cwittich] 40054: implement WlanCloseHandle
by cwittich＠svn.reactos.org 16 Mar '09

16 Mar '09

Author: cwittich Date: Mon Mar 16 11:23:58 2009 New Revision: 40054 URL: http://svn.reactos.org/svn/reactos?rev=40054&view=rev Log: implement WlanCloseHandle Modified: trunk/reactos/dll/win32/wlanapi/main.c trunk/reactos/dll/win32/wlanapi/wlanapi.rbuild trunk/reactos/include/psdk/wlanapi.h Modified: trunk/reactos/dll/win32/wlanapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/main.c [iso-8859-1] Mon Mar 16 11:23:58 2009 @@ -18,9 +18,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +/* INCLUDES ****************************************************************/ #include <windows.h> -#include <wlanapi.h> +#include "wlansvc_c.h" +#define NDEBUG +#include <debug.h> PVOID WINAPI @@ -36,3 +40,36 @@ HeapFree(GetProcessHeap(), 0, pMem); } +DWORD +WINAPI +WlanCloseHandle(IN HANDLE hClientHandle, + PVOID pReserved) +{ + DWORD dwError = ERROR_SUCCESS; + + RpcTryExcept + { + _RpcCloseHandle(hClientHandle); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = RpcExceptionCode(); + } + RpcEndExcept; + + return dwError; +} + +void __RPC_FAR * __RPC_USER +midl_user_allocate(size_t len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + + +void __RPC_USER +midl_user_free(void __RPC_FAR * ptr) +{ + HeapFree(GetProcessHeap(), 0, ptr); +} + Modified: trunk/reactos/dll/win32/wlanapi/wlanapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/wlanapi.… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/wlanapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/wlanapi.rbuild [iso-8859-1] Mon Mar 16 11:23:58 2009 @@ -1,7 +1,11 @@ <module name="wlanapi" type="win32dll" baseaddress="${BASEADDRESS_WLANAPI}" installbase="system32" installname="wlanapi.dll" entrypoint="0"> <importlibrary definition="wlanapi.spec" /> <include base="wlanapi">.</include> + <include base="wlansvc_client">.</include> + <library>wlansvc_client</library> <library>kernel32</library> + <library>rpcrt4</library> + <library>pseh</library> <library>ntdll</library> <file>main.c</file>  Modified: trunk/reactos/include/psdk/wlanapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wlanapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] Mon Mar 16 11:23:58 2009 @@ -188,6 +188,8 @@ #if !defined(__midl) && !defined(__WIDL__) PVOID WINAPI WlanAllocateMemory(DWORD dwSize); VOID WINAPI WlanFreeMemory(PVOID pMemory); +DWORD WINAPI WlanOpenHandle(IN DWORD dwClientVersion, PVOID pReserved, OUT DWORD *pdwNegotiatedVersion, OUT HANDLE *phClientHandle); +DWORD WINAPI WlanCloseHandle(IN HANDLE hClientHandle, PVOID pReserved); #endif #ifdef __cplusplus

1 0

[cwittich] 40053: stub wlan rpcserver
by cwittich＠svn.reactos.org 16 Mar '09

16 Mar '09

Author: cwittich Date: Mon Mar 16 11:08:03 2009 New Revision: 40053 URL: http://svn.reactos.org/svn/reactos?rev=40053&view=rev Log: stub wlan rpcserver Added: trunk/reactos/base/services/wlansvc/rpcserver.c (with props) Modified: trunk/reactos/base/services/wlansvc/wlansvc.rbuild Added: trunk/reactos/base/services/wlansvc/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wlansvc/rpcs… ============================================================================== --- trunk/reactos/base/services/wlansvc/rpcserver.c (added) +++ trunk/reactos/base/services/wlansvc/rpcserver.c [iso-8859-1] Mon Mar 16 11:08:03 2009 @@ -1,0 +1,467 @@ +/* + * PROJECT: ReactOS WLAN Service + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/services/wlansvc/rpcserver.c + * PURPOSE: RPC server interface + * COPYRIGHT: Copyright 2009 Christoph von Wittich + */ + +/* INCLUDES ****************************************************************/ +#include <windows.h> +#include "wlansvc_s.h" + +#define NDEBUG +#include <debug.h> + + +DWORD _RpcOpenHandle( + wchar_t *arg_1, + DWORD dwClientVersion, + DWORD *pdwNegotiatedVersion, + LPWLANSVC_RPC_HANDLE phClientHandle) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcCloseHandle( + LPWLANSVC_RPC_HANDLE phClientHandle) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcEnumInterfaces( + WLANSVC_RPC_HANDLE hClientHandle, + PWLAN_INTERFACE_INFO_LIST *ppInterfaceList) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcSetAutoConfigParameter( + WLANSVC_RPC_HANDLE hClientHandle, + long OpCode, + DWORD dwDataSize, + LPBYTE pData) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcQueryAutoConfigParameter( + WLANSVC_RPC_HANDLE hClientHandle, + DWORD OpCode, + LPDWORD pdwDataSize, + char **ppData, + DWORD *pWlanOpcodeValueType) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcGetInterfaceCapability( + WLANSVC_RPC_HANDLE hClientHandle, + GUID *pInterfaceGuid, + PWLAN_INTERFACE_CAPABILITY *ppCapability) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcSetInterface( + WLANSVC_RPC_HANDLE hClientHandle, + GUID *pInterfaceGuid, + DWORD OpCode, + DWORD dwDataSize, + LPBYTE pData) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcQueryInterface( + WLANSVC_RPC_HANDLE hClientHandle, + GUID *pInterfaceGuid, + long OpCode, + LPDWORD pdwDataSize, + LPBYTE *ppData, + LPDWORD pWlanOpcodeValueType) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcIhvControl( + WLANSVC_RPC_HANDLE hClientHandle, + GUID *pInterfaceGuid, + DWORD Type, + DWORD dwInBufferSize, + LPBYTE pInBuffer, + DWORD dwOutBufferSize, + LPBYTE pOutBuffer, + LPDWORD pdwBytesReturned) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcScan( + WLANSVC_RPC_HANDLE hClientHandle, + GUID *pInterfaceGuid, + PDOT11_SSID pDot11Ssid, + PWLAN_RAW_DATA pIeData) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcGetAvailableNetworkList( + WLANSVC_RPC_HANDLE hClientHandle, + GUID *pInterfaceGuid, + DWORD dwFlags, + WLAN_AVAILABLE_NETWORK_LIST **ppAvailableNetworkList) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcGetNetworkBssList( + WLANSVC_RPC_HANDLE hClientHandle, + GUID *pInterfaceGuid, + PDOT11_SSID pDot11Ssid, + short dot11BssType, + DWORD bSecurityEnabled, + LPDWORD dwBssListSize, + LPBYTE *ppWlanBssList) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcConnect( + WLANSVC_RPC_HANDLE hClientHandle, + GUID *pInterfaceGuid, + PWLAN_CONNECTION_PARAMETERS *pConnectionParameters) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcDisconnect( + WLANSVC_RPC_HANDLE hClientHandle, + GUID *pInterfaceGUID) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcRegisterNotification( + WLANSVC_RPC_HANDLE hClientHandle, + DWORD arg_2, + LPDWORD pdwPrevNotifSource) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcAsyncGetNotification( + WLANSVC_RPC_HANDLE hClientHandle, + PWLAN_NOTIFICATION_DATA *NotificationData) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +DWORD _RpcSetProfileEapUserData( + WLANSVC_RPC_HANDLE hClientHandle, + GUID *pInterfaceGuid, + wchar_t *strProfileName, + EAP_METHOD_TYPE MethodType, + DWORD dwFlags, + DWORD dwEapUserDataSize, + LPBYTE pbEapUserData) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcSetProfile( + WLANSVC_RPC_HANDLE hClientHandle, + GUID *pInterfaceGuid, + DWORD dwFlags, + wchar_t *strProfileXml, + wchar_t *strAllUserProfileSecurity, + BOOL bOverwrite, + LPDWORD pdwReasonCode) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcGetProfile( + WLANSVC_RPC_HANDLE hClientHandle, + GUID *pInterfaceGuid, + wchar_t *strProfileName, + wchar_t **pstrProfileXml, + LPDWORD pdwFlags, + LPDWORD pdwGrantedAccess) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcDeleteProfile( + WLANSVC_RPC_HANDLE hClientHandle, + GUID *pInterfaceGuid, + wchar_t *strProfileName) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcRenameProfile( + WLANSVC_RPC_HANDLE hClientHandle, + GUID *pInterfaceGuid, + wchar_t *strOldProfileName, + wchar_t *strNewProfileName) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcSetProfileList( + WLANSVC_RPC_HANDLE hClientHandle, + GUID *pInterfaceGuid, + DWORD dwItems, + BYTE **strProfileNames) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcGetProfileList( + WLANSVC_RPC_HANDLE hClientHandle, + GUID *pInterfaceGuid, + PWLAN_PROFILE_INFO_LIST *ppProfileList) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcSetProfilePosition( + WLANSVC_RPC_HANDLE hClientHandle, + GUID *pInterfaceGuid, + wchar_t *strProfileName, + DWORD dwPosition) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcSetProfileCustomUserData( + WLANSVC_RPC_HANDLE hClientHandle, + GUID *pInterfaceGuid, + wchar_t *strProfileName, + DWORD dwDataSize, + LPBYTE pData) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcGetProfileCustomUserData( + WLANSVC_RPC_HANDLE hClientHandle, + GUID *pInterfaceGuid, + wchar_t *strProfileName, + LPDWORD dwDataSize, + LPBYTE *pData) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcSetFilterList( + WLANSVC_RPC_HANDLE hClientHandle, + short wlanFilterListType, + PDOT11_NETWORK_LIST pNetworkList) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcGetFilterList( + WLANSVC_RPC_HANDLE hClientHandle, + short wlanFilterListType, + PDOT11_NETWORK_LIST *pNetworkList) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcSetPsdIEDataList( + WLANSVC_RPC_HANDLE hClientHandle, + wchar_t *strFormat, + DWORD dwDataListSize, + LPBYTE pPsdIEDataList) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcSaveTemporaryProfile( + WLANSVC_RPC_HANDLE hClientHandle, + GUID *pInterfaceGuid, + wchar_t *strProfileName, + wchar_t *strAllUserProfileSecurity, + DWORD dwFlags, + BOOL bOverWrite) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcIsUIRequestPending( + wchar_t *arg_1, + GUID *pInterfaceGuid, + struct_C *arg_3, + LPDWORD arg_4) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcSetUIForwardingNetworkList( + wchar_t *arg_1, + GUID *arg_2, + DWORD dwSize, + GUID *arg_4) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcIsNetworkSuppressed( + wchar_t *arg_1, + DWORD arg_2, + GUID *pInterfaceGuid, + LPDWORD arg_4) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcRemoveUIForwardingNetworkList( + wchar_t *arg_1, + GUID *pInterfaceGuid) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcQueryExtUIRequest( + wchar_t *arg_1, + GUID *arg_2, + GUID *arg_3, + short arg_4, + GUID *pInterfaceGuid, + struct_C **arg_6) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcUIResponse( + wchar_t *arg_1, + struct_C *arg_2, + struct_D *arg_3) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcGetProfileKeyInfo( + wchar_t *arg_1, + DWORD arg_2, + GUID *pInterfaceGuid, + wchar_t *arg_4, + DWORD arg_5, + LPDWORD arg_6, + char *arg_7, + LPDWORD arg_8) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcAsyncDoPlap( + wchar_t *arg_1, + GUID *pInterfaceGuid, + wchar_t *arg_3, + DWORD dwSize, + struct_E arg_5[]) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcQueryPlapCredentials( + wchar_t *arg_1, + LPDWORD dwSize, + struct_E **arg_3, + wchar_t **arg_4, + GUID *pInterfaceGuid, + LPDWORD arg_6, + LPDWORD arg_7, + LPDWORD arg_8, + LPDWORD arg_9) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcCancelPlap( + wchar_t *arg_1, + GUID *pInterfaceGuid) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcSetSecuritySettings( + WLANSVC_RPC_HANDLE hClientHandle, + WLAN_SECURABLE_OBJECT SecurableObject, + wchar_t *strModifiedSDDL) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD _RpcGetSecuritySettings( + WLANSVC_RPC_HANDLE hClientHandle, + WLAN_SECURABLE_OBJECT SecurableObject, + WLAN_OPCODE_VALUE_TYPE *pValueType, + wchar_t **pstrCurrentSDDL, + LPDWORD pdwGrantedAccess) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + + +void __RPC_USER midl_user_free(void __RPC_FAR * ptr) +{ + HeapFree(GetProcessHeap(), 0, ptr); +} + + +void __RPC_USER WLANSVC_RPC_HANDLE_rundown(WLANSVC_RPC_HANDLE hClientHandle) +{ +} + Propchange: trunk/reactos/base/services/wlansvc/rpcserver.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/services/wlansvc/wlansvc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wlansvc/wlan… ============================================================================== --- trunk/reactos/base/services/wlansvc/wlansvc.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/wlansvc/wlansvc.rbuild [iso-8859-1] Mon Mar 16 11:08:03 2009 @@ -2,8 +2,13 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="wlansvc" type="win32cui" installbase="system32" installname="wlansvc.exe" unicode="yes"> <include base="wlansvc">.</include> + <include base="wlansvc_server">.</include> + <library>wlansvc_server</library> <library>ntdll</library> <library>kernel32</library> <library>advapi32</library> + <library>rpcrt4</library> + <library>pseh</library> <file>wlansvc.c</file> + <file>rpcserver.c</file> </module>

1 0

[cwittich] 40052: move some structs to the idl
by cwittich＠svn.reactos.org 16 Mar '09

16 Mar '09

Author: cwittich Date: Mon Mar 16 10:50:27 2009 New Revision: 40052 URL: http://svn.reactos.org/svn/reactos?rev=40052&view=rev Log: move some structs to the idl Modified: trunk/reactos/include/psdk/wlanapi.h trunk/reactos/include/reactos/idl/wlansvc.idl Modified: trunk/reactos/include/psdk/wlanapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wlanapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] Mon Mar 16 10:50:27 2009 @@ -184,38 +184,6 @@ typedef L2_NOTIFICATION_DATA WLAN_NOTIFICATION_DATA, *PWLAN_NOTIFICATION_DATA; -/* FIXME */ - -#if 0 -typedef struct struct_C { - ULONGLONG elem_1; - ULONGLONG elem_2; - GUID elem_3; - GUID elem_4; - DWORD elem_5; - GUID elem_6; - DWORD elem_7; - DWORD elem_8; - ULONGLONG elem_9; - [size_is(elem_7)] BYTE elem_10[]; -} struct_C ; - -typedef struct struct_D { - GUID elem_1; - GUID elem_2; - DWORD elem_3; - ULONGLONG elem_4; - [size_is(elem_3)] BYTE elem_5[]; -} struct_D ; - -typedef struct struct_E { - /* enum16 */ short elem_1; - DWORD elem_2; - WCHAR elem_3[256]; - WCHAR elem_4[1024]; -} struct_E ; -#endif - /* Functions */ #if !defined(__midl) && !defined(__WIDL__) PVOID WINAPI WlanAllocateMemory(DWORD dwSize); Modified: trunk/reactos/include/reactos/idl/wlansvc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/wlansv… ============================================================================== --- trunk/reactos/include/reactos/idl/wlansvc.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/wlansvc.idl [iso-8859-1] Mon Mar 16 10:50:27 2009 @@ -7,6 +7,35 @@ typedef [context_handle] PVOID WLANSVC_RPC_HANDLE; typedef WLANSVC_RPC_HANDLE* LPWLANSVC_RPC_HANDLE; + +/* FIXME */ +typedef struct struct_C { + ULONGLONG elem_1; + ULONGLONG elem_2; + GUID elem_3; + GUID elem_4; + DWORD elem_5; + GUID elem_6; + DWORD elem_7; + DWORD elem_8; + ULONGLONG elem_9; + [size_is(elem_7)] BYTE elem_10[]; +} struct_C ; + +typedef struct struct_D { + GUID elem_1; + GUID elem_2; + DWORD elem_3; + ULONGLONG elem_4; + [size_is(elem_3)] BYTE elem_5[]; +} struct_D ; + +typedef struct struct_E { + /* enum16 */ short elem_1; + DWORD elem_2; + WCHAR elem_3[256]; + WCHAR elem_4[1024]; +} struct_E ; [ uuid(266f33b4-c7c1-4bd1-8f52-ddb8f2214ea9),

1 0

[jimtabor] 40051: - Patch by Evgeniy Boltik: Fix Rectangle, Ellipse, RoundRect and Polygon.
by jimtabor＠svn.reactos.org 16 Mar '09

16 Mar '09

Author: jimtabor Date: Mon Mar 16 06:21:00 2009 New Revision: 40051 URL: http://svn.reactos.org/svn/reactos?rev=40051&view=rev Log: - Patch by Evgeniy Boltik: Fix Rectangle, Ellipse, RoundRect and Polygon. Modified: trunk/reactos/subsystems/win32/win32k/include/paint.h trunk/reactos/subsystems/win32/win32k/objects/drawing.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/polyfill.c Modified: trunk/reactos/subsystems/win32/win32k/include/paint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/paint.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/paint.h [iso-8859-1] Mon Mar 16 06:21:00 2009 @@ -3,5 +3,7 @@ BOOL APIENTRY FillSolid (SURFOBJ* Surface, RECTL* Dimensions, ULONG iColor); BOOL APIENTRY FillPolygon ( DC* dc, SURFACE* pSurface, BRUSHOBJ* BrushObj, MIX RopMode, CONST PPOINT Points, INT Count, RECTL BoundRect ); +BOOL FASTCALL IntFillPolygon(PDC dc, SURFACE *psurf, BRUSHOBJ *BrushObj, + CONST PPOINT Points, int Count, RECTL DestRect, POINTL *BrushOrigin); #endif /* _WIN32K_PAINT_H */ Modified: trunk/reactos/subsystems/win32/win32k/objects/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] Mon Mar 16 06:21:00 2009 @@ -1337,26 +1337,10 @@ INT XLeft, INT YLeft, INT Width, - INT Height) -{ - BOOL ret; - PDC_ATTR Dc_Attr; - PGDIBRUSHOBJ FillBrushObj; - - Dc_Attr = dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - - FillBrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); - if (NULL == FillBrushObj) - { - DPRINT1("FillEllipse Fail\n"); - SetLastWin32Error(ERROR_INTERNAL_ERROR); - return FALSE; - } - ret = (BOOL)app_fill_ellipse(dc, rect( XLeft, YLeft, Width, Height), FillBrushObj); - - BRUSHOBJ_UnlockBrush(FillBrushObj); - return ret; + INT Height, + PGDIBRUSHOBJ FillBrushObj) +{ + return (BOOL)app_fill_ellipse(dc, rect( XLeft, YLeft, Width, Height), FillBrushObj); } BOOL @@ -1367,23 +1351,12 @@ INT Right, INT Bottom, INT Wellipse, - INT Hellipse) -{ - PDC_ATTR Dc_Attr; - PGDIBRUSHOBJ FillBrushObj; + INT Hellipse, + PGDIBRUSHOBJ FillBrushObj) +{ Rect r; int rx, ry; /* radius in x and y directions */ - Dc_Attr = dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - - FillBrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); - if (NULL == FillBrushObj) - { - DPRINT1("FillEllipse Fail\n"); - SetLastWin32Error(ERROR_INTERNAL_ERROR); - return FALSE; - } // x y Width Height r = rect( Left, Top, abs(Right-Left), abs(Bottom-Top)); rx = Wellipse/2; @@ -1432,7 +1405,6 @@ app_fill_rect(dc, rect(r.x, r.y+ry+1, r.width, r.height-ry-ry), FillBrushObj, FALSE); } - BRUSHOBJ_UnlockBrush(FillBrushObj); return TRUE; } Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Mon Mar 16 06:21:00 2009 @@ -44,9 +44,9 @@ #define Rsin(d) ((d) == 0.0 ? 0.0 : ((d) == 90.0 ? 1.0 : sin(d*M_PI/180.0))) #define Rcos(d) ((d) == 0.0 ? 1.0 : ((d) == 90.0 ? 0.0 : cos(d*M_PI/180.0))) -BOOL FASTCALL IntFillEllipse( PDC dc, INT XLeft, INT YLeft, INT Width, INT Height); +BOOL FASTCALL IntFillEllipse( PDC dc, INT XLeft, INT YLeft, INT Width, INT Height, PGDIBRUSHOBJ FillBrushObj); BOOL FASTCALL IntDrawEllipse( PDC dc, INT XLeft, INT YLeft, INT Width, INT Height, PGDIBRUSHOBJ PenBrushObj); -BOOL FASTCALL IntFillRoundRect( PDC dc, INT Left, INT Top, INT Right, INT Bottom, INT Wellipse, INT Hellipse); +BOOL FASTCALL IntFillRoundRect( PDC dc, INT Left, INT Top, INT Right, INT Bottom, INT Wellipse, INT Hellipse, PGDIBRUSHOBJ FillBrushObj); BOOL FASTCALL IntDrawRoundRect( PDC dc, INT Left, INT Top, INT Right, INT Bottom, INT Wellipse, INT Hellipse, PGDIBRUSHOBJ PenBrushObj); BOOL FASTCALL @@ -61,7 +61,10 @@ RECTL DestRect; int CurrentPoint; PDC_ATTR Dc_Attr; - + POINTL BrushOrigin; +// int Left; +// int Top; + ASSERT(dc); // caller's responsibility to pass a valid dc if (!Points || Count < 2 ) @@ -69,6 +72,16 @@ SetLastWin32Error(ERROR_INVALID_PARAMETER); return FALSE; } + +/* + //Find start x, y + Left = Points[0].x; + Top = Points[0].y; + for (CurrentPoint = 1; CurrentPoint < Count; ++CurrentPoint) { + Left = min(Left, Points[CurrentPoint].x); + Top = min(Top, Points[CurrentPoint].y); + } +*/ Dc_Attr = dc->pDc_Attr; if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; @@ -111,8 +124,12 @@ /* Now fill the polygon with the current brush. */ if (FillBrushObj && !(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL)) { + BrushOrigin = *((PPOINTL)&FillBrushObj->ptOrigin); + BrushOrigin.x += dc->ptlDCOrig.x; + BrushOrigin.y += dc->ptlDCOrig.y; IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); - ret = FillPolygon ( dc, psurf, &FillBrushInst.BrushObject, ROP2_TO_MIX(Dc_Attr->jROP2), Points, Count, DestRect ); + ret = IntFillPolygon (dc, psurf, &FillBrushInst.BrushObject, Points, Count, + DestRect, &BrushOrigin); } if (FillBrushObj) BRUSHOBJ_UnlockBrush(FillBrushObj); @@ -213,6 +230,8 @@ BOOL ret = TRUE; LONG PenWidth, PenOrigWidth; LONG RadiusX, RadiusY, CenterX, CenterY; + PGDIBRUSHOBJ pFillBrushObj; + GDIBRUSHOBJ tmpFillBrushObj; if ((Left == Right) || (Top == Bottom)) return TRUE; @@ -303,11 +322,29 @@ DPRINT("Ellipse 2: XLeft: %d, YLeft: %d, Width: %d, Height: %d\n", CenterX - RadiusX, CenterY + RadiusY, RadiusX*2, RadiusY*2); - ret = IntFillEllipse( dc, - CenterX - RadiusX, - CenterY - RadiusY, - RadiusX*2, // Width - RadiusY*2); // Height + pFillBrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); + if (NULL == pFillBrushObj) + { + DPRINT1("FillEllipse Fail\n"); + SetLastWin32Error(ERROR_INTERNAL_ERROR); + ret = FALSE; + } + else + { + RtlCopyMemory(&tmpFillBrushObj, pFillBrushObj, sizeof(tmpFillBrushObj)); +// tmpFillBrushObj.ptOrigin.x += RectBounds.left - Left; +// tmpFillBrushObj.ptOrigin.y += RectBounds.top - Top; + tmpFillBrushObj.ptOrigin.x += dc->ptlDCOrig.x; + tmpFillBrushObj.ptOrigin.y += dc->ptlDCOrig.y; + ret = IntFillEllipse( dc, + CenterX - RadiusX, + CenterY - RadiusY, + RadiusX*2, // Width + RadiusY*2, // Height + &tmpFillBrushObj); + BRUSHOBJ_UnlockBrush(pFillBrushObj); + } + if (ret) ret = IntDrawEllipse( dc, CenterX - RadiusX, @@ -512,6 +549,7 @@ RECTL DestRect; MIX Mix; PDC_ATTR Dc_Attr; + POINTL BrushOrigin; ASSERT ( dc ); // caller's responsibility to set this up @@ -581,6 +619,9 @@ { if (!(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL)) { + BrushOrigin = *((PPOINTL)&FillBrushObj->ptOrigin); + BrushOrigin.x += dc->ptlDCOrig.x; + BrushOrigin.y += dc->ptlDCOrig.y; IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); ret = IntEngBitBlt(&psurf->SurfObj, NULL, @@ -591,7 +632,7 @@ NULL, NULL, &FillBrushInst.BrushObject, - NULL, + &BrushOrigin, ROP3_TO_ROP4(PATCOPY)); } } @@ -697,6 +738,8 @@ RECTL RectBounds; LONG PenWidth, PenOrigWidth; BOOL ret = TRUE; // default to success + PGDIBRUSHOBJ pFillBrushObj; + GDIBRUSHOBJ tmpFillBrushObj; ASSERT ( dc ); // caller's responsibility to set this up @@ -763,13 +806,29 @@ RectBounds.right += dc->ptlDCOrig.x; RectBounds.bottom += dc->ptlDCOrig.y; - ret = IntFillRoundRect( dc, - RectBounds.left, - RectBounds.top, - RectBounds.right, - RectBounds.bottom, - xCurveDiameter, - yCurveDiameter); + pFillBrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); + if (NULL == pFillBrushObj) + { + DPRINT1("FillRound Fail\n"); + SetLastWin32Error(ERROR_INTERNAL_ERROR); + ret = FALSE; + } + else + { + RtlCopyMemory(&tmpFillBrushObj, pFillBrushObj, sizeof(tmpFillBrushObj)); + tmpFillBrushObj.ptOrigin.x += RectBounds.left - Left; + tmpFillBrushObj.ptOrigin.y += RectBounds.top - Top; + ret = IntFillRoundRect( dc, + RectBounds.left, + RectBounds.top, + RectBounds.right, + RectBounds.bottom, + xCurveDiameter, + yCurveDiameter, + &tmpFillBrushObj); + BRUSHOBJ_UnlockBrush(pFillBrushObj); + } + if (ret) ret = IntDrawRoundRect( dc, RectBounds.left, @@ -1048,95 +1107,93 @@ COLORREF Color, UINT FillType) { - PDC dc; - PDC_ATTR Dc_Attr; - SURFACE *psurf = NULL; - PGDIBRUSHOBJ FillBrushObj = NULL; - GDIBRUSHINST FillBrushInst; - BOOL Ret = FALSE; - RECTL DestRect; - POINTL Pt; -// MIX Mix; - - DPRINT1("FIXME: NtGdiExtFloodFill is UNIMPLEMENTED\n"); - - dc = DC_LockDc(hDC); - if (!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (dc->DC_Type == DC_TYPE_INFO) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - Dc_Attr = dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - - if (Dc_Attr->ulDirty_ & DC_PEN_DIRTY) - IntGdiSelectPen(dc,Dc_Attr->hpen); - - if (Dc_Attr->ulDirty_ & DC_BRUSH_DIRTY) - IntGdiSelectBrush(dc,Dc_Attr->hbrush); - - Pt.x = XStart; - Pt.y = YStart; - IntLPtoDP(dc, (LPPOINT)&Pt, 1); - - Ret = NtGdiPtInRegion(dc->w.hGCClipRgn, Pt.x, Pt.y); - if (Ret) - IntGdiGetRgnBox(dc->w.hGCClipRgn,(LPRECT)&DestRect); - else - goto cleanup; - - FillBrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); - if (!FillBrushObj) - { - Ret = FALSE; - goto cleanup; - } - psurf = SURFACE_LockSurface(dc->w.hBitmap); - if (!psurf) - { - Ret = FALSE; - goto cleanup; - } - - if ( FillBrushObj && (FillType == FLOODFILLBORDER)) - { - if (!(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL)) - { - FillBrushObj->BrushAttr.lbColor = Color; - IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); - Ret = IntEngBitBlt(&psurf->SurfObj, - NULL, - NULL, - dc->CombinedClip, - NULL, - &DestRect, - NULL, - NULL, + PDC dc; + PDC_ATTR Dc_Attr; + SURFACE *psurf = NULL; + PGDIBRUSHOBJ FillBrushObj = NULL; + GDIBRUSHINST FillBrushInst; + BOOL Ret = FALSE; + RECTL DestRect; + POINTL Pt; + POINTL BrushOrigin; + + DPRINT1("FIXME: NtGdiExtFloodFill is UNIMPLEMENTED\n"); + + dc = DC_LockDc(hDC); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + if (dc->DC_Type == DC_TYPE_INFO) + { + DC_UnlockDc(dc); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; + } + + Dc_Attr = dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + + if (Dc_Attr->ulDirty_ & DC_PEN_DIRTY) + IntGdiSelectPen(dc,Dc_Attr->hpen); + + if (Dc_Attr->ulDirty_ & DC_BRUSH_DIRTY) + IntGdiSelectBrush(dc,Dc_Attr->hbrush); + + Pt.x = XStart; + Pt.y = YStart; + IntLPtoDP(dc, (LPPOINT)&Pt, 1); + + Ret = NtGdiPtInRegion(dc->w.hGCClipRgn, Pt.x, Pt.y); + if (Ret) + IntGdiGetRgnBox(dc->w.hGCClipRgn,(LPRECT)&DestRect); + else + goto cleanup; + + FillBrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); + if (!FillBrushObj) + { + Ret = FALSE; + goto cleanup; + } + psurf = SURFACE_LockSurface(dc->w.hBitmap); + if (!psurf) + { + Ret = FALSE; + goto cleanup; + } + + if ( FillBrushObj && (FillType == FLOODFILLBORDER)) + { + if (!(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL)) + { + FillBrushObj->BrushAttr.lbColor = Color; + BrushOrigin = *((PPOINTL)&FillBrushObj->ptOrigin); + BrushOrigin.x += dc->ptlDCOrig.x; + BrushOrigin.y += dc->ptlDCOrig.y; + IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); + Ret = IntEngBitBlt(&psurf->SurfObj, NULL, NULL, + dc->CombinedClip, NULL, + &DestRect, NULL, NULL, &FillBrushInst.BrushObject, - NULL, + &BrushOrigin, ROP3_TO_ROP4(PATCOPY)); - } - } - else - { - } + } + } + else + { + } cleanup: - if (FillBrushObj) - BRUSHOBJ_UnlockBrush(FillBrushObj); - - if (psurf) - SURFACE_UnlockSurface(psurf); - - DC_UnlockDc(dc); - return Ret; + if (FillBrushObj) + BRUSHOBJ_UnlockBrush(FillBrushObj); + + if (psurf) + SURFACE_UnlockSurface(psurf); + + DC_UnlockDc(dc); + return Ret; } /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/objects/polyfill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/polyfill.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/polyfill.c [iso-8859-1] Mon Mar 16 06:21:00 2009 @@ -600,4 +600,76 @@ return TRUE; } + +BOOL FASTCALL +IntFillPolygon( + PDC dc, + SURFACE *psurf, + BRUSHOBJ *BrushObj, + CONST PPOINT Points, + int Count, + RECTL DestRect, + POINTL *BrushOrigin) +{ + FILL_EDGE_LIST *list = 0; + FILL_EDGE *ActiveHead = 0; + FILL_EDGE *pLeft, *pRight; + int ScanLine; + + //DPRINT("IntFillPolygon\n"); + + /* Create Edge List. */ + list = POLYGONFILL_MakeEdgeList(Points, Count); + /* DEBUG_PRINT_EDGELIST(list); */ + if (NULL == list) + return FALSE; + + /* For each Scanline from DestRect.top to DestRect.bottom, determine line segments to draw */ + for ( ScanLine = DestRect.top; ScanLine < DestRect.bottom; ++ScanLine ) + { + POLYGONFILL_BuildActiveList(ScanLine, list, &ActiveHead); + //DEBUG_PRINT_ACTIVE_EDGELIST(ActiveHead); + + if ( !ActiveHead ) + return FALSE; + + pLeft = ActiveHead; + pRight = pLeft->pNext; + ASSERT(pRight); + + while ( NULL != pRight ) + { + int x1 = pLeft->XIntercept[0]; + int x2 = pRight->XIntercept[1]; + if ( x2 > x1 ) + { + RECTL LineRect; + LineRect.top = ScanLine; + LineRect.bottom = ScanLine + 1; + LineRect.left = x1; + LineRect.right = x2; + + IntEngBitBlt(&psurf->SurfObj, + NULL, + NULL, + dc->CombinedClip, + NULL, + &LineRect, + NULL, + NULL, + BrushObj, + BrushOrigin, + ROP3_TO_ROP4(PATCOPY)); + } + pLeft = pRight->pNext; + pRight = pLeft ? pLeft->pNext : NULL; + } + } + + /* Free Edge List. If any are left. */ + POLYGONFILL_DestroyEdgeList(list); + + return TRUE; +} + /* EOF */

1 0

[jmorlan] 40050: Fixed output of various date/time stuff ($D and $T in prompt, %DATE% and %TIME% variables, DATE /T and TIME /T commands) to be more compatible with Windows.
by jmorlan＠svn.reactos.org 16 Mar '09

16 Mar '09

Author: jmorlan Date: Mon Mar 16 03:44:08 2009 New Revision: 40050 URL: http://svn.reactos.org/svn/reactos?rev=40050&view=rev Log: Fixed output of various date/time stuff ($D and $T in prompt, %DATE% and %TIME% variables, DATE /T and TIME /T commands) to be more compatible with Windows. Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/date.c trunk/reactos/base/shell/cmd/dir.c trunk/reactos/base/shell/cmd/locale.c trunk/reactos/base/shell/cmd/prompt.c trunk/reactos/base/shell/cmd/time.c trunk/reactos/base/shell/cmd/timer.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Mon Mar 16 03:44:08 2009 @@ -928,27 +928,12 @@ /* %TIME% */ else if (_tcsicmp(varName,_T("time")) ==0) { - SYSTEMTIME t; - if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) - return NULL; - GetSystemTime(&t); - _sntprintf ( ret, retlen, _T("%02d%c%02d%c%02d%c%02d"), - t.wHour, cTimeSeparator, t.wMinute, cTimeSeparator, - t.wSecond, cDecimalSeparator, t.wMilliseconds / 10); - return ret; + return GetTimeString(); } /* %DATE% */ else if (_tcsicmp(varName,_T("date")) ==0) { - - if ( !GrowIfNecessary ( GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, NULL, 0), &ret, &retlen ) ) - return NULL; - - size = GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, ret, retlen); - - if ( !size ) - return NULL; - return ret; + return GetDateString(); } /* %RANDOM% */ @@ -1155,12 +1140,9 @@ FileTimeToLocalFileTime(&w32fd.ftLastWriteTime, &ft); FileTimeToSystemTime(&ft, &st); - /* TODO: This probably should be locale-dependent */ - Out += _stprintf(Out, - _T("%02d/%02d/%04d %02d:%02d %cM "), - st.wMonth, st.wDay, st.wYear, - (st.wHour + 11) % 12 + 1, st.wMinute, - (st.wHour >= 12) ? _T('P') : _T('A')); + Out += FormatDate(Out, &st, TRUE); + *Out++ = _T(' '); + Out += FormatTime(Out, &st); } if (Modifiers & M_SIZE) { Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Mon Mar 16 03:44:08 2009 @@ -191,6 +191,8 @@ /* Prototypes for DIR.C */ +INT FormatDate (TCHAR *, LPSYSTEMTIME, BOOL); +INT FormatTime (TCHAR *, LPSYSTEMTIME); INT CommandDir (LPTSTR); @@ -304,8 +306,8 @@ VOID InitLocale (VOID); -VOID PrintDate (VOID); -VOID PrintTime (VOID); +LPTSTR GetDateString (VOID); +LPTSTR GetTimeString (VOID); /* cache codepage */ extern UINT InputCodePage; Modified: trunk/reactos/base/shell/cmd/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/date.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/date.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/date.c [iso-8859-1] Mon Mar 16 03:44:08 2009 @@ -205,7 +205,7 @@ } if (nDateString == -1) - PrintDate (); + ConOutPrintf(_T("%s"), GetDateString()); if (!bPrompt) { Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] Mon Mar 16 03:44:08 2009 @@ -644,7 +644,6 @@ { FILETIME ft; SYSTEMTIME dt; - WORD wYear; /* Select the right time field */ switch (lpFlags->stTimeField.eTimeField) @@ -668,44 +667,56 @@ break; } + FormatDate(lpDate, &dt, lpFlags->b4Digit); + FormatTime(lpTime, &dt); +} + +INT +FormatDate(TCHAR *lpDate, LPSYSTEMTIME dt, BOOL b4Digit) +{ /* Format date */ - wYear = (lpFlags->b4Digit) ? dt.wYear : dt.wYear%100; + WORD wYear = b4Digit ? dt->wYear : dt->wYear%100; switch (nDateFormat) { case 0: /* mmddyy */ default: - _stprintf(lpDate, _T("%02d%c%02d%c%0*d"), - dt.wMonth, cDateSeparator, - dt.wDay, cDateSeparator, - lpFlags->b4Digit?4:2, wYear); + return _stprintf(lpDate, _T("%02d%c%02d%c%0*d"), + dt->wMonth, cDateSeparator, + dt->wDay, cDateSeparator, + b4Digit?4:2, wYear); break; case 1: /* ddmmyy */ - _stprintf(lpDate, _T("%02d%c%02d%c%0*d"), - dt.wDay, cDateSeparator, dt.wMonth, - cDateSeparator,lpFlags->b4Digit?4:2, wYear); + return _stprintf(lpDate, _T("%02d%c%02d%c%0*d"), + dt->wDay, cDateSeparator, dt->wMonth, + cDateSeparator, b4Digit?4:2, wYear); break; case 2: /* yymmdd */ - _stprintf(lpDate, _T("%0*d%c%02d%c%02d"), - lpFlags->b4Digit?4:2, wYear, cDateSeparator, - dt.wMonth, cDateSeparator, dt.wDay); + return _stprintf(lpDate, _T("%0*d%c%02d%c%02d"), + b4Digit?4:2, wYear, cDateSeparator, + dt->wMonth, cDateSeparator, dt->wDay); break; } +} + +INT +FormatTime(TCHAR *lpTime, LPSYSTEMTIME dt) +{ /* Format Time */ switch (nTimeFormat) { case 0: /* 12 hour format */ default: - _stprintf(lpTime,_T("%02d%c%02u%c"), - (dt.wHour == 0 ? 12 : (dt.wHour <= 12 ? dt.wHour : dt.wHour - 12)), + return _stprintf(lpTime,_T("%02d%c%02u%c"), + (dt->wHour == 0 ? 12 : (dt->wHour <= 12 ? dt->wHour : dt->wHour - 12)), cTimeSeparator, - dt.wMinute, (dt.wHour <= 11 ? _T('a') : _T('p'))); + dt->wMinute, (dt->wHour <= 11 ? _T('a') : _T('p'))); break; case 1: /* 24 hour format */ - _stprintf(lpTime, _T("%02d%c%02u"), - dt.wHour, cTimeSeparator, dt.wMinute); + return _stprintf(lpTime, _T("%02d%c%02u"), + dt->wHour, cTimeSeparator, dt->wMinute); break; } } Modified: trunk/reactos/base/shell/cmd/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/locale.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/locale.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/locale.c [iso-8859-1] Mon Mar 16 03:44:08 2009 @@ -54,27 +54,30 @@ #endif } +/* Return date string including weekday. Used for $D in prompt and %DATE% */ +LPTSTR +GetDateString(VOID) +{ + static TCHAR szDate[32]; + SYSTEMTIME t; + INT len; + GetLocalTime(&t); -VOID PrintDate (VOID) -{ - TCHAR szDateDay[32]; - TCHAR szDate[32]; - - GetDateFormat(LOCALE_USER_DEFAULT, 0, NULL, _T("ddd"), szDateDay, sizeof (szDateDay)); - - GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL,szDate, sizeof (szDate)); - ConOutPrintf(_T("%s %s"),szDateDay, szDate); + len = GetDateFormat(LOCALE_USER_DEFAULT, 0, &t, _T("ddd"), szDate, sizeof szDate); + szDate[len - 1] = _T(' '); + FormatDate(&szDate[len], &t, TRUE); + return szDate; } - -VOID PrintTime (VOID) +/* Return time in hh:mm:ss.xx format. Used for $T in prompt and %TIME% */ +LPTSTR +GetTimeString(VOID) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - SYSTEMTIME t; - GetLocalTime(&t); - - LoadString(CMD_ModuleHandle, STRING_LOCALE_HELP1, szMsg, RC_STRING_MAX_SIZE); - ConOutPrintf(_T("%s: %02d%c%02d%c%02d%c%02d\n"), szMsg, t.wHour, cTimeSeparator, - t.wMinute , cTimeSeparator, - t.wSecond , cDecimalSeparator, t.wMilliseconds ); + static TCHAR szTime[12]; + SYSTEMTIME t; + GetLocalTime(&t); + _stprintf(szTime, _T("%02d%c%02d%c%02d%c%02d"), + t.wHour, cTimeSeparator, t.wMinute, cTimeSeparator, + t.wSecond, cDecimalSeparator, t.wMilliseconds / 10); + return szTime; } Modified: trunk/reactos/base/shell/cmd/prompt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/prompt.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/prompt.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/prompt.c [iso-8859-1] Mon Mar 16 03:44:08 2009 @@ -87,7 +87,7 @@ break; case _T('D'): - PrintDate (); + ConOutPrintf(_T("%s"), GetDateString()); break; case _T('E'): @@ -137,12 +137,7 @@ break; case _T('T'): - { - SYSTEMTIME t; - GetSystemTime(&t); - ConOutPrintf(_T("%02d%c%02d%c%02d%c%02d\n"),t.wHour, cTimeSeparator,t.wMinute , cTimeSeparator, - t.wSecond , cDecimalSeparator, t.wMilliseconds ); - } + ConOutPrintf(_T("%s"), GetTimeString()); break; case _T('V'): Modified: trunk/reactos/base/shell/cmd/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/time.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/time.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/time.c [iso-8859-1] Mon Mar 16 03:44:08 2009 @@ -134,7 +134,6 @@ LPTSTR *arg; INT argc; INT i; - BOOL bPrompt = TRUE; INT nTimeString = -1; if (!_tcsncmp (param, _T("/?"), 2)) @@ -152,19 +151,25 @@ for (i = 0; i < argc; i++) { if (_tcsicmp (arg[i], _T("/t")) == 0) - bPrompt = FALSE; + { + /* Display current time in short format */ + SYSTEMTIME st; + TCHAR szTime[20]; + GetLocalTime(&st); + FormatTime(szTime, &st); + ConOutPuts(szTime); + freep(arg); + return 0; + } if ((*arg[i] != _T('/')) && (nTimeString == -1)) nTimeString = i; } if (nTimeString == -1) - PrintTime (); - - if (!bPrompt) - { - freep (arg); - return 0; + { + ConOutResPrintf(STRING_LOCALE_HELP1); + ConOutPrintf(_T(": %s\n"), GetTimeString()); } while (1) Modified: trunk/reactos/base/shell/cmd/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/timer.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/timer.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/timer.c [iso-8859-1] Mon Mar 16 03:44:08 2009 @@ -153,7 +153,7 @@ cS=TRUE; ConOutResPrintf (STRING_TIMER_TIME,clk_n,cS?_T("ON"):_T("OFF")); - PrintTime(); + ConOutPuts(GetTimeString()); freep(p); return 0; } @@ -163,7 +163,7 @@ if(cS) { ConOutResPrintf (STRING_TIMER_TIME,clk_n,cS?_T("ON"):_T("OFF")); - PrintTime(); + ConOutPuts(GetTimeString()); PrintElapsedTime(GetTickCount()-cT, iFormat); freep(p); return 0; @@ -172,7 +172,7 @@ cT=GetTickCount(); cS=TRUE; ConOutResPrintf (STRING_TIMER_TIME,clk_n,cS?_T("ON"):_T("OFF")); - PrintTime(); + ConOutPuts(GetTimeString()); freep(p); return 0; } @@ -183,7 +183,7 @@ { cS=FALSE; ConOutResPrintf (STRING_TIMER_TIME,clk_n,cS?_T("ON"):_T("OFF")); - PrintTime(); + ConOutPuts(GetTimeString()); PrintElapsedTime(GetTickCount()-cT, iFormat); freep(p); return 0; @@ -192,7 +192,7 @@ cT=GetTickCount(); cS=TRUE; ConOutResPrintf (STRING_TIMER_TIME,clk_n,cS?_T("ON"):_T("OFF")); - PrintTime(); + ConOutPuts(GetTimeString()); freep(p); return 0; } @@ -204,13 +204,13 @@ { cS=FALSE; ConOutResPrintf (STRING_TIMER_TIME,clk_n,cS?_T("ON"):_T("OFF")); - PrintTime(); + ConOutPuts(GetTimeString()); PrintElapsedTime(GetTickCount()-cT, iFormat); freep(p); return 0; } ConOutResPrintf (STRING_TIMER_TIME,clk_n,cS?_T("ON"):_T("OFF")); - PrintTime(); + ConOutPuts(GetTimeString()); freep(p); return 0; }

1 0

[spetreolle] 40049: unbreak wlananpi build by #ifdef'ing struct_C, struct_D and struct_E
by spetreolle＠svn.reactos.org 15 Mar '09

15 Mar '09

Author: spetreolle Date: Mon Mar 16 00:25:18 2009 New Revision: 40049 URL: http://svn.reactos.org/svn/reactos?rev=40049&view=rev Log: unbreak wlananpi build by #ifdef'ing struct_C, struct_D and struct_E Modified: trunk/reactos/include/psdk/wlanapi.h Modified: trunk/reactos/include/psdk/wlanapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wlanapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] Mon Mar 16 00:25:18 2009 @@ -186,6 +186,7 @@ /* FIXME */ +#if 0 typedef struct struct_C { ULONGLONG elem_1; ULONGLONG elem_2; @@ -213,6 +214,7 @@ WCHAR elem_3[256]; WCHAR elem_4[1024]; } struct_E ; +#endif /* Functions */ #if !defined(__midl) && !defined(__WIDL__)

1 0

[fireball] 40048: Evgeniy Boltik <bstsoft@narod.ru> - Move clipping from StretchBlt to Eng. - Add ROP support to StretchBlt. - Fix alphablend support (alphablend.exe produces same result as tested on Windows XP). See issue #4156 for more details.
by fireball＠svn.reactos.org 15 Mar '09

15 Mar '09

Author: fireball Date: Sun Mar 15 23:13:10 2009 New Revision: 40048 URL: http://svn.reactos.org/svn/reactos?rev=40048&view=rev Log: Evgeniy Boltik <bstsoft(a)narod.ru> - Move clipping from StretchBlt to Eng. - Add ROP support to StretchBlt. - Fix alphablend support (alphablend.exe produces same result as tested on Windows XP). See issue #4156 for more details. Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.c trunk/reactos/subsystems/win32/win32k/dib/dib.h trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c trunk/reactos/subsystems/win32/win32k/eng/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib.c [iso-8859-1] Sun Mar 15 23:13:10 2009 @@ -224,10 +224,12 @@ } BOOLEAN Dummy_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, + SURFOBJ *PatternSurface, RECTL* DestRect, RECTL *SourceRect, POINTL* MaskOrigin, BRUSHOBJ* Brush, - POINTL* BrushOrign, CLIPOBJ *ClipRegion, - XLATEOBJ *ColorTranslation, ROP4 Rop) + POINTL* BrushOrign, + XLATEOBJ *ColorTranslation, + XLATEOBJ *XlatePatternToDest, ROP4 Rop) { return FALSE; } Modified: trunk/reactos/subsystems/win32/win32k/dib/dib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib.h [iso-8859-1] Sun Mar 15 23:13:10 2009 @@ -41,7 +41,7 @@ typedef VOID (*PFN_DIB_HLine)(SURFOBJ*,LONG,LONG,LONG,ULONG); typedef VOID (*PFN_DIB_VLine)(SURFOBJ*,LONG,LONG,LONG,ULONG); typedef BOOLEAN (*PFN_DIB_BitBlt)(PBLTINFO); -typedef BOOLEAN (*PFN_DIB_StretchBlt)(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,CLIPOBJ*,XLATEOBJ*,ROP4); +typedef BOOLEAN (*PFN_DIB_StretchBlt)(SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,XLATEOBJ*,ROP4); typedef BOOLEAN (*PFN_DIB_TransparentBlt)(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); typedef BOOLEAN (*PFN_DIB_ColorFill)(SURFOBJ*, RECTL*, ULONG); typedef BOOLEAN (*PFN_DIB_AlphaBlend)(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -67,7 +67,7 @@ VOID Dummy_HLine(SURFOBJ*,LONG,LONG,LONG,ULONG); VOID Dummy_VLine(SURFOBJ*,LONG,LONG,LONG,ULONG); BOOLEAN Dummy_BitBlt(PBLTINFO); -BOOLEAN Dummy_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,CLIPOBJ*,XLATEOBJ*,ROP4); +BOOLEAN Dummy_StretchBlt(SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,XLATEOBJ*,ROP4); BOOLEAN Dummy_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); BOOLEAN Dummy_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN Dummy_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); @@ -132,7 +132,7 @@ BOOLEAN DIB_32BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); BOOLEAN DIB_32BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); -BOOLEAN DIB_XXBPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,CLIPOBJ*,XLATEOBJ*,ROP4); +BOOLEAN DIB_XXBPP_StretchBlt(SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,XLATEOBJ*,ROP4); extern unsigned char notmask[2]; extern unsigned char altnotmask[2]; Modified: trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dibXXbpp.c [iso-8859-1] Sun Mar 15 23:13:10 2009 @@ -23,42 +23,33 @@ #include <debug.h> BOOLEAN DIB_XXBPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, + SURFOBJ *PatternSurface, RECTL *DestRect, RECTL *SourceRect, POINTL *MaskOrigin, BRUSHOBJ *Brush, - POINTL *BrushOrigin, CLIPOBJ *ClipRegion, - XLATEOBJ *ColorTranslation, ROP4 ROP) + POINTL *BrushOrigin, XLATEOBJ *ColorTranslation, + XLATEOBJ *XlatePatternToDest, ROP4 ROP) { - LONG SrcSizeY; - LONG SrcSizeX; - LONG DesSizeY; - LONG DesSizeX; LONG sx = 0; LONG sy = 0; LONG DesX; LONG DesY; - LONG SrcZoomXHight; - LONG SrcZoomXLow; - LONG SrcZoomYHight; - LONG SrcZoomYLow; + LONG DstHeight; + LONG DstWidth; + LONG SrcHeight; + LONG SrcWidth; - LONG sy_dec = 0; - LONG sy_max; - - LONG sx_dec = 0; - LONG sx_max; - ULONG color; + ULONG Color; ULONG Dest, Source = 0, Pattern = 0; ULONG xxBPPMask; + BOOLEAN CanDraw; PFN_DIB_GetPixel fnSource_GetPixel = NULL; PFN_DIB_GetPixel fnDest_GetPixel = NULL; PFN_DIB_PutPixel fnDest_PutPixel = NULL; + PFN_DIB_GetPixel fnPattern_GetPixel = NULL; - RECT_ENUM RectEnum; - BOOL EnumMore; - unsigned i; - RECTL OutputRect; + ULONG PatternX = 0, PatternY = 0; BOOL UsesSource = ROP4_USES_SOURCE(ROP); BOOL UsesPattern = ROP4_USES_PATTERN(ROP); @@ -76,30 +67,12 @@ BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom); } - /* Calc the Zoom height of Source */ - SrcSizeY = SourceRect->bottom - SourceRect->top; + DstHeight = DestRect->bottom - DestRect->top; + DstWidth = DestRect->right - DestRect->left; + SrcHeight = SourceRect->bottom - SourceRect->top; + SrcWidth = SourceRect->right - SourceRect->left; - /* Calc the Zoom Width of Source */ - SrcSizeX = SourceRect->right - SourceRect->left; - - /* Calc the Zoom height of Destinations */ - DesSizeY = DestRect->bottom - DestRect->top; - - /* Calc the Zoom width of Destinations */ - DesSizeX = DestRect->right - DestRect->left; - - /* Calc the zoom factor of source height */ - SrcZoomYHight = SrcSizeY / DesSizeY; - SrcZoomYLow = SrcSizeY - (SrcZoomYHight * DesSizeY); - - /* Calc the zoom factor of source width */ - SrcZoomXHight = SrcSizeX / DesSizeX; - SrcZoomXLow = SrcSizeX - (SrcZoomXHight * DesSizeX); - - sx_max = DesSizeX; - sy_max = DesSizeY; - - /* FIXME : MaskOrigin, BrushOrigin? */ + /* FIXME : MaskOrigin? */ switch(DestSurf->iBitmapFormat) { @@ -114,73 +87,76 @@ if (UsesPattern) { - DPRINT1("StretchBlt does not support pattern ROPs yet\n"); - return TRUE; + if (PatternSurface) + { + PatternY = (DestRect->top - BrushOrigin->y) % PatternSurface->sizlBitmap.cy; + if (PatternY < 0) + { + PatternY += PatternSurface->sizlBitmap.cy; + } + fnPattern_GetPixel = DibFunctionsForBitmapFormat[PatternSurface->iBitmapFormat].DIB_GetPixel; + } + else + { + if (Brush) + Pattern = Brush->iSolidColor; + } } - - CLIPOBJ_cEnumStart(ClipRegion, FALSE, CT_RECTANGLES, CD_ANY, 0); - do + + + for (DesY = DestRect->top; DesY < DestRect->bottom; DesY++) { - EnumMore = CLIPOBJ_bEnum(ClipRegion,(ULONG) sizeof(RectEnum), (PVOID) &RectEnum); + if (PatternSurface) + { + PatternX = (DestRect->left - BrushOrigin->x) % PatternSurface->sizlBitmap.cx; + if (PatternX < 0) + { + PatternX += PatternSurface->sizlBitmap.cx; + } + } + if (UsesSource) + sy = SourceRect->top+(DesY - DestRect->top) * SrcHeight / DstHeight; - for (i = 0; i < RectEnum.c; i++) + for (DesX = DestRect->left; DesX < DestRect->right; DesX++) { - OutputRect.left = RectEnum.arcl[i].left; - OutputRect.right = RectEnum.arcl[i].right; - OutputRect.top = RectEnum.arcl[i].top; - OutputRect.bottom = RectEnum.arcl[i].bottom; - - sy = SourceRect->top; - sy_dec = 0; - for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) + CanDraw = TRUE; + if (UsesSource) { - sx = SourceRect->left; - sx_dec = 0; + sx = SourceRect->left+(DesX - DestRect->left) * SrcWidth / DstWidth; + if (sx >= 0 && sy >= 0 && + SourceSurf->sizlBitmap.cx > sx && SourceSurf->sizlBitmap.cy > sy) + { + Source = XLATEOBJ_iXlate(ColorTranslation, fnSource_GetPixel(SourceSurf, sx, sy)); + } + else + { + Source = 0; + CanDraw = (ROP3_TO_ROP4(SRCCOPY) != ROP); + } + } - for (DesX=DestRect->left; DesX<DestRect->right; DesX++) + if (CanDraw) + { + if (PatternSurface) { - /* Check if inside clip region */ - if (DesX >= OutputRect.left && - DesX < OutputRect.right && - DesY >= OutputRect.top && - DesY < OutputRect.bottom) - { - if (UsesSource) - { - Source = XLATEOBJ_iXlate(ColorTranslation, fnSource_GetPixel(SourceSurf, sx, sy)); - } - - if (UsesPattern) - { - /* TBD as soon as BRUSHOBJ is available */ - } - - Dest = fnDest_GetPixel(DestSurf, DesX, DesY); - color = DIB_DoRop(ROP, Dest, Source, Pattern) & xxBPPMask; - - fnDest_PutPixel(DestSurf, DesX, DesY, color); - - } - sx += SrcZoomXHight; - sx_dec += SrcZoomXLow; - if (sx_dec >= sx_max) - { - sx++; - sx_dec -= sx_max; - } + Pattern = XLATEOBJ_iXlate(XlatePatternToDest, fnPattern_GetPixel(PatternSurface, PatternX, PatternY)); + PatternX++; + PatternX %= PatternSurface->sizlBitmap.cx; } - sy += SrcZoomYHight; - sy_dec += SrcZoomYLow; - if (sy_dec >= sy_max) - { - sy++; - sy_dec -= sy_max; - } + Dest = fnDest_GetPixel(DestSurf, DesX, DesY); + Color = DIB_DoRop(ROP, Dest, Source, Pattern) & xxBPPMask; + + fnDest_PutPixel(DestSurf, DesX, DesY, Color); } } + + if (PatternSurface) + { + PatternY++; + PatternY %= PatternSurface->sizlBitmap.cy; + } } - while (EnumMore); return TRUE; } Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Sun Mar 15 23:13:10 2009 @@ -45,7 +45,6 @@ typedef BOOLEAN (APIENTRY *PSTRETCHRECTFUNC)(SURFOBJ* OutputObj, SURFOBJ* InputObj, SURFOBJ* Mask, - CLIPOBJ* ClipRegion, XLATEOBJ* ColorTranslation, RECTL* OutputRect, RECTL* InputRect, @@ -737,7 +736,6 @@ CallDibStretchBlt(SURFOBJ* psoDest, SURFOBJ* psoSource, SURFOBJ* Mask, - CLIPOBJ* ClipRegion, XLATEOBJ* ColorTranslation, RECTL* OutputRect, RECTL* InputRect, @@ -747,6 +745,11 @@ ROP4 Rop4) { POINTL RealBrushOrigin; + SURFACE* psurfPattern; + PGDIBRUSHINST GdiBrush = NULL; + SURFOBJ* PatternSurface = NULL; + XLATEOBJ* XlatePatternToDest = NULL; + if (BrushOrigin == NULL) { RealBrushOrigin.x = RealBrushOrigin.y = 0; @@ -755,8 +758,37 @@ { RealBrushOrigin = *BrushOrigin; } + + /* Pattern brush */ + if (ROP4_USES_PATTERN(Rop4) && Brush && Brush->iSolidColor == 0xFFFFFFFF) + { + GdiBrush = CONTAINING_RECORD(Brush, GDIBRUSHINST, BrushObject); + psurfPattern = SURFACE_LockSurface(GdiBrush->GdiBrushObject->hbmPattern); + if (psurfPattern) + { + PatternSurface = &psurfPattern->SurfObj; + } + else + { + /* FIXME - What to do here? */ + } + XlatePatternToDest = GdiBrush->XlateObject; + } + else + { + psurfPattern = NULL; + } + return DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_StretchBlt( - psoDest, psoSource, OutputRect, InputRect, MaskOrigin, Brush, &RealBrushOrigin, ClipRegion, ColorTranslation, Rop4); + psoDest, psoSource, PatternSurface, + OutputRect, InputRect, MaskOrigin, Brush, &RealBrushOrigin, + ColorTranslation, XlatePatternToDest, Rop4); + + /* Pattern brush */ + if (psurfPattern) + { + SURFACE_UnlockSurface(psurfPattern); + } } @@ -836,9 +868,33 @@ SURFOBJ* psoInput; SURFOBJ* psoOutput; PSTRETCHRECTFUNC BltRectFunc; - BOOLEAN Ret; + BOOLEAN Ret = TRUE; POINTL AdjustedBrushOrigin; BOOL UsesSource = ROP4_USES_SOURCE(ROP4); + + BYTE clippingType; + RECTL ClipRect; + RECT_ENUM RectEnum; + BOOL EnumMore; + ULONG Direction; + RECTL CombinedRect; + RECTL InputToCombinedRect; + unsigned i; + + LONG DstHeight; + LONG DstWidth; + LONG SrcHeight; + LONG SrcWidth; + + /* Determine clipping type */ + if (ClipRegion == (CLIPOBJ *) NULL) + { + clippingType = DC_TRIVIAL; + } + else + { + clippingType = ClipRegion->iDComplexity; + } if (ROP4 == R4_NOOP) { @@ -864,18 +920,6 @@ if (NULL == prclSrc) { return FALSE; - } - - /* Make sure we don't try to copy anything outside the valid source region */ - if (InputRect.left < 0) - { - OutputRect.left -= InputRect.left; - InputRect.left = 0; - } - if (InputRect.top < 0) - { - OutputRect.top -= InputRect.top; - InputRect.top = 0; } if (! IntEngEnter(&EnterLeaveSource, psoSource, &InputRect, TRUE, @@ -965,9 +1009,88 @@ BltRectFunc = CallDibStretchBlt; } - Ret = (*BltRectFunc)(psoOutput, psoInput, Mask, ClipRegion, + DstHeight = OutputRect.bottom - OutputRect.top; + DstWidth = OutputRect.right - OutputRect.left; + SrcHeight = InputRect.bottom - InputRect.top; + SrcWidth = InputRect.right - InputRect.left; + switch (clippingType) + { + case DC_TRIVIAL: + Ret = (*BltRectFunc)(psoOutput, psoInput, Mask, ColorTranslation, &OutputRect, &InputRect, MaskOrigin, Brush, &AdjustedBrushOrigin, ROP4); + break; + case DC_RECT: + // Clip the blt to the clip rectangle + ClipRect.left = ClipRegion->rclBounds.left + Translate.x; + ClipRect.right = ClipRegion->rclBounds.right + Translate.x; + ClipRect.top = ClipRegion->rclBounds.top + Translate.y; + ClipRect.bottom = ClipRegion->rclBounds.bottom + Translate.y; + if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) + { + InputToCombinedRect.top = InputRect.top + (CombinedRect.top - OutputRect.top) * SrcHeight / DstHeight; + InputToCombinedRect.bottom = InputRect.top + (CombinedRect.bottom - OutputRect.top) * SrcHeight / DstHeight; + InputToCombinedRect.left = InputRect.left + (CombinedRect.left - OutputRect.left) * SrcWidth / DstWidth; + InputToCombinedRect.right = InputRect.left + (CombinedRect.right - OutputRect.left) * SrcWidth / DstWidth; + Ret = (*BltRectFunc)(psoOutput, psoInput, Mask, + ColorTranslation, + &CombinedRect, + &InputToCombinedRect, + MaskOrigin, + Brush, + &AdjustedBrushOrigin, + ROP4); + } + break; + case DC_COMPLEX: + if (psoOutput == psoInput) + { + if (OutputRect.top < InputRect.top) + { + Direction = OutputRect.left < InputRect.left ? + CD_RIGHTDOWN : CD_LEFTDOWN; + } + else + { + Direction = OutputRect.left < InputRect.left ? + CD_RIGHTUP : CD_LEFTUP; + } + } + else + { + Direction = CD_ANY; + } + CLIPOBJ_cEnumStart(ClipRegion, FALSE, CT_RECTANGLES, Direction, 0); + do + { + EnumMore = CLIPOBJ_bEnum(ClipRegion,(ULONG) sizeof(RectEnum), + (PVOID) &RectEnum); + for (i = 0; i < RectEnum.c; i++) + { + ClipRect.left = RectEnum.arcl[i].left + Translate.x; + ClipRect.right = RectEnum.arcl[i].right + Translate.x; + ClipRect.top = RectEnum.arcl[i].top + Translate.y; + ClipRect.bottom = RectEnum.arcl[i].bottom + Translate.y; + if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) + { + InputToCombinedRect.top = InputRect.top + (CombinedRect.top - OutputRect.top) * SrcHeight / DstHeight; + InputToCombinedRect.bottom = InputRect.top + (CombinedRect.bottom - OutputRect.top) * SrcHeight / DstHeight; + InputToCombinedRect.left = InputRect.left + (CombinedRect.left - OutputRect.left) * SrcWidth / DstWidth; + InputToCombinedRect.right = InputRect.left + (CombinedRect.right - OutputRect.left) * SrcWidth / DstWidth; + Ret = (*BltRectFunc)(psoOutput, psoInput, Mask, + ColorTranslation, + &CombinedRect, + &InputToCombinedRect, + MaskOrigin, + Brush, + &AdjustedBrushOrigin, + ROP4); + } + } + } + while (EnumMore); + break; + } IntEngLeave(&EnterLeaveDest); if (UsesSource) @@ -1061,18 +1184,6 @@ } InputRect = *SourceRect; - /* Make sure we don't try to copy anything outside the valid source region */ - if (InputRect.left < 0) - { - InputClippedRect.left -= InputRect.left; - InputRect.left = 0; - } - if (InputRect.top < 0) - { - InputClippedRect.top -= InputRect.top; - InputRect.top = 0; - } - if (InputClippedRect.right < InputClippedRect.left || InputClippedRect.bottom < InputClippedRect.top) { @@ -1129,19 +1240,18 @@ /* Prepare color adjustment */ /* Call the driver's DrvStretchBlt if available */ - if (psurfDest->flHooks & HOOK_STRETCHBLT) - { - /* Drv->StretchBlt (look at http://www.osr.com/ddk/graphics/ddifncs_3ew7.htm ) */ + if (psurfDest->flHooks & HOOK_STRETCHBLTROP) + { + /* Drv->StretchBltROP (look at http://www.osronline.com/ddkx/graphics/ddifncs_0z3b.htm ) */ // FIXME: MaskOrigin is always NULL ! - ret = GDIDEVFUNCS(psoDest).StretchBlt( - psoDest, (UsesSource) ? psoSource : NULL, MaskSurf, ClipRegion, ColorTranslation, - &ca, BrushOrigin, &OutputRect, &InputRect, NULL, ROP); + ret = GDIDEVFUNCS(psoDest).StretchBltROP(psoDest, (UsesSource) ? psoSource : NULL, MaskSurf, ClipRegion, ColorTranslation, + &ca, BrushOrigin, &OutputRect, &InputRect, NULL, COLORONCOLOR, Brush, ROP); } if (! ret) { // FIXME: see previous fixme - ret = EngStretchBltROP(psoDest, psoSource, MaskSurf, ClipRegion, ColorTranslation, + ret = EngStretchBltROP(psoDest, (UsesSource) ? psoSource : NULL, MaskSurf, ClipRegion, ColorTranslation, &ca, BrushOrigin, &OutputRect, &InputRect, NULL, COLORONCOLOR, Brush, ROP); }

1 0

[cwittich] 40047: -add some more WLAN types -add wlansvc.idl
by cwittich＠svn.reactos.org 15 Mar '09

15 Mar '09

Author: cwittich Date: Sun Mar 15 22:48:56 2009 New Revision: 40047 URL: http://svn.reactos.org/svn/reactos?rev=40047&view=rev Log: -add some more WLAN types -add wlansvc.idl Added: trunk/reactos/include/psdk/eaptypes.h (with props) trunk/reactos/include/psdk/l2cmn.h (with props) trunk/reactos/include/psdk/wlantypes.h (with props) trunk/reactos/include/reactos/idl/wlansvc.idl (with props) Modified: trunk/reactos/include/psdk/wlanapi.h trunk/reactos/include/reactos/idl/idl.rbuild Added: trunk/reactos/include/psdk/eaptypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/eaptypes.h?re… ============================================================================== --- trunk/reactos/include/psdk/eaptypes.h (added) +++ trunk/reactos/include/psdk/eaptypes.h [iso-8859-1] Sun Mar 15 22:48:56 2009 @@ -1,0 +1,17 @@ +#ifndef EAPTYPES_H +#define EAPTYPES_H + +typedef struct _EAP_TYPE +{ + BYTE type; + DWORD dwVendorId; + DWORD dwVendorType; +} EAP_TYPE, *PEAP_TYPE; + +typedef struct _EAP_METHOD_TYPE +{ + EAP_TYPE eapType; + DWORD dwAuthorId; +} EAP_METHOD_TYPE, *PEAP_METHOD_TYPE; + +#endif Propchange: trunk/reactos/include/psdk/eaptypes.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/l2cmn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/l2cmn.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/l2cmn.h (added) +++ trunk/reactos/include/psdk/l2cmn.h [iso-8859-1] Sun Mar 15 22:48:56 2009 @@ -1,0 +1,16 @@ +#ifndef _L2CMN_H +#define _L2CMN_H + +typedef struct _L2_NOTIFICATION_DATA { + DWORD NotificationSource; + DWORD NotificationCode; + GUID InterfaceGuid; + DWORD dwDataSize; +#if defined(__midl) || defined(__WIDL__) + [unique, size_is(dwDataSize)] PBYTE pData; +#else + PVOID pData; +#endif +} L2_NOTIFICATION_DATA, *PL2_NOTIFICATION_DATA; + +#endif Propchange: trunk/reactos/include/psdk/l2cmn.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/wlanapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wlanapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] Sun Mar 15 22:48:56 2009 @@ -1,7 +1,9 @@ #ifndef _WLANAPI_H #define _WLANAPI_H +#include <l2cmn.h> #include <windot11.h> +#include <eaptypes.h> #ifdef __cplusplus extern "C" { @@ -12,6 +14,34 @@ #define WLAN_MAX_NAME_LENGTH 256 /* Enumerations */ + +#if defined(__midl) || defined(__WIDL__) +typedef [v1_enum] enum _WLAN_OPCODE_VALUE_TYPE { +#else +typedef enum _WLAN_OPCODE_VALUE_TYPE { +#endif + wlan_opcode_value_type_query_only = 0, + wlan_opcode_value_type_set_by_group_policy, + wlan_opcode_value_type_set_by_user, + wlan_opcode_value_type_invalid +} WLAN_OPCODE_VALUE_TYPE; + +typedef enum _WLAN_SECURABLE_OBJECT { + wlan_secure_permit_list = 0, + wlan_secure_deny_list, + wlan_secure_ac_enabled, + wlan_secure_bc_scan_enabled, + wlan_secure_bss_type, + wlan_secure_show_denied, + wlan_secure_interface_properties, + wlan_secure_ihv_control, + wlan_secure_all_user_profiles_order, + wlan_secure_add_new_all_user_profiles, + wlan_secure_add_new_per_user_profiles, + wlan_secure_media_streaming_mode_enabled, + wlan_secure_current_operation_mode, + WLAN_SECURABLE_OBJECT_COUNT +} WLAN_SECURABLE_OBJECT, *PWLAN_SECURABLE_OBJECT; typedef enum _WLAN_CONNECTION_MODE { wlan_connection_mode_profile = 0, @@ -133,7 +163,7 @@ DWORD dwNumberOfItems; DWORD dwIndex; #if defined(__midl) || defined(__WIDL__) - [size_is(dwNumberOfItems)] WLAN_AVAILABLE_NETWORK Network[]; + [size_is(dwNumberOfItems)] WLAN_AVAILABLE_NETWORK Network[*]; #else WLAN_AVAILABLE_NETWORK Network[1]; #endif @@ -141,34 +171,20 @@ typedef struct _WLAN_CONNECTION_PARAMETERS { WLAN_CONNECTION_MODE wlanConnectionMode; - [string] wchar_t * strProfile; +#if defined(__midl) || defined(__WIDL__) + [string] LPCWSTR strProfile; +#else + LPCWSTR strProfile; +#endif PDOT11_SSID pDot11Ssid; PDOT11_BSSID_LIST pDesiredBssidList; DOT11_BSS_TYPE dot11BssType; DWORD dwFlags; } WLAN_CONNECTION_PARAMETERS, *PWLAN_CONNECTION_PARAMETERS; +typedef L2_NOTIFICATION_DATA WLAN_NOTIFICATION_DATA, *PWLAN_NOTIFICATION_DATA; /* FIXME */ - -typedef struct _struct_8 { - DWORD elem_1; - DWORD elem_2; - GUID elem_3; - DWORD elem_4; - [size_is(elem_4)] LPBYTE elem_5; -} struct_8 ; - -typedef struct struct_12 { - BYTE elem_1; - DWORD elem_2; - DWORD elem_3; -} struct_12 ; - -typedef struct _struct_9 { - struct_12 elem_1; - DWORD elem_2; -} struct_9 ; typedef struct struct_C { ULONGLONG elem_1; Added: trunk/reactos/include/psdk/wlantypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wlantypes.h?r… ============================================================================== --- trunk/reactos/include/psdk/wlantypes.h (added) +++ trunk/reactos/include/psdk/wlantypes.h [iso-8859-1] Sun Mar 15 22:48:56 2009 @@ -1,0 +1,12 @@ +#ifndef __WLANTYPES_H__ +#define __WLANTYPES_H__ + +typedef enum _DOT11_BSS_TYPE { + dot11_BSS_type_infrastructure = 1, + dot11_BSS_type_independent, + dot11_BSS_type_any +} DOT11_BSS_TYPE; + + +#endif + Propchange: trunk/reactos/include/psdk/wlantypes.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/reactos/idl/idl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/idl.rb… ============================================================================== --- trunk/reactos/include/reactos/idl/idl.rbuild [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/idl.rbuild [iso-8859-1] Sun Mar 15 22:48:56 2009 @@ -27,4 +27,10 @@ <module name="lsa_client" type="rpcclient"> <file>lsa.idl</file> </module> +<module name="wlansvc_server" type="rpcserver"> + <file>wlansvc.idl</file> +</module> +<module name="wlansvc_client" type="rpcclient"> + <file>wlansvc.idl</file> +</module> </group> Added: trunk/reactos/include/reactos/idl/wlansvc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/wlansv… ============================================================================== --- trunk/reactos/include/reactos/idl/wlansvc.idl (added) +++ trunk/reactos/include/reactos/idl/wlansvc.idl [iso-8859-1] Sun Mar 15 22:48:56 2009 @@ -1,0 +1,326 @@ +/* + * WLAN Service interface definition + */ + +#include <ms-dtyp.idl> +#include <wlanapi.h> + +typedef [context_handle] PVOID WLANSVC_RPC_HANDLE; +typedef WLANSVC_RPC_HANDLE* LPWLANSVC_RPC_HANDLE; + +[ + uuid(266f33b4-c7c1-4bd1-8f52-ddb8f2214ea9), + version(1.0) +] + +interface wlansvc_interface +{ + /* Function: 0x00 */ + DWORD _RpcOpenHandle( + [in] wchar_t * arg_1, + [in] DWORD dwClientVersion, + [in, out] DWORD* pdwNegotiatedVersion, + [in, out] LPWLANSVC_RPC_HANDLE phClientHandle); + + /* Function: 0x01 */ + DWORD _RpcCloseHandle( + [in, out] LPWLANSVC_RPC_HANDLE phClientHandle); + + /* Function: 0x02 */ + DWORD _RpcEnumInterfaces( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [out, ref] PWLAN_INTERFACE_INFO_LIST *ppInterfaceList); + + /* Function: 0x03 */ + DWORD _RpcSetAutoConfigParameter( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in] /* enum32 */ long OpCode, + [in] DWORD dwDataSize, + [in][size_is(dwDataSize)] LPBYTE pData); + + /* Function: 0x04 */ + DWORD _RpcQueryAutoConfigParameter( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in] /* enum32 */ DWORD OpCode, + [out] LPDWORD pdwDataSize, + [out][ref][size_is(*pdwDataSize)] char ** ppData, + [out] /* enum32 */ DWORD * pWlanOpcodeValueType); + + /* Function: 0x05 */ + DWORD _RpcGetInterfaceCapability( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in] GUID* pInterfaceGuid, + [out, ref] PWLAN_INTERFACE_CAPABILITY *ppCapability); + + /* Function: 0x06 */ + DWORD _RpcSetInterface( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in] GUID* pInterfaceGuid, + [in] /* enum32 */ DWORD OpCode, + [in] DWORD dwDataSize, + [in, size_is(dwDataSize)] LPBYTE pData); + + /* Function: 0x07 */ + DWORD _RpcQueryInterface( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in] GUID* pInterfaceGuid, + [in] /* enum32 */ long OpCode, + [out] LPDWORD pdwDataSize, + [out][ref][size_is(*pdwDataSize)] LPBYTE* ppData, + [out] /* enum32 */ LPDWORD pWlanOpcodeValueType); + + /* Function: 0x08 */ + DWORD _RpcIhvControl( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in] GUID* pInterfaceGuid, + [in] /* enum32 */ DWORD Type, + [in] DWORD dwInBufferSize, + [in][size_is(dwInBufferSize)] LPBYTE pInBuffer, + [in] DWORD dwOutBufferSize, + [out][size_is(dwOutBufferSize), length_is(*pdwBytesReturned)] LPBYTE pOutBuffer, + [out] LPDWORD pdwBytesReturned); + + /* Function: 0x09 */ + DWORD _RpcScan( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in] GUID* pInterfaceGuid, + [in][unique] PDOT11_SSID pDot11Ssid, + [in][unique] PWLAN_RAW_DATA pIeData); + + /* Function: 0x0A */ + DWORD _RpcGetAvailableNetworkList( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in] GUID* pInterfaceGuid, + [in] DWORD dwFlags, + [out][ref] WLAN_AVAILABLE_NETWORK_LIST **ppAvailableNetworkList); + + /* Function: 0x0B */ + DWORD _RpcGetNetworkBssList( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in] GUID* pInterfaceGuid, + [in][unique] PDOT11_SSID pDot11Ssid, + [in] /* enum16 */ short dot11BssType, + [in] DWORD bSecurityEnabled, + [out] LPDWORD dwBssListSize, + [out][ref][size_is(*dwBssListSize)] LPBYTE *ppWlanBssList); + + /* Function: 0x0C */ + DWORD _RpcConnect( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in] GUID* pInterfaceGuid, + [in] PWLAN_CONNECTION_PARAMETERS* pConnectionParameters); + + /* Function: 0x0D */ + DWORD _RpcDisconnect( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in] GUID* pInterfaceGUID); + + /* Function: 0x0E */ + DWORD _RpcRegisterNotification( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in] DWORD arg_2, + [out] LPDWORD pdwPrevNotifSource); + + /* Function: 0x0F */ + DWORD _RpcAsyncGetNotification( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [out][ref] PWLAN_NOTIFICATION_DATA *NotificationData); + + /* Function: 0x10 */ + DWORD _RpcSetProfileEapUserData( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in] GUID* pInterfaceGuid, + [in][string] wchar_t * strProfileName, + [in] EAP_METHOD_TYPE MethodType, + [in] DWORD dwFlags, + [in] DWORD dwEapUserDataSize, + [in][size_is(dwEapUserDataSize)] LPBYTE pbEapUserData); + + /* Function: 0x11 */ + DWORD _RpcSetProfile( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in] GUID* pInterfaceGuid, + [in] DWORD dwFlags, + [in][string] wchar_t * strProfileXml, + [in][unique][string] wchar_t * strAllUserProfileSecurity, + [in] BOOL bOverwrite, + [out] LPDWORD pdwReasonCode); + + /* Function: 0x12 */ + DWORD _RpcGetProfile( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in] GUID* pInterfaceGuid, + [in][string] wchar_t * strProfileName, + [out][ref][string] wchar_t ** pstrProfileXml, + [out] LPDWORD pdwFlags, + [in, out][unique] LPDWORD pdwGrantedAccess); + + /* Function: 0x13 */ + DWORD _RpcDeleteProfile( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in] GUID* pInterfaceGuid, + [in][string] wchar_t * strProfileName); + + /* Function: 0x14 */ + DWORD _RpcRenameProfile( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in] GUID* pInterfaceGuid, + [in][string] wchar_t * strOldProfileName, + [in][string] wchar_t * strNewProfileName); + + /* Function: 0x15 */ + DWORD _RpcSetProfileList( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in] GUID* pInterfaceGuid, + [in] DWORD dwItems, + [in] /* [string] */ [size_is(dwItems)] /* wchar_t */ BYTE ** strProfileNames); /* FIXME */ + + /* Function: 0x16 */ + DWORD _RpcGetProfileList( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in] GUID* pInterfaceGuid, + [out][ref] PWLAN_PROFILE_INFO_LIST *ppProfileList); + + /* Function: 0x17 */ + DWORD _RpcSetProfilePosition( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in] GUID* pInterfaceGuid, + [in][string] wchar_t * strProfileName, + [in] DWORD dwPosition); + + /* Function: 0x18 */ + DWORD _RpcSetProfileCustomUserData( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in] GUID* pInterfaceGuid, + [in][string] wchar_t * strProfileName, + [in] DWORD dwDataSize, + [in][unique][size_is(dwDataSize)] LPBYTE pData); + + /* Function: 0x19 */ + DWORD _RpcGetProfileCustomUserData( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in] GUID* pInterfaceGuid, + [in][string] wchar_t * strProfileName, + [out] LPDWORD dwDataSize, + [out][ref][size_is(*dwDataSize)] LPBYTE *pData); + + /* Function: 0x1A */ + DWORD _RpcSetFilterList( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in] /* enum16 */ short wlanFilterListType, + [in][unique] PDOT11_NETWORK_LIST pNetworkList); + + /* Function: 0x1B */ + DWORD _RpcGetFilterList( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in] /* enum16 */ short wlanFilterListType, + [out][ref] PDOT11_NETWORK_LIST *pNetworkList); + + /* Function: 0x1C */ + DWORD _RpcSetPsdIEDataList( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in][unique][string] wchar_t * strFormat, + [in] DWORD dwDataListSize, + [in][unique][size_is(dwDataListSize)] LPBYTE pPsdIEDataList); + + /* Function: 0x1D */ + DWORD _RpcSaveTemporaryProfile( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in] GUID* pInterfaceGuid, + [in][string] wchar_t * strProfileName, + [in][unique][string] wchar_t * strAllUserProfileSecurity, + [in] DWORD dwFlags, + [in] BOOL bOverWrite); + + /* Function: 0x1E, address: 0x2C992E36 */ + DWORD _RpcIsUIRequestPending( + [in] wchar_t * arg_1, + [in] GUID* pInterfaceGuid, + [in] struct_C * arg_3, + [out] LPDWORD arg_4); + + /* Function: 0x1F, address: 0x2C992EB3 */ + DWORD _RpcSetUIForwardingNetworkList( + [in] wchar_t * arg_1, + [in][size_is(dwSize)] GUID* arg_2, + [in] DWORD dwSize, + [out] GUID* arg_4); + + /* Function: 0x20 */ + DWORD _RpcIsNetworkSuppressed( + [in] wchar_t * arg_1, + [in] DWORD arg_2, + [in] GUID* pInterfaceGuid, + [out] LPDWORD arg_4); + + /* Function: 0x21 */ + DWORD _RpcRemoveUIForwardingNetworkList( + [in] wchar_t * arg_1, + [in] GUID* pInterfaceGuid); + + /* Function: 0x22 */ + DWORD _RpcQueryExtUIRequest( + [in] wchar_t * arg_1, + [in] GUID* arg_2, + [in] GUID* arg_3, + [in] /* enum16 */ short arg_4, + [out] GUID* pInterfaceGuid, + [out][ref] struct_C ** arg_6); + + /* Function: 0x23 */ + DWORD _RpcUIResponse( + [in] wchar_t * arg_1, + [in] struct_C * arg_2, + [in] struct_D * arg_3); + + /* Function: 0x24 */ + DWORD _RpcGetProfileKeyInfo( + [in] wchar_t * arg_1, + [in] DWORD arg_2, + [in] GUID* pInterfaceGuid, + [in][string] wchar_t * arg_4, + [in] DWORD arg_5, + [out] LPDWORD arg_6, + [in, out][unique][size_is(arg_5)] char * arg_7, + [out] LPDWORD arg_8); + + /* Function: 0x25 */ + DWORD _RpcAsyncDoPlap( + [in] wchar_t * arg_1, + [in] GUID* pInterfaceGuid, + [in][string] wchar_t * arg_3, + [in] DWORD dwSize, + [in][size_is(dwSize)] struct_E arg_5[]); + + /* Function: 0x26 */ + DWORD _RpcQueryPlapCredentials( + [in] wchar_t * arg_1, + [out] LPDWORD dwSize, + [out][ref][size_is(*dwSize)] struct_E ** arg_3, + [out][ref][string] wchar_t ** arg_4, + [out] GUID* pInterfaceGuid, + [out] LPDWORD arg_6, + [out] LPDWORD arg_7, + [out] LPDWORD arg_8, + [out] LPDWORD arg_9); + + /* Function: 0x27 */ + DWORD _RpcCancelPlap( + [in] wchar_t * arg_1, + [in] GUID* pInterfaceGuid); + + /* Function: 0x28 */ + DWORD _RpcSetSecuritySettings( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in] WLAN_SECURABLE_OBJECT SecurableObject, + [in][string] wchar_t * strModifiedSDDL); + + /* Function: 0x29 */ + DWORD _RpcGetSecuritySettings( + [in] WLANSVC_RPC_HANDLE hClientHandle, + [in] WLAN_SECURABLE_OBJECT SecurableObject, + [out] WLAN_OPCODE_VALUE_TYPE *pValueType, + [out][ref][string] wchar_t ** pstrCurrentSDDL, + [out] LPDWORD pdwGrantedAccess); + +} Propchange: trunk/reactos/include/reactos/idl/wlansvc.idl ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dchapyshev] 40046: - Add some defines
by dchapyshev＠svn.reactos.org 15 Mar '09

15 Mar '09

Author: dchapyshev Date: Sun Mar 15 22:06:48 2009 New Revision: 40046 URL: http://svn.reactos.org/svn/reactos?rev=40046&view=rev Log: - Add some defines Modified: trunk/reactos/include/psdk/winbase.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Sun Mar 15 22:06:48 2009 @@ -484,6 +484,8 @@ #define DDD_RAW_TARGET_PATH 1 #define DDD_REMOVE_DEFINITION 2 #define DDD_EXACT_MATCH_ON_REMOVE 4 +#define DDD_NO_BROADCAST_SYSTEM 8 +#define DDD_LUID_BROADCAST_DRIVE 16 #define HINSTANCE_ERROR 32 #define MS_CTS_ON 16 #define MS_DSR_ON 32

1 0

[dchapyshev] 40045: - Sync quartz with Wine head
by dchapyshev＠svn.reactos.org 15 Mar '09

15 Mar '09

Author: dchapyshev Date: Sun Mar 15 22:03:42 2009 New Revision: 40045 URL: http://svn.reactos.org/svn/reactos?rev=40045&view=rev Log: - Sync quartz with Wine head Modified: trunk/reactos/dll/directx/quartz/acmwrapper.c trunk/reactos/dll/directx/quartz/avidec.c trunk/reactos/dll/directx/quartz/avisplit.c trunk/reactos/dll/directx/quartz/control.c trunk/reactos/dll/directx/quartz/dsoundrender.c trunk/reactos/dll/directx/quartz/enumfilters.c trunk/reactos/dll/directx/quartz/enummedia.c trunk/reactos/dll/directx/quartz/enummoniker.c trunk/reactos/dll/directx/quartz/enumpins.c trunk/reactos/dll/directx/quartz/enumregfilters.c trunk/reactos/dll/directx/quartz/filesource.c trunk/reactos/dll/directx/quartz/filtergraph.c trunk/reactos/dll/directx/quartz/filtermapper.c trunk/reactos/dll/directx/quartz/main.c trunk/reactos/dll/directx/quartz/memallocator.c trunk/reactos/dll/directx/quartz/mpegsplit.c trunk/reactos/dll/directx/quartz/nullrenderer.c trunk/reactos/dll/directx/quartz/parser.c trunk/reactos/dll/directx/quartz/pin.c trunk/reactos/dll/directx/quartz/pin.h trunk/reactos/dll/directx/quartz/quartz_private.h trunk/reactos/dll/directx/quartz/regsvr.c trunk/reactos/dll/directx/quartz/systemclock.c trunk/reactos/dll/directx/quartz/transform.c trunk/reactos/dll/directx/quartz/videorenderer.c trunk/reactos/dll/directx/quartz/waveparser.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/quartz/acmwrapper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/acmwrap… Modified: trunk/reactos/dll/directx/quartz/avidec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/avidec.… Modified: trunk/reactos/dll/directx/quartz/avisplit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/avispli… Modified: trunk/reactos/dll/directx/quartz/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/control… Modified: trunk/reactos/dll/directx/quartz/dsoundrender.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/dsoundr… Modified: trunk/reactos/dll/directx/quartz/enumfilters.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/enumfil… Modified: trunk/reactos/dll/directx/quartz/enummedia.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/enummed… Modified: trunk/reactos/dll/directx/quartz/enummoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/enummon… Modified: trunk/reactos/dll/directx/quartz/enumpins.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/enumpin… Modified: trunk/reactos/dll/directx/quartz/enumregfilters.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/enumreg… Modified: trunk/reactos/dll/directx/quartz/filesource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/filesou… Modified: trunk/reactos/dll/directx/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/filterg… Modified: trunk/reactos/dll/directx/quartz/filtermapper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/filterm… Modified: trunk/reactos/dll/directx/quartz/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/main.c?… Modified: trunk/reactos/dll/directx/quartz/memallocator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/memallo… Modified: trunk/reactos/dll/directx/quartz/mpegsplit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/mpegspl… Modified: trunk/reactos/dll/directx/quartz/nullrenderer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/nullren… Modified: trunk/reactos/dll/directx/quartz/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/parser.… Modified: trunk/reactos/dll/directx/quartz/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/pin.c?r… Modified: trunk/reactos/dll/directx/quartz/pin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/pin.h?r… Modified: trunk/reactos/dll/directx/quartz/quartz_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/quartz_… Modified: trunk/reactos/dll/directx/quartz/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/regsvr.… Modified: trunk/reactos/dll/directx/quartz/systemclock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/systemc… Modified: trunk/reactos/dll/directx/quartz/transform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/transfo… Modified: trunk/reactos/dll/directx/quartz/videorenderer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/videore… Modified: trunk/reactos/dll/directx/quartz/waveparser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/wavepar…

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
49
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2009