Ros-diffs

ros-diffs@reactos.org

81390 discussions

[aandrejevic] 59959: [SOFT386] Implement "MOD-REG-R/M" byte decoding.
by aandrejevic＠svn.reactos.org 01 Sep '13

01 Sep '13

Author: aandrejevic Date: Sun Sep 1 23:49:57 2013 New Revision: 59959 URL: http://svn.reactos.org/svn/reactos?rev=59959&view=rev Log: [SOFT386] Implement "MOD-REG-R/M" byte decoding. Modified: branches/ntvdm/lib/soft386/common.c branches/ntvdm/lib/soft386/common.h Modified: branches/ntvdm/lib/soft386/common.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.c?rev=… ============================================================================== --- branches/ntvdm/lib/soft386/common.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.c [iso-8859-1] Sun Sep 1 23:49:57 2013 @@ -764,4 +764,227 @@ return !(Number & 1); } +inline +BOOLEAN +Soft386ParseModRegRm(PSOFT386_STATE State, + BOOLEAN AddressSize, + PSOFT386_MOD_REG_RM ModRegRm) +{ + UCHAR ModRmByte, Mode, RegMem; + + /* Fetch the MOD REG R/M byte */ + if (!Soft386FetchByte(State, &ModRmByte)) + { + /* Exception occurred */ + return FALSE; + } + + /* Unpack the mode and R/M */ + Mode = ModRmByte >> 6; + RegMem = ModRmByte & 0x07; + + /* Set the register operand */ + ModRegRm->Register = (ModRmByte >> 3) & 0x07; + + /* Check the mode */ + if ((ModRmByte >> 6) == 3) + { + /* The second operand is also a register */ + ModRegRm->Memory = FALSE; + ModRegRm->SecondRegister = RegMem; + + /* Done parsing */ + return TRUE; + } + + /* The second operand is memory */ + ModRegRm->Memory = TRUE; + + if (AddressSize) + { + if (RegMem == SOFT386_REG_ESP) + { + UCHAR SibByte; + ULONG Scale, Index, Base; + + /* Fetch the SIB byte */ + if (!Soft386FetchByte(State, &SibByte)) + { + /* Exception occurred */ + return FALSE; + } + + /* Unpack the scale, index and base */ + Scale = 1 << (SibByte >> 6); + Index = (SibByte >> 3) & 0x07; + if (Index != SOFT386_REG_ESP) Index = State->GeneralRegs[Index].Long; + else Index = 0; + Base = State->GeneralRegs[SibByte & 0x07].Long; + + /* Calculate the address */ + ModRegRm->MemoryAddress = Base + Index * Scale; + } + else if (RegMem == SOFT386_REG_EBP) + { + if (Mode) ModRegRm->MemoryAddress = State->GeneralRegs[SOFT386_REG_EBP].Long; + else ModRegRm->MemoryAddress = 0; + } + else + { + /* Get the base from the register */ + ModRegRm->MemoryAddress = State->GeneralRegs[RegMem].Long; + } + + /* Check if there is no segment override */ + if (!(State->PrefixFlags & SOFT386_PREFIX_SEG)) + { + /* Check if the default segment should be SS */ + if ((RegMem == SOFT386_REG_EBP) && Mode) + { + /* Add a SS: prefix */ + State->PrefixFlags |= SOFT386_PREFIX_SEG; + State->SegmentOverride = SOFT386_REG_SS; + } + } + + if (Mode == 1) + { + CHAR Offset; + + /* Fetch the byte */ + if (!Soft386FetchByte(State, (PUCHAR)&Offset)) + { + /* Exception occurred */ + return FALSE; + } + + /* Add the signed offset to the address */ + ModRegRm->MemoryAddress += (LONG)Offset; + } + else if ((Mode == 2) || ((Mode == 0) && (RegMem == SOFT386_REG_EBP))) + { + LONG Offset; + + /* Fetch the dword */ + if (!Soft386FetchDword(State, (PULONG)&Offset)) + { + /* Exception occurred */ + return FALSE; + } + + /* Add the signed offset to the address */ + ModRegRm->MemoryAddress += Offset; + } + } + else + { + /* Check the operand */ + switch (RegMem) + { + case 0: + case 2: + { + /* (SS:)[BX + SI] */ + ModRegRm->MemoryAddress = State->GeneralRegs[SOFT386_REG_EBX].LowWord + + State->GeneralRegs[SOFT386_REG_ESI].LowWord; + + break; + } + + case 1: + case 3: + { + /* (SS:)[BX + DI] */ + ModRegRm->MemoryAddress = State->GeneralRegs[SOFT386_REG_EBX].LowWord + + State->GeneralRegs[SOFT386_REG_EDI].LowWord; + + break; + } + + case 4: + { + /* [SI] */ + ModRegRm->MemoryAddress = State->GeneralRegs[SOFT386_REG_ESI].LowWord; + + break; + } + + case 5: + { + /* [DI] */ + ModRegRm->MemoryAddress = State->GeneralRegs[SOFT386_REG_EDI].LowWord; + + break; + } + + case 6: + { + if (Mode) + { + /* [BP] */ + ModRegRm->MemoryAddress = State->GeneralRegs[SOFT386_REG_EBP].LowWord; + } + else + { + /* [constant] (added later) */ + ModRegRm->MemoryAddress = 0; + } + + break; + } + + case 7: + { + /* [BX] */ + ModRegRm->MemoryAddress = State->GeneralRegs[SOFT386_REG_EBX].LowWord; + + break; + } + } + + /* Check if there is no segment override */ + if (!(State->PrefixFlags & SOFT386_PREFIX_SEG)) + { + /* Check if the default segment should be SS */ + if ((RegMem == 2) || (RegMem == 3) || ((RegMem == 6) && Mode)) + { + /* Add a SS: prefix */ + State->PrefixFlags |= SOFT386_PREFIX_SEG; + State->SegmentOverride = SOFT386_REG_SS; + } + } + + if (Mode == 1) + { + CHAR Offset; + + /* Fetch the byte */ + if (!Soft386FetchByte(State, (PUCHAR)&Offset)) + { + /* Exception occurred */ + return FALSE; + } + + /* Add the signed offset to the address */ + ModRegRm->MemoryAddress += (LONG)Offset; + } + else if ((Mode == 2) || ((Mode == 0) && (RegMem == 6))) + { + SHORT Offset; + + /* Fetch the word */ + if (!Soft386FetchWord(State, (PUSHORT)&Offset)) + { + /* Exception occurred */ + return FALSE; + } + + /* Add the signed offset to the address */ + ModRegRm->MemoryAddress += (LONG)Offset; + } + } + + return TRUE; +} + /* EOF */ Modified: branches/ntvdm/lib/soft386/common.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.h?rev=… ============================================================================== --- branches/ntvdm/lib/soft386/common.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.h [iso-8859-1] Sun Sep 1 23:49:57 2013 @@ -20,6 +20,17 @@ #define SIGN_FLAG_LONG 0x80000000 #define GET_SEGMENT_RPL(s) ((s) & 3) #define GET_SEGMENT_INDEX(s) ((s) & 0xFFF8) + +typedef struct _SOFT386_MOD_REG_RM +{ + INT Register; + BOOLEAN Memory; + union + { + INT SecondRegister; + ULONG MemoryAddress; + }; +} SOFT386_MOD_REG_RM, *PSOFT386_MOD_REG_RM; /* FUNCTIONS ******************************************************************/ @@ -129,6 +140,15 @@ UCHAR Number ); +inline +BOOLEAN +Soft386ParseModRegRm +( + PSOFT386_STATE State, + BOOLEAN AddressSize, + PSOFT386_MOD_REG_RM ModRegRm +); + #endif // _COMMON_H_ /* EOF */

