Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[hpoussin] 42495: [lsasrv] Do not launch a thread to listen for incoming calls, but do it directly Better LsarClose stub, which tries to do the right thing Fix a few prototypes See issue #4689 for more details.
by hpoussin＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: hpoussin Date: Sat Aug 8 09:27:37 2009 New Revision: 42495 URL: http://svn.reactos.org/svn/reactos?rev=42495&view=rev Log: [lsasrv] Do not launch a thread to listen for incoming calls, but do it directly Better LsarClose stub, which tries to do the right thing Fix a few prototypes See issue #4689 for more details. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/include/reactos/idl/lsa.idl Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sat Aug 8 09:27:37 2009 @@ -6,7 +6,6 @@ #define NTOS_MODE_USER #include <ndk/ntndk.h> -#include "lsasrv.h" #include "lsa_s.h" #include <wine/debug.h> @@ -26,10 +25,11 @@ /* FUNCTIONS ***************************************************************/ -/*static*/ NTSTATUS -ReferencePolicyHandle(IN LSAPR_HANDLE ObjectHandle, - IN ACCESS_MASK DesiredAccess, - OUT PLSAR_POLICY_HANDLE *Policy) +static NTSTATUS +ReferencePolicyHandle( + IN LSA_HANDLE ObjectHandle, + IN ACCESS_MASK DesiredAccess, + OUT PLSAR_POLICY_HANDLE *Policy) { PLSAR_POLICY_HANDLE ReferencedPolicy; NTSTATUS Status = STATUS_SUCCESS; @@ -58,10 +58,10 @@ return Status; } - -/*static*/ VOID -DereferencePolicyHandle(IN OUT PLSAR_POLICY_HANDLE Policy, - IN BOOLEAN Delete) +static VOID +DereferencePolicyHandle( + IN OUT PLSAR_POLICY_HANDLE Policy, + IN BOOLEAN Delete) { RtlEnterCriticalSection(&PolicyHandleTableLock); @@ -83,13 +83,17 @@ RtlLeaveCriticalSection(&PolicyHandleTableLock); } - -DWORD WINAPI -LsapRpcThreadRoutine(LPVOID lpParameter) +VOID +LsarStartRpcServer(VOID) { RPC_STATUS Status; - TRACE("LsapRpcThreadRoutine() called"); + RtlInitializeCriticalSection(&PolicyHandleTableLock); + RtlInitializeHandleTable(0x1000, + sizeof(LSAR_POLICY_HANDLE), + &PolicyHandleTable); + + TRACE("LsarStartRpcServer() called"); Status = RpcServerUseProtseqEpW(L"ncacn_np", 10, @@ -98,7 +102,7 @@ if (Status != RPC_S_OK) { WARN("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); - return 0; + return; } Status = RpcServerRegisterIf(lsarpc_v0_0_s_ifspec, @@ -107,51 +111,17 @@ if (Status != RPC_S_OK) { WARN("RpcServerRegisterIf() failed (Status %lx)\n", Status); - return 0; + return; } - Status = RpcServerListen(1, 20, FALSE); + Status = RpcServerListen(1, 20, TRUE); if (Status != RPC_S_OK) { WARN("RpcServerListen() failed (Status %lx)\n", Status); - return 0; + return; } - TRACE("LsapRpcThreadRoutine() done\n"); - - return 0; -} - - -VOID -LsarStartRpcServer(VOID) -{ - HANDLE hThread; - - TRACE("LsarStartRpcServer() called"); - - RtlInitializeCriticalSection(&PolicyHandleTableLock); - RtlInitializeHandleTable(0x1000, - sizeof(LSAR_POLICY_HANDLE), - &PolicyHandleTable); - - hThread = CreateThread(NULL, - 0, - (LPTHREAD_START_ROUTINE) - LsapRpcThreadRoutine, - NULL, - 0, - NULL); - if (!hThread) - { - WARN("Starting LsapRpcThreadRoutine-Thread failed!\n"); - } - else - { - CloseHandle(hThread); - } - - TRACE("LsarStartRpcServer() done"); + TRACE("LsarStartRpcServer() done\n"); } @@ -162,16 +132,24 @@ /* Function 0 */ -NTSTATUS -LsarClose(LSAPR_HANDLE *ObjectHandle) -{ -#if 0 +NTSTATUS LsarClose( + LSAPR_HANDLE *ObjectHandle) +{ PLSAR_POLICY_HANDLE Policy = NULL; NTSTATUS Status; TRACE("0x%p\n", ObjectHandle); - Status = ReferencePolicyHandle(*ObjectHandle, +#if 1 + /* This is our fake handle, don't go too much long way */ + if (*ObjectHandle == (LSA_HANDLE)0xcafe) + { + *ObjectHandle = NULL; + Status = STATUS_SUCCESS; + } +#endif + + Status = ReferencePolicyHandle((LSA_HANDLE)*ObjectHandle, 0, &Policy); if (NT_SUCCESS(Status)) @@ -182,28 +160,12 @@ } return Status; -#endif - NTSTATUS Status = STATUS_NOT_IMPLEMENTED; - - TRACE("LsarClose called!\n"); - - /* This is our fake handle, don't go too much long way */ - if (*ObjectHandle == (LSA_HANDLE)0xcafe) - { - *ObjectHandle = NULL; - Status = STATUS_SUCCESS; - } - - - TRACE("LsarClose done (Status: 0x%08lx)!\n", Status); - - return Status; } /* Function 1 */ -NTSTATUS -LsarDelete(LSAPR_HANDLE ObjectHandle) +NTSTATUS LsarDelete( + LSAPR_HANDLE ObjectHandle) { /* Deprecated */ return STATUS_NOT_SUPPORTED; @@ -246,7 +208,7 @@ /* Function 5 */ NTSTATUS LsarChangePassword( - handle_t hBinding, /* FIXME */ + handle_t IDL_handle, PRPC_UNICODE_STRING String1, PRPC_UNICODE_STRING String2, PRPC_UNICODE_STRING String3, @@ -265,6 +227,7 @@ ACCESS_MASK DesiredAccess, LSAPR_HANDLE *PolicyHandle) { +#if 1 TRACE("LsarOpenPolicy called!\n"); *PolicyHandle = (LSAPR_HANDLE)0xcafe; @@ -272,6 +235,10 @@ TRACE("LsarOpenPolicy done!\n"); return STATUS_SUCCESS; +#else + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +#endif } @@ -572,7 +539,11 @@ /* Function 33 */ NTSTATUS LsarLookupPrivilegeDisplayName( - LSAPR_HANDLE PolicyHandle, /* FIXME */ + LSAPR_HANDLE PolicyHandle, + PRPC_UNICODE_STRING Name, + USHORT ClientLanguage, + USHORT ClientSystemDefaultLanguage, + PRPC_UNICODE_STRING *DisplayName, USHORT *LanguageReturned) { UNIMPLEMENTED; @@ -1044,7 +1015,7 @@ /* Function 76 */ NTSTATUS LsarLookupSids3( - handle_t hBinding, + LSAPR_HANDLE PolicyHandle, PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, PLSAPR_TRANSLATED_NAMES_EX TranslatedNames, @@ -1060,7 +1031,6 @@ /* Function 77 */ NTSTATUS LsarLookupNames4( - handle_t hBinding, handle_t RpcHandle, DWORD Count, PRPC_UNICODE_STRING Names, @@ -1111,4 +1081,121 @@ return STATUS_NOT_IMPLEMENTED; } + +/* Function 82 */ +NTSTATUS CredrFindBestCredential( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 83 */ +NTSTATUS LsarSetAuditPolicy( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 84 */ +NTSTATUS LsarQueryAuditPolicy( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 85 */ +NTSTATUS LsarEnumerateAuditPolicy( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 86 */ +NTSTATUS LsarEnumerateAuditCategories( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 87 */ +NTSTATUS LsarEnumerateAuditSubCategories( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 88 */ +NTSTATUS LsarLookupAuditCategoryName( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 89 */ +NTSTATUS LsarLookupAuditSubCategoryName( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 90 */ +NTSTATUS LsarSetAuditSecurity( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 91 */ +NTSTATUS LsarQueryAuditSecurity( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 92 */ +NTSTATUS CredReadByTokenHandle( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 93 */ +NTSTATUS CredrRestoreCredentials( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* Function 94 */ +NTSTATUS CredrBackupCredentials( + handle_t hBinding) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + /* EOF */ Modified: trunk/reactos/include/reactos/idl/lsa.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/lsa.id… ============================================================================== --- trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] Sat Aug 8 09:27:37 2009 @@ -622,7 +622,6 @@ /* Function 5 */ NTSTATUS LsarChangePassword( - [in] handle_t hBinding, /* FIXME */ [in] PRPC_UNICODE_STRING String1, [in] PRPC_UNICODE_STRING String2, [in] PRPC_UNICODE_STRING String3, @@ -805,11 +804,11 @@ /* Function 33 */ NTSTATUS LsarLookupPrivilegeDisplayName( - [in] LSAPR_HANDLE PolicyHandle, /* FIXME */ - /*[in] PRPC_UNICODE_STRING Name, + [in] LSAPR_HANDLE PolicyHandle, + [in] PRPC_UNICODE_STRING Name, [in] USHORT ClientLanguage, [in] USHORT ClientSystemDefaultLanguage, - [out] PRPC_UNICODE_STRING *DisplayName,*/ + [out] PRPC_UNICODE_STRING *DisplayName, [out] USHORT *LanguageReturned); /* Function 34 */ @@ -1078,7 +1077,7 @@ /* Function 76 */ NTSTATUS LsarLookupSids3( - [in] handle_t hBinding, /* FIXME */ + [in] LSAPR_HANDLE PolicyHandle, [in] PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, [out] PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, [in, out] PLSAPR_TRANSLATED_NAMES_EX TranslatedNames, @@ -1089,8 +1088,7 @@ /* Function 77 */ NTSTATUS LsarLookupNames4( - [in] handle_t hBinding, /* FIXME */ - [in] handle_t RpcHandle, + [in] LSAPR_HANDLE PolicyHandle, [in] DWORD Count, [in, size_is(Count)] PRPC_UNICODE_STRING Names, [out] PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains,

