Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 56595: [INF] Add default security settings file for ReactOS Workstation.
by ekohl＠svn.reactos.org 17 May '12

17 May '12

Author: ekohl Date: Thu May 17 13:08:59 2012 New Revision: 56595 URL: http://svn.reactos.org/svn/reactos?rev=56595&view=rev Log: [INF] Add default security settings file for ReactOS Workstation. Added: trunk/reactos/media/inf/defltws.inf (with props) Modified: trunk/reactos/media/inf/CMakeLists.txt Modified: trunk/reactos/media/inf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] Thu May 17 13:08:59 2012 @@ -6,6 +6,7 @@ bth.inf cdrom.inf cpu.inf + defltws.inf disk.inf display.inf fdc.inf Added: trunk/reactos/media/inf/defltws.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/defltws.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/defltws.inf (added) +++ trunk/reactos/media/inf/defltws.inf [iso-8859-1] Thu May 17 13:08:59 2012 @@ -1,0 +1,9 @@ +; defltws.inf +; Default security settings for ReactOS Workstation + +[Version] +Signature = "$Windows NT$" + +[Privilege Rights] +SeAssignPrimaryTokenPrivilege = S-1-5-19, S-1-5-20 +SeAuditPrivilege = S-1-5-19, S-1-5-20 Propchange: trunk/reactos/media/inf/defltws.inf ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/media/inf/defltws.inf ------------------------------------------------------------------------------ svn:keywords = author date id revision

1 0

[ekohl] 56594: [PSDK/LSASRV] - Add new ntlsa.h file to the PSDK. - LsarAddPrivilegesToAccount: Implement the ability to add new privileges to an existing privilege set.
by ekohl＠svn.reactos.org 17 May '12

17 May '12