1 0

[ekohl] 59958: [NETAPI32] NetLocalGroupAdd: Set the admin comment only if it is not NULL.
by ekohl＠svn.reactos.org 01 Sep '13

01 Sep '13

Author: ekohl Date: Sun Sep 1 23:32:15 2013 New Revision: 59958 URL: http://svn.reactos.org/svn/reactos?rev=59958&view=rev Log: [NETAPI32] NetLocalGroupAdd: Set the admin comment only if it is not NULL. Modified: trunk/reactos/dll/win32/netapi32/local_group.c Modified: trunk/reactos/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_g… ============================================================================== --- trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] Sun Sep 1 23:32:15 2013 @@ -447,7 +447,7 @@ TRACE("Created alias \"%wZ\" (RID: %lu)\n", &AliasName, RelativeId); /* Set the admin comment */ - if (level == 1) + if (aliascomment != NULL) { RtlInitUnicodeString(&AdminComment.AdminComment, aliascomment);

1 0

[akhaldi] 59957: [CRT] * Annotate io_s.h.
by akhaldi＠svn.reactos.org 01 Sep '13

01 Sep '13

Author: akhaldi Date: Sun Sep 1 22:03:22 2013 New Revision: 59957 URL: http://svn.reactos.org/svn/reactos?rev=59957&view=rev Log: [CRT] * Annotate io_s.h. Modified: trunk/reactos/include/crt/sec_api/io_s.h Modified: trunk/reactos/include/crt/sec_api/io_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/io_s.h… ============================================================================== --- trunk/reactos/include/crt/sec_api/io_s.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sec_api/io_s.h [iso-8859-1] Sun Sep 1 22:03:22 2013 @@ -3,6 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ + #ifndef _INC_IO_S #define _INC_IO_S @@ -14,20 +15,62 @@ extern "C" { #endif - _CRTIMP errno_t __cdecl _access_s(const char *_Filename,int _AccessMode); - _CRTIMP errno_t __cdecl _chsize_s(int _FileHandle,__int64 _Size); - _CRTIMP errno_t __cdecl _mktemp_s(char *_TemplateName,size_t _Size); - _CRTIMP errno_t __cdecl _umask_s(int _NewMode,int *_OldMode); + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _access_s( + _In_z_ const char *_Filename, + _In_ int _AccessMode); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _chsize_s( + _In_ int _FileHandle, + _In_ __int64 _Size); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _mktemp_s( + _Inout_updates_z_(_Size) char *_TemplateName, + _In_ size_t _Size); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _umask_s( + _In_ int _NewMode, + _Out_ int *_OldMode); #ifndef _WIO_S_DEFINED #define _WIO_S_DEFINED - _CRTIMP errno_t __cdecl _waccess_s(const wchar_t *_Filename,int _AccessMode); - _CRTIMP errno_t __cdecl _wmktemp_s(wchar_t *_TemplateName,size_t _SizeInWords); -#endif + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _waccess_s( + _In_z_ const wchar_t *_Filename, + _In_ int _AccessMode); + + _CRTIMP + errno_t + __cdecl + _wmktemp_s( + _Inout_updates_z_(_SizeInWords) wchar_t *_TemplateName, + _In_ size_t _SizeInWords); + +#endif /* _WIO_S_DEFINED */ #ifdef __cplusplus } #endif -#endif -#endif +#endif /* MINGW_HAS_SECURE_API */ + +#endif /* _INC_IO_S */

1 0

[akhaldi] 59956: [PSDK] * Annotate winnetwk.h.
by akhaldi＠svn.reactos.org 01 Sep '13

01 Sep '13