1 0

[cwittich] 42494: delete obsolete diff
by cwittich＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: cwittich Date: Sat Aug 8 09:20:55 2009 New Revision: 42494 URL: http://svn.reactos.org/svn/reactos?rev=42494&view=rev Log: delete obsolete diff Removed: trunk/reactos/dll/win32/rsaenh/rsaenh_ros.diff Removed: trunk/reactos/dll/win32/rsaenh/rsaenh_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rsaenh_ro… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/rsaenh_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/rsaenh_ros.diff (removed) @@ -1,30 +1,0 @@ -Index: handle.h -=================================================================== ---- handle.h (revision 30501) -+++ handle.h (working copy) -@@ -48,6 +48,10 @@ - unsigned int iNextFree; - } HANDLETABLEENTRY; - -+/* Prevent conflict with wingdi.h */ -+#define tagHANDLETABLE tagHANDLETABLE_RSA -+#define HANDLETABLE HANDLETABLE_RSA -+ - typedef struct tagHANDLETABLE - { - unsigned int iEntries; -Index: rsaenh.c -=================================================================== ---- rsaenh.c (revision 30501) -+++ rsaenh.c (working copy) -@@ -34,9 +34,9 @@ - #include "winbase.h" - #include "winreg.h" - #include "wincrypt.h" -+#include "objbase.h" - #include "handle.h" - #include "implglue.h" --#include "objbase.h" - - WINE_DEFAULT_DEBUG_CHANNEL(crypt); -

