Ros-diffs September 2017

ros-diffs@reactos.org

17 participants
284 discussions

[ekohl] 75930: [TRANSLATION] Polish translation update. Patch by Adam Słaboń. CORE-13802
by ekohl＠svn.reactos.org 23 Sep '17

23 Sep '17

Author: ekohl Date: Sat Sep 23 17:32:13 2017 New Revision: 75930 URL: http://svn.reactos.org/svn/reactos?rev=75930&view=rev Log: [TRANSLATION] Polish translation update. Patch by Adam Słaboń. CORE-13802 Added: trunk/reactos/base/applications/charmap_new/lang/pl-PL.rc (with props) trunk/reactos/base/applications/clipbrd/lang/pl-PL.rc (with props) trunk/reactos/base/system/services/lang/pl-PL.rc (with props) trunk/reactos/dll/cpl/openglcfg/lang/pl-PL.rc (with props) trunk/reactos/dll/shellext/ntobjshex/lang/pl-PL.rc (with props) trunk/reactos/dll/shellext/stobject/lang/pl-PL.rc (with props) Modified: trunk/reactos/base/applications/clipbrd/clipbrd.rc trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc trunk/reactos/base/applications/fontview/lang/pl-PL.rc trunk/reactos/base/applications/msconfig/lang/pl-PL.rc trunk/reactos/base/applications/mspaint/lang/pl-PL.rc trunk/reactos/base/applications/mstsc/lang/pl-PL.rc trunk/reactos/base/applications/notepad/lang/pl-PL.rc trunk/reactos/base/applications/rapps/lang/pl-PL.rc trunk/reactos/base/applications/shutdown/lang/pl-PL.rc trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc trunk/reactos/base/setup/reactos/lang/pl-PL.rc trunk/reactos/base/shell/explorer/lang/pl-PL.rc trunk/reactos/base/system/services/services.rc trunk/reactos/base/system/subst/lang/pl-PL.rc trunk/reactos/dll/cpl/access/lang/pl-PL.rc trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc trunk/reactos/dll/cpl/console/lang/pl-PL.rc trunk/reactos/dll/cpl/desk/lang/pl-PL.rc trunk/reactos/dll/cpl/intl/lang/pl-PL.rc trunk/reactos/dll/cpl/main/lang/pl-PL.rc trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc trunk/reactos/dll/cpl/openglcfg/openglcfg.rc trunk/reactos/dll/cpl/powercfg/lang/pl-PL.rc trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc trunk/reactos/dll/cpl/timedate/lang/pl-PL.rc trunk/reactos/dll/shellext/acppage/lang/pl-PL.rc trunk/reactos/dll/shellext/deskadp/lang/pl-PL.rc trunk/reactos/dll/shellext/netshell/lang/pl-PL.rc trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc trunk/reactos/dll/shellext/stobject/stobject.rc trunk/reactos/dll/win32/browseui/lang/pl-PL.rc trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc trunk/reactos/dll/win32/samsrv/lang/pl-PL.rc trunk/reactos/dll/win32/setupapi/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc trunk/reactos/dll/win32/tapiui/lang/pl-PL.rc trunk/reactos/subsystems/mvdm/ntvdm/lang/pl-PL.rc [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/base/applications/charmap_new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_… Modified: trunk/reactos/base/applications/clipbrd/clipbrd.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… Added: trunk/reactos/base/applications/clipbrd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… Modified: trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/fontview/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… Modified: trunk/reactos/base/applications/msconfig/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… 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/mstsc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… Modified: trunk/reactos/base/applications/notepad/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/rapps/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/shutdown/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… Modified: trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/setup/reactos/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pl… Modified: trunk/reactos/base/shell/explorer/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/p… Added: trunk/reactos/base/system/services/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/lang/… Modified: trunk/reactos/base/system/services/services.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… Modified: trunk/reactos/base/system/subst/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/pl-… Modified: trunk/reactos/dll/cpl/access/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/pl-PL.… Modified: trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/pl-PL.… Modified: trunk/reactos/dll/cpl/console/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/pl-PL… Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc… Modified: trunk/reactos/dll/cpl/intl/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/pl-PL.rc… Modified: trunk/reactos/dll/cpl/main/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/pl-PL.rc… Modified: trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/pl-PL.r… Added: trunk/reactos/dll/cpl/openglcfg/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/openglcfg/lang/pl-… Modified: trunk/reactos/dll/cpl/openglcfg/openglcfg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/openglcfg/openglcf… Modified: trunk/reactos/dll/cpl/powercfg/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/pl-P… Modified: trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/pl-PL.r… Modified: trunk/reactos/dll/cpl/timedate/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/pl-P… Modified: trunk/reactos/dll/shellext/acppage/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… Modified: trunk/reactos/dll/shellext/deskadp/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… Modified: trunk/reactos/dll/shellext/netshell/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Added: trunk/reactos/dll/shellext/ntobjshex/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/lan… Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… Added: trunk/reactos/dll/shellext/stobject/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… Modified: trunk/reactos/dll/shellext/stobject/stobject.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/stob… Modified: trunk/reactos/dll/win32/browseui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/pl… Modified: trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/pl-P… Modified: trunk/reactos/dll/win32/samsrv/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/lang/pl-P… Modified: trunk/reactos/dll/win32/setupapi/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/pl… Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl… Modified: trunk/reactos/dll/win32/tapiui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/pl-P… Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang…

1 0

[tfaber] 75929: [DRIVERS][NTOS][EVTLIB][USER32] - Silence some debug spam
by tfaber＠svn.reactos.org 23 Sep '17