Author: ekohl Date: Thu May 17 12:02:50 2012 New Revision: 56594 URL: http://svn.reactos.org/svn/reactos?rev=56594&view=rev Log: [PSDK/LSASRV] - Add new ntlsa.h file to the PSDK. - LsarAddPrivilegesToAccount: Implement the ability to add new privileges to an existing privilege set. Added: trunk/reactos/include/psdk/ntlsa.h (with props) Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.h 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] Thu May 17 12:02:50 2012 @@ -733,7 +733,7 @@ /* Validate the AccountHandle */ Status = LsapValidateDbObject(AccountHandle, LsaDbAccountObject, - 0, + ACCOUNT_VIEW, &AccountObject); if (!NT_SUCCESS(Status)) { @@ -778,13 +778,18 @@ PLSAPR_PRIVILEGE_SET Privileges) { PLSA_DB_OBJECT AccountObject; + PPRIVILEGE_SET CurrentPrivileges = NULL; + PPRIVILEGE_SET NewPrivileges = NULL; ULONG PrivilegeSetSize = 0; + ULONG PrivilegeCount; + ULONG i, j; + BOOL bFound; NTSTATUS Status; /* Validate the AccountHandle */ Status = LsapValidateDbObject(AccountHandle, LsaDbAccountObject, - 0, + ACCOUNT_ADJUST_PRIVILEGES, &AccountObject); if (!NT_SUCCESS(Status)) { @@ -811,8 +816,107 @@ { /* The Privilgs attribute exists */ - Status = STATUS_NOT_IMPLEMENTED; - } + /* Allocate memory for the stored privilege set */ + CurrentPrivileges = MIDL_user_allocate(PrivilegeSetSize); + if (CurrentPrivileges == NULL) + return STATUS_NO_MEMORY; + + /* Get the current privilege set */ + Status = LsapGetObjectAttribute(AccountObject, + L"Privilgs", + CurrentPrivileges, + &PrivilegeSetSize); + if (!NT_SUCCESS(Status)) + { + TRACE("LsapGetObjectAttribute() failed (Status 0x%08lx)\n", Status); + goto done; + } + + PrivilegeCount = CurrentPrivileges->PrivilegeCount; + TRACE("Current privilege count: %lu\n", PrivilegeCount); + + /* Calculate the number privileges in the combined privilege set */ + for (i = 0; i < Privileges->PrivilegeCount; i++) + { + bFound = FALSE; + for (j = 0; j < CurrentPrivileges->PrivilegeCount; j++) + { + if (RtlEqualLuid(&(Privileges->Privilege[i].Luid), + &(CurrentPrivileges->Privilege[i].Luid))) + { + bFound = TRUE; + break; + } + } + + if (bFound == FALSE) + { + TRACE("Found new privilege\n"); + PrivilegeCount++; + } + } + TRACE("New privilege count: %lu\n", PrivilegeCount); + + /* Calculate the size of the new privilege set and allocate it */ + PrivilegeSetSize = sizeof(PRIVILEGE_SET) + + (PrivilegeCount - 1) * sizeof(LUID_AND_ATTRIBUTES); + NewPrivileges = MIDL_user_allocate(PrivilegeSetSize); + if (NewPrivileges == NULL) + { + Status = STATUS_NO_MEMORY; + goto done; + } + + /* Initialize the new privilege set */ + NewPrivileges->PrivilegeCount = PrivilegeCount; + NewPrivileges->Control = 0; + + /* Copy all privileges from the current privilege set */ + RtlCopyLuidAndAttributesArray(CurrentPrivileges->PrivilegeCount, + &(CurrentPrivileges->Privilege[0]), + &(NewPrivileges->Privilege[0])); + + /* Add new privileges to the new privilege set */ + PrivilegeCount = CurrentPrivileges->PrivilegeCount; + for (i = 0; i < Privileges->PrivilegeCount; i++) + { + bFound = FALSE; + for (j = 0; j < CurrentPrivileges->PrivilegeCount; j++) + { + if (RtlEqualLuid(&(Privileges->Privilege[i].Luid), + &(CurrentPrivileges->Privilege[i].Luid))) + { + /* Overwrite attributes if a matching privilege was found */ + NewPrivileges->Privilege[j].Attributes = Privileges->Privilege[i].Attributes; + + bFound = TRUE; + break; + } + } + + if (bFound == FALSE) + { + /* Copy the new privilege */ + RtlCopyLuidAndAttributesArray(1, + (PLUID_AND_ATTRIBUTES)&(Privileges->Privilege[i]), + &(NewPrivileges->Privilege[PrivilegeCount])); + PrivilegeCount++; + } + } + + /* Set the new priivliege set */ + Status = LsapSetObjectAttribute(AccountObject, + L"Privilgs", + NewPrivileges, + PrivilegeSetSize); + } + +done: + if (CurrentPrivileges != NULL) + MIDL_user_free(CurrentPrivileges); + + if (NewPrivileges != NULL) + MIDL_user_free(NewPrivileges); return Status; } Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Thu May 17 12:02:50 2012 @@ -17,6 +17,7 @@ #include <ndk/rtlfuncs.h> #include <ndk/setypes.h> +#include <ntlsa.h> #include <ntsecapi.h> #include <sddl.h> Added: trunk/reactos/include/psdk/ntlsa.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntlsa.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/ntlsa.h (added) +++ trunk/reactos/include/psdk/ntlsa.h [iso-8859-1] Thu May 17 12:02:50 2012 @@ -1,0 +1,40 @@ +/* + * ntlsa.h + * + * This file is part of the ReactOS PSDK package. + * + * Contributors: + * Created by Eric Kohl. + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + +#ifndef _NTLSA_ +#define _NTLSA_ + +#ifdef __cplusplus +extern "C" { +#endif + +#define ACCOUNT_VIEW 1 +#define ACCOUNT_ADJUST_PRIVILEGES 2 +#define ACCOUNT_ADJUST_QUOTAS 4 +#define ACCOUNT_ADJUST_SYSTEM_ACCESS 8 + + + +#ifdef __cplusplus +} +#endif + + +#endif /* _NTLSA_ */ Propchange: trunk/reactos/include/psdk/ntlsa.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/ntlsa.h ------------------------------------------------------------------------------ svn:keywords = author date id revision

1 0

[tkreuzer] 56593: [WIN32K] - Mark bitmap as API bitmap in NtGdiCreateDIBSection - Mark palette as DIB section palette in NtGdiCreateDIBSection - Set biXPelsPerMeter to 0 instead of using the bitmap...
by tkreuzer＠svn.reactos.org 16 May '12

16 May '12