1 0

[cwittich] 42493: allow warnings for idl
by cwittich＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: cwittich Date: Sat Aug 8 09:06:52 2009 New Revision: 42493 URL: http://svn.reactos.org/svn/reactos?rev=42493&view=rev Log: allow warnings for idl Modified: trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild Modified: trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpcrt4.r… ============================================================================== --- trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild [iso-8859-1] Sat Aug 8 09:06:52 2009 @@ -2,11 +2,9 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="rpcrt4_winetest_server" type="rpcserver" allowwarnings="true"> - <define name="__ROS_LONG64__" /> <file>server.idl</file> </module> - <module name="rpcrt4_winetest_client" type="rpcclient"> - <define name="__ROS_LONG64__" /> + <module name="rpcrt4_winetest_client" type="rpcclient" allowwarnings="true"> <file>server.idl</file> </module> <module name="rpcrt4_winetest" type="win32cui" installbase="bin" installname="rpcrt4_winetest.exe" allowwarnings="true">

1 0

[cwittich] 42492: try to re enable rpc4rt winetest
by cwittich＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: cwittich Date: Sat Aug 8 08:47:51 2009 New Revision: 42492 URL: http://svn.reactos.org/svn/reactos?rev=42492&view=rev Log: try to re enable rpc4rt winetest Modified: trunk/rostests/winetests/directory.rbuild trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild Modified: trunk/rostests/winetests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/directory.rbuil… ============================================================================== --- trunk/rostests/winetests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/directory.rbuild [iso-8859-1] Sat Aug 8 08:47:51 2009 @@ -167,7 +167,7 @@ <xi:include href="riched32/riched32.rbuild" /> </directory> <directory name="rpcrt4"> -  + <xi:include href="rpcrt4/rpcrt4.rbuild" /> </directory> <directory name="rsabase"> <xi:include href="rsabase/rsabase.rbuild" /> Modified: trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpcrt4.r… ============================================================================== --- trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild [iso-8859-1] Sat Aug 8 08:47:51 2009 @@ -2,9 +2,11 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="rpcrt4_winetest_server" type="rpcserver" allowwarnings="true"> + <define name="__ROS_LONG64__" /> <file>server.idl</file> </module> <module name="rpcrt4_winetest_client" type="rpcclient"> + <define name="__ROS_LONG64__" /> <file>server.idl</file> </module> <module name="rpcrt4_winetest" type="win32cui" installbase="bin" installname="rpcrt4_winetest.exe" allowwarnings="true">

