Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[jgardou] 64992: [WIN32K] - Always store alpha-aware cursors in a 32bpp RGB surface. CORE-8695

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Oct 25 18:11:31 2014 New Revision: 64992 URL: http://svn.reactos.org/svn/reactos?rev=64992&view=rev Log: [WIN32K] - Always store alpha-aware cursors in a 32bpp RGB surface. CORE-8695 Modified: trunk/reactos/win32ss/gdi/eng/mouse.c trunk/reactos/win32ss/gdi/eng/pdevobj.h Modified: trunk/reactos/win32ss/gdi/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/mouse.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/mouse.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/mouse.c [iso-8859-1] Sat Oct 25 18:11:31 2014 @@ -263,11 +263,9 @@ BLENDOBJ blendobj = { {AC_SRC_OVER, 0, 255, AC_SRC_ALPHA } }; EXLATEOBJ exlo; EXLATEOBJ_vInitialize(&exlo, - pgp->psurfColor->ppal, + &gpalRGB, ppdev->ppalSurf, - 0xFFFFFFFF, - 0xFFFFFFFF, - 0); + 0, 0, 0); IntEngAlphaBlend(psoDest, &pgp->psurfColor->SurfObj, NULL, @@ -373,34 +371,62 @@ if (psoColor) { - /* Color bitmap must have the same format as the dest surface */ - if (psoColor->iBitmapFormat != pso->iBitmapFormat) + if (fl & SPS_ALPHA) { - /* It's OK if we have an alpha bitmap */ - if(!(fl & SPS_ALPHA)) + /* Always store the alpha cursor in RGB. */ + EXLATEOBJ exloSrcRGB; + PEXLATEOBJ pexlo; + + pexlo = CONTAINING_RECORD(pxlo, EXLATEOBJ, xlo); + EXLATEOBJ_vInitialize(&exloSrcRGB, pexlo->ppalSrc, &gpalRGB, 0, 0, 0); + + hbmColor = EngCreateBitmap(psoColor->sizlBitmap, + WIDTH_BYTES_ALIGN32(sizel.cx, 32), + BMF_32BPP, + BMF_TOPDOWN | BMF_NOZEROINIT, + NULL); + psurfColor = SURFACE_ShareLockSurface(hbmColor); + if (!psurfColor) goto failure; + + /* Now copy the given bitmap. */ + rectl.bottom = psoColor->sizlBitmap.cy; + IntEngCopyBits(&psurfColor->SurfObj, + psoColor, + NULL, + &exloSrcRGB.xlo, + &rectl, + (POINTL*)&rectl); + + EXLATEOBJ_vCleanup(&exloSrcRGB); + } + else + { + /* Color bitmap must have the same format as the dest surface */ + if (psoColor->iBitmapFormat != pso->iBitmapFormat) { DPRINT1("Screen surface and cursor color bitmap format don't match!.\n"); goto failure; } + + /* Create a bitmap to copy the color bitmap to */ + hbmColor = EngCreateBitmap(psoColor->sizlBitmap, + lDelta, + pso->iBitmapFormat, + BMF_TOPDOWN | BMF_NOZEROINIT, + NULL); + psurfColor = SURFACE_ShareLockSurface(hbmColor); + if (!psurfColor) goto failure; + + /* Now copy the given bitmap. */ + rectl.bottom = psoColor->sizlBitmap.cy; + IntEngCopyBits(&psurfColor->SurfObj, + psoColor, + NULL, + pxlo, + &rectl, + (POINTL*)&rectl); } - /* Create a bitmap to copy the color bitmap to */ - hbmColor = EngCreateBitmap(psoColor->sizlBitmap, - lDelta, - pso->iBitmapFormat, - BMF_TOPDOWN | BMF_NOZEROINIT, - NULL); - psurfColor = SURFACE_ShareLockSurface(hbmColor); - if (!psurfColor) goto failure; - - /* Now copy the given bitmap */ - rectl.bottom = psoColor->sizlBitmap.cy; - IntEngCopyBits(&psurfColor->SurfObj, - psoColor, - NULL, - pxlo, - &rectl, - (POINTL*)&rectl); } /* Create a mask surface */ @@ -408,6 +434,8 @@ { EXLATEOBJ exlo; PPALETTE ppal; + + lDelta = WIDTH_BYTES_ALIGN32(sizel.cx, BitsPerFormat(pso->iBitmapFormat)); /* Create a bitmap for the mask */ hbmMask = EngCreateBitmap(psoMask->sizlBitmap, Modified: trunk/reactos/win32ss/gdi/eng/pdevobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/pdevobj.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/pdevobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/pdevobj.h [iso-8859-1] Sat Oct 25 18:11:31 2014 @@ -30,7 +30,6 @@ BOOL Enabled; SIZEL Size; POINTL HotSpot; - XLATEOBJ *XlateObject; SURFACE *psurfColor; SURFACE *psurfMask; SURFACE *psurfSave;