Author: tkreuzer Date: Wed May 16 14:13:26 2012 New Revision: 56593 URL: http://svn.reactos.org/svn/reactos?rev=56593&view=rev Log: [WIN32K] - Mark bitmap as API bitmap in NtGdiCreateDIBSection - Mark palette as DIB section palette in NtGdiCreateDIBSection - Set biXPelsPerMeter to 0 instead of using the bitmap dimentions - Check BITMAPINFO parameters in GreGetDIBits - Handle case when requested bit depth doesn't match actual one in GreGetDIBits - Use maximum BITMAPINFO size in NtGdiGetDIBitsInternal - Verify header size in NtGdiGetDIBitsInternal - Misc code improvements Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c [iso-8859-1] Wed May 16 14:13:26 2012 @@ -530,6 +530,12 @@ /* Return the base address if requested */ if (ppvBits) *ppvBits = psurfDIBSection->SurfObj.pvBits; + /* Mark as API bitmap */ + psurfDIBSection->flags |= API_BITMAP; + + /* Mark the palette as a DIB section palette */ + psurfDIBSection->ppal->flFlags |= PAL_DIBSECTION; + /* Save the handle and unlock the bitmap */ hbmp = psurfDIBSection->BaseObject.hHmgr; SURFACE_UnlockSurface(psurfDIBSection); @@ -697,7 +703,7 @@ HANDLE hSecure; HBITMAP hbmp; -__debugbreak(); +//__debugbreak(); if (fInit & CBM_INIT) { @@ -772,24 +778,16 @@ pbmi->bmiHeader.biPlanes = 1; pbmi->bmiHeader.biCompression = SURFACE_iCompression(psurf); pbmi->bmiHeader.biSizeImage = psurf->SurfObj.cjBits; - pbmi->bmiHeader.biXPelsPerMeter = psurf->sizlDim.cx; - pbmi->bmiHeader.biYPelsPerMeter = psurf->sizlDim.cy; - - /* Check if the caller requests a color table */ - if (pbmi->bmiHeader.biBitCount != 0) - { - /* Synthesize a color table */ - __debugbreak(); - } + pbmi->bmiHeader.biXPelsPerMeter = 0; + pbmi->bmiHeader.biYPelsPerMeter = 0; + pbmi->bmiHeader.biBitCount = gajBitsPerFormat[psurf->SurfObj.iBitmapFormat]; + + /* Set the number of colors */ + if (pbmi->bmiHeader.biBitCount <= 8) + pbmi->bmiHeader.biClrUsed = 1 << pbmi->bmiHeader.biBitCount; else - { - /* Just return the bit depth */ - pbmi->bmiHeader.biBitCount = - gajBitsPerFormat[psurf->SurfObj.iBitmapFormat]; - } - - /* Set the number of colors */ - pbmi->bmiHeader.biClrUsed = 1 << pbmi->bmiHeader.biBitCount; + pbmi->bmiHeader.biClrUsed = 0; + pbmi->bmiHeader.biClrImportant = pbmi->bmiHeader.biClrUsed; if (pbmi->bmiHeader.biSize >= sizeof(BITMAPV4HEADER)) @@ -828,12 +826,31 @@ _In_ UINT cjMaxInfo) { PDC pdc; - PSURFACE psurf; + PSURFACE psurfBmp; ULONG iCompression, cBitsPixel, cjLine; LONG lDeltaDst; PBYTE pjSrc; INT iResult = 0; + /* Check bitmap info */ + if ((pbmi->bmiHeader.biCompression >= BI_JPEG) || + (pbmi->bmiHeader.biWidth <= 0) || + (pbmi->bmiHeader.biHeight == 0)) + { + return 0; + } + + /* Check if we have a proper bit count value */ + if ((pbmi->bmiHeader.biBitCount != 1) && + (pbmi->bmiHeader.biBitCount != 4) && + (pbmi->bmiHeader.biBitCount != 8) && + (pbmi->bmiHeader.biBitCount != 16) && + (pbmi->bmiHeader.biBitCount != 24) && + (pbmi->bmiHeader.biBitCount != 32)) + { + return 0; + } + /* Lock the DC */ pdc = DC_LockDc(hdc); if (!pdc) @@ -842,35 +859,56 @@ } /* Lock the bitmap */ - psurf = SURFACE_ShareLockSurface(hbm); - if (!psurf) - { - + psurfBmp = SURFACE_ShareLockSurface(hbm); + if (!psurfBmp) + { + DC_UnlockDc(pdc); return 0; } + /* Check if the bitmap is compatile with the dc */ + if (!DC_bIsBitmapCompatible(pdc, psurfBmp)) + { + /* Dereference the bitmap, unlock the DC and fail. */ + SURFACE_ShareUnlockSurface(psurfBmp); + DC_UnlockDc(pdc); + return 0; + } + + /* Calculate width of one dest line */ + lDeltaDst = WIDTH_BYTES_ALIGN32(pbmi->bmiHeader.biWidth, + pbmi->bmiHeader.biBitCount); + + /* Calculate the image size */ + pbmi->bmiHeader.biSizeImage = lDeltaDst * abs(pbmi->bmiHeader.biHeight); + + /* Set planes to 1 */ + pbmi->bmiHeader.biPlanes = 1; + /* Check if there is anything to do */ - if (iStartScan < (ULONG)psurf->SurfObj.sizlBitmap.cy) - { + if (pjBits == NULL) + { + /* Nothing to copy, but we had success */ + iResult = 1; + } + else if (iStartScan < (ULONG)psurfBmp->SurfObj.sizlBitmap.cy) + { + /* Calculate the maximum number of scan lines to be copied */ + cScans = min(cScans, psurfBmp->SurfObj.sizlBitmap.cy - iStartScan); + cScans = min(cScans, cjMaxBits / lDeltaDst); + /* Get the bit depth of the bitmap */ - cBitsPixel = gajBitsPerFormat[psurf->SurfObj.iBitmapFormat]; + cBitsPixel = gajBitsPerFormat[psurfBmp->SurfObj.iBitmapFormat]; /* Get the compression of the bitmap */ - iCompression = SURFACE_iCompression(psurf); + iCompression = SURFACE_iCompression(psurfBmp); /* Check if the requested format matches the actual one */ if ((cBitsPixel == pbmi->bmiHeader.biBitCount) && (iCompression == pbmi->bmiHeader.biCompression)) { - /* Calculate width of one dest line */ - lDeltaDst = WIDTH_BYTES_ALIGN32(pbmi->bmiHeader.biWidth, cBitsPixel); - - /* Calculate the maximum number of scan lines to be copied */ - cScans = min(cScans, psurf->SurfObj.sizlBitmap.cy - iStartScan); - cScans = min(cScans, cjMaxBits / lDeltaDst); - /* Calculate the maximum length of a line */ - cjLine = min(lDeltaDst, abs(psurf->SurfObj.lDelta)); + cjLine = min(lDeltaDst, abs(psurfBmp->SurfObj.lDelta)); /* Check for top-down bitmaps */ if (pbmi->bmiHeader.biHeight > 0) @@ -881,8 +919,8 @@ } /* Calculate the start address from where to copy */ - pjSrc = psurf->SurfObj.pvScan0; - pjSrc += iStartScan * psurf->SurfObj.lDelta; + pjSrc = psurfBmp->SurfObj.pvScan0; + pjSrc += iStartScan * psurfBmp->SurfObj.lDelta; /* Save number of copied scans */ iResult = cScans; @@ -894,7 +932,7 @@ RtlCopyMemory(pjBits, pjSrc, cjLine); /* go to the next scan line */ - pjSrc += psurf->SurfObj.lDelta; + pjSrc += psurfBmp->SurfObj.lDelta; pjBits += lDeltaDst; } @@ -904,7 +942,42 @@ } else { - __debugbreak(); + RECTL rclDest = {0, 0, pbmi->bmiHeader.biWidth - 1, cScans -1}; + POINTL ptlSrc = {0, iStartScan}; + EXLATEOBJ exlo; + PSURFACE psurfDIB; + + /* Create a DIB surface */ + psurfDIB = DibCreateDIBSurface(pbmi, + pdc, + iUsage, + 0, + pjBits, + cjMaxBits); + if (psurfDIB) + { + /* Initialize XLATEOBJ */ + EXLATEOBJ_vInitialize(&exlo, + psurfDIB->ppal, + psurfBmp->ppal, + RGB(0xff, 0xff, 0xff), + pdc->pdcattr->crBackgroundClr, + pdc->pdcattr->crForegroundClr); + + EngCopyBits(&psurfDIB->SurfObj, + &psurfBmp->SurfObj, + NULL, + &exlo.xlo, + &rclDest, + &ptlSrc); + + /* Cleanup */ + EXLATEOBJ_vCleanup(&exlo); + GDIOBJ_vDeleteObject(&psurfDIB->BaseObject); + + /* Return the number of copied scan lnes */ + iResult = cScans; + } } } else @@ -913,9 +986,8 @@ iResult = 0; } - /* Unlock the bitmap surface */ - SURFACE_ShareUnlockSurface(psurf); - + /* Unlock the bitmap surface and the DC */ + SURFACE_ShareUnlockSurface(psurfBmp); DC_UnlockDc(pdc); return iResult; @@ -936,7 +1008,10 @@ { PBITMAPINFO pbmi; HANDLE hSecure; - INT iResult; + INT iResult = 0; + + /* Check for bad iUsage */ + if (iUsage > 2) return 0; /* Check if the size of the bitmap info is large enough */ if (cjMaxInfo < sizeof(BITMAPINFOHEADER)) @@ -944,37 +1019,53 @@ return 0; } + /* Use maximum size */ + cjMaxInfo = min(cjMaxInfo, sizeof(BITMAPV5HEADER) + 256 * sizeof(RGBQUAD)); + + /* Allocate a buffer the bitmapinfo */ + pbmi = ExAllocatePoolWithTag(PagedPool, cjMaxInfo, GDITAG_BITMAPINFO); + if (!pbmi) + { + /* Fail */ + return 0; + } + + /* Use SEH */ + _SEH2_TRY + { + /* Probe and copy the BITMAPINFO */ + ProbeForWrite(pbmiUser, cjMaxInfo, 1); + RtlCopyMemory(pbmi, pbmiUser, cjMaxInfo); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(goto cleanup;) + } + _SEH2_END; + + /* Check if the header size is large enough */ + if ((pbmi->bmiHeader.biSize < sizeof(BITMAPINFOHEADER)) || + (pbmi->bmiHeader.biSize > cjMaxInfo)) + { + iResult = 0; + goto cleanup; + } + + /* Check if the caller provided bitmap bits */ if (pjBits) { + /* Secure the user mode memory */ hSecure = EngSecureMem(pjBits, cjMaxBits); if (!hSecure) { - return 0; - } - } - - pbmi = ExAllocatePoolWithTag(PagedPool, cjMaxInfo, GDITAG_BITMAPINFO); - if (!pbmi) - { - __debugbreak(); - } - - _SEH2_TRY - { - ProbeForWrite(pbmiUser, cjMaxInfo, 1); - RtlCopyMemory(pbmi, pbmiUser, cjMaxInfo); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - __debugbreak(); - } - _SEH2_END; - - // FIXME: check pbmi size - - if (pjBits) - { - /* Call the internal functiomn */ + goto cleanup; + } + } + + /* Check if the bitcount member is initialized */ + if (pbmi->bmiHeader.biBitCount != 0) + { + /* Call the internal function */ iResult = GreGetDIBits(hdc, hbm, iStartScan, @@ -985,23 +1076,35 @@ cjMaxBits, cjMaxInfo); } + else if (pjBits == NULL) + { + /* Just get the BITMAPINFO */ + iResult = GreGetDIBitmapInfo(hbm, pbmi, iUsage, cjMaxInfo); + } else { - iResult = GreGetDIBitmapInfo(hbm, pbmi, iUsage, cjMaxInfo); - } - - _SEH2_TRY - { - RtlCopyMemory(pbmiUser, pbmi, cjMaxInfo); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - } - _SEH2_END; - - + /* This combination is not valid */ + iResult = 0; + } + + /* Check for success */ + if (iResult) + { + /* Use SEH to copy back to user mode */ + _SEH2_TRY + { + /* Buffer is already probed, copy the data back */ + RtlCopyMemory(pbmiUser, pbmi, cjMaxInfo); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + } + +cleanup: + if (hSecure) EngUnsecureMem(hSecure); ExFreePoolWithTag(pbmi, GDITAG_BITMAPINFO); - return iResult; } @@ -1269,7 +1372,7 @@ BITMAPINFO* FASTCALL -DIB_ConvertBitmapInfo(CONST BITMAPINFO* pbmi, DWORD Usage) +_DIB_ConvertBitmapInfo(CONST BITMAPINFO* pbmi, DWORD Usage) { __debugbreak(); return 0; @@ -1277,7 +1380,7 @@ VOID FASTCALL -DIB_FreeConvertedBitmapInfo(BITMAPINFO* converted, BITMAPINFO* orig) +_DIB_FreeConvertedBitmapInfo(BITMAPINFO* converted, BITMAPINFO* orig) { if(converted != orig) ExFreePoolWithTag(converted, TAG_DIB);

