Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 57496: [WIN32K] - Fix detection of trivial clipping region - CID 731584
by tkreuzer＠svn.reactos.org 06 Oct '12

06 Oct '12

Author: tkreuzer Date: Sat Oct 6 14:23:22 2012 New Revision: 57496 URL: http://svn.reactos.org/svn/reactos?rev=57496&view=rev Log: [WIN32K] - Fix detection of trivial clipping region - CID 731584 Modified: trunk/reactos/win32ss/gdi/eng/stretchblt.c Modified: trunk/reactos/win32ss/gdi/eng/stretchblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/stretchblt… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/stretchblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/stretchblt.c [iso-8859-1] Sat Oct 6 14:23:22 2012 @@ -440,7 +440,7 @@ return TRUE; } - if (ClipRegion) + if (ClipRegion->iDComplexity != DC_TRIVIAL) { if (!RECTL_bIntersectRect(&OutputRect, &InputClippedRect, &ClipRegion->rclBounds))

1 0

[tkreuzer] 57495: [WIN32K] Disable APCs when acquiring the pushlock.
by tkreuzer＠svn.reactos.org 06 Oct '12

06 Oct '12

Author: tkreuzer Date: Sat Oct 6 12:21:41 2012 New Revision: 57495 URL: http://svn.reactos.org/svn/reactos?rev=57495&view=rev Log: [WIN32K] Disable APCs when acquiring the pushlock. Modified: trunk/reactos/win32ss/gdi/ntgdi/text.h Modified: trunk/reactos/win32ss/gdi/ntgdi/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/text.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/text.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/text.h [iso-8859-1] Sat Oct 6 12:21:41 2012 @@ -85,6 +85,7 @@ TEXTOBJ_LockText(HFONT hfont) { PLFONT plfnt = LFONT_ShareLockFont(hfont); + KeEnterCriticalRegion(); ExAcquirePushLockExclusive(&plfnt->lock); return plfnt; } @@ -94,6 +95,7 @@ TEXTOBJ_UnlockText(PLFONT plfnt) { ExReleasePushLockExclusive(&plfnt->lock); + KeLeaveCriticalRegion(); LFONT_ShareUnlockFont(plfnt); }

1 0

[tkreuzer] 57494: [WIN23K] - Make LFONTs (for some incomprehensible reason called TEXTOBJ in ros) shared objects, as they are supposed to be. Since that conflicts with our totally broken font code ...
by tkreuzer＠svn.reactos.org 06 Oct '12

06 Oct '12

Author: tkreuzer Date: Sat Oct 6 12:16:06 2012 New Revision: 57494 URL: http://svn.reactos.org/svn/reactos?rev=57494&view=rev Log: [WIN23K] - Make LFONTs (for some incomprehensible reason called TEXTOBJ in ros) shared objects, as they are supposed to be. Since that conflicts with our totally broken font code that happily messes with the LFONT's contents, an additional push lock is aquired to get exclusive ownership. Modified: trunk/reactos/win32ss/gdi/ntgdi/font.c trunk/reactos/win32ss/gdi/ntgdi/freetype.c trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c trunk/reactos/win32ss/gdi/ntgdi/text.h Modified: trunk/reactos/win32ss/gdi/ntgdi/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/font.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/font.c [iso-8859-1] Sat Oct 6 12:16:06 2012 @@ -1056,7 +1056,7 @@ { ENUMLOGFONTEXDVW SafeLogfont; HFONT hNewFont; - PTEXTOBJ TextObj; + PLFONT plfont; NTSTATUS Status = STATUS_SUCCESS; /* Silence GCC warnings */ @@ -1084,25 +1084,26 @@ return NULL; } - TextObj = TEXTOBJ_AllocTextWithHandle(); - if (!TextObj) + plfont = LFONT_AllocFontWithHandle(); + if (!plfont) { return NULL; } - hNewFont = TextObj->BaseObject.hHmgr; - - TextObj->lft = lft; - TextObj->fl = fl; - RtlCopyMemory (&TextObj->logfont, &SafeLogfont, sizeof(ENUMLOGFONTEXDVW)); + hNewFont = plfont->BaseObject.hHmgr; + + plfont->lft = lft; + plfont->fl = fl; + RtlCopyMemory (&plfont->logfont, &SafeLogfont, sizeof(ENUMLOGFONTEXDVW)); + ExInitializePushLock(&plfont->lock); if (SafeLogfont.elfEnumLogfontEx.elfLogFont.lfEscapement != SafeLogfont.elfEnumLogfontEx.elfLogFont.lfOrientation) { /* This should really depend on whether GM_ADVANCED is set */ - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation = - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfEscapement; - } - TEXTOBJ_UnlockText(TextObj); + plfont->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation = + plfont->logfont.elfEnumLogfontEx.elfLogFont.lfEscapement; + } + LFONT_UnlockFont(plfont); if (pvCliData && hNewFont) { 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] Sat Oct 6 12:16:06 2012 @@ -447,23 +447,24 @@ NTSTATUS FASTCALL TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont) { - PTEXTOBJ TextObj; - - TextObj = TEXTOBJ_AllocTextWithHandle(); - if (!TextObj) + PLFONT plfont; + + plfont = LFONT_AllocFontWithHandle(); + if (!plfont) { return STATUS_NO_MEMORY; } - *NewFont = TextObj->BaseObject.hHmgr; - RtlCopyMemory(&TextObj->logfont.elfEnumLogfontEx.elfLogFont, lf, sizeof(LOGFONTW)); + ExInitializePushLock(&plfont->lock); + *NewFont = plfont->BaseObject.hHmgr; + RtlCopyMemory(&plfont->logfont.elfEnumLogfontEx.elfLogFont, lf, sizeof(LOGFONTW)); if (lf->lfEscapement != lf->lfOrientation) { /* This should really depend on whether GM_ADVANCED is set */ - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation = - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfEscapement; - } - TEXTOBJ_UnlockText(TextObj); + plfont->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation = + plfont->logfont.elfEnumLogfontEx.elfLogFont.lfEscapement; + } + LFONT_UnlockFont(plfont); return STATUS_SUCCESS; } Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Sat Oct 6 12:16:06 2012 @@ -51,8 +51,7 @@ (objt) == GDIObjType_BRUSH_TYPE) #define ASSERT_EXCLUSIVE_OBJECT_TYPE(objt) \ ASSERT((objt) == GDIObjType_DC_TYPE || \ - (objt) == GDIObjType_RGN_TYPE || \ - (objt) == GDIObjType_LFONT_TYPE) + (objt) == GDIObjType_RGN_TYPE) #else #define DBG_INCREASE_LOCK_COUNT(ppi, hobj) #define DBG_DECREASE_LOCK_COUNT(x, y) Modified: trunk/reactos/win32ss/gdi/ntgdi/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/text.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/text.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/text.h [iso-8859-1] Sat Oct 6 12:16:06 2012 @@ -56,7 +56,7 @@ #define TEXTOBJECT_INIT 0x00010000 /* GDI logical font object */ -typedef struct +typedef struct _LFONT { /* Header for all gdi objects in the handle table. Do not (re)move this. */ @@ -70,16 +70,33 @@ DWORD dwOffsetEndArray; // Fixed: ENUMLOGFONTEXDVW logfont; -} TEXTOBJ, *PTEXTOBJ; + EX_PUSH_LOCK lock; +} TEXTOBJ, *PTEXTOBJ, LFONT, *PLFONT; /* Internal interface */ -#define TEXTOBJ_AllocText() ((PTEXTOBJ) GDIOBJ_AllocObj(GDIObjType_LFONT_TYPE)) -#define TEXTOBJ_AllocTextWithHandle() ((PTEXTOBJ) GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_FONT, sizeof(TEXTOBJ))) -#define TEXTOBJ_FreeText(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDILoObjType_LO_FONT_TYPE) -#define TEXTOBJ_FreeTextByHandle(hBMObj) GDIOBJ_FreeObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_FONT) -#define TEXTOBJ_LockText(hBMObj) ((PTEXTOBJ) GDIOBJ_LockObject((HGDIOBJ) hBMObj, GDIObjType_LFONT_TYPE)) -#define TEXTOBJ_UnlockText(pBMObj) GDIOBJ_vUnlockObject ((POBJ)pBMObj) +#define LFONT_AllocFontWithHandle() ((PLFONT)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_FONT, sizeof(TEXTOBJ))) +#define LFONT_ShareLockFont(hfont) (PLFONT)GDIOBJ_ReferenceObjectByHandle(hfont, GDIObjType_LFONT_TYPE) +#define LFONT_ShareUnlockFont(plfnt) GDIOBJ_vDereferenceObject((POBJ)plfnt) +#define LFONT_UnlockFont(plfnt) GDIOBJ_vUnlockObject((POBJ)plfnt) + +PTEXTOBJ +FORCEINLINE +TEXTOBJ_LockText(HFONT hfont) +{ + PLFONT plfnt = LFONT_ShareLockFont(hfont); + ExAcquirePushLockExclusive(&plfnt->lock); + return plfnt; +} + +VOID +FORCEINLINE +TEXTOBJ_UnlockText(PLFONT plfnt) +{ + ExReleasePushLockExclusive(&plfnt->lock); + LFONT_ShareUnlockFont(plfnt); +} + PTEXTOBJ FASTCALL RealizeFontInit(HFONT); NTSTATUS FASTCALL TextIntRealizeFont(HFONT,PTEXTOBJ);