Author: akhaldi Date: Sun Sep 1 21:25:52 2013 New Revision: 59956 URL: http://svn.reactos.org/svn/reactos?rev=59956&view=rev Log: [PSDK] * Annotate winnetwk.h. Modified: trunk/reactos/include/psdk/winnetwk.h Modified: trunk/reactos/include/psdk/winnetwk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnetwk.h?re… ============================================================================== --- trunk/reactos/include/psdk/winnetwk.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnetwk.h [iso-8859-1] Sun Sep 1 21:25:52 2013 @@ -4,10 +4,12 @@ #ifdef __cplusplus extern "C" { #endif + #ifdef _MSC_VER #pragma warning(push) #pragma warning(disable:4820) #endif + #define WNNC_NET_MSNET 0x00010000 #define WNNC_NET_LANMAN 0x00020000 #define WNNC_NET_NETWARE 0x00030000 @@ -160,6 +162,7 @@ #define WNCON_DYNAMIC 8 #ifndef RC_INVOKED + typedef struct _NETRESOURCEA { DWORD dwScope; DWORD dwType; @@ -244,49 +247,299 @@ DWORD dwOptDataSize; } NETCONNECTINFOSTRUCT,*LPNETCONNECTINFOSTRUCT; -DWORD APIENTRY WNetAddConnectionA(LPCSTR,LPCSTR,LPCSTR); -DWORD APIENTRY WNetAddConnectionW(LPCWSTR,LPCWSTR,LPCWSTR); -DWORD APIENTRY WNetAddConnection2A(LPNETRESOURCEA,LPCSTR,LPCSTR,DWORD); -DWORD APIENTRY WNetAddConnection2W(LPNETRESOURCEW,LPCWSTR,LPCWSTR,DWORD); -DWORD APIENTRY WNetAddConnection3A(HWND,LPNETRESOURCEA,LPCSTR,LPCSTR,DWORD); -DWORD APIENTRY WNetAddConnection3W(HWND,LPNETRESOURCEW,LPCWSTR,LPCWSTR,DWORD); -DWORD APIENTRY WNetCancelConnectionA(LPCSTR,BOOL); -DWORD APIENTRY WNetCancelConnectionW(LPCWSTR,BOOL); -DWORD APIENTRY WNetCancelConnection2A(LPCSTR,DWORD,BOOL); -DWORD APIENTRY WNetCancelConnection2W(LPCWSTR,DWORD,BOOL); -DWORD APIENTRY WNetGetConnectionA(LPCSTR,LPSTR,PDWORD); -DWORD APIENTRY WNetGetConnectionW(LPCWSTR,LPWSTR,PDWORD); -DWORD APIENTRY WNetUseConnectionA(HWND,LPNETRESOURCEA,LPCSTR,LPCSTR,DWORD,LPSTR,PDWORD,PDWORD); -DWORD APIENTRY WNetUseConnectionW(HWND,LPNETRESOURCEW,LPCWSTR,LPCWSTR,DWORD,LPWSTR,PDWORD,PDWORD); +_Check_return_ +DWORD +APIENTRY +WNetAddConnectionA( + _In_ LPCSTR, + _In_opt_ LPCSTR, + _In_opt_ LPCSTR); + +_Check_return_ +DWORD +APIENTRY +WNetAddConnectionW( + _In_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_opt_ LPCWSTR); + +_Check_return_ +DWORD +APIENTRY +WNetAddConnection2A( + _In_ LPNETRESOURCEA, + _In_opt_ LPCSTR, + _In_opt_ LPCSTR, + _In_ DWORD); + +_Check_return_ +DWORD +APIENTRY +WNetAddConnection2W( + _In_ LPNETRESOURCEW, + _In_opt_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_ DWORD); + +_Check_return_ +DWORD +APIENTRY +WNetAddConnection3A( + _In_opt_ HWND, + _In_ LPNETRESOURCEA, + _In_opt_ LPCSTR, + _In_opt_ LPCSTR, + _In_ DWORD); + +_Check_return_ +DWORD +APIENTRY +WNetAddConnection3W( + _In_opt_ HWND, + _In_ LPNETRESOURCEW, + _In_opt_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_ DWORD); + +_Check_return_ DWORD APIENTRY WNetCancelConnectionA(_In_ LPCSTR, _In_ BOOL); +_Check_return_ DWORD APIENTRY WNetCancelConnectionW(_In_ LPCWSTR, _In_ BOOL); + +_Check_return_ +DWORD +APIENTRY +WNetCancelConnection2A( + _In_ LPCSTR, + _In_ DWORD, + _In_ BOOL); + +_Check_return_ +DWORD +APIENTRY +WNetCancelConnection2W( + _In_ LPCWSTR, + _In_ DWORD, + _In_ BOOL); + +_Check_return_ +DWORD +APIENTRY +WNetGetConnectionA( + _In_ LPCSTR lpLocalName, + _Out_writes_opt_(*lpnLength) LPSTR lpRemoteName, + _Inout_ LPDWORD lpnLength); + +_Check_return_ +DWORD +APIENTRY +WNetGetConnectionW( + _In_ LPCWSTR lpLocalName, + _Out_writes_opt_(*lpnLength) LPWSTR lpRemoteName, + _Inout_ LPDWORD lpnLength); + +_Check_return_ +DWORD +APIENTRY +WNetUseConnectionA( + _In_opt_ HWND hwndOwner, + _In_ LPNETRESOURCEA lpNetResource, + _In_opt_ LPCSTR lpPassword, + _In_opt_ LPCSTR lpUserId, + _In_ DWORD dwFlags, + _Out_writes_opt_(*lpBufferSize) LPSTR lpAccessName, + _Inout_opt_ LPDWORD lpBufferSize, + _Out_opt_ LPDWORD lpResult); + +_Check_return_ +DWORD +APIENTRY +WNetUseConnectionW( + _In_opt_ HWND hwndOwner, + _In_ LPNETRESOURCEW lpNetResource, + _In_opt_ LPCWSTR lpPassword, + _In_opt_ LPCWSTR lpUserId, + _In_ DWORD dwFlags, + _Out_writes_opt_(*lpBufferSize) LPWSTR lpAccessName, + _Inout_opt_ LPDWORD lpBufferSize, + _Out_opt_ LPDWORD lpResult); + DWORD APIENTRY WNetSetConnectionA(LPCSTR,DWORD,PVOID); DWORD APIENTRY WNetSetConnectionW(LPCWSTR,DWORD,PVOID); -DWORD APIENTRY WNetConnectionDialog(HWND,DWORD); -DWORD APIENTRY WNetDisconnectDialog(HWND,DWORD); -DWORD APIENTRY WNetConnectionDialog1A(LPCONNECTDLGSTRUCTA); -DWORD APIENTRY WNetConnectionDialog1W(LPCONNECTDLGSTRUCTW); -DWORD APIENTRY WNetDisconnectDialog1A(LPDISCDLGSTRUCTA); -DWORD APIENTRY WNetDisconnectDialog1W(LPDISCDLGSTRUCTW); -DWORD APIENTRY WNetOpenEnumA(DWORD,DWORD,DWORD,LPNETRESOURCEA,LPHANDLE); -DWORD APIENTRY WNetOpenEnumW(DWORD,DWORD,DWORD,LPNETRESOURCEW,LPHANDLE); -DWORD APIENTRY WNetEnumResourceA(HANDLE,PDWORD,PVOID,PDWORD); -DWORD APIENTRY WNetEnumResourceW(HANDLE,PDWORD,PVOID,PDWORD); -DWORD APIENTRY WNetCloseEnum(HANDLE); -DWORD APIENTRY WNetGetUniversalNameA(LPCSTR,DWORD,PVOID,PDWORD); -DWORD APIENTRY WNetGetUniversalNameW(LPCWSTR,DWORD,PVOID,PDWORD); -DWORD APIENTRY WNetGetUserA(LPCSTR,LPSTR,PDWORD); -DWORD APIENTRY WNetGetUserW(LPCWSTR,LPWSTR,PDWORD); -DWORD APIENTRY WNetGetProviderNameA(DWORD,LPSTR,PDWORD); -DWORD APIENTRY WNetGetProviderNameW(DWORD,LPWSTR,PDWORD); -DWORD APIENTRY WNetGetNetworkInformationA(LPCSTR,LPNETINFOSTRUCT); -DWORD APIENTRY WNetGetNetworkInformationW(LPCWSTR,LPNETINFOSTRUCT); -DWORD APIENTRY WNetGetResourceInformationA(LPNETRESOURCEA,LPVOID,LPDWORD,LPSTR*); -DWORD APIENTRY WNetGetResourceInformationW(LPNETRESOURCEW,LPVOID,LPDWORD,LPWSTR*); -DWORD APIENTRY WNetGetLastErrorA(PDWORD,LPSTR,DWORD,LPSTR,DWORD); -DWORD APIENTRY WNetGetLastErrorW(PDWORD,LPWSTR,DWORD,LPWSTR,DWORD); +_Check_return_ DWORD APIENTRY WNetConnectionDialog(_In_ HWND, _In_ DWORD); +_Check_return_ DWORD APIENTRY WNetDisconnectDialog(_In_opt_ HWND, _In_ DWORD); + +_Check_return_ +DWORD +APIENTRY +WNetConnectionDialog1A( + _Inout_ LPCONNECTDLGSTRUCTA); + +_Check_return_ +DWORD +APIENTRY +WNetConnectionDialog1W( + _Inout_ LPCONNECTDLGSTRUCTW); + +_Check_return_ DWORD APIENTRY WNetDisconnectDialog1A(_In_ LPDISCDLGSTRUCTA); +_Check_return_ DWORD APIENTRY WNetDisconnectDialog1W(_In_ LPDISCDLGSTRUCTW); + +_Check_return_ +DWORD +APIENTRY +WNetOpenEnumA( + _In_ DWORD, + _In_ DWORD, + _In_ DWORD, + _In_opt_ LPNETRESOURCEA, + _Out_ LPHANDLE); + +_Check_return_ +DWORD +APIENTRY +WNetOpenEnumW( + _In_ DWORD, + _In_ DWORD, + _In_ DWORD, + _In_opt_ LPNETRESOURCEW, + _Out_ LPHANDLE); + +_Check_return_ +DWORD +APIENTRY +WNetEnumResourceA( + _In_ HANDLE hEnum, + _Inout_ LPDWORD lpcCount, + _Out_writes_bytes_(*lpBufferSize) LPVOID lpBuffer, + _Inout_ LPDWORD lpBufferSize); + +_Check_return_ +DWORD +APIENTRY +WNetEnumResourceW( + _In_ HANDLE hEnum, + _Inout_ LPDWORD lpcCount, + _Out_writes_bytes_(*lpBufferSize) LPVOID lpBuffer, + _Inout_ LPDWORD lpBufferSize); + +_Check_return_ DWORD APIENTRY WNetCloseEnum(_In_ HANDLE); + +_Check_return_ +DWORD +APIENTRY +WNetGetUniversalNameA( + _In_ LPCSTR lpLocalPath, + _In_ DWORD dwInfoLevel, + _Out_writes_bytes_(*lpBufferSize) LPVOID lpBuffer, + _Inout_ LPDWORD lpBufferSize); + +_Check_return_ +DWORD +APIENTRY +WNetGetUniversalNameW( + _In_ LPCWSTR lpLocalPath, + _In_ DWORD dwInfoLevel, + _Out_writes_bytes_(*lpBufferSize) LPVOID lpBuffer, + _Inout_ LPDWORD lpBufferSize); + +_Check_return_ +DWORD +APIENTRY +WNetGetUserA( + _In_opt_ LPCSTR lpName, + _Out_writes_(*lpnLength) LPSTR lpUserName, + _Inout_ LPDWORD lpnLength); + +_Check_return_ +DWORD +APIENTRY +WNetGetUserW( + _In_opt_ LPCWSTR lpName, + _Out_writes_(*lpnLength) LPWSTR lpUserName, + _Inout_ LPDWORD lpnLength); + +_Check_return_ +DWORD +APIENTRY +WNetGetProviderNameA( + _In_ DWORD dwNetType, + _Out_writes_(*lpBufferSize) LPSTR lpProviderName, + _Inout_ LPDWORD lpBufferSize); + +_Check_return_ +DWORD +APIENTRY +WNetGetProviderNameW( + _In_ DWORD dwNetType, + _Out_writes_(*lpBufferSize) LPWSTR lpProviderName, + _Inout_ LPDWORD lpBufferSize); + +_Check_return_ +DWORD +APIENTRY +WNetGetNetworkInformationA( + _In_ LPCSTR, + _Out_ LPNETINFOSTRUCT); + +_Check_return_ +DWORD +APIENTRY +WNetGetNetworkInformationW( + _In_ LPCWSTR, + _Out_ LPNETINFOSTRUCT); + +_Check_return_ +DWORD +APIENTRY +WNetGetResourceInformationA( + _In_ LPNETRESOURCEA lpNetResource, + _Out_writes_bytes_(*lpcbBuffer) LPVOID lpBuffer, + _Inout_ LPDWORD lpcbBuffer, + _Outptr_ LPSTR *lplpSystem); + +_Check_return_ +DWORD +APIENTRY +WNetGetResourceInformationW( + _In_ LPNETRESOURCEW lpNetResource, + _Out_writes_bytes_(*lpcbBuffer) LPVOID lpBuffer, + _Inout_ LPDWORD lpcbBuffer, + _Outptr_ LPWSTR *lplpSystem); + +_Check_return_ +DWORD +APIENTRY +WNetGetLastErrorA( + _Out_ LPDWORD lpError, + _Out_writes_(nErrorBufSize) LPSTR lpErrorBuf, + _In_ DWORD nErrorBufSize, + _Out_writes_(nNameBufSize) LPSTR lpNameBuf, + _In_ DWORD nNameBufSize); + +_Check_return_ +DWORD +APIENTRY +WNetGetLastErrorW( + _Out_ LPDWORD lpError, + _Out_writes_(nErrorBufSize) LPWSTR lpErrorBuf, + _In_ DWORD nErrorBufSize, + _Out_writes_(nNameBufSize) LPWSTR lpNameBuf, + _In_ DWORD nNameBufSize); + DWORD WINAPI WNetRestoreConnectionA(HWND,LPCSTR); DWORD WINAPI WNetRestoreConnectionW(HWND,LPCWSTR); -DWORD APIENTRY MultinetGetConnectionPerformanceA(LPNETRESOURCEA,LPNETCONNECTINFOSTRUCT); -DWORD APIENTRY MultinetGetConnectionPerformanceW(LPNETRESOURCEW,LPNETCONNECTINFOSTRUCT); + +_Check_return_ +DWORD +APIENTRY +MultinetGetConnectionPerformanceA( + _In_ LPNETRESOURCEA, + _Out_ LPNETCONNECTINFOSTRUCT); + +_Check_return_ +DWORD +APIENTRY +MultinetGetConnectionPerformanceW( + _In_ LPNETRESOURCEW, + _Out_ LPNETCONNECTINFOSTRUCT); #ifdef _WINE typedef struct tagPASSWORD_CACHE_ENTRY @@ -362,11 +615,15 @@ #define WNetGetLastError WNetGetLastErrorA #define MultinetGetConnectionPerformance MultinetGetConnectionPerformanceA #endif -#endif + +#endif /* !RC_INVOKED */ + #ifdef _MSC_VER #pragma warning(pop) #endif + #ifdef __cplusplus } #endif -#endif + +#endif /* _WINNETWK_ */