1 0

[akhaldi] 56592: [GDI32_WINETEST] * Complete the sync to Wine 1.5.4 now that bug #7070 is fixed (thanks Timo).
by akhaldi＠svn.reactos.org 15 May '12

15 May '12

Author: akhaldi Date: Tue May 15 17:21:43 2012 New Revision: 56592 URL: http://svn.reactos.org/svn/reactos?rev=56592&view=rev Log: [GDI32_WINETEST] * Complete the sync to Wine 1.5.4 now that bug #7070 is fixed (thanks Timo). Modified: trunk/rostests/winetests/gdi32/bitmap.c trunk/rostests/winetests/gdi32/dib.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/gdi32/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/bitmap.c?… Modified: trunk/rostests/winetests/gdi32/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/dib.c?rev…

1 0

[tkreuzer] 56591: [WIN32K] Implement DC_bIsBitmapCompatible, which checks if a bitmap can be used with the DC in SelectBitmap or GetDIBits
by tkreuzer＠svn.reactos.org 15 May '12

15 May '12

Author: tkreuzer Date: Tue May 15 16:52:21 2012 New Revision: 56591 URL: http://svn.reactos.org/svn/reactos?rev=56591&view=rev Log: [WIN32K] Implement DC_bIsBitmapCompatible, which checks if a bitmap can be used with the DC in SelectBitmap or GetDIBits Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dc.h branches/dib_rewrite/win32ss/gdi/ntgdi/dcobjs.c Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/ntgdi/dc.h [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/ntgdi/dc.h [iso-8859-1] Tue May 15 16:52:21 2012 @@ -193,6 +193,10 @@ NTAPI DC_vSetBrushOrigin(PDC pdc, LONG x, LONG y); +BOOL +NTAPI +DC_bIsBitmapCompatible(PDC pdc, PSURFACE psurf); + FORCEINLINE PDC DC_LockDc(HDC hdc) Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dcobjs.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] Tue May 15 16:52:21 2012 @@ -316,6 +316,28 @@ return hOrgPen; } +BOOL +NTAPI +DC_bIsBitmapCompatible(PDC pdc, PSURFACE psurf) +{ + ULONG cBitsPixel; + + /* Must be an API bitmap */ + if (!(psurf->flags & API_BITMAP)) return FALSE; + + /* DIB sections are always compatible */ + if (psurf->ppal->flFlags & PAL_DIBSECTION) return TRUE; + + /* Get the bit depth of the bitmap */ + cBitsPixel = gajBitsPerFormat[psurf->SurfObj.iBitmapFormat]; + + /* 1 BPP is compatible */ + if ((cBitsPixel == 1) || (cBitsPixel == pdc->ppdev->gdiinfo.cBitsPixel)) + return TRUE; + + return FALSE; +} + /* * @implemented */ @@ -330,7 +352,6 @@ PSURFACE psurfNew, psurfOld; HRGN hVisRgn; HDC hdcOld; - ULONG cBitsPixel; ASSERT_NOGDILOCKS(); /* Verify parameters */ @@ -396,10 +417,7 @@ } /* Check if the bitmap is compatile with the dc */ - cBitsPixel = gajBitsPerFormat[psurfNew->SurfObj.iBitmapFormat]; - if ((cBitsPixel != 1) && - (cBitsPixel != pdc->ppdev->gdiinfo.cBitsPixel) && - (psurfNew->hSecure == NULL)) + if (!DC_bIsBitmapCompatible(pdc, psurfNew)) { /* Dereference the bitmap, unlock the DC and fail. */ SURFACE_ShareUnlockSurface(psurfNew);