1 0

[cgutman] 42491: - Stop trying to find more adapters if it failed to avoid spamming the debug log - Should fix buildbot test 2nd stage
by cgutman＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: cgutman Date: Sat Aug 8 05:18:41 2009 New Revision: 42491 URL: http://svn.reactos.org/svn/reactos?rev=42491&view=rev Log: - Stop trying to find more adapters if it failed to avoid spamming the debug log - Should fix buildbot test 2nd stage Modified: trunk/reactos/base/services/dhcp/adapter.c trunk/reactos/base/services/dhcp/dispatch.c trunk/reactos/base/services/dhcp/include/rosdhcp.h Modified: trunk/reactos/base/services/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/adapter… ============================================================================== --- trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] Sat Aug 8 05:18:41 2009 @@ -229,12 +229,13 @@ /* * XXX Figure out the way to bind a specific adapter to a socket. */ -void AdapterDiscover() { +BOOLEAN AdapterDiscover() { PMIB_IFTABLE Table = (PMIB_IFTABLE) malloc(sizeof(MIB_IFTABLE)); DWORD Error, Size = sizeof(MIB_IFTABLE); PDHCP_ADAPTER Adapter = NULL; struct interface_info *ifi = NULL; int i; + BOOLEAN ret = TRUE; DH_DbgPrint(MID_TRACE,("Getting Adapter List...\n")); @@ -245,7 +246,10 @@ Table = (PMIB_IFTABLE) malloc( Size ); } - if( Error != NO_ERROR ) goto term; + if( Error != NO_ERROR ) { + ret = FALSE; + goto term; + } DH_DbgPrint(MID_TRACE,("Got Adapter List (%d entries)\n", Table->dwNumEntries)); @@ -335,6 +339,7 @@ term: if( Table ) free( Table ); + return ret; } void AdapterStop() { Modified: trunk/reactos/base/services/dhcp/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dispatc… ============================================================================== --- trunk/reactos/base/services/dhcp/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/dispatch.c [iso-8859-1] Sat Aug 8 05:18:41 2009 @@ -77,7 +77,10 @@ * a timeout registered, time out the select call then. */ another: - AdapterDiscover(); + if (!AdapterDiscover()) { + AdapterStop(); + break; + } for (l = protocols, nfds = 0; l; l = l->next) nfds++; Modified: trunk/reactos/base/services/dhcp/include/rosdhcp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/include… ============================================================================== --- trunk/reactos/base/services/dhcp/include/rosdhcp.h [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/include/rosdhcp.h [iso-8859-1] Sat Aug 8 05:18:41 2009 @@ -73,7 +73,8 @@ #define srandom srand void AdapterInit(VOID); -void AdapterDiscover(VOID); +BOOLEAN AdapterDiscover(VOID); +void AdapterStop(VOID); HANDLE PipeInit(VOID); extern PDHCP_ADAPTER AdapterGetFirst(); extern PDHCP_ADAPTER AdapterGetNext(PDHCP_ADAPTER);