1 0

[tkreuzer] 57493: [NTOSKRNL] Add missing break in KdpServiceDispatcher
by tkreuzer＠svn.reactos.org 06 Oct '12

06 Oct '12

Author: tkreuzer Date: Sat Oct 6 09:47:15 2012 New Revision: 57493 URL: http://svn.reactos.org/svn/reactos?rev=57493&view=rev Log: [NTOSKRNL] Add missing break in KdpServiceDispatcher Modified: trunk/reactos/ntoskrnl/kd/kdmain.c Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Sat Oct 6 09:47:15 2012 @@ -103,6 +103,7 @@ case 'RbdK': { Result = KdbRegisterCliCallback(Buffer1, Buffer1Length); + break; } #endif /* KDBG */ #endif /* DBG */

1 0

[tkreuzer] 57492: [GDI32] - Use GdiAllocBatchCommand in DeleteObject instead of doing all manually
by tkreuzer＠svn.reactos.org 06 Oct '12

06 Oct '12

Author: tkreuzer Date: Sat Oct 6 08:33:17 2012 New Revision: 57492 URL: http://svn.reactos.org/svn/reactos?rev=57492&view=rev Log: [GDI32] - Use GdiAllocBatchCommand in DeleteObject instead of doing all manually Modified: trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h trunk/reactos/win32ss/gdi/gdi32/objects/dc.c Modified: trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/include/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h [iso-8859-1] Sat Oct 6 08:33:17 2012 @@ -334,7 +334,7 @@ /* Check if the buffer is full */ if ((pTeb->GdiBatchCount >= GDI_BatchLimit) || - ((pTeb->GdiTebBatch.Offset + cjSize) > GDIBATCHBUFSIZE)) + ((pTeb->GdiTebBatch.Offset + cjSize) > GDIBATCHBUFSIZE)) { /* Call win32k, the kernel will call NtGdiFlushUserBatch to flush the current batch */ Modified: trunk/reactos/win32ss/gdi/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] Sat Oct 6 08:33:17 2012 @@ -320,27 +320,28 @@ WINAPI DeleteObject(HGDIOBJ hObject) { - UINT Type = 0; + DWORD dwType = 0; /* From Wine: DeleteObject does not SetLastError() on a null object */ if(!hObject) return FALSE; - if (0 != ((DWORD) hObject & GDI_HANDLE_STOCK_MASK)) + if ((DWORD)hObject & GDI_HANDLE_STOCK_MASK) { // Relax! This is a normal return! DPRINT("Trying to delete system object 0x%x\n", hObject); return TRUE; } + // If you dont own it?! Get OUT! if(!GdiIsHandleValid(hObject)) return FALSE; - Type = GDI_HANDLE_GET_TYPE(hObject); - - if ((Type == GDI_OBJECT_TYPE_METAFILE) || - (Type == GDI_OBJECT_TYPE_ENHMETAFILE)) + dwType = GDI_HANDLE_GET_TYPE(hObject); + + if ((dwType == GDI_OBJECT_TYPE_METAFILE) || + (dwType == GDI_OBJECT_TYPE_ENHMETAFILE)) return FALSE; - switch (Type) + switch (dwType) { case GDI_OBJECT_TYPE_DC: return DeleteDC((HDC) hObject); @@ -367,33 +368,30 @@ { PBRUSH_ATTR Brh_Attr; PTEB pTeb; - - if ((!GdiGetHandleUserData(hObject, (DWORD)Type, (PVOID) &Brh_Attr)) || - (Brh_Attr == NULL) ) break; + PGDIBSOBJECT pgO; + + if ((!GdiGetHandleUserData(hObject, dwType, (PVOID) &Brh_Attr)) || + (Brh_Attr == NULL)) break; pTeb = NtCurrentTeb(); if (pTeb->Win32ThreadInfo == NULL) break; - if ((pTeb->GdiTebBatch.Offset + sizeof(GDIBSOBJECT)) <= GDIBATCHBUFSIZE) - { - PGDIBSOBJECT pgO = (PGDIBSOBJECT)(&pTeb->GdiTebBatch.Buffer[0] + - pTeb->GdiTebBatch.Offset); - pgO->gbHdr.Cmd = GdiBCDelObj; - pgO->gbHdr.Size = sizeof(GDIBSOBJECT); + pgO = GdiAllocBatchCommand(NULL, GdiBCDelObj); + if (pgO) + { pgO->hgdiobj = hObject; - - pTeb->GdiTebBatch.Offset += sizeof(GDIBSOBJECT); - pTeb->GdiBatchCount++; - if (pTeb->GdiBatchCount >= GDI_BatchLimit) NtGdiFlush(); return TRUE; } + break; } + case GDI_OBJECT_TYPE_BITMAP: default: break; } + return NtGdiDeleteObjectApp(hObject); }

1 0

[jimtabor] 57491: [NtUser] - Tested wine win test_scrollwindow, test_scrollvalidate, test_scrolldc, and test_scroll plus ReactOS API tests. Pass all but three region tests in test_scrollvalidate. -...
by jimtabor＠svn.reactos.org 06 Oct '12

06 Oct '12