1 0

[akhaldi] 59955: [PAINT] * Fix MSVC build.
by akhaldi＠svn.reactos.org 01 Sep '13

01 Sep '13

Author: akhaldi Date: Sun Sep 1 21:17:36 2013 New Revision: 59955 URL: http://svn.reactos.org/svn/reactos?rev=59955&view=rev Log: [PAINT] * Fix MSVC build. Modified: trunk/reactos/base/applications/mspaint/drawing.c Modified: trunk/reactos/base/applications/mspaint/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/drawing.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/drawing.c [iso-8859-1] Sun Sep 1 21:17:36 2013 @@ -110,9 +110,10 @@ Erase(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG radius) { LONG a, b; - b = max(1, max(abs(x2 - x1), abs(y2 - y1))); HPEN oldPen; HBRUSH oldBrush = SelectObject(hdc, CreateSolidBrush(color)); + + b = max(1, max(abs(x2 - x1), abs(y2 - y1))); oldPen = SelectObject(hdc, CreatePen(PS_SOLID, 1, color)); for(a = 0; a <= b; a++) Rectangle(hdc, (x1 * (b - a) + x2 * a) / b - radius + 1, @@ -194,10 +195,10 @@ case 10: case 11: { - POINT offsTop[] = {{.x = 4, .y = -3}, {.x = 2, .y = -2}, {.x = 0, .y = 0}, - {.x = -3, .y = -3}, {.x = -2, .y = -2}, {.x = -1, .y = 0}}; - POINT offsBtm[] = {{.x = -3, .y = 4}, {.x = -2, .y = 2}, {.x = -1, .y = 1}, - {.x = 4, .y = 4}, {.x = 2, .y = 2}, {.x = 0, .y = 1}}; + POINT offsTop[] = {{4, 3}, {2, -2}, {0, 0}, + {-3, -3}, {-2, -2}, {-1, 0}}; + POINT offsBtm[] = {{-3, 4}, {-2, 2}, {-1, 1}, + {4, 4}, {2, 2}, {0, 1}}; LONG idx = style - 6; POINT pts[4]; pts[0].x = x1 + offsTop[idx].x;