9 years, 10 months

[jgardou] 64991: [WIN32K] - Avoid leaking handles when loading animated cursors.

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Oct 25 18:11:27 2014 New Revision: 64991 URL: http://svn.reactos.org/svn/reactos?rev=64991&view=rev Log: [WIN32K] - Avoid leaking handles when loading animated cursors. Modified: trunk/reactos/win32ss/user/ntuser/cursoricon_new.c Modified: trunk/reactos/win32ss/user/ntuser/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon_new.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon_new.c [iso-8859-1] Sat Oct 25 18:11:27 2014 @@ -229,7 +229,10 @@ UINT i; for(i = 0; i < AniCurIcon->cpcur; i++) + { + UserDereferenceObject(AniCurIcon->aspcur[i]); IntDestroyCurIconObject(AniCurIcon->aspcur[i]); + } ExFreePoolWithTag(AniCurIcon->aspcur, USERTAG_CURSOR); } @@ -1068,7 +1071,10 @@ for(i = 0; i < numFrames; i++) { if(AniCurIcon->aspcur[i]) + { + UserDereferenceObject(AniCurIcon->aspcur[i]); IntDestroyCurIconObject(AniCurIcon->aspcur[i]); + } } AniCurIcon->cicur = 0; AniCurIcon->cpcur = 0;

9 years, 10 months