23 Sep '17

Author: tfaber Date: Sat Sep 23 13:34:50 2017 New Revision: 75929 URL: http://svn.reactos.org/svn/reactos?rev=75929&view=rev Log: [DRIVERS][NTOS][EVTLIB][USER32] - Silence some debug spam Modified: trunk/reactos/drivers/filesystems/mup/dfs.c trunk/reactos/drivers/ksfilter/swenum/swenum.c trunk/reactos/drivers/network/ndisuio/main.c trunk/reactos/drivers/network/ndisuio/protocol.c trunk/reactos/ntoskrnl/wmi/wmi.c trunk/reactos/sdk/lib/evtlib/evtlib.c trunk/reactos/win32ss/user/user32/misc/dllmain.c Modified: trunk/reactos/drivers/filesystems/mup/dfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/df… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/dfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/dfs.c [iso-8859-1] Sat Sep 23 13:34:50 2017 @@ -90,7 +90,7 @@ /* We don't support DFS yet, so * fail to make sure it remains disabled */ - UNIMPLEMENTED; + DPRINT("DfsDriverEntry not implemented\n"); return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/ksfilter/swenum/swenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/swenum/sw… ============================================================================== --- trunk/reactos/drivers/ksfilter/swenum/swenum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/swenum/swenum.c [iso-8859-1] Sat Sep 23 13:34:50 2017 @@ -425,7 +425,7 @@ DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = SwDispatchDeviceControl; DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = SwDispatchSystemControl; - DPRINT1("SWENUM loaded\n"); + DPRINT("SWENUM loaded\n"); return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/network/ndisuio/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndisuio/ma… ============================================================================== --- trunk/reactos/drivers/network/ndisuio/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndisuio/main.c [iso-8859-1] Sat Sep 23 13:34:50 2017 @@ -8,7 +8,7 @@ #include "ndisuio.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> PDEVICE_OBJECT GlobalDeviceObject; Modified: trunk/reactos/drivers/network/ndisuio/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndisuio/pr… ============================================================================== --- trunk/reactos/drivers/network/ndisuio/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndisuio/protocol.c [iso-8859-1] Sat Sep 23 13:34:50 2017 @@ -88,7 +88,7 @@ return NDIS_STATUS_SUCCESS; case NetEventBindsComplete: - DPRINT1("NetPnPEvent: BindsComplete\n"); + DPRINT("NetPnPEvent: BindsComplete\n"); return NDIS_STATUS_SUCCESS; case NetEventPnPCapabilities: Modified: trunk/reactos/ntoskrnl/wmi/wmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/wmi/wmi.c?rev=759… ============================================================================== --- trunk/reactos/ntoskrnl/wmi/wmi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/wmi/wmi.c [iso-8859-1] Sat Sep 23 13:34:50 2017 @@ -68,7 +68,7 @@ IoWMIRegistrationControl(IN PDEVICE_OBJECT DeviceObject, IN ULONG Action) { - DPRINT1("IoWMIRegistrationControl() called for DO %p, requesting %lu action, returning success\n", + DPRINT("IoWMIRegistrationControl() called for DO %p, requesting %lu action, returning success\n", DeviceObject, Action); return STATUS_SUCCESS; Modified: trunk/reactos/sdk/lib/evtlib/evtlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/evtlib/evtlib.c?re… ============================================================================== --- trunk/reactos/sdk/lib/evtlib/evtlib.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/evtlib/evtlib.c [iso-8859-1] Sat Sep 23 13:34:50 2017 @@ -507,7 +507,7 @@ /* Is it an EVENTLOGEOF record? */ if (RtlCompareMemory(&EofRec, &EOFRecord, EVENTLOGEOF_SIZE_FIXED) == EVENTLOGEOF_SIZE_FIXED) { - DPRINT1("Found EOF record at %llx\n", FileOffset.QuadPart); + DPRINT("Found EOF record at %llx\n", FileOffset.QuadPart); /* Got it! Break the loop and continue */ break; @@ -695,8 +695,8 @@ // LogFile->Header.Flags |= ELF_LOGFILE_HEADER_WRAP; // } - DPRINT1("StartOffset = 0x%x, EndOffset = 0x%x\n", - LogFile->Header.StartOffset, LogFile->Header.EndOffset); + DPRINT("StartOffset = 0x%x, EndOffset = 0x%x\n", + LogFile->Header.StartOffset, LogFile->Header.EndOffset); /* * For non-read-only logs of size < MaxSize, reorganize the events @@ -816,7 +816,7 @@ if (NextOffset.QuadPart == LogFile->Header.EndOffset) { /* We have finished enumerating all the event records */ - DPRINT1("NextOffset.QuadPart == LogFile->Header.EndOffset, break\n"); + DPRINT("NextOffset.QuadPart == LogFile->Header.EndOffset, break\n"); break; } Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Sat Sep 23 13:34:50 2017 @@ -359,7 +359,7 @@ // FIXME: Disabling this call is a HACK!! See also User32CallClientThreadSetupFromKernel... // return ClientThreadSetupHelper(FALSE); - UNIMPLEMENTED; + TRACE("ClientThreadSetup is not implemented\n"); return TRUE; }

1 0

[mjansen] 75928: [USER32][WIN32K] Make antialiased disabled font readable. Patch by Katayama Hirofumi MZ. CORE-7721
by mjansen＠svn.reactos.org 22 Sep '17

22 Sep '17