1 0

[bfreisen] 59954: [PAINT] * Stretch/Skew dialog fully implemented (skewing not yet functional), please check translations * pre Windows Vista MSPaint palette selectable via menu entry * Attributes ...
by bfreisen＠svn.reactos.org 01 Sep '13

01 Sep '13

Author: bfreisen Date: Sun Sep 1 20:13:15 2013 New Revision: 59954 URL: http://svn.reactos.org/svn/reactos?rev=59954&view=rev Log: [PAINT] * Stretch/Skew dialog fully implemented (skewing not yet functional), please check translations * pre Windows Vista MSPaint palette selectable via menu entry * Attributes dialog supports setting width and height in inches and cm also * drawing functions improved * some variables grouped into structs * Changed SendMessage(... WM_PAINT ...) into InvalidateRect(...), this is the way it should be and it fixes half of the repainting bugs Added: trunk/reactos/base/applications/mspaint/icons/horzskew.ico (with props) trunk/reactos/base/applications/mspaint/icons/vertskew.ico (with props) Modified: trunk/reactos/base/applications/mspaint/definitions.h trunk/reactos/base/applications/mspaint/dialogs.c trunk/reactos/base/applications/mspaint/drawing.c trunk/reactos/base/applications/mspaint/drawing.h trunk/reactos/base/applications/mspaint/globalvar.h trunk/reactos/base/applications/mspaint/icons.rc trunk/reactos/base/applications/mspaint/lang/bg-BG.rc trunk/reactos/base/applications/mspaint/lang/cs-CZ.rc trunk/reactos/base/applications/mspaint/lang/de-DE.rc trunk/reactos/base/applications/mspaint/lang/en-GB.rc trunk/reactos/base/applications/mspaint/lang/en-US.rc trunk/reactos/base/applications/mspaint/lang/es-ES.rc trunk/reactos/base/applications/mspaint/lang/eu-ES.rc trunk/reactos/base/applications/mspaint/lang/fr-FR.rc trunk/reactos/base/applications/mspaint/lang/he-IL.rc trunk/reactos/base/applications/mspaint/lang/hu-HU.rc trunk/reactos/base/applications/mspaint/lang/it-IT.rc trunk/reactos/base/applications/mspaint/lang/ja-JP.rc trunk/reactos/base/applications/mspaint/lang/nl-NL.rc trunk/reactos/base/applications/mspaint/lang/no-NO.rc trunk/reactos/base/applications/mspaint/lang/pl-PL.rc trunk/reactos/base/applications/mspaint/lang/pt-BR.rc trunk/reactos/base/applications/mspaint/lang/pt-PT.rc trunk/reactos/base/applications/mspaint/lang/ro-RO.rc trunk/reactos/base/applications/mspaint/lang/ru-RU.rc trunk/reactos/base/applications/mspaint/lang/sk-SK.rc trunk/reactos/base/applications/mspaint/lang/sv-SE.rc trunk/reactos/base/applications/mspaint/lang/tr-TR.rc trunk/reactos/base/applications/mspaint/lang/uk-UA.rc trunk/reactos/base/applications/mspaint/lang/zh-CN.rc trunk/reactos/base/applications/mspaint/lang/zh-TW.rc trunk/reactos/base/applications/mspaint/main.c trunk/reactos/base/applications/mspaint/mouse.c trunk/reactos/base/applications/mspaint/palette.c trunk/reactos/base/applications/mspaint/selection.c trunk/reactos/base/applications/mspaint/sizebox.c trunk/reactos/base/applications/mspaint/toolsettings.c trunk/reactos/base/applications/mspaint/winproc.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/mspaint/definitions.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/drawing.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/globalvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/icons.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Added: trunk/reactos/base/applications/mspaint/icons/horzskew.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Added: trunk/reactos/base/applications/mspaint/icons/vertskew.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/selection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/sizebox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/toolsettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/…