Author: jimtabor Date: Sat Oct 6 02:36:46 2012 New Revision: 57491 URL: http://svn.reactos.org/svn/reactos?rev=57491&view=rev Log: [NtUser] - Tested wine win test_scrollwindow, test_scrollvalidate, test_scrolldc, and test_scroll plus ReactOS API tests. Pass all but three region tests in test_scrollvalidate. - Dedicated to Víctor Martínez Calvo. Modified: trunk/reactos/win32ss/user/ntuser/painting.c Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Sat Oct 6 02:36:46 2012 @@ -1611,9 +1611,11 @@ INT Result; PWND Window = NULL, CaretWnd; HDC hDC; - HRGN hrgnOwn = NULL, hrgnTemp; + HRGN hrgnOwn = NULL, hrgnTemp, hrgnWinupd = NULL; HWND hwndCaret; DWORD dcxflags = 0; + int rdw_flags; + BOOL bOwnRgn = TRUE; NTSTATUS Status = STATUS_SUCCESS; DECLARE_RETURN(DWORD); USER_REFERENCE_ENTRY Ref, CaretRef; @@ -1666,7 +1668,10 @@ } if (hrgnUpdate) + { hrgnOwn = hrgnUpdate; + bOwnRgn = FALSE; + } else hrgnOwn = IntSysCreateRectRgn(0, 0, 0, 0); @@ -1694,6 +1699,8 @@ /* FIXME: SetLastError? */ RETURN(ERROR); } + + rdw_flags = (flags & SW_ERASE) && (flags & SW_INVALIDATE) ? RDW_INVALIDATE | RDW_ERASE : RDW_INVALIDATE ; rcCaret = rcScroll; hwndCaret = co_IntFixCaret(Window, &rcCaret, flags); @@ -1710,16 +1717,22 @@ /* * Take into account the fact that some damage may have occurred during - * the scroll. + * the scroll. Keep a copy in hrgnWinupd to be added to hrngUpdate at the end. */ hrgnTemp = IntSysCreateRectRgn(0, 0, 0, 0); if (co_UserGetUpdateRgn(Window, hrgnTemp, FALSE) != NULLREGION) { HRGN hrgnClip = IntSysCreateRectRgnIndirect(&rcClip); + if (!bOwnRgn) + { + hrgnWinupd = IntSysCreateRectRgn( 0, 0, 0, 0); + NtGdiCombineRgn( hrgnWinupd, hrgnTemp, 0, RGN_COPY); + } NtGdiOffsetRgn(hrgnTemp, dx, dy); NtGdiCombineRgn(hrgnTemp, hrgnTemp, hrgnClip, RGN_AND); - co_UserRedrawWindow(Window, NULL, hrgnTemp, RDW_INVALIDATE | RDW_ERASE); + if (!bOwnRgn) NtGdiCombineRgn( hrgnWinupd, hrgnWinupd, hrgnTemp, RGN_OR ); + co_UserRedrawWindow(Window, NULL, hrgnTemp, rdw_flags ); GreDeleteObject(hrgnClip); } GreDeleteObject(hrgnTemp); @@ -1746,7 +1759,7 @@ UserRefObjectCo(Child, &WndRef); co_WinPosSetWindowPos(Child, 0, rcChild.left + dx, rcChild.top + dy, 0, 0, SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE | - SWP_NOREDRAW); + SWP_NOREDRAW | SWP_DEFERERASE); UserDerefObjectCo(Child); } } @@ -1754,7 +1767,7 @@ if (flags & (SW_INVALIDATE | SW_ERASE)) { - co_UserRedrawWindow(Window, NULL, hrgnOwn, RDW_INVALIDATE | RDW_ERASE | + co_UserRedrawWindow(Window, NULL, hrgnOwn, rdw_flags | ((flags & SW_ERASE) ? RDW_ERASENOW : 0) | ((flags & SW_SCROLLCHILDREN) ? RDW_ALLCHILDREN : 0)); } @@ -1793,6 +1806,12 @@ RETURN(Result); CLEANUP: + if (hrgnWinupd && !bOwnRgn) + { + NtGdiCombineRgn( hrgnOwn, hrgnOwn, hrgnWinupd, RGN_OR); + GreDeleteObject(hrgnWinupd); + } + if (hrgnOwn && !hrgnUpdate) { GreDeleteObject(hrgnOwn);

1 0

[hbelusca] 57490: [REGEDIT] - Re-number some resource IDs. - Add key exportation message-box error (thus removing some fwprintf calls). - Use IDS_MY_COMPUTER localized string instead of hardcoded one.
by hbelusca＠svn.reactos.org 05 Oct '12

05 Oct '12