1 0

[cgutman] 56590: [NDIS] - Fix some sickening formatting disasters - Allocate the unicode string buffers from paged pool, like everything else in the NDIS config API
by cgutman＠svn.reactos.org 14 May '12

14 May '12

Author: cgutman Date: Mon May 14 22:39:58 2012 New Revision: 56590 URL: http://svn.reactos.org/svn/reactos?rev=56590&view=rev Log: [NDIS] - Fix some sickening formatting disasters - Allocate the unicode string buffers from paged pool, like everything else in the NDIS config API Modified: trunk/reactos/drivers/network/ndis/ndis/config.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Mon May 14 22:39:58 2012 @@ -444,10 +444,8 @@ return; } - if( - !wcsncmp(Keyword->Buffer, L"Environment", Keyword->Length/sizeof(WCHAR)) && - wcslen(L"Environment") == Keyword->Length/sizeof(WCHAR) - ) + if(!wcsncmp(Keyword->Buffer, L"Environment", Keyword->Length/sizeof(WCHAR)) && + wcslen(L"Environment") == Keyword->Length/sizeof(WCHAR)) { *ParameterValue = ExAllocatePool(PagedPool, sizeof(NDIS_CONFIGURATION_PARAMETER)); if(!*ParameterValue) @@ -483,10 +481,8 @@ return; } - if( - !wcsncmp(Keyword->Buffer, L"ProcessorType", Keyword->Length/sizeof(WCHAR)) && - wcslen(L"ProcessorType") == Keyword->Length/sizeof(WCHAR) - ) + if(!wcsncmp(Keyword->Buffer, L"ProcessorType", Keyword->Length/sizeof(WCHAR)) && + wcslen(L"ProcessorType") == Keyword->Length/sizeof(WCHAR)) { *ParameterValue = ExAllocatePool(PagedPool, sizeof(NDIS_CONFIGURATION_PARAMETER)); if(!*ParameterValue) @@ -519,10 +515,8 @@ return; } - if( - !wcsncmp(Keyword->Buffer, L"NdisVersion", Keyword->Length/sizeof(WCHAR)) && - wcslen(L"NdisVersion") == Keyword->Length/sizeof(WCHAR) - ) + if(!wcsncmp(Keyword->Buffer, L"NdisVersion", Keyword->Length/sizeof(WCHAR)) && + wcslen(L"NdisVersion") == Keyword->Length/sizeof(WCHAR)) { *ParameterValue = ExAllocatePool(PagedPool, sizeof(NDIS_CONFIGURATION_PARAMETER)); if(!*ParameterValue) @@ -613,7 +607,7 @@ (*ParameterValue)->ParameterType = NdisParameterBinary; - Buffer = ExAllocatePool(NonPagedPool, KeyInformation->DataLength); + Buffer = ExAllocatePool(PagedPool, KeyInformation->DataLength); if (!Buffer) { NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); @@ -634,7 +628,7 @@ (*ParameterValue)->ParameterType = NdisParameterMultiString; - Buffer = ExAllocatePool(NonPagedPool, KeyInformation->DataLength); + Buffer = ExAllocatePool(PagedPool, KeyInformation->DataLength); if (!Buffer) { NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); @@ -678,7 +672,7 @@ (*ParameterValue)->ParameterType = NdisParameterString; - Buffer = ExAllocatePool(NonPagedPool, KeyInformation->DataLength); + Buffer = ExAllocatePool(PagedPool, KeyInformation->DataLength); if (!Buffer) { NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n"));

