Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 25008: stubed Main_DirectDraw_SetCooperativeLevel it need be rewrite
by greatlrd＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: greatlrd Date: Fri Dec 1 00:43:07 2006 New Revision: 25008 URL: http://svn.reactos.org/svn/reactos?rev=25008&view=rev Log: stubed Main_DirectDraw_SetCooperativeLevel it need be rewrite Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Fri Dec 1 00:43:07 2006 @@ -207,11 +207,15 @@ return CLASS_E_NOAGGREGATION; } + DX_STUB_str("ok pUnkOuter == NULL"); + if (sizeof(DDSURFACEDESC2)!=pDDSD->dwSize && sizeof(DDSURFACEDESC)!=pDDSD->dwSize) { return DDERR_UNSUPPORTED; } + DX_STUB_str("ok pDDSD->dwSize ok"); + That = (LPDDRAWI_DDRAWSURFACE_INT)DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_INT)); if (That == NULL) @@ -219,12 +223,22 @@ return E_OUTOFMEMORY; } + DX_STUB_str("That got memory"); + That->lpVtbl = &DirectDrawSurface7_Vtable; + + DX_STUB_str("That->lpVtbl ok"); + *ppSurf = (LPDIRECTDRAWSURFACE7)That; + + DX_STUB_str("*ppSurf ok"); That->lpLcl->lpGbl = &ddSurfGbl; + DX_STUB_str("ddSurfGbl ok"); + That->lpLcl->lpGbl->lpDD = &ddgbl; + DX_STUB_str("crash one line below : why ? to tried figout lpDD ok"); Main_DDrawSurface_AddRef((LPDIRECTDRAWSURFACE7)That); @@ -248,17 +262,22 @@ pDDSD->ddsCaps.dwCaps = DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY; } + if (pDDSD->ddsCaps.dwCaps & DDSCAPS_ALLOCONLOAD) { /* If the surface is of the 'alloconload' type, ignore the LPSURFACE field */ pDDSD->dwFlags &= ~DDSD_LPSURFACE; } + DX_STUB_str("pDDSD->ddsCaps.dwCaps ok"); + if ((pDDSD->dwFlags & DDSD_LPSURFACE) && (pDDSD->lpSurface == NULL)) { /* Frank Herbert's Dune specifies a null pointer for the surface, ignore the LPSURFACE field */ pDDSD->dwFlags &= ~DDSD_LPSURFACE; } + + DX_STUB_str("pDDSD->dwFlags ok"); /* own code now */ @@ -292,6 +311,7 @@ DX_STUB_str( "Can not create offscreenplain surface"); } + DX_STUB_str("DDERR_INVALIDSURFACETYPE"); return DDERR_INVALIDSURFACETYPE; } @@ -726,48 +746,49 @@ - LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; - DDHAL_SETEXCLUSIVEMODEDATA SetExclusiveMode; - - DX_WINDBG_trace(); - - - // check the parameters - if ((HWND)This->lpLcl->lpGbl->lpExclusiveOwner->hWnd == hwnd) - return DD_OK; - - - - if ((cooplevel&DDSCL_EXCLUSIVE) && !(cooplevel&DDSCL_FULLSCREEN)) - return DDERR_INVALIDPARAMS; - - if (cooplevel&DDSCL_NORMAL && cooplevel&DDSCL_FULLSCREEN) - return DDERR_INVALIDPARAMS; - - // set the data - This->lpLcl->lpGbl->lpExclusiveOwner->hWnd = (ULONG_PTR) hwnd; - This->lpLcl->lpGbl->lpExclusiveOwner->hDC = (ULONG_PTR)GetDC(hwnd); - - - /* FIXME : fill the mDDrawGlobal.lpExclusiveOwner->dwLocalFlags right */ - //mDDrawGlobal.lpExclusiveOwner->dwLocalFlags - - - SetExclusiveMode.ddRVal = DDERR_NOTPALETTIZED; - if ((This->lpLcl->lpGbl->lpDDCBtmp->cbDDCallbacks.dwFlags & DDHAL_CB32_SETEXCLUSIVEMODE)) - { - - SetExclusiveMode.SetExclusiveMode = This->lpLcl->lpGbl->lpDDCBtmp->cbDDCallbacks.SetExclusiveMode; - SetExclusiveMode.lpDD = This->lpLcl->lpGbl; - SetExclusiveMode.dwEnterExcl = cooplevel; - - if (SetExclusiveMode.SetExclusiveMode(&SetExclusiveMode) != DDHAL_DRIVER_HANDLED) - { - return DDERR_NODRIVERSUPPORT; - } - } - - return SetExclusiveMode.ddRVal; + // LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + // DDHAL_SETEXCLUSIVEMODEDATA SetExclusiveMode; + + //DX_WINDBG_trace(); + // + // + // // check the parameters + // if ((HWND)This->lpLcl->lpGbl->lpExclusiveOwner->hWnd == hwnd) + // return DD_OK; + // + // + + // if ((cooplevel&DDSCL_EXCLUSIVE) && !(cooplevel&DDSCL_FULLSCREEN)) + // return DDERR_INVALIDPARAMS; + + // if (cooplevel&DDSCL_NORMAL && cooplevel&DDSCL_FULLSCREEN) + // return DDERR_INVALIDPARAMS; + + // // set the data + // This->lpLcl->lpGbl->lpExclusiveOwner->hWnd = (ULONG_PTR) hwnd; + // This->lpLcl->lpGbl->lpExclusiveOwner->hDC = (ULONG_PTR)GetDC(hwnd); + + // + ///* FIXME : fill the mDDrawGlobal.lpExclusiveOwner->dwLocalFlags right */ + ////mDDrawGlobal.lpExclusiveOwner->dwLocalFlags + + + // SetExclusiveMode.ddRVal = DDERR_NOTPALETTIZED; + //if ((This->lpLcl->lpGbl->lpDDCBtmp->cbDDCallbacks.dwFlags & DDHAL_CB32_SETEXCLUSIVEMODE)) + // { + // + // SetExclusiveMode.SetExclusiveMode = This->lpLcl->lpGbl->lpDDCBtmp->cbDDCallbacks.SetExclusiveMode; + // SetExclusiveMode.lpDD = This->lpLcl->lpGbl; + // SetExclusiveMode.dwEnterExcl = cooplevel; + + // if (SetExclusiveMode.SetExclusiveMode(&SetExclusiveMode) != DDHAL_DRIVER_HANDLED) + // { + // return DDERR_NODRIVERSUPPORT; + // } + // } + // + // return SetExclusiveMode.ddRVal; + DX_STUB_DD_OK; } /*

1 0

[greatlrd] 25007: fixing stub of drvsetcolorkey
by greatlrd＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: greatlrd Date: Fri Dec 1 00:04:09 2006 New Revision: 25007 URL: http://svn.reactos.org/svn/reactos?rev=25007&view=rev Log: fixing stub of drvsetcolorkey Modified: trunk/reactos/dll/directx/ddraw/callbacks_hel.c trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/callbacks_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/callback… ============================================================================== --- trunk/reactos/dll/directx/ddraw/callbacks_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/callbacks_hel.c Fri Dec 1 00:04:09 2006 @@ -29,7 +29,7 @@ } -DWORD CALLBACK HelDdSetColorKey(LPDDHAL_SETCOLORKEYDATA lpSetColorKey) +DWORD CALLBACK HelDdSetColorKey(LPDDHAL_DRVSETCOLORKEYDATA lpDrvSetColorKey) { DX_STUB; } Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Fri Dec 1 00:04:09 2006 @@ -562,7 +562,7 @@ /* HEL CALLBACK */ DWORD CALLBACK HelDdDestroyDriver(LPDDHAL_DESTROYDRIVERDATA lpDestroyDriver); DWORD CALLBACK HelDdCreateSurface(LPDDHAL_CREATESURFACEDATA lpCreateSurface); -DWORD CALLBACK HelDdSetColorKey(LPDDHAL_SETCOLORKEYDATA lpSetColorKey); +DWORD CALLBACK HelDdSetColorKey(LPDDHAL_DRVSETCOLORKEYDATA lpSetColorKey); DWORD CALLBACK HelDdSetMode(LPDDHAL_SETMODEDATA SetMode); DWORD CALLBACK HelDdWaitForVerticalBlank(LPDDHAL_WAITFORVERTICALBLANKDATA lpWaitForVerticalBlank); DWORD CALLBACK HelDdCanCreateSurface(LPDDHAL_CANCREATESURFACEDATA lpCanCreateSurface); Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Fri Dec 1 00:04:09 2006 @@ -798,10 +798,12 @@ This->lpLcl->lpDDCB->HELDD.DestroyDriver = HelDdDestroyDriver; This->lpLcl->lpDDCB->HELDD.FlipToGDISurface = HelDdFlipToGDISurface; This->lpLcl->lpDDCB->HELDD.GetScanLine = HelDdGetScanLine; - //This->lpLcl->lpDDCB->HELDD.SetColorKey = HelDdSetColorKey; + This->lpLcl->lpDDCB->HELDD.SetColorKey = HelDdSetColorKey; This->lpLcl->lpDDCB->HELDD.SetExclusiveMode = HelDdSetExclusiveMode; This->lpLcl->lpDDCB->HELDD.SetMode = HelDdSetMode; This->lpLcl->lpDDCB->HELDD.WaitForVerticalBlank = HelDdWaitForVerticalBlank; + + This->lpLcl->lpDDCB->HELDD.dwFlags = DDHAL_CB32_CANCREATESURFACE | DDHAL_CB32_CREATESURFACE | @@ -809,7 +811,7 @@ DDHAL_CB32_DESTROYDRIVER | DDHAL_CB32_FLIPTOGDISURFACE | DDHAL_CB32_GETSCANLINE | - //DDHAL_CB32_SETCOLORKEY | + DDHAL_CB32_SETCOLORKEY | DDHAL_CB32_SETEXCLUSIVEMODE | DDHAL_CB32_SETMODE | DDHAL_CB32_WAITFORVERTICALBLANK ;

1 0

[janderwald] 25006: - bye bye fixdef
by janderwald＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: janderwald Date: Thu Nov 30 23:57:52 2006 New Revision: 25006 URL: http://svn.reactos.org/svn/reactos?rev=25006&view=rev Log: - bye bye fixdef Removed: trunk/reactos/tools/fixdef/ Modified: trunk/reactos/tools/tools.mak Modified: trunk/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=25006&… ============================================================================== --- trunk/reactos/tools/tools.mak (original) +++ trunk/reactos/tools/tools.mak Thu Nov 30 23:57:52 2006 @@ -59,5 +59,4 @@ include tools/wpp/wpp.mak include tools/wrc/wrc.mak include tools/sysreg/sysreg.mak -include tools/dbgprint/dbgprint.mak -include tools/fixdef/fixdef.mak +include tools/dbgprint/dbgprint.mak

1 0

[ion] 25005: - Fix a bug in DbgkCreateThread which wasn't saving the initial thread information in the right place. The process create event is now fully supported and properly returns the entrypoint of the application.
by ion＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: ion Date: Thu Nov 30 23:46:48 2006 New Revision: 25005 URL: http://svn.reactos.org/svn/reactos?rev=25005&view=rev Log: - Fix a bug in DbgkCreateThread which wasn't saving the initial thread information in the right place. The process create event is now fully supported and properly returns the entrypoint of the application. Modified: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c Modified: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkutil.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkutil.c (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkutil.c Thu Nov 30 23:46:48 2006 @@ -178,8 +178,8 @@ if (!(ProcessFlags & PSF_CREATE_REPORTED_BIT)) { /* Setup the information structure for the new thread */ - CreateThread->SubSystemKey = 0; - CreateThread->StartAddress = NULL; + CreateProcess->InitialThread.SubSystemKey = 0; + CreateProcess->InitialThread.StartAddress = NULL; /* And for the new process */ CreateProcess->SubSystemKey = 0; @@ -194,10 +194,9 @@ if (NtHeader) { /* Fill out data from the header */ - CreateThread->StartAddress = (PVOID)((ULONG_PTR)NtHeader-> - OptionalHeader.ImageBase + - NtHeader->OptionalHeader. - AddressOfEntryPoint); + CreateProcess->InitialThread.StartAddress = + (PVOID)((ULONG_PTR)NtHeader->OptionalHeader.ImageBase + + NtHeader->OptionalHeader.AddressOfEntryPoint); CreateProcess->DebugInfoFileOffset = NtHeader->FileHeader. PointerToSymbolTable; CreateProcess->DebugInfoSize = NtHeader->FileHeader.

1 0

[ion] 25004: - Implement support for DEBUG_PROCESS in CreateProcess so that processes can be started with a debugger (works and tested with a new test app). - We still seem to be suffering from a bug during certain debug event waits.
by ion＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: ion Date: Thu Nov 30 23:37:21 2006 New Revision: 25004 URL: http://svn.reactos.org/svn/reactos?rev=25004&view=rev Log: - Implement support for DEBUG_PROCESS in CreateProcess so that processes can be started with a debugger (works and tested with a new test app). - We still seem to be suffering from a bug during certain debug event waits. Modified: trunk/reactos/dll/win32/kernel32/process/create.c trunk/reactos/ntoskrnl/dbgk/debug.c Modified: trunk/reactos/dll/win32/kernel32/process/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/create.c (original) +++ trunk/reactos/dll/win32/kernel32/process/create.c Thu Nov 30 23:37:21 2006 @@ -642,7 +642,7 @@ UNICODE_STRING ApplicationName = {0}; OBJECT_ATTRIBUTES LocalObjectAttributes; POBJECT_ATTRIBUTES ObjectAttributes; - HANDLE hSection = NULL, hProcess = NULL, hThread = NULL; + HANDLE hSection = NULL, hProcess = NULL, hThread = NULL, hDebug = NULL; SECTION_IMAGE_INFORMATION SectionImageInfo; LPWSTR CurrentDirectory = NULL; LPWSTR CurrentDirectoryPart; @@ -1101,7 +1101,7 @@ } /* FIXME: Check for Debugger */ - + /* FIXME: Check if Machine Type and SubSys Version Match */ /* We don't support POSIX or anything else for now */ @@ -1124,7 +1124,35 @@ ObjectAttributes = BasepConvertObjectAttributes(&LocalObjectAttributes, lpProcessAttributes, NULL); - + + /* Check if we're going to be debugged */ + if (dwCreationFlags & DEBUG_PROCESS) + { + /* FIXME: Set process flag */ + } + + /* Check if we're going to be debugged */ + if (dwCreationFlags & (DEBUG_PROCESS | DEBUG_ONLY_THIS_PROCESS)) + { + /* Connect to DbgUi */ + Status = DbgUiConnectToDbg(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to connect to DbgUI!\n"); + SetLastErrorByStatus(Status); + goto Cleanup; + } + + /* Get the debug object */ + hDebug = DbgUiGetThreadDebugObject(); + + /* Check if only this process will be debugged */ + if (dwCreationFlags & DEBUG_ONLY_THIS_PROCESS) + { + /* FIXME: Set process flag */ + } + } + /* Create the Process */ Status = NtCreateProcess(&hProcess, PROCESS_ALL_ACCESS, @@ -1132,7 +1160,7 @@ NtCurrentProcess(), bInheritHandles, hSection, - NULL, + hDebug, NULL); if(!NT_SUCCESS(Status)) { Modified: trunk/reactos/ntoskrnl/dbgk/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/debug.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/debug.c (original) +++ trunk/reactos/ntoskrnl/dbgk/debug.c Thu Nov 30 23:37:21 2006 @@ -329,6 +329,7 @@ PAGED_CODE(); DBGKTRACE(DBGK_EXCEPTION_DEBUG, "ExceptionRecord: %p Port: %p\n", ExceptionRecord, DebugPort); + KEBUGCHECK(0); /* Setup the API Message */ ApiMessage.h.u1.Length = sizeof(DBGKM_MSG) << 16 | @@ -339,7 +340,7 @@ /* Check if this is to be sent on the debug port */ if (DebugPort) { - /* Use the debug port, onless the thread is being hidden */ + /* Use the debug port, unless the thread is being hidden */ Port = PsGetCurrentThread()->HideFromDebugger ? NULL : Process->DebugPort; }

1 0

[ion] 25003: - Properly set and check the image notification flag for the process in DbgkCreateThread. Patch by hto. See issue #1879 for more details.
by ion＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: ion Date: Thu Nov 30 22:52:49 2006 New Revision: 25003 URL: http://svn.reactos.org/svn/reactos?rev=25003&view=rev Log: - Properly set and check the image notification flag for the process in DbgkCreateThread. Patch by hto. See issue #1879 for more details. Modified: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c trunk/reactos/ntoskrnl/tests/TestDebug.c Modified: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkutil.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkutil.c (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkutil.c Thu Nov 30 22:52:49 2006 @@ -104,10 +104,12 @@ PTEB Teb; PAGED_CODE(); - /* Check if this process has already been notified */ - ProcessFlags = InterlockedAnd((PLONG)&Process->Flags, - PSF_CREATE_REPORTED_BIT | - PSF_IMAGE_NOTIFY_DONE_BIT); + /* Try ORing in the create reported and image notify flags */ + ProcessFlags = InterlockedOr((PLONG)&Process->Flags, + PSF_CREATE_REPORTED_BIT | + PSF_IMAGE_NOTIFY_DONE_BIT); + + /* Check if we were the first to set them or if another thread raced us */ if (!(ProcessFlags & PSF_IMAGE_NOTIFY_DONE_BIT) && (PsImageNotifyEnabled)) { /* It hasn't.. set up the image info for the process */ Modified: trunk/reactos/ntoskrnl/tests/TestDebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/tests/TestDebug.c… ============================================================================== --- trunk/reactos/ntoskrnl/tests/TestDebug.c (original) +++ trunk/reactos/ntoskrnl/tests/TestDebug.c Thu Nov 30 22:52:49 2006 @@ -49,7 +49,7 @@ &ClientId); Status = DbgUiDebugActiveProcess(hProcess); #else - Error = DebugActiveProcess(2648); + Error = DebugActiveProcess(168); #endif #if NATIVE

1 0

[ion] 25002: - Fix various Dbgk bugs in the DbgUI and Win32 Debug wrapper APIs. - Win32 Debug test application now works as well as Native one. - The Dbgk framework still crashes on exceptions, I think.
by ion＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: ion Date: Thu Nov 30 22:38:04 2006 New Revision: 25002 URL: http://svn.reactos.org/svn/reactos?rev=25002&view=rev Log: - Fix various Dbgk bugs in the DbgUI and Win32 Debug wrapper APIs. - Win32 Debug test application now works as well as Native one. - The Dbgk framework still crashes on exceptions, I think. Modified: trunk/reactos/dll/ntdll/dbg/dbgui.c trunk/reactos/dll/win32/kernel32/debug/debugger.c Modified: trunk/reactos/dll/ntdll/dbg/dbgui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dbg/dbgui.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/dbg/dbgui.c (original) +++ trunk/reactos/dll/ntdll/dbg/dbgui.c Thu Nov 30 22:38:04 2006 @@ -163,12 +163,12 @@ if (!NT_SUCCESS(Status)) { /* Failed to get PEB address */ - DebugEvent->u.CreateThread.lpThreadLocalBase = NULL; + DebugEvent->u.CreateProcessInfo.lpThreadLocalBase = NULL; } else { /* Write PEB Address */ - DebugEvent->u.CreateThread.lpThreadLocalBase = + DebugEvent->u.CreateProcessInfo.lpThreadLocalBase = ThreadBasicInfo.TebBaseAddress; } Modified: trunk/reactos/dll/win32/kernel32/debug/debugger.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/debug/d… ============================================================================== --- trunk/reactos/dll/win32/kernel32/debug/debugger.c (original) +++ trunk/reactos/dll/win32/kernel32/debug/debugger.c Thu Nov 30 22:38:04 2006 @@ -235,6 +235,7 @@ if (dwProcessId == -1) dwProcessId = (DWORD)CsrGetProcessId(); /* Open a handle to the process */ + ClientId.UniqueThread = NULL; ClientId.UniqueProcess = (HANDLE)dwProcessId; InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); Status = NtOpenProcess(&Handle, @@ -498,7 +499,7 @@ } while ((Status == STATUS_ALERTED) || (Status == STATUS_USER_APC)); /* Check if the wait failed */ - if (!(NT_SUCCESS(Status)) || (Status != DBG_UNABLE_TO_PROVIDE_HANDLE)) + if (!(NT_SUCCESS(Status)) || (Status == DBG_UNABLE_TO_PROVIDE_HANDLE)) { /* Set the error code and quit */ SetLastErrorByStatus(Status);

1 0

[gedmurphy] 25001: allow the Americans their incorrect spellings and add a correct UK resource file ; )
by gedmurphy＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: gedmurphy Date: Thu Nov 30 22:23:19 2006 New Revision: 25001 URL: http://svn.reactos.org/svn/reactos?rev=25001&view=rev Log: allow the Americans their incorrect spellings and add a correct UK resource file ;) Added: trunk/reactos/base/applications/imagesoft/lang/en-GB.rc Modified: trunk/reactos/base/applications/imagesoft/lang/en-US.rc Added: trunk/reactos/base/applications/imagesoft/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/lang/en-GB.rc (added) +++ trunk/reactos/base/applications/imagesoft/lang/en-GB.rc Thu Nov 30 22:23:19 2006 @@ -1,0 +1,234 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ImageSoft" + IDS_VERSION "v0.1" +END + +IDR_MAINMENU MENU +BEGIN + POPUP "&File" + BEGIN + MENUITEM "&New...", ID_NEW + MENUITEM "&Open...", ID_OPEN + MENUITEM SEPARATOR + MENUITEM "&Close\tCtrl+F4", ID_CLOSE, GRAYED + MENUITEM "C&lose all", ID_CLOSEALL,GRAYED + MENUITEM SEPARATOR + MENUITEM "&Save", ID_SAVE, GRAYED + MENUITEM "Save &As...", ID_SAVEAS, GRAYED + MENUITEM SEPARATOR + MENUITEM "Print Pre&view", ID_PRINTPRE,GRAYED + MENUITEM "&Print...", ID_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "Pr&operties...", ID_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "E&xit\tAlt+F4", ID_EXIT + END + POPUP "&Edit" + BEGIN + MENUITEM "&Undo", ID_UNDO, GRAYED + MENUITEM "&Redo", ID_REDO, GRAYED + MENUITEM SEPARATOR + MENUITEM "Cu&t", ID_CUT, GRAYED + MENUITEM "&Copy", ID_COPY, GRAYED + MENUITEM "&Paste", ID_PASTE, GRAYED + MENUITEM "Paste as new &image", ID_PASTENEWIMAGE, GRAYED + MENUITEM SEPARATOR + MENUITEM "Select &All", ID_SELALL, GRAYED + END + POPUP "&View" + BEGIN + MENUITEM "&Tools", ID_TOOLS + MENUITEM "&Colours", ID_COLOR + MENUITEM "&History", ID_HISTORY + MENUITEM "&Status Bar", ID_STATUSBAR + END + POPUP "&Adjust" + BEGIN + MENUITEM "Brightness...", ID_BRIGHTNESS + MENUITEM "Contrast...", -1, GRAYED + MENUITEM "Hue/Saturation...", -1, GRAYED + POPUP "Colour" + BEGIN + MENUITEM "Black and White" ID_BLACKANDWHITE + MENUITEM "Invert Colours" ID_INVERTCOLORS + END + MENUITEM SEPARATOR + MENUITEM "Blur", ID_BLUR + MENUITEM "Sharpen", ID_SHARPEN + MENUITEM "Smooth Edges", -1, GRAYED + MENUITEM "Add Shadow", -1, GRAYED + MENUITEM SEPARATOR + MENUITEM "Image Size...", -1, GRAYED + MENUITEM "Flip", -1, GRAYED + MENUITEM "Mirror", -1, GRAYED + MENUITEM "Rotate", -1, GRAYED + + END + POPUP "&Colours" + BEGIN + MENUITEM "&Edit Colours...", ID_EDITCOLOURS + END + POPUP "&Window" + BEGIN + MENUITEM "&Cascade", ID_WINDOW_CASCADE + MENUITEM "Tile &Horizontally", ID_WINDOW_TILE_HORZ + MENUITEM "Tile &Vertiacally", ID_WINDOW_TILE_VERT + MENUITEM "&Arrange Icons", ID_WINDOW_ARRANGE + MENUITEM SEPARATOR + MENUITEM "Nex&t\tCtrl+F6", ID_WINDOW_NEXT + END + POPUP "&Help" + BEGIN + MENUITEM "&About...", ID_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + + MENUITEM SEPARATOR + + END +END + + +IDD_BRIGHTNESS DIALOGEX 6, 5, 193, 120 +CAPTION "Brightness" +FONT 8,"MS Sans Serif", 0, 0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "", IDC_PICPREVIEW, 0, 1, 132, 96, SS_OWNERDRAW | SS_SUNKEN + LTEXT "Colour form:", IDC_STATIC, 135, 5, 36, 9 + GROUPBOX "", IDC_BRI_GROUP, 138 ,30, 50, 48 + CONTROL "Full (RGB)", IDC_BRI_FULL, "Button", BS_AUTORADIOBUTTON, 138, 18, 46, 9 + CONTROL "Red", IDC_BRI_RED, "Button", BS_AUTORADIOBUTTON, 142, 38, 42, 9 + CONTROL "Green", IDC_BRI_GREEN, "Button", BS_AUTORADIOBUTTON, 142, 51, 42, 9 + CONTROL "Blue", IDC_BRI_BLUE, "Button", BS_AUTORADIOBUTTON, 142, 64, 42, 9 + EDITTEXT IDC_BRI_EDIT, 98, 103, 28, 13 + CONTROL "", IDC_BRI_TRACKBAR, "msctls_trackbar32", TBS_BOTH | TBS_NOTICKS | WS_TABSTOP, 2, 105, 90, 11 + PUSHBUTTON "OK", IDOK, 142, 88, 48, 13 + PUSHBUTTON "Cancel", IDCANCEL, 142, 105, 48, 13 +END + +IDD_ABOUTBOX DIALOGEX 22,16,210,182 +CAPTION "About ImageSoft" +FONT 8,"MS Sans Serif",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +//EXSTYLE WS_EX_LAYERED +BEGIN + LTEXT "ImageSoft v0.1\nCopyright (C) 2006\nThomas Weidenmueller (w3seek(a)reactos.org)\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 + PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 + ICON IDI_IMAGESOFTICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + + +IDD_IMAGE_PROP DIALOGEX 6, 5, 156, 163 +CAPTION "Image Properties" +FONT 8,"MS Sans Serif",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Name:", IDC_STATIC, 12, 5, 38, 9 + EDITTEXT IDC_IMAGE_NAME_EDIT, 58, 3, 94, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Canvas properties", IDC_STATIC, 4, 22, 148, 98 + LTEXT "Image type:", IDC_STATIC, 12, 36, 42, 9 + CONTROL "", IDC_IMAGETYPE, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 35, 88, 54 + LTEXT "Width:", IDC_STATIC, 12, 51, 42, 9 + EDITTEXT IDC_WIDTH_EDIT, 58, 49, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_WIDTH_STAT, 94, 51, 40, 9 + LTEXT "Height:", IDC_STATIC, 12, 68, 42, 9 + EDITTEXT IDC_HEIGHT_EDIT, 58, 66, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_HEIGHT_STAT, 94, 68, 40, 9 + LTEXT "Resolution:", IDC_STATIC, 12, 84, 42, 9 + EDITTEXT IDC_RES_EDIT, 58, 83, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_RES_STAT, 94, 84, 40, 9 + LTEXT "Unit:", IDC_STATIC, 12, 99, 42, 9 + CONTROL "", IDC_UNIT, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 99, 54, 50 + LTEXT "Image size:", IDC_STATIC, 12, 125, 42, 9 + LTEXT "", IDC_IMAGE_SIZE, 58, 125, 54, 9 + PUSHBUTTON "OK", IDOK, 50, 144, 48, 13 + PUSHBUTTON "Cancel", IDCANCEL, 102, 144, 48, 13 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." + IDS_READY " Ready." + IDS_TOOLBAR_STANDARD "Standard" + IDS_TOOLBAR_TEST "Test" + IDS_IMAGE_NAME "Image %1!u!" + IDS_FLT_TOOLS "Tools" + IDS_FLT_COLORS "Colours" + IDS_FLT_HISTORY "History" +END + +/* imageprop.c */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMAGE_MONOCHROME "Monochrome (1 bit)" + IDS_IMAGE_GREYSCALE "Greyscale (8 bit)" + IDS_IMAGE_PALETTE "Palette or 256 colour (8 bit)" + IDS_IMAGE_TRUECOLOR "True colour (24 bit)" + + IDS_UNIT_PIXELS "Pixels" + IDS_UNIT_CM "Cm" + IDS_UNIT_INCHES "Inches" + IDS_UNIT_DOTSCM "Dots / Cm" + IDS_UNIT_DPI "DPI" + IDS_UNIT_KB "%d KB" + IDS_UNIT_MB "%d MB" +END + +/* Tooltips */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_NEW "New" + IDS_TOOLTIP_OPEN "Open" + IDS_TOOLTIP_SAVE "Save" + IDS_TOOLTIP_PRINTPRE "Print preview" + IDS_TOOLTIP_PRINT "Print" + IDS_TOOLTIP_CUT "Cut" + IDS_TOOLTIP_COPY "Copy" + IDS_TOOLTIP_PASTE "Paste" + IDS_TOOLTIP_UNDO "Undo" + IDS_TOOLTIP_REDO "Redo" +END + + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HINT_BLANK " " + IDS_HINT_NEW " Creates a new document." + IDS_HINT_OPEN " Opens an existing document." + IDS_HINT_CLOSE " Closes this window." + IDS_HINT_CLOSEALL " Closes all windows." + IDS_HINT_SAVE " Saves the active document." + IDS_HINT_SAVEAS " Saves the active document with a new name." + IDS_HINT_PRINTPRE " Previews the printed document." + IDS_HINT_PRINT " Prints the active document." + IDS_HINT_PROP " Shows the properties of the active image." + IDS_HINT_EXIT " Exits this application." + + IDS_HINT_TOOLS " Shows or hides the tools floating window." + IDS_HINT_COLORS " Shows or hides the colours floating window." + IDS_HINT_HISTORY " Shows or hides the history floating window." + IDS_HINT_STATUS " Shows or hides the status bar." + + IDS_HINT_CASCADE " Arrange windows so they overlap." + IDS_HINT_TILE_HORZ " Arrange windows as non-overlapping tiles." + IDS_HINT_TILE_VERT " Arrange windows as non-overlapping tiles." + IDS_HINT_ARRANGE " Arrange icons at the bottom of the window." + IDS_HINT_NEXT " Activates the next window." + + IDS_HINT_SYS_RESTORE " Restores this window to normal size." + IDS_HINT_SYS_MOVE " Moves this window." + IDS_HINT_SYS_SIZE " Resizes this window." + IDS_HINT_SYS_MINIMIZE " Collapses this window to an icon." + IDS_HINT_SYS_MAXIMIZE " Expands this window to fill this screen." +END Modified: trunk/reactos/base/applications/imagesoft/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/lang/en-US.rc (original) +++ trunk/reactos/base/applications/imagesoft/lang/en-US.rc Thu Nov 30 22:23:19 2006 @@ -50,10 +50,10 @@ MENUITEM "Brightness...", ID_BRIGHTNESS MENUITEM "Contrast...", -1, GRAYED MENUITEM "Hue/Saturation...", -1, GRAYED - POPUP "Colour" + POPUP "Color" BEGIN MENUITEM "Black and White" ID_BLACKANDWHITE - MENUITEM "Invert Colours" ID_INVERTCOLORS + MENUITEM "Invert Colors" ID_INVERTCOLORS END MENUITEM SEPARATOR MENUITEM "Blur", ID_BLUR

1 0

[ion] 25000: - Remove Dbgk entries from KrnlFun.c, the subsystem is now implemented, save a few small bugs. - Congratulations ROS on your 25000th commit!
by ion＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: ion Date: Thu Nov 30 22:04:17 2006 New Revision: 25000 URL: http://svn.reactos.org/svn/reactos?rev=25000&view=rev Log: - Remove Dbgk entries from KrnlFun.c, the subsystem is now implemented, save a few small bugs. - Congratulations ROS on your 25000th commit! Modified: trunk/reactos/ntoskrnl/KrnlFun.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=250… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Thu Nov 30 22:04:17 2006 @@ -42,11 +42,6 @@ // - Activate new NTLPC and delete old implementation. // - Figure out why LPC-processes won't die anymore. // -// Dbgk: -// - Implement remaining Dbgk routines. -// - Add Dbgk callbacks to image map/unmap routines. -// - Implement helper Mm APIs. -// // Ex: // - Implement Generic Callback mechanism. // - Use pushlocks for handle implementation.

1 0

[ion] 24999: - Update Dbgk test application to test Win32 as well (definable by a compile-time #define).
by ion＠svn.reactos.org 30 Nov '06

30 Nov '06

Author: ion Date: Thu Nov 30 22:02:22 2006 New Revision: 24999 URL: http://svn.reactos.org/svn/reactos?rev=24999&view=rev Log: - Update Dbgk test application to test Win32 as well (definable by a compile-time #define). Modified: trunk/reactos/ntoskrnl/tests/TestDebug.c Modified: trunk/reactos/ntoskrnl/tests/TestDebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/tests/TestDebug.c… ============================================================================== --- trunk/reactos/ntoskrnl/tests/TestDebug.c (original) +++ trunk/reactos/ntoskrnl/tests/TestDebug.c Thu Nov 30 22:02:22 2006 @@ -1,16 +1,30 @@ +#define NATIVE 0 + +#if NATIVE #define _X86_ #include "ntndk.h" +#else +#include "stdio.h" +#include "windows.h" +#endif VOID Main(VOID) { +#if NATIVE NTSTATUS Status; - HANDLE hProcess; OBJECT_ATTRIBUTES ObjectAttributes; CLIENT_ID ClientId; DBGUI_WAIT_STATE_CHANGE State; +#else + DWORD Error, BytesRead; + DEBUG_EVENT DebugEvent; + WCHAR ImageName[MAX_PATH]; +#endif + HANDLE hProcess; BOOLEAN Alive = TRUE; +#if NATIVE printf("*** Native (DbgUi) Debugging Test Application\n"); printf("Press any key to connect to Dbgk..."); getchar(); @@ -19,8 +33,13 @@ printf(" Connection Established. Status: %lx\n", Status); printf("Debug Object Handle: %lx\n", NtCurrentTeb()->DbgSsReserved[1]); printf("Press any key to debug services.exe..."); +#else + printf("*** Win32 (Debug) Debugging Test Application\n"); + printf("Press any key to debug services.exe..."); +#endif getchar(); +#if NATIVE InitializeObjectAttributes(&ObjectAttributes, NULL, 0, 0, 0); ClientId.UniqueThread = 0; ClientId.UniqueProcess = UlongToHandle(168); @@ -29,20 +48,41 @@ &ObjectAttributes, &ClientId); Status = DbgUiDebugActiveProcess(hProcess); +#else + Error = DebugActiveProcess(2648); +#endif + +#if NATIVE printf(" Debugger Attached. Status: %lx\n", Status); +#else + printf(" Debugger Attached. Error: %lx\n", Error); +#endif printf("Press any key to get first debug event... "); getchar(); while (Alive) { +#if NATIVE Status = DbgUiWaitStateChange(&State, NULL); printf(" Event Received. Status: %lx\n", Status); printf("New State: %lx. Application Client ID: %lx/%lx\n", State.NewState, State.AppClientId.UniqueProcess, State.AppClientId.UniqueThread); +#else + Error = WaitForDebugEvent(&DebugEvent, -1); + printf(" Event Received. Error: %lx\n", Error); + printf("New State: %lx. Application Client ID: %lx/%lx\n", + DebugEvent.dwDebugEventCode, + DebugEvent.dwProcessId, DebugEvent.dwThreadId); +#endif +#if NATIVE switch (State.NewState) +#else + switch (DebugEvent.dwDebugEventCode) +#endif { +#if NATIVE case DbgCreateProcessStateChange: printf("Process Handle: %lx. Thread Handle: %lx\n", State.StateInfo.CreateProcessInfo.HandleToProcess, @@ -51,40 +91,98 @@ State.StateInfo.CreateProcessInfo.NewProcess.FileHandle); printf("Process image base: %lx\n", State.StateInfo.CreateProcessInfo.NewProcess.BaseOfImage); +#else + case CREATE_PROCESS_DEBUG_EVENT: + printf("Process Handle: %lx. Thread Handle: %lx\n", + DebugEvent.u.CreateProcessInfo.hProcess, + DebugEvent.u.CreateProcessInfo.hThread); + printf("Process image handle: %lx\n", + DebugEvent.u.CreateProcessInfo.hFile); + printf("Process image base: %lx\n", + DebugEvent.u.CreateProcessInfo.lpBaseOfImage); + hProcess = DebugEvent.u.CreateProcessInfo.hProcess; +#endif break; +#if NATIVE case DbgCreateThreadStateChange: printf("New thread: %lx\n", State.StateInfo.CreateThread.HandleToThread); printf("Thread Start Address: %p\n", State.StateInfo.CreateThread.NewThread.StartAddress); +#else + case CREATE_THREAD_DEBUG_EVENT: + printf("New thread: %lx\n", DebugEvent.u.CreateThread.hThread); + printf("Thread Start Address: %p\n", + DebugEvent.u.CreateThread.lpStartAddress); +#endif break; +#if NATIVE case DbgLoadDllStateChange: printf("New DLL: %lx\n", State.StateInfo.LoadDll.FileHandle); printf("DLL LoadAddress: %p\n", State.StateInfo.LoadDll.BaseOfDll); +#else + case LOAD_DLL_DEBUG_EVENT: + printf("New DLL: %lx\n", DebugEvent.u.LoadDll.hFile); + printf("DLL LoadAddress: %p\n", DebugEvent.u.LoadDll.lpBaseOfDll); + Error = ReadProcessMemory(hProcess, + DebugEvent.u.LoadDll.lpImageName, + &DebugEvent.u.LoadDll.lpImageName, + sizeof(DebugEvent.u.LoadDll.lpImageName), + &BytesRead); + if (DebugEvent.u.LoadDll.lpImageName) + { + Error = ReadProcessMemory(hProcess, + DebugEvent.u.LoadDll.lpImageName, + ImageName, + sizeof(ImageName), + &BytesRead); + printf("DLL Name: %S\n", ImageName); + } +#endif break; +#if NATIVE case DbgBreakpointStateChange: printf("Initial breakpoint hit at: %p!\n", State.StateInfo.Exception.ExceptionRecord.ExceptionAddress); +#else + +#endif break; +#if NATIVE case DbgExitThreadStateChange: printf("Thread exited: %lx\n", State.StateInfo.ExitThread.ExitStatus); +#else + +#endif break; +#if NATIVE case DbgExitProcessStateChange: printf("Process exited: %lx\n", State.StateInfo.ExitProcess.ExitStatus); Alive = FALSE; +#else + +#endif break; } printf("Press any key to continue debuggee..."); getchar(); +#if NATIVE ClientId.UniqueProcess = State.AppClientId.UniqueProcess; ClientId.UniqueThread = State.AppClientId.UniqueThread; Status = DbgUiContinue(&ClientId, DBG_CONTINUE); printf(" Debuggee Resumed. Status: %lx\n", Status); +#else + Error = ContinueDebugEvent(DebugEvent.dwProcessId, + DebugEvent.dwThreadId, + DBG_CONTINUE); + printf(" Debuggee Resumed. Error: %lx\n", Error); +#endif + printf("Press any key to get next debug event... "); getchar(); };

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