Author: hbelusca Date: Fri Oct 5 20:08:16 2012 New Revision: 57490 URL: http://svn.reactos.org/svn/reactos?rev=57490&view=rev Log: [REGEDIT] - Re-number some resource IDs. - Add key exportation message-box error (thus removing some fwprintf calls). - Use IDS_MY_COMPUTER localized string instead of hardcoded one. Modified: trunk/reactos/base/applications/regedit/childwnd.c trunk/reactos/base/applications/regedit/framewnd.c trunk/reactos/base/applications/regedit/lang/bg-BG.rc trunk/reactos/base/applications/regedit/lang/cs-CZ.rc trunk/reactos/base/applications/regedit/lang/de-DE.rc trunk/reactos/base/applications/regedit/lang/el-GR.rc trunk/reactos/base/applications/regedit/lang/en-US.rc trunk/reactos/base/applications/regedit/lang/es-ES.rc trunk/reactos/base/applications/regedit/lang/fr-FR.rc trunk/reactos/base/applications/regedit/lang/hu-HU.rc trunk/reactos/base/applications/regedit/lang/id-ID.rc trunk/reactos/base/applications/regedit/lang/it-IT.rc trunk/reactos/base/applications/regedit/lang/ja-JP.rc trunk/reactos/base/applications/regedit/lang/ko-KR.rc trunk/reactos/base/applications/regedit/lang/nl-NL.rc trunk/reactos/base/applications/regedit/lang/no-NO.rc trunk/reactos/base/applications/regedit/lang/pl-PL.rc trunk/reactos/base/applications/regedit/lang/pt-BR.rc trunk/reactos/base/applications/regedit/lang/pt-PT.rc trunk/reactos/base/applications/regedit/lang/ro-RO.rc trunk/reactos/base/applications/regedit/lang/ru-RU.rc trunk/reactos/base/applications/regedit/lang/sk-SK.rc trunk/reactos/base/applications/regedit/lang/sl-SI.rc trunk/reactos/base/applications/regedit/lang/sv-SE.rc trunk/reactos/base/applications/regedit/lang/th-TH.rc trunk/reactos/base/applications/regedit/lang/uk-UA.rc trunk/reactos/base/applications/regedit/lang/zh-CN.rc trunk/reactos/base/applications/regedit/lang/zh-TW.rc trunk/reactos/base/applications/regedit/regedit.c trunk/reactos/base/applications/regedit/resource.h trunk/reactos/base/applications/regedit/settings.c trunk/reactos/base/applications/regedit/treeview.c Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -325,7 +325,8 @@ WNDPROC oldproc; HFONT hFont; WCHAR buffer[MAX_PATH]; - /* load "My Computer" string */ + + /* Load "My Computer" string */ LoadStringW(hInst, IDS_MY_COMPUTER, buffer, COUNT_OF(buffer)); g_pChildWnd = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ChildWnd)); Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -85,8 +85,7 @@ } else { - while(RemoveMenu(hMenu, s_nFavoriteMenuSubPos, MF_BYPOSITION)) - ; + while(RemoveMenu(hMenu, s_nFavoriteMenuSubPos, MF_BYPOSITION)) ; } lResult = RegOpenKeyW(HKEY_CURRENT_USER, s_szFavoritesRegKey, &hKey); @@ -436,7 +435,7 @@ { BOOL bRet = FALSE; OPENFILENAME ofn; - WCHAR Caption[128], szTitle[256], szText[256]; + WCHAR Caption[128], szTitle[512], szText[512]; HKEY hKeyRoot; LPCWSTR pszKeyPath; @@ -455,14 +454,15 @@ wcsicmp(ofn.lpstrFile + ofn.nFileExtension, L"reg") == 0) /* REGEDIT4 or Windows Registry Editor Version 5.00 */ { /* Open the file */ - FILE *fp = _wfopen(ofn.lpstrFile, L"r"); + FILE* fp = _wfopen(ofn.lpstrFile, L"r"); /* Import it */ if (fp == NULL || !import_registry_file(fp)) { - LPSTR p = GetMultiByteString(ofn.lpstrFile); - fwprintf(stderr, L"Can't open file \"%s\"\n", p); - HeapFree(GetProcessHeap(), 0, p); + /* Error opening the file */ + LoadStringW(hInst, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); + LoadStringW(hInst, IDS_IMPORT_ERROR, szText, COUNT_OF(szText)); + InfoMessageBox(hWnd, MB_OK | MB_ICONERROR, szTitle, szText, ofn.lpstrFile); bRet = FALSE; } else @@ -470,7 +470,7 @@ /* Show successful import */ LoadStringW(hInst, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); LoadStringW(hInst, IDS_IMPORT_OK, szText, COUNT_OF(szText)); - MessageBoxW(NULL, szText, szTitle, MB_OK); + InfoMessageBox(hWnd, MB_OK | MB_ICONINFORMATION, szTitle, szText, ofn.lpstrFile); bRet = TRUE; } @@ -582,7 +582,7 @@ BOOL bRet = FALSE; OPENFILENAME ofn; WCHAR ExportKeyPath[_MAX_PATH]; - WCHAR Caption[128]; + WCHAR Caption[128], szTitle[512], szText[512]; HKEY hKeyRoot; LPCWSTR pszKeyPath; @@ -664,9 +664,10 @@ (ofn.nFilterIndex == 3 ? REG_FORMAT_4 : REG_FORMAT_5))) { - LPSTR p = GetMultiByteString(ofn.lpstrFile); - fwprintf(stderr, L"Can't open file \"%s\"\n", p); - HeapFree(GetProcessHeap(), 0, p); + /* Error creating the file */ + LoadStringW(hInst, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); + LoadStringW(hInst, IDS_EXPORT_ERROR, szText, COUNT_OF(szText)); + InfoMessageBox(hWnd, MB_OK | MB_ICONERROR, szTitle, szText, ofn.lpstrFile); bRet = FALSE; } else Modified: trunk/reactos/base/applications/regedit/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/bg-BG.rc [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -452,6 +452,7 @@ IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/cs-CZ.rc [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -437,6 +437,7 @@ IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/de-DE.rc [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -437,6 +437,7 @@ IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/el-GR.rc [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -437,6 +437,7 @@ IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/en-US.rc [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -437,6 +437,7 @@ IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/es-ES.rc [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -440,6 +440,7 @@ IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/fr-FR.rc [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -432,7 +432,8 @@ BEGIN IDS_IMPORT_PROMPT "L'ajout d'informations peut involontairement modifier ou supprimer des valeurs et endommager le fonctionnement de composants. Si vous n'Ãªtes pas sÃ»r de la source de ces informations dans '%1', ne les ajoutez pas au Registre.\n\nÃtes-vous sÃ»r de vouloir continuer ?" IDS_IMPORT_OK "Les clÃ©s et valeurs contenues dans '%1' ont Ã©tÃ© correctement ajoutÃ©es au Registre." - IDS_IMPORT_ERROR "Impossible dâimporter '%1' Ã la suite dâune erreur lors de la lecture de ce fichier. Il sâagit dâune erreur disque, ou le fichier est endommagÃ©." + IDS_IMPORT_ERROR "Impossible d'importer '%1' Ã la suite d'une erreur lors de la lecture de ce fichier. Il s'agit d'une erreur disque, ou le fichier est endommagÃ©." + IDS_EXPORT_ERROR "Impossible d'exporter dans le fichier '%1' Ã la suite d'une erreur lors de sa crÃ©ation ou d'une tentative d'Ã©criture, pouvant Ãªtre due Ã une erreur de disque ou de systÃ¨me de fichiers." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/hu-HU.rc [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -438,6 +438,7 @@ IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/id-ID.rc [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -436,6 +436,7 @@ IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -439,6 +439,7 @@ IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -437,6 +437,7 @@ IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ko-KR.rc [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -422,6 +422,7 @@ IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/nl-NL.rc [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -437,6 +437,7 @@ IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/no-NO.rc [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -437,6 +437,7 @@ IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -444,6 +444,7 @@ IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pt-BR.rc [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -438,6 +438,7 @@ IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pt-PT.rc [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -439,6 +439,7 @@ IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ro-RO.rc [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -435,6 +435,7 @@ IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ru-RU.rc [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -434,6 +434,7 @@ IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sk-SK.rc [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -422,6 +422,7 @@ IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sl-SI.rc [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -437,6 +437,7 @@ IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sv-SE.rc [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -437,6 +437,7 @@ IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/th-TH.rc [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -437,6 +437,7 @@ IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/uk-UA.rc [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -438,6 +438,7 @@ IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/zh-CN.rc [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -437,6 +437,7 @@ IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/zh-TW.rc [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -438,6 +438,7 @@ IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." + IDS_EXPORT_ERROR "Cannot export '%1': Error creating or writing to the file. There may be a disk or file system error." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/regedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -146,9 +146,8 @@ get_file_name(&s, filename); if (!filename[0]) { - fwprintf(stderr, L"%s: No file name is specified\n", getAppName()); - // fwprintf(stderr, usage); - MessageBoxW(NULL, usage, NULL, MB_OK | MB_ICONINFORMATION); + InfoMessageBox(NULL, MB_OK | MB_ICONINFORMATION, NULL, L"No file name is specified."); + InfoMessageBox(NULL, MB_OK | MB_ICONINFORMATION, NULL, usage); exit(4); } @@ -165,34 +164,31 @@ goto cont; } + /* Open the file */ fp = _wfopen(filename, L"r"); - if (fp != NULL) - { - import_registry_file(fp); - + + /* Import it */ + if (fp == NULL || !import_registry_file(fp)) + { + /* Error opening the file */ + if (!silent) + { + LoadStringW(hInst, IDS_IMPORT_ERROR, szText, COUNT_OF(szText)); + InfoMessageBox(NULL, MB_OK | MB_ICONERROR, szTitle, szText, filename); + } + } + else + { /* Show successful import */ if (!silent) { LoadStringW(hInst, IDS_IMPORT_OK, szText, COUNT_OF(szText)); InfoMessageBox(NULL, MB_OK | MB_ICONINFORMATION, szTitle, szText, filename); } - - fclose(fp); - } - else - { - //LPSTR p = GetMultiByteString(filename); - //perror(""); - fwprintf(stderr, L"%s: Can't open file \"%s\"\n", getAppName(), filename /*p*/); - //HeapFree(GetProcessHeap(), 0, p); - - /* Error opening the file */ - if (!silent) - { - LoadStringW(hInst, IDS_IMPORT_ERROR, szText, COUNT_OF(szText)); - InfoMessageBox(NULL, MB_OK | MB_ICONERROR, szTitle, szText, filename); - } - } + } + + /* Close the file */ + if (fp) fclose(fp); cont: get_file_name(&s, filename); @@ -206,9 +202,8 @@ get_file_name(&s, reg_key_name); if (!reg_key_name[0]) { - fwprintf(stderr, L"%s: No registry key is specified for removal\n", getAppName()); - // fwprintf(stderr, usage); - MessageBoxW(NULL, usage, NULL, MB_OK | MB_ICONINFORMATION); + InfoMessageBox(NULL, MB_OK | MB_ICONINFORMATION, NULL, L"No registry key is specified for removal."); + InfoMessageBox(NULL, MB_OK | MB_ICONINFORMATION, NULL, usage); exit(6); } delete_registry_key(reg_key_name); @@ -223,9 +218,8 @@ get_file_name(&s, filename); if (!filename[0]) { - fwprintf(stderr, L"%s: No file name is specified\n", getAppName()); - // fwprintf(stderr, usage); - MessageBoxW(NULL, usage, NULL, MB_OK | MB_ICONINFORMATION); + InfoMessageBox(NULL, MB_OK | MB_ICONINFORMATION, NULL, L"No file name is specified."); + InfoMessageBox(NULL, MB_OK | MB_ICONINFORMATION, NULL, usage); exit(7); } @@ -310,8 +304,7 @@ action = ACTION_EXPORT; break; case L'?': - //fwprintf(stderr, usage); - MessageBoxW(NULL, usage, NULL, MB_OK | MB_ICONINFORMATION); + InfoMessageBox(NULL, MB_OK | MB_ICONINFORMATION, NULL, usage); exit(3); break; default: Modified: trunk/reactos/base/applications/regedit/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/resource.h [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -167,79 +167,80 @@ #define IDS_FLT_ALLFILES 31007 #define IDS_FLT_ALLFILES_FLT 31008 -#define IDS_ACCESS_FULLCONTROL 31101 -#define IDS_ACCESS_READ 31102 -#define IDS_ACCESS_QUERYVALUE 31103 -#define IDS_ACCESS_SETVALUE 31104 -#define IDS_ACCESS_CREATESUBKEY 31105 -#define IDS_ACCESS_ENUMERATESUBKEYS 31106 -#define IDS_ACCESS_NOTIFY 31107 -#define IDS_ACCESS_CREATELINK 31108 -#define IDS_ACCESS_DELETE 31109 -#define IDS_ACCESS_WRITEDAC 31110 -#define IDS_ACCESS_WRITEOWNER 31111 -#define IDS_ACCESS_READCONTROL 31112 - -#define IDS_INHERIT_THISKEYONLY 31121 -#define IDS_INHERIT_THISKEYANDSUBKEYS 31122 -#define IDS_INHERIT_SUBKEYSONLY 31123 -#define IDS_EXPAND 31124 -#define IDS_COLLAPSE 31125 -#define IDS_NEW_KEY 31126 -#define IDS_NEW_VALUE 31127 -#define IDS_GOTO_SUGGESTED_KEY 31128 - -#define IDS_IMPORT_PROMPT 31129 -#define IDS_IMPORT_OK 31130 -#define IDS_IMPORT_ERROR 31131 - -#define IDS_FINISHEDFIND 31132 - -#define IDS_BUSNUMBER 31133 -#define IDS_INTERFACE 31134 - -#define IDS_DMA_CHANNEL 31135 -#define IDS_DMA_PORT 31136 -#define IDS_INTERRUPT_VECTOR 31137 -#define IDS_INTERRUPT_LEVEL 31138 -#define IDS_INTERRUPT_AFFINITY 31139 -#define IDS_INTERRUPT_TYPE 31140 -#define IDS_MEMORY_ADDRESS 31141 -#define IDS_MEMORY_LENGTH 31142 -#define IDS_MEMORY_ACCESS 31143 -#define IDS_PORT_ADDRESS 31144 -#define IDS_PORT_LENGTH 31145 -#define IDS_PORT_ACCESS 31146 -#define IDS_SPECIFIC_RESERVED1 31147 -#define IDS_SPECIFIC_RESERVED2 31148 -#define IDS_SPECIFIC_DATASIZE 31149 - -#define IDS_PORT_PORT_IO 31150 -#define IDS_PORT_MEMORY_IO 31151 -#define IDS_INTERRUPT_EDGE_SENSITIVE 31152 -#define IDS_INTERRUPT_LEVEL_SENSITIVE 31153 -#define IDS_MEMORY_READ_ONLY 31154 -#define IDS_MEMORY_WRITE_ONLY 31155 -#define IDS_MEMORY_READ_WRITE 31156 - -#define IDS_BUS_UNDEFINED 31157 -#define IDS_BUS_INTERNAL 31158 -#define IDS_BUS_ISA 31159 -#define IDS_BUS_EISA 31160 -#define IDS_BUS_MICROCHANNEL 31161 -#define IDS_BUS_TURBOCHANNEL 31162 -#define IDS_BUS_PCIBUS 31163 -#define IDS_BUS_VMEBUS 31164 -#define IDS_BUS_NUBUS 31165 -#define IDS_BUS_PCMCIABUS 31166 -#define IDS_BUS_CBUS 31167 -#define IDS_BUS_MPIBUS 31168 -#define IDS_BUS_MPSABUS 31169 -#define IDS_BUS_PROCESSORINTERNAL 31170 -#define IDS_BUS_INTERNALPOWERBUS 31171 -#define IDS_BUS_PNPISABUS 31172 -#define IDS_BUS_PNPBUS 31173 -#define IDS_BUS_UNKNOWNTYPE 31174 +#define IDS_ACCESS_FULLCONTROL 31100 +#define IDS_ACCESS_READ 31101 +#define IDS_ACCESS_QUERYVALUE 31102 +#define IDS_ACCESS_SETVALUE 31103 +#define IDS_ACCESS_CREATESUBKEY 31104 +#define IDS_ACCESS_ENUMERATESUBKEYS 31105 +#define IDS_ACCESS_NOTIFY 31106 +#define IDS_ACCESS_CREATELINK 31107 +#define IDS_ACCESS_DELETE 31108 +#define IDS_ACCESS_WRITEDAC 31109 +#define IDS_ACCESS_WRITEOWNER 31110 +#define IDS_ACCESS_READCONTROL 31111 + +#define IDS_INHERIT_THISKEYONLY 31200 +#define IDS_INHERIT_THISKEYANDSUBKEYS 31201 +#define IDS_INHERIT_SUBKEYSONLY 31202 +#define IDS_EXPAND 31203 +#define IDS_COLLAPSE 31204 +#define IDS_NEW_KEY 31205 +#define IDS_NEW_VALUE 31206 +#define IDS_GOTO_SUGGESTED_KEY 31207 + +#define IDS_IMPORT_PROMPT 31300 +#define IDS_IMPORT_OK 31301 +#define IDS_IMPORT_ERROR 31302 +#define IDS_EXPORT_ERROR 31303 + +#define IDS_FINISHEDFIND 31304 + +#define IDS_BUSNUMBER 31400 +#define IDS_INTERFACE 31401 + +#define IDS_DMA_CHANNEL 31500 +#define IDS_DMA_PORT 31501 +#define IDS_INTERRUPT_VECTOR 31502 +#define IDS_INTERRUPT_LEVEL 31503 +#define IDS_INTERRUPT_AFFINITY 31504 +#define IDS_INTERRUPT_TYPE 31505 +#define IDS_MEMORY_ADDRESS 31506 +#define IDS_MEMORY_LENGTH 31507 +#define IDS_MEMORY_ACCESS 31508 +#define IDS_PORT_ADDRESS 31509 +#define IDS_PORT_LENGTH 31510 +#define IDS_PORT_ACCESS 31511 +#define IDS_SPECIFIC_RESERVED1 31512 +#define IDS_SPECIFIC_RESERVED2 31513 +#define IDS_SPECIFIC_DATASIZE 31514 + +#define IDS_PORT_PORT_IO 31520 +#define IDS_PORT_MEMORY_IO 31521 +#define IDS_INTERRUPT_EDGE_SENSITIVE 31522 +#define IDS_INTERRUPT_LEVEL_SENSITIVE 31523 +#define IDS_MEMORY_READ_ONLY 31524 +#define IDS_MEMORY_WRITE_ONLY 31525 +#define IDS_MEMORY_READ_WRITE 31526 + +#define IDS_BUS_UNDEFINED 31530 +#define IDS_BUS_INTERNAL 31531 +#define IDS_BUS_ISA 31532 +#define IDS_BUS_EISA 31533 +#define IDS_BUS_MICROCHANNEL 31534 +#define IDS_BUS_TURBOCHANNEL 31535 +#define IDS_BUS_PCIBUS 31536 +#define IDS_BUS_VMEBUS 31537 +#define IDS_BUS_NUBUS 31538 +#define IDS_BUS_PCMCIABUS 31539 +#define IDS_BUS_CBUS 31540 +#define IDS_BUS_MPIBUS 31541 +#define IDS_BUS_MPSABUS 31542 +#define IDS_BUS_PROCESSORINTERNAL 31543 +#define IDS_BUS_INTERNALPOWERBUS 31544 +#define IDS_BUS_PNPISABUS 31545 +#define IDS_BUS_PNPBUS 31546 +#define IDS_BUS_UNKNOWNTYPE 31547 #define IDD_EDIT_STRING 2000 #define IDC_VALUE_NAME 2001 Modified: trunk/reactos/base/applications/regedit/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/settings.c [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -129,8 +129,13 @@ if (keyPath) { rootName = get_root_key_name(hRootKey); - _snwprintf(szBuffer, COUNT_OF(szBuffer), L"My Computer\\%s\\%s", rootName, keyPath); - RegSetValueExW(hKey, L"LastKey", 0, REG_SZ, (LPBYTE) szBuffer, (DWORD)wcslen(szBuffer) * sizeof(WCHAR)); + + /* Load "My Computer" string and complete it */ + LoadStringW(hInst, IDS_MY_COMPUTER, szBuffer, COUNT_OF(szBuffer)); + wcscat(szBuffer, L"\\"); wcscat(szBuffer, rootName); + wcscat(szBuffer, L"\\"); wcscat(szBuffer, keyPath); + + RegSetValueExW(hKey, L"LastKey", 0, REG_SZ, (LPBYTE)szBuffer, (DWORD)wcslen(szBuffer) * sizeof(WCHAR)); } /* Get statusbar settings */ Modified: trunk/reactos/base/applications/regedit/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/treeview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/treeview.c [iso-8859-1] Fri Oct 5 20:08:16 2012 @@ -601,9 +601,7 @@ } else if (!hNewKey) { - WCHAR sz[256]; - wsprintf(sz, L"Cannot create new key!\n\nError Code: %d", nResult); - MessageBoxW(hFrameWnd, sz, NULL, MB_ICONERROR); + InfoMessageBox(hFrameWnd, MB_OK | MB_ICONERROR, NULL, L"Cannot create new key!\n\nError Code: %d", nResult); goto done; } } @@ -668,9 +666,16 @@ LPCWSTR s; TVITEM tvi; - /* Total no-good hack */ - if (!_wcsnicmp(keyPath, L"My Computer\\", 12)) - keyPath += 12; + /* Load "My Computer" string... */ + LoadStringW(hInst, IDS_MY_COMPUTER, szBuffer, COUNT_OF(szBuffer)); + wcscat(szBuffer, L"\\"); + + /* ... and remove it from the key path */ + if (!_wcsnicmp(keyPath, szBuffer, wcslen(szBuffer))) + keyPath += wcslen(szBuffer); + + /* Reinitialize szBuffer */ + szBuffer[0] = L'\0'; hRoot = TreeView_GetRoot(hwndTV); hItem = hRoot;