[jgardou] 64990: [USER32] - Fix a stupid buffer overflow I introduced in r64967. - Take BITMAPCOREINFO into account when loading a cursor from file.

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Oct 25 18:11:11 2014 New Revision: 64990 URL: http://svn.reactos.org/svn/reactos?rev=64990&view=rev Log: [USER32] - Fix a stupid buffer overflow I introduced in r64967. - Take BITMAPCOREINFO into account when loading a cursor from file. Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c [iso-8859-1] Sat Oct 25 18:11:11 2014 @@ -254,7 +254,7 @@ HDC hdc = NULL, hdcScreen; unsigned char *ptr; void *bits = NULL; - int i; + size_t size; hdcScreen = CreateDCW(DISPLAYW, NULL, NULL, NULL); if (!hdcScreen) @@ -270,12 +270,16 @@ { BITMAP bm; BITMAPINFO *info = NULL; + + TRACE("Creating alpha bitmap from existing bitmap.\n"); if (!GetObjectW( color, sizeof(bm), &bm )) goto done; if (bm.bmBitsPixel != 32) goto done; + size = get_dib_image_size(bm.bmWidth, bm.bmHeight, 32); + info = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(BITMAPINFO, bmiColors[256])); if(!info) goto done; @@ -285,13 +289,13 @@ info->bmiHeader.biPlanes = 1; info->bmiHeader.biBitCount = 32; info->bmiHeader.biCompression = BI_RGB; - info->bmiHeader.biSizeImage = bm.bmWidth * bm.bmHeight * 4; + info->bmiHeader.biSizeImage = size; info->bmiHeader.biXPelsPerMeter = 0; info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrUsed = 0; info->bmiHeader.biClrImportant = 0; - bits = HeapAlloc(GetProcessHeap(), 0, info->bmiHeader.biSizeImage); + bits = HeapAlloc(GetProcessHeap(), 0, size); if(!bits) { HeapFree(GetProcessHeap(), 0, info); @@ -309,7 +313,7 @@ } /* pre-multiply by alpha */ - for (i = 0, ptr = bits; i < width * height; i++, ptr += 4) + for (ptr = bits; ptr < ((BYTE*)bits + size); ptr += 4) { unsigned int alpha = ptr[3]; ptr[0] = (ptr[0] * alpha) / 255; @@ -321,14 +325,14 @@ alpha = CreateDIBitmap(hdc, NULL, CBM_INIT | 2, bits, info, DIB_RGB_COLORS); HeapFree(GetProcessHeap(), 0, info); - HeapFree(GetProcessHeap(), 0, bits); } else { WORD bpp; DWORD compr; - int size; LONG orig_width, orig_height; + + TRACE("Creating alpha bitmap from bitmap info.\n"); if(!bmi_has_alpha(src_info, color_bits)) goto done; @@ -344,7 +348,7 @@ goto done; CopyMemory(bits, color_bits, size); /* pre-multiply by alpha */ - for (i = 0, ptr = bits; i < width * height; i++, ptr += 4) + for (ptr = bits; ptr < ((BYTE*)bits + size); ptr += 4) { unsigned int alpha = ptr[3]; ptr[0] = (ptr[0] * alpha) / 255; @@ -497,7 +501,10 @@ /* Let's assume there's always one plane */ fakeEntry->wPlanes = 1; /* We must get the bitcount from the BITMAPINFOHEADER itself */ - fakeEntry->wBitCount = ((BITMAPINFOHEADER *)((char *)dir + entry->dwDIBOffset))->biBitCount; + if (((BITMAPINFOHEADER *)((char *)dir + entry->dwDIBOffset))->biSize == sizeof(BITMAPCOREHEADER)) + fakeEntry->wBitCount = ((BITMAPCOREHEADER *)((char *)dir + entry->dwDIBOffset))->bcBitCount; + else + fakeEntry->wBitCount = ((BITMAPINFOHEADER *)((char *)dir + entry->dwDIBOffset))->biBitCount; fakeEntry->dwBytesInRes = entry->dwDIBSize; fakeEntry->wResId = i + 1; }

9 years, 10 months