1 0

[akhaldi] 59953: [KMTESTS] * Run this block now that guard pages are supported. ROSTESTS-107 #resolve
by akhaldi＠svn.reactos.org 01 Sep '13

01 Sep '13

Author: akhaldi Date: Sun Sep 1 17:55:00 2013 New Revision: 59953 URL: http://svn.reactos.org/svn/reactos?rev=59953&view=rev Log: [KMTESTS] * Run this block now that guard pages are supported. ROSTESTS-107 #resolve Modified: trunk/rostests/kmtests/ntos_mm/ZwAllocateVirtualMemory.c Modified: trunk/rostests/kmtests/ntos_mm/ZwAllocateVirtualMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/ZwAllocat… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/ZwAllocateVirtualMemory.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/ZwAllocateVirtualMemory.c [iso-8859-1] Sun Sep 1 17:55:00 2013 @@ -238,8 +238,7 @@ ////////////////////////////////////////////////////////////////////////// // GUARD PAGES ////////////////////////////////////////////////////////////////////////// -/* FIXME: We don't support guard pages. See CORE-6639, ROSTESTS-107 */ -#ifdef ROSTESTS_107_FIXED + RegionSize = 1000; Base = NULL; ZwAllocateVirtualMemory(NtCurrentProcess(), &Base, 0, &RegionSize, (MEM_COMMIT | MEM_RESERVE), (PAGE_GUARD | PAGE_READWRITE)); @@ -257,7 +256,6 @@ RegionSize = 0; ZwFreeVirtualMemory(NtCurrentProcess(), &Base, &RegionSize, MEM_RELEASE); -#endif /* ROSTESTS_107_FIXED */ return Status; }

1 0

[aandrejevic] 59952: [SOFT386] Implement the "MOV reg8, imm8" instruction.
by aandrejevic＠svn.reactos.org 01 Sep '13

01 Sep '13

Author: aandrejevic Date: Sun Sep 1 17:54:51 2013 New Revision: 59952 URL: http://svn.reactos.org/svn/reactos?rev=59952&view=rev Log: [SOFT386] Implement the "MOV reg8, imm8" instruction. Modified: branches/ntvdm/lib/soft386/opcodes.c branches/ntvdm/lib/soft386/opcodes.h Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Sun Sep 1 17:54:51 2013 @@ -200,14 +200,14 @@ NULL, // TODO: OPCODE 0xAD NOT SUPPORTED NULL, // TODO: OPCODE 0xAE NOT SUPPORTED NULL, // TODO: OPCODE 0xAF NOT SUPPORTED - NULL, // TODO: OPCODE 0xB0 NOT SUPPORTED - NULL, // TODO: OPCODE 0xB1 NOT SUPPORTED - NULL, // TODO: OPCODE 0xB2 NOT SUPPORTED - NULL, // TODO: OPCODE 0xB3 NOT SUPPORTED - NULL, // TODO: OPCODE 0xB4 NOT SUPPORTED - NULL, // TODO: OPCODE 0xB5 NOT SUPPORTED - NULL, // TODO: OPCODE 0xB6 NOT SUPPORTED - NULL, // TODO: OPCODE 0xB7 NOT SUPPORTED + Soft386OpcodeMovByteRegImm, + Soft386OpcodeMovByteRegImm, + Soft386OpcodeMovByteRegImm, + Soft386OpcodeMovByteRegImm, + Soft386OpcodeMovByteRegImm, + Soft386OpcodeMovByteRegImm, + Soft386OpcodeMovByteRegImm, + Soft386OpcodeMovByteRegImm, Soft386OpcodeMovRegImm, Soft386OpcodeMovRegImm, Soft386OpcodeMovRegImm, @@ -1221,3 +1221,40 @@ return TRUE; } + +BOOLEAN +FASTCALL +Soft386OpcodeMovByteRegImm(PSOFT386_STATE State, UCHAR Opcode) +{ + UCHAR Value; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xF8) == 0xB0); + + if (State->PrefixFlags != 0) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Fetch the byte */ + if (!Soft386FetchByte(State, &Value)) + { + /* Exception occurred */ + return FALSE; + } + + if (Opcode & 0x04) + { + /* AH, CH, DH or BH */ + State->GeneralRegs[Opcode & 0x03].HighByte = Value; + } + else + { + /* AL, CL, DL or BL */ + State->GeneralRegs[Opcode & 0x03].LowByte = Value; + } + + return TRUE; +} Modified: branches/ntvdm/lib/soft386/opcodes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.h?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] Sun Sep 1 17:54:51 2013 @@ -199,4 +199,12 @@ UCHAR Opcode ); +BOOLEAN +FASTCALL +Soft386OpcodeMovByteRegImm +( + PSOFT386_STATE State, + UCHAR Opcode +); + #endif // _OPCODES_H_