1 0

[tkreuzer] 42490: NtUserGetIconInfo: Move lockingunlocking out of SEH, as this is a bad idea. Get rid of RETURN(). Add a comment.
by tkreuzer＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: tkreuzer Date: Sat Aug 8 04:47:32 2009 New Revision: 42490 URL: http://svn.reactos.org/svn/reactos?rev=42490&view=rev Log: NtUserGetIconInfo: Move lockingunlocking out of SEH, as this is a bad idea. Get rid of RETURN(). Add a comment. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Sat Aug 8 04:47:32 2009 @@ -434,6 +434,7 @@ /* Copy bitmaps and size info */ if (Indirect) { + // FIXME: WTF? CurIcon->IconInfo.hbmMask = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmMask); CurIcon->IconInfo.hbmColor = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmColor); } @@ -496,10 +497,9 @@ { ICONINFO ii; PCURICON_OBJECT CurIcon; - PWINSTATION_OBJECT WinSta; NTSTATUS Status = STATUS_SUCCESS; BOOL Ret = FALSE; - DECLARE_RETURN(BOOL); + DWORD colorBpp = 0; DPRINT("Enter NtUserGetIconInfo\n"); UserEnterExclusive(); @@ -507,19 +507,12 @@ if (!IconInfo) { SetLastWin32Error(ERROR_INVALID_PARAMETER); - RETURN(FALSE); - } - - WinSta = IntGetWinStaObj(); - if (WinSta == NULL) - { - RETURN(FALSE); + goto leave; } if (!(CurIcon = UserGetCurIconObject(hCurIcon))) { - ObDereferenceObject(WinSta); - RETURN(FALSE); + goto leave; } RtlCopyMemory(&ii, &CurIcon->IconInfo, sizeof(ICONINFO)); @@ -528,6 +521,18 @@ ii.hbmMask = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmMask); ii.hbmColor = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmColor); + if (pbpp) + { + PSURFACE psurfBmp; + + psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmColor); + if (psurfBmp) + { + colorBpp = BitsPerFormat(psurfBmp->SurfObj.iBitmapFormat); + SURFACE_UnlockSurface(psurfBmp); + } + } + /* Copy fields */ _SEH2_TRY { @@ -536,21 +541,9 @@ if (pbpp) { - PSURFACE psurfBmp; - int colorBpp = 0; - ProbeForWrite(pbpp, sizeof(DWORD), 1); - - psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmColor); - if (psurfBmp) - { - colorBpp = BitsPerFormat(psurfBmp->SurfObj.iBitmapFormat); - SURFACE_UnlockSurface(psurfBmp); - } - - RtlCopyMemory(pbpp, &colorBpp, sizeof(DWORD)); - } - + *pbpp = colorBpp; + } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -564,13 +557,12 @@ SetLastNtError(Status); UserDereferenceObject(CurIcon); - ObDereferenceObject(WinSta); - RETURN(Ret); - -CLEANUP: - DPRINT("Leave NtUserGetIconInfo, ret=%i\n",_ret_); + +leave: + DPRINT("Leave NtUserGetIconInfo, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + + return Ret; }

1 0