[akhaldi] 64989: [ADVAPI32] * Move a couple functions from sec.c to security.c. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 25 17:46:33 2014 New Revision: 64989 URL: http://svn.reactos.org/svn/reactos?rev=64989&view=rev Log: [ADVAPI32] * Move a couple functions from sec.c to security.c. CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sec… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sec.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sec.c [iso-8859-1] Sat Oct 25 17:46:33 2014 @@ -168,29 +168,6 @@ return TRUE; } - -/* - * @implemented - */ -BOOL -WINAPI -InitializeSecurityDescriptor(PSECURITY_DESCRIPTOR pSecurityDescriptor, - DWORD dwRevision) -{ - NTSTATUS Status; - - Status = RtlCreateSecurityDescriptor(pSecurityDescriptor, - dwRevision); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; -} - - /* * @implemented */ @@ -206,47 +183,6 @@ return (BOOL)Result; } - - -/* - * @implemented - */ -BOOL -WINAPI -MakeAbsoluteSD(PSECURITY_DESCRIPTOR pSelfRelativeSecurityDescriptor, - PSECURITY_DESCRIPTOR pAbsoluteSecurityDescriptor, - LPDWORD lpdwAbsoluteSecurityDescriptorSize, - PACL pDacl, - LPDWORD lpdwDaclSize, - PACL pSacl, - LPDWORD lpdwSaclSize, - PSID pOwner, - LPDWORD lpdwOwnerSize, - PSID pPrimaryGroup, - LPDWORD lpdwPrimaryGroupSize) -{ - NTSTATUS Status; - - Status = RtlSelfRelativeToAbsoluteSD(pSelfRelativeSecurityDescriptor, - pAbsoluteSecurityDescriptor, - lpdwAbsoluteSecurityDescriptorSize, - pDacl, - lpdwDaclSize, - pSacl, - lpdwSaclSize, - pOwner, - lpdwOwnerSize, - pPrimaryGroup, - lpdwPrimaryGroupSize); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; -} - /* * @implemented Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Sat Oct 25 17:46:33 2014 @@ -854,6 +854,66 @@ return (DWORD)RtlLengthSid(pSid); } +/* + * @implemented + */ +BOOL +WINAPI +InitializeSecurityDescriptor(PSECURITY_DESCRIPTOR pSecurityDescriptor, + DWORD dwRevision) +{ + NTSTATUS Status; + + Status = RtlCreateSecurityDescriptor(pSecurityDescriptor, + dwRevision); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +MakeAbsoluteSD(PSECURITY_DESCRIPTOR pSelfRelativeSecurityDescriptor, + PSECURITY_DESCRIPTOR pAbsoluteSecurityDescriptor, + LPDWORD lpdwAbsoluteSecurityDescriptorSize, + PACL pDacl, + LPDWORD lpdwDaclSize, + PACL pSacl, + LPDWORD lpdwSaclSize, + PSID pOwner, + LPDWORD lpdwOwnerSize, + PSID pPrimaryGroup, + LPDWORD lpdwPrimaryGroupSize) +{ + NTSTATUS Status; + + Status = RtlSelfRelativeToAbsoluteSD(pSelfRelativeSecurityDescriptor, + pAbsoluteSecurityDescriptor, + lpdwAbsoluteSecurityDescriptorSize, + pDacl, + lpdwDaclSize, + pSacl, + lpdwSaclSize, + pOwner, + lpdwOwnerSize, + pPrimaryGroup, + lpdwPrimaryGroupSize); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; +} + /****************************************************************************** * GetKernelObjectSecurity [ADVAPI32.@] */

9 years, 10 months

[aandrejevic] 64988: [FAST486] The opcode handlers don't need a return value, it's not used anywhere.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Oct 25 17:16:37 2014 New Revision: 64988 URL: http://svn.reactos.org/svn/reactos?rev=64988&view=rev Log: [FAST486] The opcode handlers don't need a return value, it's not used anywhere. Modified: trunk/reactos/lib/fast486/common.h trunk/reactos/lib/fast486/extraops.c trunk/reactos/lib/fast486/fpu.c trunk/reactos/lib/fast486/fpu.h trunk/reactos/lib/fast486/opcodes.c trunk/reactos/lib/fast486/opcodes.h trunk/reactos/lib/fast486/opgroups.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/lib/fast486/common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.h?rev=6… Modified: trunk/reactos/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/extraops.c?rev… Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6498… Modified: trunk/reactos/lib/fast486/fpu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.h?rev=6498… Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… Modified: trunk/reactos/lib/fast486/opcodes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.h?rev=… Modified: trunk/reactos/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opgroups.c?rev…

9 years, 10 months

[akhaldi] 64987: [ADVAPI32] * Update GetKernelObjectSecurity(). CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 25 16:08:39 2014 New Revision: 64987 URL: http://svn.reactos.org/svn/reactos?rev=64987&view=rev Log: [ADVAPI32] * Update GetKernelObjectSecurity(). CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Sat Oct 25 16:08:39 2014 @@ -854,31 +854,21 @@ return (DWORD)RtlLengthSid(pSid); } -/* - * @implemented - */ -BOOL -WINAPI -GetKernelObjectSecurity(HANDLE Handle, - SECURITY_INFORMATION RequestedInformation, - PSECURITY_DESCRIPTOR pSecurityDescriptor, - DWORD nLength, - LPDWORD lpnLengthNeeded) -{ - NTSTATUS Status; - - Status = NtQuerySecurityObject(Handle, - RequestedInformation, - pSecurityDescriptor, - nLength, - lpnLengthNeeded); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; +/****************************************************************************** + * GetKernelObjectSecurity [ADVAPI32.@] + */ +BOOL WINAPI GetKernelObjectSecurity( + HANDLE Handle, + SECURITY_INFORMATION RequestedInformation, + PSECURITY_DESCRIPTOR pSecurityDescriptor, + DWORD nLength, + LPDWORD lpnLengthNeeded ) +{ + TRACE("(%p,0x%08x,%p,0x%08x,%p)\n", Handle, RequestedInformation, + pSecurityDescriptor, nLength, lpnLengthNeeded); + + return set_ntstatus( NtQuerySecurityObject(Handle, RequestedInformation, pSecurityDescriptor, + nLength, lpnLengthNeeded )); } /*