1 0

[akhaldi] 56589: [MSI_WINETEST] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 14 May '12

14 May '12

Author: akhaldi Date: Mon May 14 21:41:45 2012 New Revision: 56589 URL: http://svn.reactos.org/svn/reactos?rev=56589&view=rev Log: [MSI_WINETEST] * Sync to Wine 1.5.4. Modified: trunk/rostests/winetests/msi/action.c trunk/rostests/winetests/msi/automation.c trunk/rostests/winetests/msi/db.c trunk/rostests/winetests/msi/msi.c trunk/rostests/winetests/msi/package.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/action.c?re… Modified: trunk/rostests/winetests/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/automation.… Modified: trunk/rostests/winetests/msi/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/db.c?rev=56… Modified: trunk/rostests/winetests/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.c?rev=5… Modified: trunk/rostests/winetests/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/package.c?r…

1 0

[akhaldi] 56588: [MSI] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 14 May '12

14 May '12

Author: akhaldi Date: Mon May 14 21:41:31 2012 New Revision: 56588 URL: http://svn.reactos.org/svn/reactos?rev=56588&view=rev Log: [MSI] * Sync to Wine 1.5.4. Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/appsearch.c trunk/reactos/dll/win32/msi/assembly.c trunk/reactos/dll/win32/msi/automation.c trunk/reactos/dll/win32/msi/custom.c trunk/reactos/dll/win32/msi/dialog.c trunk/reactos/dll/win32/msi/files.c trunk/reactos/dll/win32/msi/install.c trunk/reactos/dll/win32/msi/media.c trunk/reactos/dll/win32/msi/msi.c trunk/reactos/dll/win32/msi/msi.rc trunk/reactos/dll/win32/msi/msi.rgs trunk/reactos/dll/win32/msi/msi.spec trunk/reactos/dll/win32/msi/msipriv.h trunk/reactos/dll/win32/msi/package.c trunk/reactos/dll/win32/msi/registry.c trunk/reactos/dll/win32/msi/script.c trunk/reactos/dll/win32/msi/sql.tab.c trunk/reactos/dll/win32/msi/table.c trunk/reactos/include/psdk/msi.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.t… Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… Modified: trunk/reactos/dll/win32/msi/appsearch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/appsearch.c?… Modified: trunk/reactos/dll/win32/msi/assembly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/assembly.c?r… Modified: trunk/reactos/dll/win32/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/automation.c… Modified: trunk/reactos/dll/win32/msi/custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/custom.c?rev… Modified: trunk/reactos/dll/win32/msi/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/dialog.c?rev… Modified: trunk/reactos/dll/win32/msi/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/files.c?rev=… Modified: trunk/reactos/dll/win32/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/install.c?re… Modified: trunk/reactos/dll/win32/msi/media.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/media.c?rev=… Modified: trunk/reactos/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=56… Modified: trunk/reactos/dll/win32/msi/msi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rc?rev=5… Modified: trunk/reactos/dll/win32/msi/msi.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rgs?rev=… Modified: trunk/reactos/dll/win32/msi/msi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.spec?rev… Modified: trunk/reactos/dll/win32/msi/msipriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msipriv.h?re… Modified: trunk/reactos/dll/win32/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/package.c?re… Modified: trunk/reactos/dll/win32/msi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/registry.c?r… Modified: trunk/reactos/dll/win32/msi/script.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/script.c?rev… Modified: trunk/reactos/dll/win32/msi/sql.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/sql.tab.c?re… Modified: trunk/reactos/dll/win32/msi/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/table.c?rev=… Modified: trunk/reactos/include/psdk/msi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msi.h?rev=565… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[tfaber] 56587: [SHELL32] - Port CommandLineToArgvW fixes from Wine. Fixes crash in shell32:shlexec test.
by tfaber＠svn.reactos.org 14 May '12