[tkreuzer] 42489: [win32k] - Use DIB_GetDIBWidthBytes and BitsPerFormat instead of switch - Add SPS_CHANGE flag when calling IntEngSetPointerShape - Fixes VMWare Driver mouse pointer regression
by tkreuzer＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: tkreuzer Date: Sat Aug 8 04:42:41 2009 New Revision: 42489 URL: http://svn.reactos.org/svn/reactos?rev=42489&view=rev Log: [win32k] - Use DIB_GetDIBWidthBytes and BitsPerFormat instead of switch - Add SPS_CHANGE flag when calling IntEngSetPointerShape - Fixes VMWare Driver mouse pointer regression Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Sat Aug 8 04:42:41 2009 @@ -382,30 +382,8 @@ pgp->HotSpot.y = yHot; /* Calculate lDelta for our surfaces. */ - switch (pso->iBitmapFormat) - { - case BMF_1BPP: - lDelta = pgp->Size.cx >> 3; - break; - case BMF_4BPP: - lDelta = pgp->Size.cx >> 1; - break; - case BMF_8BPP: - lDelta = pgp->Size.cx; - break; - case BMF_16BPP: - lDelta = pgp->Size.cx << 1; - break; - case BMF_24BPP: - lDelta = pgp->Size.cx * 3; - break; - case BMF_32BPP: - lDelta = pgp->Size.cx << 2; - break; - default: - lDelta = 0; - break; - } + lDelta = DIB_GetDIBWidthBytes(pgp->Size.cx, + BitsPerFormat(pso->iBitmapFormat)); rcl.left = 0; rcl.top = 0; @@ -690,7 +668,7 @@ x, y, &pdc->ppdev->Pointer.Exclude, - fl); + fl | SPS_CHANGE); /* Cleanup */ if (hbmColor)

1 0

[tkreuzer] 42488: Comment out rpcrt4 winetest, as it breaks testcd.
by tkreuzer＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: tkreuzer Date: Sat Aug 8 03:35:06 2009 New Revision: 42488 URL: http://svn.reactos.org/svn/reactos?rev=42488&view=rev Log: Comment out rpcrt4 winetest, as it breaks testcd. Modified: trunk/rostests/winetests/directory.rbuild Modified: trunk/rostests/winetests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/directory.rbuil… ============================================================================== --- trunk/rostests/winetests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/directory.rbuild [iso-8859-1] Sat Aug 8 03:35:06 2009 @@ -167,7 +167,7 @@ <xi:include href="riched32/riched32.rbuild" /> </directory> <directory name="rpcrt4"> - <xi:include href="rpcrt4/rpcrt4.rbuild" /> +  </directory> <directory name="rsabase"> <xi:include href="rsabase/rsabase.rbuild" />

1 0

[tkreuzer] 42487: Update the fill brush, in NtGdiFillPath.
by tkreuzer＠svn.reactos.org 08 Aug '09

08 Aug '09

Author: tkreuzer Date: Sat Aug 8 02:50:42 2009 New Revision: 42487 URL: http://svn.reactos.org/svn/reactos?rev=42487&view=rev Log: Update the fill brush, in NtGdiFillPath. Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] Sat Aug 8 02:50:42 2009 @@ -2298,6 +2298,9 @@ if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY)) DC_vUpdateLineBrush(dc); + if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) + DC_vUpdateFillBrush(dc); + ret = PATH_FillPath( dc, pPath ); if ( ret ) {

1 0

[sginsberg] 42486: - Don't use dllexport for dxapi -- we have a .spec
by sginsberg＠svn.reactos.org 07 Aug '09

07 Aug '09

Author: sginsberg Date: Fri Aug 7 23:53:26 2009 New Revision: 42486 URL: http://svn.reactos.org/svn/reactos?rev=42486&view=rev Log: - Don't use dllexport for dxapi -- we have a .spec Modified: trunk/reactos/drivers/directx/dxapi/main.c trunk/reactos/include/ddk/ddkmapi.h Modified: trunk/reactos/drivers/directx/dxapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxapi/main… ============================================================================== --- trunk/reactos/drivers/directx/dxapi/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxapi/main.c [iso-8859-1] Fri Aug 7 23:53:26 2009 @@ -45,8 +45,8 @@ * none * *--*/ -DXAPI -ULONG PASCAL +ULONG +PASCAL DxApiGetVersion() { /* MSDN say this always return Direct Sound version 4.02 */ @@ -98,8 +98,8 @@ * *--*/ -DXAPI -DWORD PASCAL +DWORD +PASCAL DxApi(IN DWORD dwFunctionNum, IN LPVOID lpvInBuffer, IN DWORD cbInBuffer, Modified: trunk/reactos/include/ddk/ddkmapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddkmapi.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ddkmapi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ddkmapi.h [iso-8859-1] Fri Aug 7 23:53:26 2009 @@ -23,7 +23,7 @@ #if defined(_DXAPI_) - #define DXAPI DECLSPEC_EXPORT + #define DXAPI #else #define DXAPI DECLSPEC_IMPORT #endif

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
66
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 August 2009