1 0

[ekohl] 57489: [LSASRV] - Change LsapLookupSids to match LsarLookupSids2 and LsarLookupSids3. - Implement LsarLookupSids2 and LsarLookupSids3. - Update the call to LsapLookupSids in LsarLookupSids ...
by ekohl＠svn.reactos.org 05 Oct '12

05 Oct '12

Author: ekohl Date: Fri Oct 5 19:41:14 2012 New Revision: 57489 URL: http://svn.reactos.org/svn/reactos?rev=57489&view=rev Log: [LSASRV] - Change LsapLookupSids to match LsarLookupSids2 and LsarLookupSids3. - Implement LsarLookupSids2 and LsarLookupSids3. - Update the call to LsapLookupSids in LsarLookupSids and convert the translated names list after calling LsapLookupSids. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/sids.c 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] Fri Oct 5 19:41:14 2012 @@ -647,23 +647,49 @@ LSAP_LOOKUP_LEVEL LookupLevel, DWORD *MappedCount) { + LSAPR_TRANSLATED_NAMES_EX TranslatedNamesEx; + ULONG i; NTSTATUS Status; - TRACE("LsarLookupSids(%p, %p, %p, %p, %d, %p)\n", + TRACE("(%p %p %p %p %d %p)\n", PolicyHandle, SidEnumBuffer, ReferencedDomains, TranslatedNames, LookupLevel, MappedCount); + /* FIXME: Fail, if there is an invalid SID in the SidEnumBuffer */ + TranslatedNames->Entries = SidEnumBuffer->Entries; - TranslatedNames->Names = NULL; + TranslatedNames->Names = MIDL_user_allocate(SidEnumBuffer->Entries * sizeof(LSAPR_TRANSLATED_NAME)); + if (TranslatedNames->Names == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + *ReferencedDomains = NULL; - /* FIXME: Fail, if there is an invalid SID in the SidEnumBuffer */ + TranslatedNamesEx.Entries = SidEnumBuffer->Entries; + TranslatedNamesEx.Names = NULL;; Status = LsapLookupSids(SidEnumBuffer, ReferencedDomains, - TranslatedNames, + &TranslatedNamesEx, LookupLevel, - MappedCount); + MappedCount, + 0, + 0); + if (!NT_SUCCESS(Status)) + { + MIDL_user_free(TranslatedNamesEx.Names); + return Status; + } + + for (i = 0; i < TranslatedNamesEx.Entries; i++) + { + TranslatedNames->Names[i].Use = TranslatedNamesEx.Names[i].Use; + TranslatedNames->Names[i].Name.Length = TranslatedNamesEx.Names[i].Name.Length; + TranslatedNames->Names[i].Name.MaximumLength = TranslatedNamesEx.Names[i].Name.MaximumLength; + TranslatedNames->Names[i].Name.Buffer = TranslatedNamesEx.Names[i].Name.Buffer; + TranslatedNames->Names[i].DomainIndex = TranslatedNamesEx.Names[i].DomainIndex; + } + + MIDL_user_free(TranslatedNamesEx.Names); return Status; } @@ -1915,8 +1941,27 @@ DWORD LookupOptions, DWORD ClientRevision) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + + TRACE("(%p %p %p %p %d %p %lu %lu)\n", + PolicyHandle, SidEnumBuffer, ReferencedDomains, TranslatedNames, + LookupLevel, MappedCount, LookupOptions, ClientRevision); + + TranslatedNames->Entries = SidEnumBuffer->Entries; + TranslatedNames->Names = NULL; + *ReferencedDomains = NULL; + + /* FIXME: Fail, if there is an invalid SID in the SidEnumBuffer */ + + Status = LsapLookupSids(SidEnumBuffer, + ReferencedDomains, + TranslatedNames, + LookupLevel, + MappedCount, + LookupOptions, + ClientRevision); + + return Status; } @@ -2142,8 +2187,27 @@ DWORD LookupOptions, DWORD ClientRevision) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + + TRACE("(%p %p %p %p %d %p %lu %lu)\n", + PolicyHandle, SidEnumBuffer, ReferencedDomains, TranslatedNames, + LookupLevel, MappedCount, LookupOptions, ClientRevision); + + TranslatedNames->Entries = SidEnumBuffer->Entries; + TranslatedNames->Names = NULL; + *ReferencedDomains = NULL; + + /* FIXME: Fail, if there is an invalid SID in the SidEnumBuffer */ + + Status = LsapLookupSids(SidEnumBuffer, + ReferencedDomains, + TranslatedNames, + LookupLevel, + MappedCount, + LookupOptions, + ClientRevision); + + 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] Fri Oct 5 19:41:14 2012 @@ -205,8 +205,10 @@ NTSTATUS LsapLookupSids(PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, - PLSAPR_TRANSLATED_NAMES TranslatedNames, + PLSAPR_TRANSLATED_NAMES_EX TranslatedNames, LSAP_LOOKUP_LEVEL LookupLevel, - DWORD *MappedCount); + DWORD *MappedCount, + DWORD LookupOptions, + DWORD ClientRevision); /* EOF */ Modified: trunk/reactos/dll/win32/lsasrv/sids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/sids.c?re… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] Fri Oct 5 19:41:14 2012 @@ -1009,12 +1009,14 @@ NTSTATUS LsapLookupSids(PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, - PLSAPR_TRANSLATED_NAMES TranslatedNames, + PLSAPR_TRANSLATED_NAMES_EX TranslatedNames, LSAP_LOOKUP_LEVEL LookupLevel, - DWORD *MappedCount) + DWORD *MappedCount, + DWORD LookupOptions, + DWORD ClientRevision) { PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer = NULL; - PLSAPR_TRANSLATED_NAME NamesBuffer = NULL; + PLSAPR_TRANSLATED_NAME_EX NamesBuffer = NULL; ULONG NamesBufferLength; ULONG DomainIndex; ULONG i; @@ -1030,7 +1032,7 @@ ULONG SidLength; - NamesBufferLength = SidEnumBuffer->Entries * sizeof(LSA_TRANSLATED_NAME); + NamesBufferLength = SidEnumBuffer->Entries * sizeof(LSAPR_TRANSLATED_NAME_EX); NamesBuffer = MIDL_user_allocate(NamesBufferLength); if (NamesBuffer == NULL) { @@ -1063,6 +1065,7 @@ NamesBuffer[i].Name.MaximumLength = 0; NamesBuffer[i].Name.Buffer = NULL; NamesBuffer[i].DomainIndex = -1; + NamesBuffer[i].Flags = 0; } @@ -1085,6 +1088,7 @@ if (ptr != NULL) { NamesBuffer[i].Use = ptr->Use; + NamesBuffer[i].Flags = 0; NamesBuffer[i].Name.Buffer = MIDL_user_allocate(ptr->Name.MaximumLength); NamesBuffer[i].Name.Length = ptr->Name.Length; @@ -1109,6 +1113,7 @@ /* Hack: Map the SID to the Admin Account if it is not a well-known SID */ NamesBuffer[i].Use = SidTypeWellKnownGroup; + NamesBuffer[i].Flags = 0; NamesBuffer[i].Name.Length = AdminName.Length; NamesBuffer[i].Name.MaximumLength = AdminName.MaximumLength; NamesBuffer[i].Name.Buffer = MIDL_user_allocate(AdminName.MaximumLength);