14 May '12

Author: tfaber Date: Mon May 14 19:26:40 2012 New Revision: 56587 URL: http://svn.reactos.org/svn/reactos?rev=56587&view=rev Log: [SHELL32] - Port CommandLineToArgvW fixes from Wine. Fixes crash in shell32:shlexec test. Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp 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] Mon May 14 19:26:40 2012 @@ -66,27 +66,34 @@ LPWSTR cmdline; int in_quotes,bcount; + if(!numargs) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + if (*lpCmdline==0) { /* Return the path to the executable */ - DWORD len, size=16; - - argv = (LPWSTR *)LocalAlloc(LMEM_FIXED, size); + DWORD len, deslen=MAX_PATH, size; + + size = sizeof(LPWSTR) + deslen*sizeof(WCHAR) + sizeof(LPWSTR); for (;;) { - len = GetModuleFileNameW(0, (LPWSTR)(argv+1), (size-sizeof(LPWSTR))/sizeof(WCHAR)); + if (!(argv = (LPWSTR *)LocalAlloc(LMEM_FIXED, size))) return NULL; + len = GetModuleFileNameW(0, (LPWSTR)(argv+1), deslen); if (!len) { LocalFree(argv); return NULL; } - if (len < size) break; - size*=2; - argv = (LPWSTR *)LocalReAlloc(argv, size, 0); + if (len < deslen) break; + deslen*=2; + size = sizeof(LPWSTR) + deslen*sizeof(WCHAR) + sizeof(LPWSTR); + LocalFree( argv ); } argv[0]=(LPWSTR)(argv+1); - if (numargs) - *numargs=1; + *numargs=1; return argv; } @@ -133,11 +140,9 @@ /* Allocate in a single lump, the string array, and the strings that go with it. * This way the caller can make a single GlobalFree call to free both, as per MSDN. */ - argv = (LPWSTR *)LocalAlloc(LMEM_FIXED, argc*sizeof(LPWSTR)+(wcslen(lpCmdline)+1)*sizeof(WCHAR)); - + argv=(LPWSTR *)LocalAlloc(LMEM_FIXED, argc*sizeof(LPWSTR)+(wcslen(lpCmdline)+1)*sizeof(WCHAR)); if (!argv) return NULL; - cmdline=(LPWSTR)(argv+argc); wcscpy(cmdline, lpCmdline); @@ -203,8 +208,7 @@ *d='\0'; argv[argc++]=arg; } - if (numargs) - *numargs=argc; + *numargs=argc; return argv; }