9 years, 10 months

[dquintana] 64986: [EXPLORER-NEW] * Fix HMENU leak. [BROWSEUI] * Work around for WM_SETICON not properly returning the old HICON. [SHELL32] * Fix HICON leak. * Nitpick. [WIN32K] * Do not refcount t...

by dquintana＠svn.reactos.org

Author: dquintana Date: Sat Oct 25 15:44:11 2014 New Revision: 64986 URL: http://svn.reactos.org/svn/reactos?rev=64986&view=rev Log: [EXPLORER-NEW] * Fix HMENU leak. [BROWSEUI] * Work around for WM_SETICON not properly returning the old HICON. [SHELL32] * Fix HICON leak. * Nitpick. [WIN32K] * Do not refcount the menus improperly. Modified: branches/shell-experiments/base/shell/explorer-new/traywnd.c branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp branches/shell-experiments/dll/win32/shell32/newmenu.cpp branches/shell-experiments/dll/win32/shell32/shlview.cpp branches/shell-experiments/win32ss/user/ntuser/menu.c Modified: branches/shell-experiments/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/traywnd.c [iso-8859-1] Sat Oct 25 15:44:11 2014 @@ -1023,6 +1023,8 @@ cmdId, pcmContext, Context); + + DestroyMenu(hPopup); } return cmdId; Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Sat Oct 25 15:44:11 2014 @@ -1078,14 +1078,17 @@ HICON icSmall = ImageList_GetIcon(himlSmall, indexOpen, 0); HICON icLarge = ImageList_GetIcon(himlLarge, indexOpen, 0); - HICON oldSmall = (HICON)SendMessage(WM_SETICON, ICON_SMALL, reinterpret_cast<LPARAM>(icSmall)); - HICON oldLarge = (HICON)SendMessage(WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(icLarge)); + /* Hack to make it possible to release the old icons */ + /* Something seems to go wrong with WM_SETICON */ + HICON oldSmall = (HICON)SendMessage(WM_GETICON, ICON_SMALL, 0); + HICON oldLarge = (HICON)SendMessage(WM_GETICON, ICON_BIG, 0); + + SendMessage(WM_SETICON, ICON_SMALL, reinterpret_cast<LPARAM>(icSmall)); + SendMessage(WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(icLarge)); DestroyIcon(oldSmall); DestroyIcon(oldLarge); } - - // TODO: Update the window icon FireCommandStateChangeAll(); hResult = UpdateForwardBackState(); Modified: branches/shell-experiments/dll/win32/shell32/newmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/newmenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/newmenu.cpp [iso-8859-1] Sat Oct 25 15:44:11 2014 @@ -179,7 +179,10 @@ pNewItem->pwszExt = _wcsdup(pwszExt); pNewItem->pwszDesc = _wcsdup(fi.szTypeName); if (fi.hIcon) + { pNewItem->hBitmap = IconToBitmap(fi.hIcon); + DestroyIcon(fi.hIcon); + } return pNewItem; } Modified: branches/shell-experiments/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] Sat Oct 25 15:44:11 2014 @@ -984,7 +984,7 @@ SHFree((LPITEMIDLIST)ntreg.pidl); } - m_hAccel = LoadAcceleratorsA(shell32_hInstance, MAKEINTRESOURCEA( IDA_SHELLVIEW)); + m_hAccel = LoadAcceleratorsW(shell32_hInstance, MAKEINTRESOURCEW(IDA_SHELLVIEW)); return S_OK; } Modified: branches/shell-experiments/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… ============================================================================== --- branches/shell-experiments/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ branches/shell-experiments/win32ss/user/ntuser/menu.c [iso-8859-1] Sat Oct 25 15:44:11 2014 @@ -1653,7 +1653,7 @@ { return NULL; } - SysMenu = IntGetMenuObject(hSysMenu); + SysMenu = UserGetMenuObject(hSysMenu); if (NULL == SysMenu) { UserDestroyMenu(hSysMenu); @@ -1684,7 +1684,7 @@ UserDestroyMenu(hSysMenu); return NULL; } - Menu = IntGetMenuObject(hNewMenu); + Menu = UserGetMenuObject(hNewMenu); if (!Menu) { IntReleaseMenuObject(SysMenu);

9 years, 10 months

[hbelusca] 64985: [NTVDM]: So..... do not overflow the Cycles count, i.e. better estimate the number of instructions per second :)

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 25 15:36:11 2014 New Revision: 64985 URL: http://svn.reactos.org/svn/reactos?rev=64985&view=rev Log: [NTVDM]: So..... do not overflow the Cycles count, i.e. better estimate the number of instructions per second :) Modified: trunk/reactos/subsystems/ntvdm/clock.c Modified: trunk/reactos/subsystems/ntvdm/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/clock.c?r… ============================================================================== --- trunk/reactos/subsystems/ntvdm/clock.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/clock.c [iso-8859-1] Sat Oct 25 15:36:11 2014 @@ -56,7 +56,7 @@ #ifdef IPS_DISPLAY DWORD LastCyclePrintout; - DWORD Cycles = 0; + ULONGLONG Cycles = 0; #endif /* PUBLIC FUNCTIONS ***********************************************************/ @@ -142,7 +142,7 @@ { CpuStep(); #ifdef IPS_DISPLAY - Cycles++; + ++Cycles; #endif }

9 years, 10 months

[akhaldi] 64984: [ADVAPI32] * Update AllocateAndInitializeSid(). CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 25 15:28:29 2014 New Revision: 64984 URL: http://svn.reactos.org/svn/reactos?rev=64984&view=rev Log: [ADVAPI32] * Update AllocateAndInitializeSid(). CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Sat Oct 25 15:28:29 2014 @@ -580,42 +580,36 @@ return DuplicateTokenEx( baseToken, MAXIMUM_ALLOWED, NULL, level, type, newToken ); } -/* - * @implemented +/****************************************************************************** + * AllocateAndInitializeSid [ADVAPI32.@] + * + * PARAMS + * pIdentifierAuthority [] + * nSubAuthorityCount [] + * nSubAuthority0 [] + * nSubAuthority1 [] + * nSubAuthority2 [] + * nSubAuthority3 [] + * nSubAuthority4 [] + * nSubAuthority5 [] + * nSubAuthority6 [] + * nSubAuthority7 [] + * pSid [] */ BOOL WINAPI -AllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY pIdentifierAuthority, - BYTE nSubAuthorityCount, - DWORD dwSubAuthority0, - DWORD dwSubAuthority1, - DWORD dwSubAuthority2, - DWORD dwSubAuthority3, - DWORD dwSubAuthority4, - DWORD dwSubAuthority5, - DWORD dwSubAuthority6, - DWORD dwSubAuthority7, - PSID *pSid) -{ - NTSTATUS Status; - - Status = RtlAllocateAndInitializeSid(pIdentifierAuthority, - nSubAuthorityCount, - dwSubAuthority0, - dwSubAuthority1, - dwSubAuthority2, - dwSubAuthority3, - dwSubAuthority4, - dwSubAuthority5, - dwSubAuthority6, - dwSubAuthority7, - pSid); - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; +AllocateAndInitializeSid( PSID_IDENTIFIER_AUTHORITY pIdentifierAuthority, + BYTE nSubAuthorityCount, + DWORD nSubAuthority0, DWORD nSubAuthority1, + DWORD nSubAuthority2, DWORD nSubAuthority3, + DWORD nSubAuthority4, DWORD nSubAuthority5, + DWORD nSubAuthority6, DWORD nSubAuthority7, + PSID *pSid ) +{ + return set_ntstatus( RtlAllocateAndInitializeSid( + pIdentifierAuthority, nSubAuthorityCount, + nSubAuthority0, nSubAuthority1, nSubAuthority2, nSubAuthority3, + nSubAuthority4, nSubAuthority5, nSubAuthority6, nSubAuthority7, + pSid )); } /*

9 years, 10 months

[ekohl] 64983: [NET] Display local group properties and members.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Oct 25 14:28:38 2014 New Revision: 64983 URL: http://svn.reactos.org/svn/reactos?rev=64983&view=rev Log: [NET] Display local group properties and members. Modified: trunk/reactos/base/applications/network/net/cmdLocalGroup.c Modified: trunk/reactos/base/applications/network/net/cmdLocalGroup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdLocalGroup.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdLocalGroup.c [iso-8859-1] Sat Oct 25 14:28:38 2014 @@ -69,6 +69,93 @@ NetApiBufferFree(pBuffer); return NERR_Success; +} + + +static +NET_API_STATUS +DisplayLocalGroup(LPWSTR lpGroupName) +{ + PLOCALGROUP_INFO_1 pGroupInfo = NULL; + PLOCALGROUP_MEMBERS_INFO_3 pMembers = NULL; + PSERVER_INFO_100 pServer = NULL; + LPWSTR *pNames = NULL; + DWORD dwRead = 0; + DWORD dwTotal = 0; + DWORD_PTR ResumeHandle = 0; + DWORD i; + DWORD len; + NET_API_STATUS Status; + + Status = NetLocalGroupGetInfo(NULL, + lpGroupName, + 1, + (LPBYTE*)&pGroupInfo); + if (Status != NERR_Success) + return Status; + + Status = NetLocalGroupGetMembers(NULL, + lpGroupName, + 3, + (LPBYTE*)&pMembers, + MAX_PREFERRED_LENGTH, + &dwRead, + &dwTotal, + &ResumeHandle); + if (Status != NERR_Success) + goto done; + + Status = NetServerGetInfo(NULL, + 100, + (LPBYTE*)&pServer); + if (Status != NERR_Success) + goto done; + + pNames = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + dwRead * sizeof(LPWSTR)); + if (pNames == NULL) + { + Status = ERROR_OUTOFMEMORY; + goto done; + } + + len = wcslen(pServer->sv100_name); + for (i = 0; i < dwRead; i++) + { + if (!wcsncmp(pMembers[i].lgrmi3_domainandname, pServer->sv100_name, len)) + pNames[i] = &pMembers[i].lgrmi3_domainandname[len + 1]; + else + pNames[i] = pMembers[i].lgrmi3_domainandname; + } + + printf("Alias name %S\n", pGroupInfo->lgrpi1_name); + printf("Comment %S\n", pGroupInfo->lgrpi1_comment); + printf("\n"); + printf("Members\n"); + printf("\n"); + printf("------------------------------------------\n"); + + for (i = 0; i < dwRead; i++) + { + if (pNames[i]) + printf("%S\n", pNames[i]); + } + +done: + if (pNames != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, pNames); + + if (pServer != NULL) + NetApiBufferFree(pServer); + + if (pMembers != NULL) + NetApiBufferFree(pMembers); + + if (pGroupInfo != NULL) + NetApiBufferFree(pGroupInfo); + + return Status; } @@ -99,6 +186,12 @@ printf("Status: %lu\n", Status); return 0; } + else if (argc == 3) + { + Status = DisplayLocalGroup(argv[2]); + printf("Status: %lu\n", Status); + return 0; + } i = 2; if (argv[i][0] != L'/')

9 years, 10 months

← Newer
1
...
15
16
17
18
19
20
21
...
73
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2014