1 0

[gadamopoulos] 59951: - forgot to commit this
by gadamopoulos＠svn.reactos.org 01 Sep '13

01 Sep '13

Author: gadamopoulos Date: Sun Sep 1 16:56:48 2013 New Revision: 59951 URL: http://svn.reactos.org/svn/reactos?rev=59951&view=rev Log: - forgot to commit this Modified: trunk/reactos/include/psdk/shlguid.h Modified: trunk/reactos/include/psdk/shlguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlguid.h?rev… ============================================================================== --- trunk/reactos/include/psdk/shlguid.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlguid.h [iso-8859-1] Sun Sep 1 16:56:48 2013 @@ -214,6 +214,7 @@ DEFINE_GUID(CLSID_NewMenu, 0xd969A300, 0xe7FF, 0x11D0, 0xA9, 0x3B, 0x0, 0xA0, 0xC9, 0x0F, 0x27, 0x19); DEFINE_GUID(IID_IShellFolderViewCB, 0x2047E320, 0xF2A9, 0x11CE, 0xAE, 0x65, 0x8, 0x00, 0x2B, 0x2E, 0x12, 0x62); DEFINE_GUID(CLSID_InternetButtons, 0x1E796980, 0x9CC5, 0x11D1, 0xA8, 0x3F, 0x0, 0xC0, 0x4F, 0xC9, 0x9D, 0x61); +DEFINE_GUID(CLSID_MenuDeskBar, 0xECD4FC4F, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1); DEFINE_GUID(SID_SMenuBandChild, 0xed9cc020, 0x08b9, 0x11d1, 0x98, 0x23, 0x0, 0xc0, 0x4f, 0xd9, 0x19, 0x72); DEFINE_GUID(SID_SMenuBandParent, 0x8c278eec, 0x3eab, 0x11d1, 0x8c, 0xb0, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0);

1 0

[gadamopoulos] 59950: [shell32] - Stub CMenuDeskBar class
by gadamopoulos＠svn.reactos.org 01 Sep '13

01 Sep '13