1 0

[tkreuzer] 56586: [GDI32_APITEST] Simplify code
by tkreuzer＠svn.reactos.org 14 May '12

14 May '12

Author: tkreuzer Date: Mon May 14 11:48:17 2012 New Revision: 56586 URL: http://svn.reactos.org/svn/reactos?rev=56586&view=rev Log: [GDI32_APITEST] Simplify code Modified: trunk/rostests/apitests/gdi32/CreateDIBitmap.c Modified: trunk/rostests/apitests/gdi32/CreateDIBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateDIBi… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateDIBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateDIBitmap.c [iso-8859-1] Mon May 14 11:48:17 2012 @@ -28,7 +28,7 @@ return FALSE; } - if (fuUsage != 0) + if (fuUsage != DIB_RGB_COLORS) { if (hdc == (HDC)-1) { @@ -76,22 +76,19 @@ return TRUE; } - if (lpbmih && (lpbmih != (PVOID)0xc0000000) && (lpbmih->biSize != 0)) - { - if (hdc == (HDC)-1) - { - *pdwError = ERROR_INVALID_PARAMETER; - return FALSE; - } - } - - if ((lpbmih == NULL) || (lpbmih == (PVOID)0xC0000000) || (lpbmih->biSize == 0)) { return FALSE; } + + if (hdc == (HDC)-1) + { + *pdwError = ERROR_INVALID_PARAMETER; + return FALSE; + } + if (lpbmi == (PVOID)0xc0000000) return FALSE;

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