1 0

[ekohl] 57488: [LSASRV] - Move most of the code from LsarLookupSids into LsapLookupSids. - Use the code from LsapLookupNames to handle the referenced domains list in LsapLookupSids.
by ekohl＠svn.reactos.org 05 Oct '12

05 Oct '12

Author: ekohl Date: Fri Oct 5 17:34:23 2012 New Revision: 57488 URL: http://svn.reactos.org/svn/reactos?rev=57488&view=rev Log: [LSASRV] - Move most of the code from LsarLookupSids into LsapLookupSids. - Use the code from LsapLookupNames to handle the referenced domains list in LsapLookupSids. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/sids.c 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] Fri Oct 5 17:34:23 2012 @@ -647,14 +647,6 @@ LSAP_LOOKUP_LEVEL LookupLevel, DWORD *MappedCount) { - SID_IDENTIFIER_AUTHORITY IdentifierAuthority = {SECURITY_NT_AUTHORITY}; - static const UNICODE_STRING DomainName = RTL_CONSTANT_STRING(L"DOMAIN"); - PLSAPR_REFERENCED_DOMAIN_LIST OutputDomains = NULL; - PLSAPR_TRANSLATED_NAME OutputNames = NULL; - ULONG OutputNamesLength; - ULONG i; - PSID Sid; - ULONG SidLength; NTSTATUS Status; TRACE("LsarLookupSids(%p, %p, %p, %p, %d, %p)\n", @@ -665,67 +657,13 @@ TranslatedNames->Names = NULL; *ReferencedDomains = NULL; - OutputNamesLength = SidEnumBuffer->Entries * sizeof(LSA_TRANSLATED_NAME); - OutputNames = MIDL_user_allocate(OutputNamesLength); - if (OutputNames == NULL) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlZeroMemory(OutputNames, OutputNamesLength); - - OutputDomains = MIDL_user_allocate(sizeof(LSAPR_REFERENCED_DOMAIN_LIST)); - if (OutputDomains == NULL) - { - MIDL_user_free(OutputNames); - return STATUS_INSUFFICIENT_RESOURCES; - } - - OutputDomains->Entries = SidEnumBuffer->Entries; - OutputDomains->Domains = MIDL_user_allocate(SidEnumBuffer->Entries * sizeof(LSA_TRUST_INFORMATION)); - if (OutputDomains->Domains == NULL) - { - MIDL_user_free(OutputDomains); - MIDL_user_free(OutputNames); - return STATUS_INSUFFICIENT_RESOURCES; - } - - Status = RtlAllocateAndInitializeSid(&IdentifierAuthority, - 2, - SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - 0, 0, 0, 0, 0, 0, - &Sid); - if (!NT_SUCCESS(Status)) - { - MIDL_user_free(OutputDomains->Domains); - MIDL_user_free(OutputDomains); - MIDL_user_free(OutputNames); - return Status; - } - - SidLength = RtlLengthSid(Sid); - - for (i = 0; i < SidEnumBuffer->Entries; i++) - { - OutputDomains->Domains[i].Sid = MIDL_user_allocate(SidLength); - RtlCopyMemory(OutputDomains->Domains[i].Sid, Sid, SidLength); - - OutputDomains->Domains[i].Name.Buffer = MIDL_user_allocate(DomainName.MaximumLength); - OutputDomains->Domains[i].Name.Length = DomainName.Length; - OutputDomains->Domains[i].Name.MaximumLength = DomainName.MaximumLength; - RtlCopyMemory(OutputDomains->Domains[i].Name.Buffer, DomainName.Buffer, DomainName.MaximumLength); - } + /* FIXME: Fail, if there is an invalid SID in the SidEnumBuffer */ Status = LsapLookupSids(SidEnumBuffer, - OutputNames); - - *ReferencedDomains = OutputDomains; - - *MappedCount = SidEnumBuffer->Entries; - - TranslatedNames->Entries = SidEnumBuffer->Entries; - TranslatedNames->Names = OutputNames; + ReferencedDomains, + TranslatedNames, + LookupLevel, + MappedCount); 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] Fri Oct 5 17:34:23 2012 @@ -193,10 +193,6 @@ LsapInitSids(VOID); NTSTATUS -LsapLookupSids(PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, - PLSAPR_TRANSLATED_NAME OutputNames); - -NTSTATUS LsapLookupNames(DWORD Count, PRPC_UNICODE_STRING Names, PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, @@ -206,4 +202,11 @@ DWORD LookupOptions, DWORD ClientRevision); +NTSTATUS +LsapLookupSids(PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, + PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, + PLSAPR_TRANSLATED_NAMES TranslatedNames, + LSAP_LOOKUP_LEVEL LookupLevel, + DWORD *MappedCount); + /* EOF */ Modified: trunk/reactos/dll/win32/lsasrv/sids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/sids.c?re… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] Fri Oct 5 17:34:23 2012 @@ -161,7 +161,7 @@ PULONG p; ULONG i; - SidEntry = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(WELL_KNOWN_SID)); + SidEntry = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WELL_KNOWN_SID)); if (SidEntry == NULL) return FALSE; @@ -204,9 +204,17 @@ NTSTATUS LsapInitSids(VOID) { - ULONG SubAuthorities[5]; + ULONG SubAuthorities[8]; InitializeListHead(&WellKnownSidListHead); + + /* NT Authority */ + LsapCreateSid(&NtAuthority, + 0, + NULL, + L"NT AUTHORITY", + L"NT AUTHORITY", + SidTypeDomain); /* Null Sid */ SubAuthorities[0] = SECURITY_NULL_RID; @@ -270,14 +278,6 @@ L"CREATOR GROUP SERVER", L"", SidTypeWellKnownGroup); - - /* NT Domain Sid */ - LsapCreateSid(&NtAuthority, - 0, - NULL, - L"NT AUTHORITY", - L"NT AUTHORITY", - SidTypeDomain); /* Dialup Sid */ SubAuthorities[0] = SECURITY_DIALUP_RID; @@ -603,78 +603,6 @@ } -NTSTATUS -LsapLookupSids(PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, - PLSAPR_TRANSLATED_NAME OutputNames) -{ - static const UNICODE_STRING UserName = RTL_CONSTANT_STRING(L"Administrator"); - PWELL_KNOWN_SID ptr; - ULONG Mapped = 0; - ULONG i; - NTSTATUS Status; - - PSID *Sids = (PSID *) SidEnumBuffer->SidInfo; - -TRACE("LsapLookupSids(%p, %p)\n", SidEnumBuffer, OutputNames); -TRACE("SidEnumBuffer->Entries: %lu\n", SidEnumBuffer->Entries); -TRACE("SidEnumBuffer->SidInfo: %p\n", SidEnumBuffer->SidInfo); - - for (i = 0; i < SidEnumBuffer->Entries; i++) - { -TRACE("i: %lu\n", i); - ptr = LsapLookupWellKnownSid(Sids[i]); - if (ptr != NULL) - { - OutputNames[i].Use = ptr->Use; - - OutputNames[i].DomainIndex = i; /* Fixme */ - - OutputNames[i].Name.Buffer = MIDL_user_allocate(ptr->Name.MaximumLength); - OutputNames[i].Name.Length = ptr->Name.Length; - OutputNames[i].Name.MaximumLength = ptr->Name.MaximumLength; - RtlCopyMemory(OutputNames[i].Name.Buffer, ptr->Name.Buffer, ptr->Name.MaximumLength); - - Mapped++; - continue; - } - - /* Check for buildin domain SID */ - - /* Check for account domain SID */ - - /* Check for primary domain SID (later) */ - - /* Check for trusted domain SID (later) */ - - /* Check for builtin domain account SID */ - - /* Check for account domain account SID */ - - /* Check for primary domain account SID (later) */ - - - /* Unknown SID */ - OutputNames[i].Use = SidTypeWellKnownGroup; - OutputNames[i].DomainIndex = i; - OutputNames[i].Name.Buffer = MIDL_user_allocate(UserName.MaximumLength); - OutputNames[i].Name.Length = UserName.Length; - OutputNames[i].Name.MaximumLength = UserName.MaximumLength; - RtlCopyMemory(OutputNames[i].Name.Buffer, UserName.Buffer, UserName.MaximumLength); - - Mapped++; - } - - if (Mapped == 0) - Status = STATUS_NONE_MAPPED; - else if (Mapped < SidEnumBuffer->Entries) - Status = STATUS_SOME_NOT_MAPPED; - else - Status = STATUS_SUCCESS; - - return Status; -} - - PWELL_KNOWN_SID LsapLookupWellKnownName(PUNICODE_STRING Name) { @@ -688,7 +616,9 @@ WELL_KNOWN_SID, ListEntry); if (RtlEqualUnicodeString(Name, &Ptr->Name, TRUE)) + { return Ptr; + } ListEntry = ListEntry->Flink; } @@ -1075,4 +1005,160 @@ return Status; } + +NTSTATUS +LsapLookupSids(PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, + PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, + PLSAPR_TRANSLATED_NAMES TranslatedNames, + LSAP_LOOKUP_LEVEL LookupLevel, + DWORD *MappedCount) +{ + PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer = NULL; + PLSAPR_TRANSLATED_NAME NamesBuffer = NULL; + ULONG NamesBufferLength; + ULONG DomainIndex; + ULONG i; + ULONG Mapped = 0; + NTSTATUS Status = STATUS_SUCCESS; + + PWELL_KNOWN_SID ptr, ptr2; + + SID_IDENTIFIER_AUTHORITY IdentifierAuthority = {SECURITY_NT_AUTHORITY}; + static const UNICODE_STRING DomainName = RTL_CONSTANT_STRING(L"DOMAIN"); + static const UNICODE_STRING AdminName = RTL_CONSTANT_STRING(L"Administrator"); + PSID AdminsSid = NULL; + ULONG SidLength; + + + NamesBufferLength = SidEnumBuffer->Entries * sizeof(LSA_TRANSLATED_NAME); + NamesBuffer = MIDL_user_allocate(NamesBufferLength); + if (NamesBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + DomainsBuffer = MIDL_user_allocate(sizeof(LSAPR_REFERENCED_DOMAIN_LIST)); + if (DomainsBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + DomainsBuffer->Domains = MIDL_user_allocate(SidEnumBuffer->Entries * sizeof(LSA_TRUST_INFORMATION)); + if (DomainsBuffer->Domains == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + DomainsBuffer->Entries = 0; + DomainsBuffer->MaxEntries = SidEnumBuffer->Entries; + + /* Initialize all name entries */ + for (i = 0; i < SidEnumBuffer->Entries; i++) + { + NamesBuffer[i].Use = SidTypeUnknown; + NamesBuffer[i].Name.Length = 0; + NamesBuffer[i].Name.MaximumLength = 0; + NamesBuffer[i].Name.Buffer = NULL; + NamesBuffer[i].DomainIndex = -1; + } + + + Status = RtlAllocateAndInitializeSid(&IdentifierAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, 0, 0, 0, 0, 0, + &AdminsSid); + if (!NT_SUCCESS(Status)) + goto done; + + + SidLength = RtlLengthSid(AdminsSid); + + + for (i = 0; i < SidEnumBuffer->Entries; i++) + { + ptr = LsapLookupWellKnownSid(SidEnumBuffer->SidInfo[i].Sid); + if (ptr != NULL) + { + NamesBuffer[i].Use = ptr->Use; + + NamesBuffer[i].Name.Buffer = MIDL_user_allocate(ptr->Name.MaximumLength); + NamesBuffer[i].Name.Length = ptr->Name.Length; + NamesBuffer[i].Name.MaximumLength = ptr->Name.MaximumLength; + RtlCopyMemory(NamesBuffer[i].Name.Buffer, ptr->Name.Buffer, ptr->Name.MaximumLength); + + ptr2= LsapLookupWellKnownName(&ptr->Domain); + if (ptr2 != NULL) + { + Status = LsapAddDomainToDomainsList(DomainsBuffer, + &ptr2->Name, + ptr2->Sid, + &DomainIndex); + if (NT_SUCCESS(Status)) + NamesBuffer[i].DomainIndex = DomainIndex; + } + + Mapped++; + continue; + } + + + /* Hack: Map the SID to the Admin Account if it is not a well-known SID */ + NamesBuffer[i].Use = SidTypeWellKnownGroup; + NamesBuffer[i].Name.Length = AdminName.Length; + NamesBuffer[i].Name.MaximumLength = AdminName.MaximumLength; + NamesBuffer[i].Name.Buffer = MIDL_user_allocate(AdminName.MaximumLength); + RtlCopyMemory(NamesBuffer[i].Name.Buffer, AdminName.Buffer, AdminName.MaximumLength); + + Status = LsapAddDomainToDomainsList(DomainsBuffer, + (PUNICODE_STRING)&DomainName, + AdminsSid, + &DomainIndex); + if (NT_SUCCESS(Status)) + NamesBuffer[i].DomainIndex = DomainIndex; + + Mapped++; + continue; + + + } + +done: + if (AdminsSid != NULL) + RtlFreeSid(AdminsSid); + + + if (!NT_SUCCESS(Status)) + { + if (DomainsBuffer != NULL) + { + if (DomainsBuffer->Domains != NULL) + MIDL_user_free(DomainsBuffer->Domains); + + MIDL_user_free(DomainsBuffer); + } + + if (NamesBuffer != NULL) + MIDL_user_free(NamesBuffer); + } + else + { + *ReferencedDomains = DomainsBuffer; + TranslatedNames->Entries = SidEnumBuffer->Entries; + TranslatedNames->Names = NamesBuffer; + *MappedCount = Mapped; + + if (Mapped == 0) + Status = STATUS_NONE_MAPPED; + else if (Mapped < SidEnumBuffer->Entries) + Status = STATUS_SOME_NOT_MAPPED; + } + + return Status; +} + /* EOF */

1 0

[ion] 57487: [RTL]: Fix typo in RtlValidAcl.
by ion＠svn.reactos.org 05 Oct '12

05 Oct '12

Author: ion Date: Fri Oct 5 15:20:10 2012 New Revision: 57487 URL: http://svn.reactos.org/svn/reactos?rev=57487&view=rev Log: [RTL]: Fix typo in RtlValidAcl. Modified: trunk/reactos/lib/rtl/acl.c Modified: trunk/reactos/lib/rtl/acl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/acl.c?rev=57487&r1… ============================================================================== --- trunk/reactos/lib/rtl/acl.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/acl.c [iso-8859-1] Fri Oct 5 15:20:10 2012 @@ -932,8 +932,8 @@ { DPRINT1("Unsupported ACE in ReactOS, assuming valid\n"); } - else if ((Ace->AceType >= ACCESS_MIN_MS_ACE_TYPE) || - (Ace->AceType <= ACCESS_MAX_MS_V2_ACE_TYPE)) + else if ((Ace->AceType >= ACCESS_MIN_MS_OBJECT_ACE_TYPE) || + (Ace->AceType <= ACCESS_MAX_MS_OBJECT_ACE_TYPE)) { DPRINT1("Unsupported ACE in ReactOS, assuming valid\n"); }

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