Author: mjansen Date: Fri Sep 22 19:47:34 2017 New Revision: 75928 URL: http://svn.reactos.org/svn/reactos?rev=75928&view=rev Log: [USER32][WIN32K] Make antialiased disabled font readable. Patch by Katayama Hirofumi MZ. CORE-7721 Modified: trunk/reactos/win32ss/gdi/ntgdi/font.h trunk/reactos/win32ss/gdi/ntgdi/freetype.c trunk/reactos/win32ss/user/user32/windows/draw.c Modified: trunk/reactos/win32ss/gdi/ntgdi/font.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/font.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/font.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/font.h [iso-8859-1] Fri Sep 22 19:47:34 2017 @@ -29,6 +29,7 @@ FT_Face Face; FT_BitmapGlyph BitmapGlyph; int Height; + FT_Render_Mode RenderMode; MATRIX mxWorldToDevice; } FONT_CACHE_ENTRY, *PFONT_CACHE_ENTRY; Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Fri Sep 22 19:47:34 2017 @@ -1392,6 +1392,7 @@ switch (logfont->lfQuality) { case ANTIALIASED_QUALITY: + break; case NONANTIALIASED_QUALITY: return FT_RENDER_MODE_MONO; case DRAFT_QUALITY: @@ -2608,6 +2609,7 @@ FT_Face Face, INT GlyphIndex, INT Height, + FT_Render_Mode RenderMode, PMATRIX pmx) { PLIST_ENTRY CurrentEntry; @@ -2622,6 +2624,7 @@ if ((FontEntry->Face == Face) && (FontEntry->GlyphIndex == GlyphIndex) && (FontEntry->Height == Height) && + (FontEntry->RenderMode == RenderMode) && (SameScaleMatrix(&FontEntry->mxWorldToDevice, pmx))) break; CurrentEntry = CurrentEntry->Flink; @@ -2737,6 +2740,7 @@ NewEntry->Face = Face; NewEntry->BitmapGlyph = BitmapGlyph; NewEntry->Height = Height; + NewEntry->RenderMode = RenderMode; NewEntry->mxWorldToDevice = *pmx; InsertHeadList(&FontCacheListHead, &NewEntry->ListEntry); @@ -3589,7 +3593,6 @@ else RenderMode = FT_RENDER_MODE_MONO; - /* Get the DC's world-to-device transformation matrix */ pmxWorldToDevice = DC_pmxWorldToDevice(dc); FtSetCoordinateTransform(face, pmxWorldToDevice); @@ -3607,8 +3610,8 @@ if (EmuBold || EmuItalic) realglyph = NULL; else - realglyph = ftGdiGlyphCacheGet(face, glyph_index, - plf->lfHeight, pmxWorldToDevice); + realglyph = ftGdiGlyphCacheGet(face, glyph_index, plf->lfHeight, + RenderMode, pmxWorldToDevice); if (EmuBold || EmuItalic || !realglyph) { @@ -5320,8 +5323,8 @@ if (EmuBold || EmuItalic) realglyph = NULL; else - realglyph = ftGdiGlyphCacheGet(face, glyph_index, - plf->lfHeight, pmxWorldToDevice); + realglyph = ftGdiGlyphCacheGet(face, glyph_index, plf->lfHeight, + RenderMode, pmxWorldToDevice); if (!realglyph) { error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); @@ -5543,8 +5546,8 @@ if (EmuBold || EmuItalic) realglyph = NULL; else - realglyph = ftGdiGlyphCacheGet(face, glyph_index, - plf->lfHeight, pmxWorldToDevice); + realglyph = ftGdiGlyphCacheGet(face, glyph_index, plf->lfHeight, + RenderMode, pmxWorldToDevice); if (!realglyph) { error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); Modified: trunk/reactos/win32ss/user/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/draw.c [iso-8859-1] Fri Sep 22 19:47:34 2017 @@ -6,6 +6,7 @@ * Copyright 2003 Andrew Greenwood * Copyright 2003 Filip Navara * Copyright 2009 Matthias Kupfer + * Copyright 2017 Katayama Hirofumi MZ * * Based on Wine code. * @@ -1242,6 +1243,8 @@ UINT opcode = flags & 0xf; INT len = wp; BOOL retval, tmp; + LOGFONTW lf; + HFONT hFontOriginal, hNaaFont = NULL; if((opcode == DST_TEXT || opcode == DST_PREFIXTEXT) && !len) /* The string is '\0' terminated */ { @@ -1249,6 +1252,15 @@ len = lstrlenW((LPWSTR)lp); else len = lstrlenA((LPSTR)lp); + } + + hFontOriginal = GetCurrentObject(hdc, OBJ_FONT); + if (flags & (DSS_MONO | DSS_DISABLED)) + { + /* Create a non-antialiased font */ + GetObjectW(hFontOriginal, sizeof(lf), &lf); + lf.lfQuality = NONANTIALIASED_QUALITY; + hNaaFont = CreateFontIndirectW(&lf); } /* Find out what size the image has if not given by caller */ @@ -1332,7 +1344,10 @@ if(!FillRect(memdc, &rc, (HBRUSH)GetStockObject(WHITE_BRUSH))) goto cleanup; SetBkColor(memdc, RGB(255, 255, 255)); SetTextColor(memdc, RGB(0, 0, 0)); - hfsave = (HFONT)SelectObject(memdc, GetCurrentObject(hdc, OBJ_FONT)); + if (hNaaFont) + hfsave = (HFONT)SelectObject(memdc, hNaaFont); + else + hfsave = (HFONT)SelectObject(memdc, hFontOriginal); SetLayout( memdc, GetLayout( hdc )); /* DST_COMPLEX may draw text as well, @@ -1341,6 +1356,7 @@ if(!hfsave && (opcode <= DST_PREFIXTEXT)) goto cleanup; tmp = PAINTING_DrawStateJam(memdc, opcode, func, lp, len, &rc, dtflags, unicode); if(hfsave) SelectObject(memdc, hfsave); + if (hNaaFont) DeleteObject(hNaaFont); if(!tmp) goto cleanup; /* This state cause the image to be dithered */