Author: gadamopoulos Date: Sun Sep 1 16:52:36 2013 New Revision: 59950 URL: http://svn.reactos.org/svn/reactos?rev=59950&view=rev Log: [shell32] - Stub CMenuDeskBar class Added: trunk/reactos/dll/win32/shell32/CMenuDeskBar.cpp (with props) trunk/reactos/dll/win32/shell32/CMenuDeskBar.h (with props) trunk/reactos/dll/win32/shell32/res/rgs/menudeskbar.rgs (with props) Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shell32/precomp.h trunk/reactos/dll/win32/shell32/rgs_res.rc trunk/reactos/dll/win32/shell32/shell32_main.cpp trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Sun Sep 1 16:52:36 2013 @@ -24,6 +24,7 @@ clipboard.cpp control.cpp CMenuBand.cpp + CMenuDeskBar.cpp dataobject.cpp dde.cpp debughlp.cpp Added: trunk/reactos/dll/win32/shell32/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMenuDes… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMenuDeskBar.cpp (added) +++ trunk/reactos/dll/win32/shell32/CMenuDeskBar.cpp [iso-8859-1] Sun Sep 1 16:52:36 2013 @@ -0,0 +1,141 @@ + +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(shell); + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::Popup( + POINTL *ppt, + RECTL *prcExclude, + MP_POPUPFLAGS dwFlags) +{ + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnSelect( + DWORD dwSelectType) +{ + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSubMenu( + IMenuPopup *pmp, + BOOL fSet) +{ + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetClient( + IUnknown *punkClient) +{ + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetClient( + IUnknown **ppunkClient) +{ + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnPosRectChangeDB( + RECT *prc) +{ + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetWindow( + HWND *phwnd) +{ + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::ContextSensitiveHelp( + BOOL fEnterMode) +{ + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSite( + IUnknown *pUnkSite) +{ + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetSite( + REFIID riid, + PVOID *ppvSite) +{ + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetIconSize(THIS_ DWORD iIcon) +{ + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetIconSize(THIS_ DWORD* piIcon) +{ + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetBitmap(THIS_ HBITMAP hBitmap) +{ + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetBitmap(THIS_ HBITMAP* phBitmap) +{ + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::Initialize(THIS) +{ + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::QueryStatus( + const GUID *pguidCmdGroup, + ULONG cCmds, + OLECMD prgCmds[], + OLECMDTEXT *pCmdText) +{ + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::Exec( + const GUID *pguidCmdGroup, + DWORD nCmdID, + DWORD nCmdexecopt, + VARIANT *pvaIn, + VARIANT *pvaOut) +{ + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::QueryService( + REFGUID guidService, + REFIID riid, + void **ppvObject) +{ + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnFocusChangeIS(THIS_ LPUNKNOWN lpUnknown, BOOL bFocus) +{ + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::UIActivateIO(THIS_ BOOL bActivating, LPMSG lpMsg) +{ + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::HasFocusIO(THIS) +{ + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuDeskBar::TranslateAcceleratorIO(THIS_ LPMSG lpMsg) +{ + return S_OK; +} + Propchange: trunk/reactos/dll/win32/shell32/CMenuDeskBar.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shell32/CMenuDeskBar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMenuDes… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMenuDeskBar.h (added) +++ trunk/reactos/dll/win32/shell32/CMenuDeskBar.h [iso-8859-1] Sun Sep 1 16:52:36 2013 @@ -0,0 +1,75 @@ + +class CMenuDeskBar: + public CComCoClass<CMenuDeskBar, &CLSID_MenuDeskBar>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IOleCommandTarget, + public IServiceProvider, + public IInputObjectSite, + public IInputObject, + public IMenuPopup, + public IObjectWithSite, + public IBanneredBar, + public IInitializeObject +{ +public: + + // *** IMenuPopup methods *** + virtual HRESULT STDMETHODCALLTYPE Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags); + virtual HRESULT STDMETHODCALLTYPE OnSelect(DWORD dwSelectType); + virtual HRESULT STDMETHODCALLTYPE SetSubMenu(IMenuPopup *pmp,BOOL fSet); + + // *** IDeskBar methods *** + virtual HRESULT STDMETHODCALLTYPE SetClient(IUnknown *punkClient); + virtual HRESULT STDMETHODCALLTYPE GetClient(IUnknown **ppunkClient); + virtual HRESULT STDMETHODCALLTYPE OnPosRectChangeDB(RECT *prc); + + // *** IOleWindow methods *** + virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *phwnd); + virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode); + + // *** IObjectWithSite methods *** + virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite); + virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid,PVOID *ppvSite); + + // *** IBanneredBar methods *** + virtual HRESULT STDMETHODCALLTYPE SetIconSize(THIS_ DWORD iIcon); + virtual HRESULT STDMETHODCALLTYPE GetIconSize(THIS_ DWORD* piIcon); + virtual HRESULT STDMETHODCALLTYPE SetBitmap(THIS_ HBITMAP hBitmap); + virtual HRESULT STDMETHODCALLTYPE GetBitmap(THIS_ HBITMAP* phBitmap); + + // *** IInitializeObject methods *** + virtual HRESULT STDMETHODCALLTYPE Initialize(THIS); + + // *** IOleCommandTarget methods *** + virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText); + virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); + + // *** IServiceProvider methods *** + virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject); + + // *** IInputObjectSite methods *** + virtual HRESULT STDMETHODCALLTYPE OnFocusChangeIS(THIS_ LPUNKNOWN lpUnknown, BOOL bFocus); + + // *** IInputObject methods *** + virtual HRESULT STDMETHODCALLTYPE UIActivateIO(THIS_ BOOL bActivating, LPMSG lpMsg); + virtual HRESULT STDMETHODCALLTYPE HasFocusIO(THIS); + virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorIO(THIS_ LPMSG lpMsg); + +DECLARE_REGISTRY_RESOURCEID(IDR_MENUDESKBAR) +DECLARE_NOT_AGGREGATABLE(CMenuDeskBar) +DECLARE_PROTECT_FINAL_CONSTRUCT() + +BEGIN_COM_MAP(CMenuDeskBar) + COM_INTERFACE_ENTRY_IID(IID_IMenuPopup, IMenuPopup) + COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) + COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) + COM_INTERFACE_ENTRY_IID(IID_IInputObjectSite, IInputObjectSite) + COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject) + COM_INTERFACE_ENTRY_IID(IID_IDeskBar, IMenuPopup) + COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IMenuPopup) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) + COM_INTERFACE_ENTRY_IID(IID_IBanneredBar, IBanneredBar) + COM_INTERFACE_ENTRY_IID(IID_IInitializeObject, IInitializeObject) +END_COM_MAP() + +}; Propchange: trunk/reactos/dll/win32/shell32/CMenuDeskBar.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… ============================================================================== --- trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] Sun Sep 1 16:52:36 2013 @@ -72,6 +72,7 @@ #include "filedefext.h" #include "drvdefext.h" #include "CMenuBand.h" +#include "CMenuDeskBar.h" #include <wine/debug.h> Added: trunk/reactos/dll/win32/shell32/res/rgs/menudeskbar.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/rgs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/res/rgs/menudeskbar.rgs (added) +++ trunk/reactos/dll/win32/shell32/res/rgs/menudeskbar.rgs [iso-8859-1] Sun Sep 1 16:52:36 2013 @@ -0,0 +1,13 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {ECD4FC4F-521C-11D0-B792-00A0C90312E1} = s 'Menu Desk Bar' + { + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + } + } +} Propchange: trunk/reactos/dll/win32/shell32/res/rgs/menudeskbar.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shell32/rgs_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/rgs_res.… ============================================================================== --- trunk/reactos/dll/win32/shell32/rgs_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/rgs_res.rc [iso-8859-1] Sun Sep 1 16:52:36 2013 @@ -11,6 +11,7 @@ IDR_FONTSFOLDERSHORTCUT REGISTRY "res/rgs/fontsfoldershortcut.rgs" IDR_MENUBAND REGISTRY "res/rgs/menuband.rgs" IDR_MENUBANDSITE REGISTRY "res/rgs/menubandsite.rgs" +IDR_MENUDESKBAR REGISTRY "res/rgs/menudeskbar.rgs" IDR_MYCOMPUTER REGISTRY "res/rgs/mycomputer.rgs" IDR_MYDOCUMENTS REGISTRY "res/rgs/mydocuments.rgs" IDR_NETWORKPLACES REGISTRY "res/rgs/networkplaces.rgs" Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Sun Sep 1 16:52:36 2013 @@ -1369,6 +1369,7 @@ OBJECT_ENTRY(CLSID_StartMenu, CStartMenu) OBJECT_ENTRY(CLSID_MenuBandSite, CMenuBandSite) OBJECT_ENTRY(CLSID_MenuBand, CMenuBand) + OBJECT_ENTRY(CLSID_MenuDeskBar, CMenuDeskBar) END_OBJECT_MAP() CShell32Module gModule; Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Sun Sep 1 16:52:36 2013 @@ -538,5 +538,6 @@ #define IDR_FILEDEFEXT 147 #define IDR_DRVDEFEXT 148 #define IDR_MENUBAND 149 +#define IDR_MENUDESKBAR 150 #endif

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs