Ros-diffs December 2006

ros-diffs@reactos.org

16 participants
168 discussions

[greatlrd] 25017: Fixed follow bug Create_DirectDraw 1. did not set the DDRAWILCL_DIRECTDRAW7 to This->lpLcl->dwLocalFlags 2. did not initate the This->lpLcl->dwLocalRefCnt to 0 and Main_DDrawSurface_AddRef did wrong count then
by greatlrd＠svn.reactos.org 02 Dec '06

02 Dec '06

Author: greatlrd Date: Sat Dec 2 19:57:21 2006 New Revision: 25017 URL: http://svn.reactos.org/svn/reactos?rev=25017&view=rev Log: Fixed follow bug Create_DirectDraw 1. did not set the DDRAWILCL_DIRECTDRAW7 to This->lpLcl->dwLocalFlags 2. did not initate the This->lpLcl->dwLocalRefCnt to 0 and Main_DDrawSurface_AddRef did wrong count then Modified: trunk/reactos/dll/directx/ddraw/startup.c 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 Sat Dec 2 19:57:21 2006 @@ -889,7 +889,6 @@ return DDERR_INVALIDDIRECTDRAWGUID; } - if (This == NULL) { /* We do not have any DirectDraw interface alloc */ @@ -919,8 +918,10 @@ /* FIXME cleanup */ return DDERR_OUTOFMEMORY; } - + This->lpLcl->lpGbl = &ddgbl; + This->lpLcl->dwLocalRefCnt = 0; + This->lpLcl->dwLocalFlags = DDRAWILCL_DIRECTDRAW7; *pIface = (LPDIRECTDRAW)This; @@ -928,7 +929,7 @@ { return DDERR_INVALIDPARAMS; } - + if (StartDirectDraw((LPDIRECTDRAW*)This, pGUID) == DD_OK); {

1 0

[greatlrd] 25016: fixed partly linking with other directdraw interface, but we still overwrite some member and crash it, when we doing a link.
by greatlrd＠svn.reactos.org 02 Dec '06

02 Dec '06

Author: greatlrd Date: Sat Dec 2 16:37:55 2006 New Revision: 25016 URL: http://svn.reactos.org/svn/reactos?rev=25016&view=rev Log: fixed partly linking with other directdraw interface, but we still overwrite some member and crash it, when we doing a link. Modified: trunk/reactos/dll/directx/ddraw/startup.c 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 Sat Dec 2 16:37:55 2006 @@ -879,20 +879,37 @@ LPDIRECTDRAW* pIface, REFIID id, BOOL ex) -{ - LPDDRAWI_DIRECTDRAW_INT This; - +{ + LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)*pIface; + DX_WINDBG_trace(); if (!IsEqualGUID(&IID_IDirectDraw7, id)) { return DDERR_INVALIDDIRECTDRAWGUID; } - - This = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT)); - if (This == NULL) - { - return DDERR_OUTOFMEMORY; + + + if (This == NULL) + { + /* We do not have any DirectDraw interface alloc */ + This = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT)); + if (This == NULL) + { + return DDERR_OUTOFMEMORY; + } + } + else + { + /* We got the DirectDraw interface alloc and we need create the link */ + LPDDRAWI_DIRECTDRAW_INT newThis; + newThis = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT)); + if (newThis == NULL) + { + return DDERR_OUTOFMEMORY; + } + newThis->lpLink = This; + This = newThis; } This->lpLcl = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT));

1 0

[greatlrd] 25015: adding check if it is IID_IDirectDraw7 on right place and learn it is lpDD->QueryInterface that optain the d3d interface.
by greatlrd＠svn.reactos.org 02 Dec '06

02 Dec '06

Author: greatlrd Date: Sat Dec 2 13:27:56 2006 New Revision: 25015 URL: http://svn.reactos.org/svn/reactos?rev=25015&view=rev Log: adding check if it is IID_IDirectDraw7 on right place and learn it is lpDD->QueryInterface that optain the d3d interface. Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/startup.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 Sat Dec 2 13:27:56 2006 @@ -28,6 +28,10 @@ DX_WINDBG_trace(); + /* fixme + the D3D object cab be optain from here + Direct3D7 + */ if (IsEqualGUID(&IID_IDirectDraw7, id)) { /* DirectDraw7 Vtable */ 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 Sat Dec 2 13:27:56 2006 @@ -620,11 +620,11 @@ */ -#define DX_WINDBG_trace() -#define DX_STUB -#define DX_STUB_DD_OK return DD_OK; -#define DX_STUB_str(x) printf("%s",x); -#define DX_WINDBG_trace_res +//#define DX_WINDBG_trace() +//#define DX_STUB +//#define DX_STUB_DD_OK return DD_OK; +//#define DX_STUB_str(x) printf("%s",x); +//#define DX_WINDBG_trace_res /* use this if want doing a trace from a program @@ -635,58 +635,58 @@ This marco does not create warings when you compile */ -//#define DX_STUB \ -//{ \ -// static BOOL firstcall = TRUE; \ -// if (firstcall) \ -// { \ -// char buffer[1024]; \ -// sprintf ( buffer, "Function %s is not implemented yet (%s:%d)\n", __FUNCTION__,__FILE__,__LINE__ ); \ -// OutputDebugStringA(buffer); \ -// firstcall = FALSE; \ -// } \ -//} \ -// return DDERR_UNSUPPORTED; -// -//#define DX_STUB_DD_OK \ -//{ \ -// static BOOL firstcall = TRUE; \ -// if (firstcall) \ -// { \ -// char buffer[1024]; \ -// sprintf ( buffer, "Function %s is not implemented yet (%s:%d)\n", __FUNCTION__,__FILE__,__LINE__ ); \ -// OutputDebugStringA(buffer); \ -// firstcall = FALSE; \ -// } \ -//} \ -// return DD_OK; -// -// -//#define DX_STUB_str(x) \ -// { \ -// char buffer[1024]; \ -// sprintf ( buffer, "Function %s %s (%s:%d)\n", __FUNCTION__,x,__FILE__,__LINE__ ); \ -// OutputDebugStringA(buffer); \ -// } -// -//#define DX_WINDBG_trace() \ -// static BOOL firstcallx = TRUE; \ -// if (firstcallx) \ -// { \ -// char buffer[1024]; \ -// sprintf ( buffer, "Enter Function %s (%s:%d)\n", __FUNCTION__,__FILE__,__LINE__ ); \ -// OutputDebugStringA(buffer); \ -// firstcallx = TRUE; \ -// } -// -//#define DX_WINDBG_trace_res(width,height,bpp) \ -// static BOOL firstcallxx = TRUE; \ -// if (firstcallxx) \ -// { \ -// char buffer[1024]; \ -// sprintf ( buffer, "Setmode have been req width=%d, height=%d bpp=%d\n",width,height,bpp); \ -// OutputDebugStringA(buffer); \ -// firstcallxx = FALSE; \ -// } +#define DX_STUB \ +{ \ + static BOOL firstcall = TRUE; \ + if (firstcall) \ + { \ + char buffer[1024]; \ + sprintf ( buffer, "Function %s is not implemented yet (%s:%d)\n", __FUNCTION__,__FILE__,__LINE__ ); \ + OutputDebugStringA(buffer); \ + firstcall = FALSE; \ + } \ +} \ + return DDERR_UNSUPPORTED; + +#define DX_STUB_DD_OK \ +{ \ + static BOOL firstcall = TRUE; \ + if (firstcall) \ + { \ + char buffer[1024]; \ + sprintf ( buffer, "Function %s is not implemented yet (%s:%d)\n", __FUNCTION__,__FILE__,__LINE__ ); \ + OutputDebugStringA(buffer); \ + firstcall = FALSE; \ + } \ +} \ + return DD_OK; + + +#define DX_STUB_str(x) \ + { \ + char buffer[1024]; \ + sprintf ( buffer, "Function %s %s (%s:%d)\n", __FUNCTION__,x,__FILE__,__LINE__ ); \ + OutputDebugStringA(buffer); \ + } + +#define DX_WINDBG_trace() \ + static BOOL firstcallx = TRUE; \ + if (firstcallx) \ + { \ + char buffer[1024]; \ + sprintf ( buffer, "Enter Function %s (%s:%d)\n", __FUNCTION__,__FILE__,__LINE__ ); \ + OutputDebugStringA(buffer); \ + firstcallx = TRUE; \ + } + +#define DX_WINDBG_trace_res(width,height,bpp) \ + static BOOL firstcallxx = TRUE; \ + if (firstcallxx) \ + { \ + char buffer[1024]; \ + sprintf ( buffer, "Setmode have been req width=%d, height=%d bpp=%d\n",width,height,bpp); \ + OutputDebugStringA(buffer); \ + firstcallxx = FALSE; \ + } #endif /* __DDRAW_PRIVATE */ 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 Sat Dec 2 13:27:56 2006 @@ -881,14 +881,18 @@ BOOL ex) { LPDDRAWI_DIRECTDRAW_INT This; - DX_WINDBG_trace(); + + if (!IsEqualGUID(&IID_IDirectDraw7, id)) + { + return DDERR_INVALIDDIRECTDRAWGUID; + } This = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT)); if (This == NULL) { - return E_OUTOFMEMORY; + return DDERR_OUTOFMEMORY; } This->lpLcl = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT));

1 0

[greatlrd] 25014: remove trunk stuff. for it was wine idea, if you reading msdn and test ms ddraw you can not use other interface that IID_IDirectDraw7 but wine allown you use older IID interface. But It will be hell to support DirectX 1-6 IID_IDirectDraw, IID_IDirectDraw2, IID_IDirectDraw4 so we doing like microsoft kill it. and this check can be use to detect if it wine ddraw or not. like test if other that IID_IDirectDraw7 are vaild.
by greatlrd＠svn.reactos.org 02 Dec '06

02 Dec '06

Author: greatlrd Date: Sat Dec 2 13:20:33 2006 New Revision: 25014 URL: http://svn.reactos.org/svn/reactos?rev=25014&view=rev Log: remove trunk stuff. for it was wine idea, if you reading msdn and test ms ddraw you can not use other interface that IID_IDirectDraw7 but wine allown you use older IID interface. But It will be hell to support DirectX 1-6 IID_IDirectDraw, IID_IDirectDraw2, IID_IDirectDraw4 so we doing like microsoft kill it. and this check can be use to detect if it wine ddraw or not. like test if other that IID_IDirectDraw7 are vaild. Removed: trunk/reactos/dll/directx/ddraw/thunks/ Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild trunk/reactos/dll/directx/ddraw/main.c trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Sat Dec 2 13:20:33 2006 @@ -36,9 +36,4 @@ <file>ddraw_main.c</file> <file>surface_main.c</file> </directory> - - <directory name="thunks"> - <file>ddraw_thunk.c</file> - <file>surface_thunk.c</file> - </directory> </module> Modified: trunk/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?r… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main.c (original) +++ trunk/reactos/dll/directx/ddraw/main.c Sat Dec 2 13:20:33 2006 @@ -48,7 +48,7 @@ return CLASS_E_NOAGGREGATION; } - return Create_DirectDraw (lpGUID, lplpDD, &IID_IDirectDraw, FALSE); + return Create_DirectDraw (lpGUID, lplpDD, &IID_IDirectDraw7, FALSE); } /* 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 Sat Dec 2 13:20:33 2006 @@ -32,24 +32,6 @@ { /* DirectDraw7 Vtable */ This->lpVtbl = &DirectDraw7_Vtable; - *obj = &This->lpVtbl; - } - else if (IsEqualGUID(&IID_IDirectDraw, id)) - { - /* DirectDraw1 Vtable */ - This->lpVtbl = &DirectDraw_Vtable; - *obj = &This->lpVtbl; - } - else if (IsEqualGUID(&IID_IDirectDraw2, id)) - { - /* DirectDraw2 Vtable */ - This->lpVtbl = &DirectDraw2_Vtable; - *obj = &This->lpVtbl; - } - else if (IsEqualGUID(&IID_IDirectDraw4, id)) - { - /* DirectDraw4 Vtable */ - This->lpVtbl = &DirectDraw4_Vtable; *obj = &This->lpVtbl; } else 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 Sat Dec 2 13:20:33 2006 @@ -620,11 +620,11 @@ */ -//#define DX_WINDBG_trace() -//#define DX_STUB -//#define DX_STUB_DD_OK return DD_OK; -//#define DX_STUB_str(x) printf("%s",x); -//#define DX_WINDBG_trace_res +#define DX_WINDBG_trace() +#define DX_STUB +#define DX_STUB_DD_OK return DD_OK; +#define DX_STUB_str(x) printf("%s",x); +#define DX_WINDBG_trace_res /* use this if want doing a trace from a program @@ -635,58 +635,58 @@ This marco does not create warings when you compile */ -#define DX_STUB \ -{ \ - static BOOL firstcall = TRUE; \ - if (firstcall) \ - { \ - char buffer[1024]; \ - sprintf ( buffer, "Function %s is not implemented yet (%s:%d)\n", __FUNCTION__,__FILE__,__LINE__ ); \ - OutputDebugStringA(buffer); \ - firstcall = FALSE; \ - } \ -} \ - return DDERR_UNSUPPORTED; - -#define DX_STUB_DD_OK \ -{ \ - static BOOL firstcall = TRUE; \ - if (firstcall) \ - { \ - char buffer[1024]; \ - sprintf ( buffer, "Function %s is not implemented yet (%s:%d)\n", __FUNCTION__,__FILE__,__LINE__ ); \ - OutputDebugStringA(buffer); \ - firstcall = FALSE; \ - } \ -} \ - return DD_OK; - - -#define DX_STUB_str(x) \ - { \ - char buffer[1024]; \ - sprintf ( buffer, "Function %s %s (%s:%d)\n", __FUNCTION__,x,__FILE__,__LINE__ ); \ - OutputDebugStringA(buffer); \ - } - -#define DX_WINDBG_trace() \ - static BOOL firstcallx = TRUE; \ - if (firstcallx) \ - { \ - char buffer[1024]; \ - sprintf ( buffer, "Enter Function %s (%s:%d)\n", __FUNCTION__,__FILE__,__LINE__ ); \ - OutputDebugStringA(buffer); \ - firstcallx = TRUE; \ - } - -#define DX_WINDBG_trace_res(width,height,bpp) \ - static BOOL firstcallxx = TRUE; \ - if (firstcallxx) \ - { \ - char buffer[1024]; \ - sprintf ( buffer, "Setmode have been req width=%d, height=%d bpp=%d\n",width,height,bpp); \ - OutputDebugStringA(buffer); \ - firstcallxx = FALSE; \ - } +//#define DX_STUB \ +//{ \ +// static BOOL firstcall = TRUE; \ +// if (firstcall) \ +// { \ +// char buffer[1024]; \ +// sprintf ( buffer, "Function %s is not implemented yet (%s:%d)\n", __FUNCTION__,__FILE__,__LINE__ ); \ +// OutputDebugStringA(buffer); \ +// firstcall = FALSE; \ +// } \ +//} \ +// return DDERR_UNSUPPORTED; +// +//#define DX_STUB_DD_OK \ +//{ \ +// static BOOL firstcall = TRUE; \ +// if (firstcall) \ +// { \ +// char buffer[1024]; \ +// sprintf ( buffer, "Function %s is not implemented yet (%s:%d)\n", __FUNCTION__,__FILE__,__LINE__ ); \ +// OutputDebugStringA(buffer); \ +// firstcall = FALSE; \ +// } \ +//} \ +// return DD_OK; +// +// +//#define DX_STUB_str(x) \ +// { \ +// char buffer[1024]; \ +// sprintf ( buffer, "Function %s %s (%s:%d)\n", __FUNCTION__,x,__FILE__,__LINE__ ); \ +// OutputDebugStringA(buffer); \ +// } +// +//#define DX_WINDBG_trace() \ +// static BOOL firstcallx = TRUE; \ +// if (firstcallx) \ +// { \ +// char buffer[1024]; \ +// sprintf ( buffer, "Enter Function %s (%s:%d)\n", __FUNCTION__,__FILE__,__LINE__ ); \ +// OutputDebugStringA(buffer); \ +// firstcallx = TRUE; \ +// } +// +//#define DX_WINDBG_trace_res(width,height,bpp) \ +// static BOOL firstcallxx = TRUE; \ +// if (firstcallxx) \ +// { \ +// char buffer[1024]; \ +// sprintf ( buffer, "Setmode have been req width=%d, height=%d bpp=%d\n",width,height,bpp); \ +// OutputDebugStringA(buffer); \ +// firstcallxx = FALSE; \ +// } #endif /* __DDRAW_PRIVATE */

1 0

[greatlrd] 25013: Adding two new debuger macro and debocument each debug macro I am using in windows and why you should use one of them with time the debug macro will be compelete remove.
by greatlrd＠svn.reactos.org 02 Dec '06

02 Dec '06

Author: greatlrd Date: Sat Dec 2 11:30:16 2006 New Revision: 25013 URL: http://svn.reactos.org/svn/reactos?rev=25013&view=rev Log: Adding two new debuger macro and debocument each debug macro I am using in windows and why you should use one of them with time the debug macro will be compelete remove. Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Sat Dec 2 11:30:16 2006 @@ -15,6 +15,7 @@ <library>ole32</library> <library>user32</library> <library>advapi32</library> + <library>msvcrt</library> <file>ddraw.rc</file> <file>main.c</file> 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 Sat Dec 2 11:30:16 2006 @@ -596,6 +596,45 @@ /*********** Macros ***********/ +/* + use this macro to close + down the debuger text complete + no debuging at all, it will + crash ms debuger in VS +*/ + +//#define DX_WINDBG_trace() +//#define DX_STUB +//#define DX_STUB_DD_OK return DD_OK; +//#define DX_STUB_str(x) +//#define DX_WINDBG_trace_res + + +/* + Use this macro if you want deboug in visual studio or + if you have a program to look at the _INT struct from + ReactOS ddraw.dll or ms ddraw.dll, so you can see what + value ms are being setup. + + This macro will create allot warings and can not be help when you compile +*/ + + +//#define DX_WINDBG_trace() +//#define DX_STUB +//#define DX_STUB_DD_OK return DD_OK; +//#define DX_STUB_str(x) printf("%s",x); +//#define DX_WINDBG_trace_res + +/* + use this if want doing a trace from a program + like a game and ReactOS ddraw.dll in windows + so you can figout what going wrong and what + api are being call or if it hel or is it hal + + This marco does not create warings when you compile +*/ + #define DX_STUB \ { \ static BOOL firstcall = TRUE; \ @@ -630,10 +669,6 @@ OutputDebugStringA(buffer); \ } - -//#define DX_WINDBG_trace() - - #define DX_WINDBG_trace() \ static BOOL firstcallx = TRUE; \ if (firstcallx) \ @@ -644,7 +679,6 @@ firstcallx = TRUE; \ } - #define DX_WINDBG_trace_res(width,height,bpp) \ static BOOL firstcallxx = TRUE; \ if (firstcallxx) \ 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 Sat Dec 2 11:30:16 2006 @@ -40,7 +40,7 @@ { DX_STUB_str("Out of memmory"); return DD_FALSE; - } + } This->lpLcl->lpDDCB = ddgbl.lpDDCBtmp; @@ -158,9 +158,13 @@ This->lpLcl->dwProcessId = GetCurrentProcessId(); - - hal_ret = StartDirectDrawHal(iface); - hel_ret = StartDirectDrawHel(iface); + + + hel_ret = StartDirectDrawHel(iface); + hal_ret = StartDirectDrawHal(iface); + + + if ((hal_ret!=DD_OK) && (hel_ret!=DD_OK)) { DX_STUB_str("DDERR_NODIRECTDRAWSUPPORT"); @@ -641,6 +645,8 @@ DeleteDC((HDC)This->lpLcl->hDC); return DD_FALSE; } + + return DD_OK; // Do not relase HDC it have been map in kernel mode // DeleteDC(hdc); @@ -901,7 +907,7 @@ { return DDERR_INVALIDPARAMS; } - + if (StartDirectDraw((LPDIRECTDRAW*)This, pGUID) == DD_OK); {

1 0

[greatlrd] 25012: Colin Finck (mail at colinfinck dot de) patch to sysdm (id=1161) fixing truncate of string and making allot better layout of the system info. See issue #1858 for more details.
by greatlrd＠svn.reactos.org 01 Dec '06

01 Dec '06

Author: greatlrd Date: Fri Dec 1 20:36:07 2006 New Revision: 25012 URL: http://svn.reactos.org/svn/reactos?rev=25012&view=rev Log: Colin Finck (mail at colinfinck dot de) patch to sysdm (id=1161) fixing truncate of string and making allot better layout of the system info. See issue #1858 for more details. Modified: trunk/reactos/dll/cpl/sysdm/en.rc trunk/reactos/dll/cpl/sysdm/general.c trunk/reactos/dll/cpl/sysdm/resource.h Modified: trunk/reactos/dll/cpl/sysdm/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/en.rc?rev=25… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/en.rc (original) +++ trunk/reactos/dll/cpl/sysdm/en.rc Fri Dec 1 20:36:07 2006 @@ -11,10 +11,11 @@ LTEXT "Version ", IDC_STATIC, 10, 153, 25, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 LTEXT "Machine:", IDC_STATIC, 124, 132, 34, 9 - LTEXT "", IDC_PROCESSORMANUFACTURER, 130, 144, 118, 9 - LTEXT "", IDC_PROCESSOR, 130, 153, 118, 9 - LTEXT "", IDC_PROCESSORSPEED, 130, 162, 118, 9 - LTEXT "", IDC_SYSTEMMEMORY, 130, 171, 118, 9 + LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 LTEXT "Visit the ReactOS Homepage", IDC_ROSHOMEPAGE_LINK, 20, 200, 93, 8 PUSHBUTTON "View licence...", IDC_LICENCE, 170, 199, 78, 13 END Modified: trunk/reactos/dll/cpl/sysdm/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/general.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/general.c (original) +++ trunk/reactos/dll/cpl/sysdm/general.c Fri Dec 1 20:36:07 2006 @@ -5,6 +5,7 @@ * PURPOSE: General System Information * COPYRIGHT: Copyright Thomas Weidenmueller <w3seek(a)reactos.org> * Copyright 2006 Ged Murphy <gedmurphy(a)gmail.com> + * Copyright 2006 Colin Finck <mail(a)colinfinck.de> * */ @@ -110,16 +111,21 @@ } } -static VOID -SetProcName(HWND hwnd, - HKEY hKey, - LPTSTR Value, - UINT uID) +static INT +SetProcNameString(HWND hwnd, + HKEY hKey, + LPTSTR Value, + UINT uID1, + UINT uID2) { LPTSTR lpBuf = NULL; DWORD BufSize = 0; DWORD Type; - + INT Ret = 0; + TCHAR szBuf[31]; + TCHAR* szLastSpace; + INT LastSpace = 0; + if (RegQueryValueEx(hKey, Value, NULL, @@ -129,8 +135,8 @@ { lpBuf = HeapAlloc(GetProcessHeap(), 0, - BufSize); - if (!lpBuf) return; + BufSize); + if (!lpBuf) return 0; if (RegQueryValueEx(hKey, Value, @@ -139,15 +145,56 @@ (PBYTE)lpBuf, &BufSize) == ERROR_SUCCESS) { - SetDlgItemText(hwnd, - uID, - lpBuf + _tcsspn(lpBuf, _T(" "))); + if(BufSize > ((30 + 1) * sizeof(TCHAR))) + { + /* Wrap the Processor Name String like XP does: * + * - Take the first 30 characters and look for the last space. * + * Then wrap the string after this space. * + * - If no space is found, wrap the string after character 30. * + * * + * For example the Processor Name String of a Pentium 4 is right-aligned. * + * With this wrapping the first line looks centered. */ + + _tcsncpy(szBuf, lpBuf, 30); + szLastSpace = _tcsrchr(szBuf, ' '); + + if(szLastSpace == 0) + LastSpace = 30; + else + LastSpace = (szLastSpace - szBuf); + + _tcsncpy(szBuf, lpBuf, LastSpace); + szBuf[LastSpace] = 0; + + SetDlgItemText(hwnd, + uID1, + szBuf); + + SetDlgItemText(hwnd, + uID2, + lpBuf+LastSpace+1); + + /* Return the number of used lines */ + Ret = 2; + } + else + { + SetDlgItemText(hwnd, + uID1, + lpBuf); + + Ret = 1; + } } HeapFree(GetProcessHeap(), 0, lpBuf); - } + + return Ret; + } + + return 0; } static VOID @@ -193,6 +240,7 @@ MEMORYSTATUSEX MemStat; TCHAR Buf[32]; INT Ret = 0; + INT CurMachineLine = IDC_MACHINELINE1; /* Get Processor information * @@ -209,17 +257,21 @@ SetRegTextData(hwnd, hKey, _T("VendorIdentifier"), - IDC_PROCESSORMANUFACTURER); - - SetProcName(hwnd, - hKey, - _T("ProcessorNameString"), - IDC_PROCESSOR); - + CurMachineLine); + CurMachineLine++; + + Ret = SetProcNameString(hwnd, + hKey, + _T("ProcessorNameString"), + CurMachineLine, + CurMachineLine+1); + CurMachineLine += Ret; + SetProcSpeed(hwnd, hKey, _T("~MHz"), - IDC_PROCESSORSPEED); + CurMachineLine); + CurMachineLine++; } @@ -279,7 +331,7 @@ if (Ret) { SetDlgItemText(hwnd, - IDC_SYSTEMMEMORY, + CurMachineLine, Buf); } } @@ -363,3 +415,6 @@ } + + + Modified: trunk/reactos/dll/cpl/sysdm/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/resource.h (original) +++ trunk/reactos/dll/cpl/sysdm/resource.h Fri Dec 1 20:36:07 2006 @@ -22,13 +22,14 @@ /* propsheet - general */ #define IDD_PROPPAGEGENERAL 100 -#define IDC_PROCESSORMANUFACTURER 101 -#define IDC_PROCESSOR 102 -#define IDC_PROCESSORSPEED 103 -#define IDC_SYSTEMMEMORY 104 -#define IDC_LICENCE 105 -#define IDC_ROSIMG 106 -#define IDC_ROSHOMEPAGE_LINK 107 +#define IDC_MACHINELINE1 101 +#define IDC_MACHINELINE2 102 +#define IDC_MACHINELINE3 103 +#define IDC_MACHINELINE4 104 +#define IDC_MACHINELINE5 105 +#define IDC_LICENCE 106 +#define IDC_ROSIMG 107 +#define IDC_ROSHOMEPAGE_LINK 108 /* propsheet - computer name */

1 0

[ion] 25011: - Kill some debug prints. - Remove debug-test infinite loop from DbgkForwardException - Fix missing "break" statement in DbgkFreeDebugEvent, causing a handle leak, and in DbgkpOpenHandles, causing user-mode to get a kernel-mode handle for DLL images instead of the correct duplicated one. - Currently struggling with the fact that ArbitraryUserPointer seems to be reset to zero before it's read for the debug event, so DLL names don't come through.
by ion＠svn.reactos.org 01 Dec '06

01 Dec '06

Author: ion Date: Fri Dec 1 11:20:37 2006 New Revision: 25011 URL: http://svn.reactos.org/svn/reactos?rev=25011&view=rev Log: - Kill some debug prints. - Remove debug-test infinite loop from DbgkForwardException - Fix missing "break" statement in DbgkFreeDebugEvent, causing a handle leak, and in DbgkpOpenHandles, causing user-mode to get a kernel-mode handle for DLL images instead of the correct duplicated one. - Currently struggling with the fact that ArbitraryUserPointer seems to be reset to zero before it's read for the debug event, so DLL names don't come through. Modified: trunk/reactos/dll/ntdll/dbg/dbgui.c trunk/reactos/dll/ntdll/ldr/utils.c trunk/reactos/ntoskrnl/dbgk/debug.c trunk/reactos/ntoskrnl/ke/i386/exp.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 Fri Dec 1 11:20:37 2006 @@ -282,7 +282,6 @@ DebugEvent->u.LoadDll.lpImageName = ((PTEB)ThreadBasicInfo.TebBaseAddress)-> Tib.ArbitraryUserPointer; - DPRINT1("Image name: %p\n", DebugEvent->u.LoadDll.lpImageName); } else { Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c Fri Dec 1 11:20:37 2006 @@ -2030,7 +2030,6 @@ ImageBase = 0; ArbitraryUserPointer = NtCurrentTeb()->Tib.ArbitraryUserPointer; NtCurrentTeb()->Tib.ArbitraryUserPointer = FullDosName.Buffer; - DPRINT1("POI. DAT: %p %S\n", NtCurrentTeb()->Tib.ArbitraryUserPointer, FullDosName.Buffer); Status = NtMapViewOfSection(SectionHandle, NtCurrentProcess(), &ImageBase, @@ -2042,7 +2041,6 @@ MEM_COMMIT, PAGE_READONLY); NtCurrentTeb()->Tib.ArbitraryUserPointer = ArbitraryUserPointer; - DPRINT1("Poi gone!\n"); if (!NT_SUCCESS(Status)) { DPRINT1("map view of section failed (Status 0x%08lx)\n", 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 Fri Dec 1 11:20:37 2006 @@ -329,7 +329,6 @@ PAGED_CODE(); DBGKTRACE(DBGK_EXCEPTION_DEBUG, "ExceptionRecord: %p Port: %p\n", ExceptionRecord, DebugPort); - while (TRUE); /* Setup the API Message */ ApiMessage.h.u1.Length = sizeof(DBGKM_MSG) << 16 | @@ -401,6 +400,7 @@ /* Get the pointer */ Handle = &DebugEvent->ApiMsg.CreateProcess.FileHandle; + break; /* As does DLL load */ case DbgKmLoadDllApi: @@ -1021,6 +1021,7 @@ /* Fall through to duplicate file handle */ DupHandle = &WaitStateChange->StateInfo.LoadDll.FileHandle; + break; /* Anything else has no handles */ default: Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c Fri Dec 1 11:20:37 2006 @@ -693,7 +693,7 @@ if (PsGetCurrentProcess()->DebugPort) { /* FIXME : TODO */ - ASSERT(FALSE); + //KEBUGCHECK(0); } else if (KiDebugRoutine(TrapFrame, ExceptionFrame,

1 0

[ion] 25010: - Write DLL Being mapped into NtTib->ArbitraryUserPointer so that the debugger can pick it up. - Fix bugs in DbgkWakeTarget, DbgkCreateThread, DbgkMapViewOfSection and call from NtMapViewOfSection.
by ion＠svn.reactos.org 01 Dec '06

01 Dec '06

Author: ion Date: Fri Dec 1 10:36:49 2006 New Revision: 25010 URL: http://svn.reactos.org/svn/reactos?rev=25010&view=rev Log: - Write DLL Being mapped into NtTib->ArbitraryUserPointer so that the debugger can pick it up. - Fix bugs in DbgkWakeTarget, DbgkCreateThread, DbgkMapViewOfSection and call from NtMapViewOfSection. Modified: trunk/reactos/dll/ntdll/dbg/dbgui.c trunk/reactos/dll/ntdll/ldr/utils.c trunk/reactos/ntoskrnl/dbgk/dbgkutil.c trunk/reactos/ntoskrnl/dbgk/debug.c trunk/reactos/ntoskrnl/include/internal/dbgk.h trunk/reactos/ntoskrnl/mm/section.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 Fri Dec 1 10:36:49 2006 @@ -280,8 +280,9 @@ { /* Save the image name from the TIB */ DebugEvent->u.LoadDll.lpImageName = - &((PTEB)ThreadBasicInfo.TebBaseAddress)-> + ((PTEB)ThreadBasicInfo.TebBaseAddress)-> Tib.ArbitraryUserPointer; + DPRINT1("Image name: %p\n", DebugEvent->u.LoadDll.lpImageName); } else { Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c Fri Dec 1 10:36:49 2006 @@ -1986,6 +1986,7 @@ PVOID ImageBase; PIMAGE_NT_HEADERS NtHeaders; BOOLEAN MappedAsDataFile; + PVOID ArbitraryUserPointer; if (Module == NULL) { @@ -2027,6 +2028,9 @@ /* Map the dll into the process */ ViewSize = 0; ImageBase = 0; + ArbitraryUserPointer = NtCurrentTeb()->Tib.ArbitraryUserPointer; + NtCurrentTeb()->Tib.ArbitraryUserPointer = FullDosName.Buffer; + DPRINT1("POI. DAT: %p %S\n", NtCurrentTeb()->Tib.ArbitraryUserPointer, FullDosName.Buffer); Status = NtMapViewOfSection(SectionHandle, NtCurrentProcess(), &ImageBase, @@ -2037,6 +2041,8 @@ 0, MEM_COMMIT, PAGE_READONLY); + NtCurrentTeb()->Tib.ArbitraryUserPointer = ArbitraryUserPointer; + DPRINT1("Poi gone!\n"); if (!NT_SUCCESS(Status)) { DPRINT1("map view of section failed (Status 0x%08lx)\n", Status); 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 Fri Dec 1 10:36:49 2006 @@ -11,6 +11,8 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +extern ULONG DbgkpTraceLevel; /* FUNCTIONS *****************************************************************/ @@ -236,9 +238,11 @@ if (Teb) { /* Copy the system library name and link to it */ +#if 0 wcsncpy(Teb->StaticUnicodeBuffer, L"ntdll.dll", - sizeof(Teb->StaticUnicodeBuffer)); + sizeof(Teb->StaticUnicodeBuffer) / sizeof(WCHAR)); +#endif Teb->Tib.ArbitraryUserPointer = Teb->StaticUnicodeBuffer; /* Return it in the debug event as well */ @@ -369,7 +373,7 @@ VOID NTAPI -DbgkMapViewOfSection(IN HANDLE SectionHandle, +DbgkMapViewOfSection(IN PVOID Section, IN PVOID BaseAddress, IN ULONG SectionOffset, IN ULONG_PTR ViewSize) @@ -380,6 +384,8 @@ PETHREAD Thread = PsGetCurrentThread(); PIMAGE_NT_HEADERS NtHeader; PAGED_CODE(); + DBGKTRACE(DBGK_PROCESS_DEBUG, + "Section: %p. Base: %p\n", Section, BaseAddress); /* Check if this thread is hidden, doesn't have a debug port, or died */ if ((Thread->HideFromDebugger) || @@ -392,7 +398,7 @@ } /* Setup the parameters */ - LoadDll->FileHandle = DbgkpSectionToFileHandle(SectionHandle); + LoadDll->FileHandle = DbgkpSectionToFileHandle(Section); LoadDll->BaseOfDll = BaseAddress; LoadDll->DebugInfoFileOffset = 0; LoadDll->DebugInfoSize = 0; 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 Fri Dec 1 10:36:49 2006 @@ -329,7 +329,7 @@ PAGED_CODE(); DBGKTRACE(DBGK_EXCEPTION_DEBUG, "ExceptionRecord: %p Port: %p\n", ExceptionRecord, DebugPort); - KEBUGCHECK(0); + while (TRUE); /* Setup the API Message */ ApiMessage.h.u1.Length = sizeof(DBGKM_MSG) << 16 | @@ -442,13 +442,13 @@ /* Check if we have to wake up the event */ if (DebugEvent->Flags & 2) { + /* Otherwise, free the debug event */ + DbgkpFreeDebugEvent(DebugEvent); + } + else + { /* Signal the continue event */ KeSetEvent(&DebugEvent->ContinueEvent, IO_NO_INCREMENT, FALSE); - } - else - { - /* Otherwise, free the debug event */ - DbgkpFreeDebugEvent(DebugEvent); } } Modified: trunk/reactos/ntoskrnl/include/internal/dbgk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/dbgk.h (original) +++ trunk/reactos/ntoskrnl/include/internal/dbgk.h Fri Dec 1 10:36:49 2006 @@ -74,7 +74,7 @@ VOID NTAPI DbgkMapViewOfSection( - IN HANDLE SectionHandle, + IN PVOID Section, IN PVOID BaseAddress, IN ULONG SectionOffset, IN ULONG_PTR ViewSize Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c (original) +++ trunk/reactos/ntoskrnl/mm/section.c Fri Dec 1 10:36:49 2006 @@ -3777,7 +3777,7 @@ (Status != STATUS_IMAGE_NOT_AT_BASE)) { /* Notify the debugger */ - DbgkMapViewOfSection(SectionHandle, + DbgkMapViewOfSection(Section, SafeBaseAddress, SafeSectionOffset.LowPart, SafeViewSize);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2006