1 0

[mjansen] 75927: [ACPPAGE] Work around a crash with BSTR's. CORE-13800 #resolve
by mjansen＠svn.reactos.org 22 Sep '17

22 Sep '17

Author: mjansen Date: Fri Sep 22 19:42:08 2017 New Revision: 75927 URL: http://svn.reactos.org/svn/reactos?rev=75927&view=rev Log: [ACPPAGE] Work around a crash with BSTR's. CORE-13800 #resolve Modified: trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp Modified: trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/CLaye… ============================================================================== --- trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp [iso-8859-1] Fri Sep 22 19:42:08 2017 @@ -494,7 +494,7 @@ while (TRUE) { - CComBSTR str; + CComHeapPtr<OLECHAR> str; HRESULT hr = pList.Next(1, &str, NULL); if (hr != S_OK) break;

1 0

[ekohl] 75926: [DDK] Add all ide commands to make the storahci driver happy.
by ekohl＠svn.reactos.org 22 Sep '17

22 Sep '17

Author: ekohl Date: Fri Sep 22 17:45:04 2017 New Revision: 75926 URL: http://svn.reactos.org/svn/reactos?rev=75926&view=rev Log: [DDK] Add all ide commands to make the storahci driver happy. Modified: trunk/reactos/sdk/include/ddk/ata.h Modified: trunk/reactos/sdk/include/ddk/ata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/ata.h?rev=… ============================================================================== --- trunk/reactos/sdk/include/ddk/ata.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ddk/ata.h [iso-8859-1] Fri Sep 22 17:45:04 2017 @@ -252,7 +252,50 @@ } IDENTIFY_DEVICE_DATA, *PIDENTIFY_DEVICE_DATA; #include <poppack.h> -#define IDE_COMMAND_FLUSH_CACHE 0xE7 -#define IDE_COMMAND_IDENTIFY 0xEC +#define IDE_LBA_MODE (1 << 6) + +#define IDE_COMMAND_NOP 0x00 +#define IDE_COMMAND_DATA_SET_MANAGEMENT 0x06 +#define IDE_COMMAND_ATAPI_RESET 0x08 +#define IDE_COMMAND_READ 0x20 +#define IDE_COMMAND_READ_EXT 0x24 +#define IDE_COMMAND_READ_DMA_EXT 0x25 +#define IDE_COMMAND_READ_DMA_QUEUED_EXT 0x26 +#define IDE_COMMAND_READ_MULTIPLE_EXT 0x29 +#define IDE_COMMAND_WRITE 0x30 +#define IDE_COMMAND_WRITE_EXT 0x34 +#define IDE_COMMAND_WRITE_DMA_EXT 0x35 +#define IDE_COMMAND_WRITE_DMA_QUEUED_EXT 0x36 +#define IDE_COMMAND_WRITE_MULTIPLE_EXT 0x39 +#define IDE_COMMAND_WRITE_DMA_FUA_EXT 0x3D +#define IDE_COMMAND_WRITE_DMA_QUEUED_FUA_EXT 0x3E +#define IDE_COMMAND_VERIFY 0x40 +#define IDE_COMMAND_VERIFY_EXT 0x42 +#define IDE_COMMAND_EXECUTE_DEVICE_DIAGNOSTIC 0x90 +#define IDE_COMMAND_SET_DRIVE_PARAMETERS 0x91 +#define IDE_COMMAND_ATAPI_PACKET 0xA0 +#define IDE_COMMAND_ATAPI_IDENTIFY 0xA1 +#define IDE_COMMAND_SMART 0xB0 +#define IDE_COMMAND_READ_MULTIPLE 0xC4 +#define IDE_COMMAND_WRITE_MULTIPLE 0xC5 +#define IDE_COMMAND_SET_MULTIPLE 0xC6 +#define IDE_COMMAND_READ_DMA 0xC8 +#define IDE_COMMAND_WRITE_DMA 0xCA +#define IDE_COMMAND_WRITE_DMA_QUEUED 0xCC +#define IDE_COMMAND_WRITE_MULTIPLE_FUA_EXT 0xCE +#define IDE_COMMAND_GET_MEDIA_STATUS 0xDA +#define IDE_COMMAND_DOOR_LOCK 0xDE +#define IDE_COMMAND_DOOR_UNLOCK 0xDF +#define IDE_COMMAND_STANDBY_IMMEDIATE 0xE0 +#define IDE_COMMAND_IDLE_IMMEDIATE 0xE1 +#define IDE_COMMAND_CHECK_POWER 0xE5 +#define IDE_COMMAND_SLEEP 0xE6 +#define IDE_COMMAND_FLUSH_CACHE 0xE7 +#define IDE_COMMAND_FLUSH_CACHE_EXT 0xEA +#define IDE_COMMAND_IDENTIFY 0xEC +#define IDE_COMMAND_MEDIA_EJECT 0xED +#define IDE_COMMAND_SET_FEATURE 0xEF +#define IDE_COMMAND_SECURITY_FREEZE_LOCK 0xF5 +#define IDE_COMMAND_NOT_VALID 0xFF #endif

1 0

[ekohl] 75925: [SAMSRV] Implement SamIFree_SAMPR_DISPLAY_INFO_BUFFER.
by ekohl＠svn.reactos.org 22 Sep '17

22 Sep '17

Author: ekohl Date: Fri Sep 22 12:29:53 2017 New Revision: 75925 URL: http://svn.reactos.org/svn/reactos?rev=75925&view=rev Log: [SAMSRV] Implement SamIFree_SAMPR_DISPLAY_INFO_BUFFER. Modified: trunk/reactos/dll/win32/samsrv/samsrv.c trunk/reactos/dll/win32/samsrv/samsrv.spec Modified: trunk/reactos/dll/win32/samsrv/samsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] Fri Sep 22 12:29:53 2017 @@ -189,6 +189,103 @@ VOID NTAPI +SamIFree_SAMPR_DISPLAY_INFO_BUFFER( + PSAMPR_DISPLAY_INFO_BUFFER Ptr, + DOMAIN_DISPLAY_INFORMATION InformationClass) +{ + ULONG i; + + if (Ptr == NULL) + return; + + switch (InformationClass) + { + case DomainDisplayUser: + if (Ptr->UserInformation.Buffer != NULL) + { + for (i = 0; i < Ptr->UserInformation.EntriesRead; i++) + { + if (Ptr->UserInformation.Buffer[i].AccountName.Buffer != NULL) + MIDL_user_free(Ptr->UserInformation.Buffer[i].AccountName.Buffer); + + if (Ptr->UserInformation.Buffer[i].AdminComment.Buffer != NULL) + MIDL_user_free(Ptr->UserInformation.Buffer[i].AdminComment.Buffer); + + if (Ptr->UserInformation.Buffer[i].FullName.Buffer != NULL) + MIDL_user_free(Ptr->UserInformation.Buffer[i].FullName.Buffer); + } + + MIDL_user_free(Ptr->UserInformation.Buffer); + } + break; + + case DomainDisplayMachine: + if (Ptr->MachineInformation.Buffer != NULL) + { + for (i = 0; i < Ptr->MachineInformation.EntriesRead; i++) + { + if (Ptr->MachineInformation.Buffer[i].AccountName.Buffer != NULL) + MIDL_user_free(Ptr->MachineInformation.Buffer[i].AccountName.Buffer); + + if (Ptr->MachineInformation.Buffer[i].AdminComment.Buffer != NULL) + MIDL_user_free(Ptr->MachineInformation.Buffer[i].AdminComment.Buffer); + } + + MIDL_user_free(Ptr->MachineInformation.Buffer); + } + break; + + case DomainDisplayGroup: + if (Ptr->GroupInformation.Buffer != NULL) + { + for (i = 0; i < Ptr->GroupInformation.EntriesRead; i++) + { + if (Ptr->GroupInformation.Buffer[i].AccountName.Buffer != NULL) + MIDL_user_free(Ptr->GroupInformation.Buffer[i].AccountName.Buffer); + + if (Ptr->GroupInformation.Buffer[i].AdminComment.Buffer != NULL) + MIDL_user_free(Ptr->GroupInformation.Buffer[i].AdminComment.Buffer); + } + + MIDL_user_free(Ptr->GroupInformation.Buffer); + } + break; + + case DomainDisplayOemUser: + if (Ptr->OemUserInformation.Buffer != NULL) + { + for (i = 0; i < Ptr->OemUserInformation.EntriesRead; i++) + { + if (Ptr->OemUserInformation.Buffer[i].OemAccountName.Buffer != NULL) + MIDL_user_free(Ptr->OemUserInformation.Buffer[i].OemAccountName.Buffer); + } + + MIDL_user_free(Ptr->OemUserInformation.Buffer); + } + break; + + case DomainDisplayOemGroup: + if (Ptr->OemGroupInformation.Buffer != NULL) + { + for (i = 0; i < Ptr->OemGroupInformation.EntriesRead; i++) + { + if (Ptr->OemGroupInformation.Buffer[i].OemAccountName.Buffer != NULL) + MIDL_user_free(Ptr->OemGroupInformation.Buffer[i].OemAccountName.Buffer); + } + + MIDL_user_free(Ptr->OemGroupInformation.Buffer); + } + break; + + default: + FIXME("Unsupported information class: %lu\n", InformationClass); + break; + } +} + + +VOID +NTAPI SamIFree_SAMPR_DOMAIN_INFO_BUFFER( PSAMPR_DOMAIN_INFO_BUFFER Ptr, DOMAIN_INFORMATION_CLASS InformationClass) @@ -271,21 +368,21 @@ { ULONG i; - if (Ptr != NULL) - { - if (Ptr->Buffer != NULL) + if (Ptr == NULL) + return; + + if (Ptr->Buffer != NULL) + { + for (i = 0; i < Ptr->EntriesRead; i++) { - for (i = 0; i < Ptr->EntriesRead; i++) - { - if (Ptr->Buffer[i].Name.Buffer != NULL) - MIDL_user_free(Ptr->Buffer[i].Name.Buffer); - } - - MIDL_user_free(Ptr->Buffer); + if (Ptr->Buffer[i].Name.Buffer != NULL) + MIDL_user_free(Ptr->Buffer[i].Name.Buffer); } - MIDL_user_free(Ptr); - } + MIDL_user_free(Ptr->Buffer); + } + + MIDL_user_free(Ptr); } @@ -293,13 +390,13 @@ NTAPI SamIFree_SAMPR_GET_GROUPS_BUFFER(PSAMPR_GET_GROUPS_BUFFER Ptr) { - if (Ptr != NULL) - { - if (Ptr->Groups != NULL) - MIDL_user_free(Ptr->Groups); - - MIDL_user_free(Ptr); - } + if (Ptr == NULL) + return; + + if (Ptr->Groups != NULL) + MIDL_user_free(Ptr->Groups); + + MIDL_user_free(Ptr); } @@ -307,16 +404,16 @@ NTAPI SamIFree_SAMPR_GET_MEMBERS_BUFFER(PSAMPR_GET_MEMBERS_BUFFER Ptr) { - if (Ptr != NULL) - { - if (Ptr->Members != NULL) - MIDL_user_free(Ptr->Members); - - if (Ptr->Attributes != NULL) - MIDL_user_free(Ptr->Attributes); - - MIDL_user_free(Ptr); - } + if (Ptr == NULL) + return; + + if (Ptr->Members != NULL) + MIDL_user_free(Ptr->Members); + + if (Ptr->Attributes != NULL) + MIDL_user_free(Ptr->Attributes); + + MIDL_user_free(Ptr); } @@ -365,36 +462,36 @@ NTAPI SamIFree_SAMPR_PSID_ARRAY(PSAMPR_PSID_ARRAY Ptr) { - if (Ptr != NULL) - { - if (Ptr->Sids != NULL) + if (Ptr == NULL) + return; + + if (Ptr->Sids != NULL) + { + MIDL_user_free(Ptr->Sids); + } +} + + +VOID +NTAPI +SamIFree_SAMPR_RETURNED_USTRING_ARRAY(PSAMPR_RETURNED_USTRING_ARRAY Ptr) +{ + ULONG i; + + if (Ptr == NULL) + return; + + if (Ptr->Element != NULL) + { + for (i = 0; i < Ptr->Count; i++) { - MIDL_user_free(Ptr->Sids); + if (Ptr->Element[i].Buffer != NULL) + MIDL_user_free(Ptr->Element[i].Buffer); } - } -} - - -VOID -NTAPI -SamIFree_SAMPR_RETURNED_USTRING_ARRAY(PSAMPR_RETURNED_USTRING_ARRAY Ptr) -{ - ULONG i; - - if (Ptr != NULL) - { - if (Ptr->Element != NULL) - { - for (i = 0; i < Ptr->Count; i++) - { - if (Ptr->Element[i].Buffer != NULL) - MIDL_user_free(Ptr->Element[i].Buffer); - } - - MIDL_user_free(Ptr->Element); - Ptr->Element = NULL; - Ptr->Count = 0; - } + + MIDL_user_free(Ptr->Element); + Ptr->Element = NULL; + Ptr->Count = 0; } } @@ -403,13 +500,13 @@ NTAPI SamIFree_SAMPR_SR_SECURITY_DESCRIPTOR(PSAMPR_SR_SECURITY_DESCRIPTOR Ptr) { - if (Ptr != NULL) - { - if (Ptr->SecurityDescriptor != NULL) - MIDL_user_free(Ptr->SecurityDescriptor); - - MIDL_user_free(Ptr); - } + if (Ptr == NULL) + return; + + if (Ptr->SecurityDescriptor != NULL) + MIDL_user_free(Ptr->SecurityDescriptor); + + MIDL_user_free(Ptr); } @@ -417,14 +514,14 @@ NTAPI SamIFree_SAMPR_ULONG_ARRAY(PSAMPR_ULONG_ARRAY Ptr) { - if (Ptr != NULL) - { - if (Ptr->Element != NULL) - { - MIDL_user_free(Ptr->Element); - Ptr->Element = NULL; - Ptr->Count = 0; - } + if (Ptr == NULL) + return; + + if (Ptr->Element != NULL) + { + MIDL_user_free(Ptr->Element); + Ptr->Element = NULL; + Ptr->Count = 0; } } Modified: trunk/reactos/dll/win32/samsrv/samsrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.sp… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] Fri Sep 22 12:29:53 2017 @@ -18,7 +18,7 @@ @ stub SamIFreeSidArray @ stdcall SamIFreeVoid(ptr) @ stdcall SamIFree_SAMPR_ALIAS_INFO_BUFFER(ptr long) -@ stub SamIFree_SAMPR_DISPLAY_INFO_BUFFER +@ stdcall SamIFree_SAMPR_DISPLAY_INFO_BUFFER(ptr long) @ stdcall SamIFree_SAMPR_DOMAIN_INFO_BUFFER(ptr long) @ stdcall SamIFree_SAMPR_ENUMERATION_BUFFER(ptr) @ stdcall SamIFree_SAMPR_GET_GROUPS_BUFFER(ptr)

1 0

[ekohl] 75924: [SAMSRV] Implement SamIFree_SAMPR_ALIAS_INFO_BUFFER, SamIFree_SAMPR_DOMAIN_INFO_BUFFER and SamIFree_SAMPR_GROUP_INFO_BUFFER.
by ekohl＠svn.reactos.org 22 Sep '17

22 Sep '17

Author: ekohl Date: Fri Sep 22 10:05:48 2017 New Revision: 75924 URL: http://svn.reactos.org/svn/reactos?rev=75924&view=rev Log: [SAMSRV] Implement SamIFree_SAMPR_ALIAS_INFO_BUFFER, SamIFree_SAMPR_DOMAIN_INFO_BUFFER and SamIFree_SAMPR_GROUP_INFO_BUFFER. Modified: trunk/reactos/dll/win32/samsrv/samsrv.c trunk/reactos/dll/win32/samsrv/samsrv.spec Modified: trunk/reactos/dll/win32/samsrv/samsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] Fri Sep 22 10:05:48 2017 @@ -151,6 +151,122 @@ VOID NTAPI +SamIFree_SAMPR_ALIAS_INFO_BUFFER( + PSAMPR_ALIAS_INFO_BUFFER Ptr, + ALIAS_INFORMATION_CLASS InformationClass) +{ + if (Ptr == NULL) + return; + + switch (InformationClass) + { + case AliasGeneralInformation: + if (Ptr->General.Name.Buffer != NULL) + MIDL_user_free(Ptr->General.Name.Buffer); + + if (Ptr->General.AdminComment.Buffer != NULL) + MIDL_user_free(Ptr->General.AdminComment.Buffer); + break; + + case AliasNameInformation: + if (Ptr->Name.Name.Buffer != NULL) + MIDL_user_free(Ptr->Name.Name.Buffer); + break; + + case AliasAdminCommentInformation: + if (Ptr->AdminComment.AdminComment.Buffer != NULL) + MIDL_user_free(Ptr->AdminComment.AdminComment.Buffer); + break; + + default: + FIXME("Unsupported information class: %lu\n", InformationClass); + break; + } + + MIDL_user_free(Ptr); +} + + +VOID +NTAPI +SamIFree_SAMPR_DOMAIN_INFO_BUFFER( + PSAMPR_DOMAIN_INFO_BUFFER Ptr, + DOMAIN_INFORMATION_CLASS InformationClass) +{ + if (Ptr == NULL) + return; + + switch (InformationClass) + { + case DomainPasswordInformation: + break; + + case DomainGeneralInformation: + if (Ptr->General.OemInformation.Buffer != NULL) + MIDL_user_free(Ptr->General.OemInformation.Buffer); + + if (Ptr->General.DomainName.Buffer != NULL) + MIDL_user_free(Ptr->General.DomainName.Buffer); + + if (Ptr->General.ReplicaSourceNodeName.Buffer != NULL) + MIDL_user_free(Ptr->General.ReplicaSourceNodeName.Buffer); + break; + + case DomainLogoffInformation: + break; + + case DomainOemInformation: + if (Ptr->Oem.OemInformation.Buffer != NULL) + MIDL_user_free(Ptr->Oem.OemInformation.Buffer); + break; + + case DomainNameInformation: + if (Ptr->Name.DomainName.Buffer != NULL) + MIDL_user_free(Ptr->Name.DomainName.Buffer); + break; + + case DomainReplicationInformation: + if (Ptr->Replication.ReplicaSourceNodeName.Buffer != NULL) + MIDL_user_free(Ptr->Replication.ReplicaSourceNodeName.Buffer); + break; + + case DomainServerRoleInformation: + break; + + case DomainModifiedInformation: + break; + + case DomainStateInformation: + break; + + case DomainGeneralInformation2: + if (Ptr->General2.I1.OemInformation.Buffer != NULL) + MIDL_user_free(Ptr->General2.I1.OemInformation.Buffer); + + if (Ptr->General2.I1.DomainName.Buffer != NULL) + MIDL_user_free(Ptr->General2.I1.DomainName.Buffer); + + if (Ptr->General2.I1.ReplicaSourceNodeName.Buffer != NULL) + MIDL_user_free(Ptr->General2.I1.ReplicaSourceNodeName.Buffer); + break; + + case DomainLockoutInformation: + break; + + case DomainModifiedInformation2: + break; + + default: + FIXME("Unsupported information class: %lu\n", InformationClass); + break; + } + + MIDL_user_free(Ptr); +} + + +VOID +NTAPI SamIFree_SAMPR_ENUMERATION_BUFFER(PSAMPR_ENUMERATION_BUFFER Ptr) { ULONG i; @@ -206,6 +322,47 @@ VOID NTAPI +SamIFree_SAMPR_GROUP_INFO_BUFFER( + PSAMPR_GROUP_INFO_BUFFER Ptr, + GROUP_INFORMATION_CLASS InformationClass) +{ + if (Ptr == NULL) + return; + + switch (InformationClass) + { + case GroupGeneralInformation: + if (Ptr->General.Name.Buffer != NULL) + MIDL_user_free(Ptr->General.Name.Buffer); + + if (Ptr->General.AdminComment.Buffer != NULL) + MIDL_user_free(Ptr->General.AdminComment.Buffer); + break; + + case GroupNameInformation: + if (Ptr->Name.Name.Buffer != NULL) + MIDL_user_free(Ptr->Name.Name.Buffer); + break; + + case GroupAttributeInformation: + break; + + case GroupAdminCommentInformation: + if (Ptr->AdminComment.AdminComment.Buffer != NULL) + MIDL_user_free(Ptr->AdminComment.AdminComment.Buffer); + break; + + default: + FIXME("Unsupported information class: %lu\n", InformationClass); + break; + } + + MIDL_user_free(Ptr); +} + + +VOID +NTAPI SamIFree_SAMPR_PSID_ARRAY(PSAMPR_PSID_ARRAY Ptr) { if (Ptr != NULL) Modified: trunk/reactos/dll/win32/samsrv/samsrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.sp… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] Fri Sep 22 10:05:48 2017 @@ -17,13 +17,13 @@ @ stub SamIFreeSidAndAttributesList @ stub SamIFreeSidArray @ stdcall SamIFreeVoid(ptr) -@ stub SamIFree_SAMPR_ALIAS_INFO_BUFFER +@ stdcall SamIFree_SAMPR_ALIAS_INFO_BUFFER(ptr long) @ stub SamIFree_SAMPR_DISPLAY_INFO_BUFFER -@ stub SamIFree_SAMPR_DOMAIN_INFO_BUFFER +@ stdcall SamIFree_SAMPR_DOMAIN_INFO_BUFFER(ptr long) @ stdcall SamIFree_SAMPR_ENUMERATION_BUFFER(ptr) @ stdcall SamIFree_SAMPR_GET_GROUPS_BUFFER(ptr) @ stdcall SamIFree_SAMPR_GET_MEMBERS_BUFFER(ptr) -@ stub SamIFree_SAMPR_GROUP_INFO_BUFFER +@ stdcall SamIFree_SAMPR_GROUP_INFO_BUFFER(ptr long) @ stdcall SamIFree_SAMPR_PSID_ARRAY(ptr) @ stdcall SamIFree_SAMPR_RETURNED_USTRING_ARRAY(ptr) @ stdcall SamIFree_SAMPR_SR_SECURITY_DESCRIPTOR(ptr)

1 0

[tfaber] 75923: [CMAKE] - Hackfix base addresses to avoid comctl32/rpcrt4 overlap. This makes use of the fact that baseaddress_winspool.drv is not being used (it should be called baseaddress_winspo...
by tfaber＠svn.reactos.org 22 Sep '17

22 Sep '17

Author: tfaber Date: Fri Sep 22 09:26:32 2017 New Revision: 75923 URL: http://svn.reactos.org/svn/reactos?rev=75923&view=rev Log: [CMAKE] - Hackfix base addresses to avoid comctl32/rpcrt4 overlap. This makes use of the fact that baseaddress_winspool.drv is not being used (it should be called baseaddress_winspool). Base addresses should be properly regenerated at some point, and the issues exposed by the relocations are still bugs that need to be fixed. This should at least make testbot reliable again though. CORE-13804 Modified: trunk/reactos/sdk/cmake/baseaddress.cmake Modified: trunk/reactos/sdk/cmake/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/baseaddress.cmak… ============================================================================== --- trunk/reactos/sdk/cmake/baseaddress.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/baseaddress.cmake [iso-8859-1] Fri Sep 22 09:26:32 2017 @@ -11,10 +11,9 @@ set(baseaddress_ws2_32 0x7c280000) set(baseaddress_ws2help 0x7c250000) set(baseaddress_shlwapi 0x7c1a0000) -set(baseaddress_rpcrt4 0x7c0d0000) -set(baseaddress_comctl32 0x7bf40000) -set(baseaddress_ole32 0x7bd60000) -set(baseaddress_winspool.drv 0x7bd30000) +set(baseaddress_rpcrt4 0x7c0e0000) +set(baseaddress_comctl32 0x7bf20000) +set(baseaddress_ole32 0x7bd20000) set(baseaddress_winmm 0x7bc70000) set(baseaddress_comdlg32 0x7bb70000) set(baseaddress_shell32 0x7b1b0000)

1 0

[tfaber] 75922: [NDIS] - Don't assert on IRP_MJ_CLEANUP CORE-7630
by tfaber＠svn.reactos.org 22 Sep '17

22 Sep '17

Author: tfaber Date: Fri Sep 22 07:31:57 2017 New Revision: 75922 URL: http://svn.reactos.org/svn/reactos?rev=75922&view=rev Log: [NDIS] - Don't assert on IRP_MJ_CLEANUP CORE-7630 Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Sep 22 07:31:57 2017 @@ -2579,7 +2579,8 @@ if (DeviceObject->DeviceType == FILE_DEVICE_PHYSICAL_NETCARD) { if ((IrpSp->MajorFunction == IRP_MJ_CREATE) || - (IrpSp->MajorFunction == IRP_MJ_CLOSE)) + (IrpSp->MajorFunction == IRP_MJ_CLOSE) || + (IrpSp->MajorFunction == IRP_MJ_CLEANUP)) { return NdisICreateClose(DeviceObject, Irp); }

1 0

[tfaber] 75921: [NDIS] - Don't assert on unimplemented ioctl. Print the control code instead. CORE-7630
by tfaber＠svn.reactos.org 22 Sep '17

22 Sep '17

Author: tfaber Date: Fri Sep 22 07:28:29 2017 New Revision: 75921 URL: http://svn.reactos.org/svn/reactos?rev=75921&view=rev Log: [NDIS] - Don't assert on unimplemented ioctl. Print the control code instead. CORE-7630 Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Sep 22 07:28:29 2017 @@ -2293,13 +2293,15 @@ PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)DeviceObject->DeviceExtension; PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); NDIS_STATUS Status = STATUS_NOT_SUPPORTED; + ULONG ControlCode; ULONG Written; Irp->IoStatus.Information = 0; ASSERT(Adapter); - switch (Stack->Parameters.DeviceIoControl.IoControlCode) + ControlCode = Stack->Parameters.DeviceIoControl.IoControlCode; + switch (ControlCode) { case IOCTL_NDIS_QUERY_GLOBAL_STATS: Status = MiniQueryInformation(Adapter, @@ -2311,7 +2313,7 @@ break; default: - ASSERT(FALSE); + NDIS_DbgPrint(MIN_TRACE, ("NdisIDeviceIoControl: unsupported control code 0x%lx\n", ControlCode)); break; }

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
29
Older →

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 September 2017