Ros-diffs April 2008

ros-diffs@reactos.org

21 participants
395 discussions

[greatlrd] 33045: fixed 3 diffent bug for ms dxg.sys add correct prototypes for DxEngLockShareSem and DxEngUnlockShareSem add param check in NtGdiDdDeleteDirectDrawObject it now crash after or inside DxEngLockShareSem when it call on NtGdiDdDeleteDirectDrawObject
by greatlrd＠svn.reactos.org 20 Apr '08

20 Apr '08

Author: greatlrd Date: Sun Apr 20 02:17:17 2008 New Revision: 33045 URL: http://svn.reactos.org/svn/reactos?rev=33045&view=rev Log: fixed 3 diffent bug for ms dxg.sys add correct prototypes for DxEngLockShareSem and DxEngUnlockShareSem add param check in NtGdiDdDeleteDirectDrawObject it now crash after or inside DxEngLockShareSem when it call on NtGdiDdDeleteDirectDrawObject Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/include/reactos/drivers/directx/dxeng.h trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Apr 20 02:17:17 2008 @@ -125,7 +125,8 @@ dll\directx\dplayx\dplayx.dll 1 dll\directx\dsound\dsound.dll 1 dll\directx\dxdiagn\dxdiagn.dll 1 -dll\directx\ddraw\ddraw.dll 1 +windows\ddraw.dll 1 +windows\dciman32.dll 1 dll\directx\d3d8thk\d3d8thk.dll 1 dll\directx\devenum\devenum.dll 1 dll\directx\ksproxy\ksproxy.ax 1 @@ -307,9 +308,9 @@ drivers\bus\isapnp\isapnp.sys 2 -drivers\directx\dxapi\dxapi.sys 2 -drivers\directx\dxg\dxg.sys 2 -drivers\directx\dxgthk\dxgthk.sys 2 +windows\dxapi.sys 2 +windows\dxg.sys 2 +windows\dxgthk.sys 2 drivers\filesystems\fs_rec\fs_rec.sys 2 drivers\filesystems\msfs\msfs.sys 2 @@ -605,6 +606,17 @@ modules\rostests\winetests\uxtheme\uxtheme_winetest.exe 7 optional modules\rostests\winetests\version\version_winetest.exe 7 optional modules\rostests\winetests\wininet\wininet_winetest.exe 7 optional + +modules\rostests\dxtest\ddraw_test\ddraw_test.exe 7 optional +modules\rostests\dxtest\win32kdxtest\win32kdxtest.exe 7 optional + +modules\rostests\apitests\gdi32api\gdi32api.exe 7 optional + +modules\rostests\apitests\user32api\user32api.exe 7 optional +modules\rostests\apitests\w32knapi\w32knapi.exe 7 optional +modules\rostests\apitests\w32kdll\w32kdll_ros\w32kdll.dll 7 optional + + modules\wallpaper\lake.bmp 4 optional ; Native libraries Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] Sun Apr 20 02:17:17 2008 @@ -73,7 +73,6 @@ /* win32k.sys internal protypes for the driver functions it export */ /************************************************************************/ BOOLEAN STDCALL DxEngNUIsTermSrv(); - PDC STDCALL DxEngLockDC(HDC hDC); BOOLEAN STDCALL DxEngUnlockDC(PDC pDC); DWORD STDCALL DxEngGetHdevData(HDEV, DXEGSHDEVDATA); @@ -82,6 +81,8 @@ BOOLEAN STDCALL DxEngUnlockHdev(HDEV hdev); DWORD STDCALL DxEngGetDCState(HDC hDC, DWORD type); DWORD STDCALL DxEngReferenceHdev(HDEV hdev); +BOOLEAN STDCALL DxEngLockShareSem(); +BOOLEAN STDCALL DxEngUnlockShareSem(); /* prototypes are not done yet, I need gather all my notes * to make them correct @@ -92,8 +93,6 @@ HDEV *DxEngEnumerateHdev(HDEV *hdev); BOOL DxEngGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp); BOOLEAN DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Unuse); -BOOLEAN DxEngLockShareSem(); -BOOLEAN DxEngUnlockShareSem(); BOOLEAN DxEngCleanDC(HDC hdc); BOOLEAN DxEngIncDispUniq(); Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Sun Apr 20 02:17:17 2008 @@ -331,6 +331,11 @@ return DDHAL_DRIVER_NOTHANDLED; } + if (hDirectDrawLocal == NULL) + { + DPRINT1("Warning: hDirectDrawLocal is NULL\n"); + return DDHAL_DRIVER_HANDLED; + } DPRINT1("Calling dxg.sys pfnDdDeleteDirectDrawObject\n"); return pfnDdDeleteDirectDrawObject(hDirectDrawLocal); } Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Sun Apr 20 02:17:17 2008 @@ -175,6 +175,7 @@ *SystemResourcesList *--*/ BOOLEAN +STDCALL DxEngLockShareSem() { BOOLEAN retVal = 0; @@ -203,6 +204,7 @@ * *--*/ BOOLEAN +STDCALL DxEngUnlockShareSem() { DPRINT1("ReactX Calling : DxEngUnlockShareSem\n");

1 0

[cwittich] 33044: fix formatting
by cwittich＠svn.reactos.org 20 Apr '08

20 Apr '08

Author: cwittich Date: Sun Apr 20 01:30:38 2008 New Revision: 33044 URL: http://svn.reactos.org/svn/reactos?rev=33044&view=rev Log: fix formatting Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c [iso-8859-1] Sun Apr 20 01:30:38 2008 @@ -34,8 +34,8 @@ if (_stricmp(SectionName, Section->SectionName) == 0) { // We found it - if (SectionId) - *SectionId = (ULONG)Section; + if (SectionId) + *SectionId = (ULONG)Section; DbgPrint((DPRINT_INIFILE, "IniOpenSection() Found it! SectionId = 0x%x\n", SectionId)); return TRUE; }

1 0

[greatlrd] 33043: add back a check for the negative value thx Christoph_vW notes this mistake.
by greatlrd＠svn.reactos.org 20 Apr '08

20 Apr '08

Author: greatlrd Date: Sun Apr 20 01:25:30 2008 New Revision: 33043 URL: http://svn.reactos.org/svn/reactos?rev=33043&view=rev Log: add back a check for the negative value thx Christoph_vW notes this mistake. Modified: trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sun Apr 20 01:25:30 2008 @@ -1164,15 +1164,23 @@ if (position) { position += 2; - Token = _tcstok(position, _T(",")); - while ((Token != NULL) && (i < 2)) + if (_tcschr(position, _T(',')) != NULL) { - StringPart[i] = _ttoi(Token); - i++; - Token = _tcstok (NULL, _T(",")); + Token = _tcstok(position, _T(",")); + while ((Token != NULL) && (i < 2)) + { + StringPart[i] = _ttoi(Token); + i++; + Token = _tcstok (NULL, _T(",")); + } + if (i > 0) + { + if (StringPart[1] < 0) + StringPart[1] = _tcslen(ret + StringPart[0]) + StringPart[1]; + _tcsncpy(ReturnValue, ret + StringPart[0], StringPart[1]); + _tcscpy(ret, ReturnValue); + } } - _tcsncpy(ReturnValue, ret + StringPart[0], StringPart[1]); - _tcscpy(ret, ReturnValue); return ret; } else

1 0

[cfinck] 33042: Idx already contains the length of the string Just loop and remove all newline & line feed characters from the right instead of doing this with 8 strlen calls
by cfinck＠svn.reactos.org 19 Apr '08

19 Apr '08

Author: cfinck Date: Sat Apr 19 18:57:44 2008 New Revision: 33042 URL: http://svn.reactos.org/svn/reactos?rev=33042&view=rev Log: Idx already contains the length of the string Just loop and remove all newline & line feed characters from the right instead of doing this with 8 strlen calls Modified: trunk/reactos/boot/freeldr/freeldr/inifile/parse.c Modified: trunk/reactos/boot/freeldr/freeldr/inifile/parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/inifile/parse.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/inifile/parse.c [iso-8859-1] Sat Apr 19 18:57:44 2008 @@ -232,10 +232,8 @@ Buffer[Idx] = '\0'; // Get rid of newline & linefeed characters (if any) - if(strlen(Buffer) && ((Buffer[strlen(Buffer)-1] == '\n') || (Buffer[strlen(Buffer)-1] == '\r'))) - Buffer[strlen(Buffer)-1] = '\0'; - if(strlen(Buffer) && ((Buffer[strlen(Buffer)-1] == '\n') || (Buffer[strlen(Buffer)-1] == '\r'))) - Buffer[strlen(Buffer)-1] = '\0'; + while(Idx && (Buffer[--Idx] == '\n' || Buffer[Idx] == '\r')) + Buffer[Idx] = '\0'; // Send back new offset return CurrentOffset;

1 0

[arty] 33041: Fix two very small bugs found by running this code in valgrind.
by arty＠svn.reactos.org 19 Apr '08

19 Apr '08

Author: arty Date: Sat Apr 19 18:16:39 2008 New Revision: 33041 URL: http://svn.reactos.org/svn/reactos?rev=33041&view=rev Log: Fix two very small bugs found by running this code in valgrind. Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c trunk/reactos/boot/freeldr/freeldr/inifile/parse.c Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c [iso-8859-1] Sat Apr 19 18:16:39 2008 @@ -34,7 +34,8 @@ if (_stricmp(SectionName, Section->SectionName) == 0) { // We found it - *SectionId = (ULONG)Section; + if (SectionId) + *SectionId = (ULONG)Section; DbgPrint((DPRINT_INIFILE, "IniOpenSection() Found it! SectionId = 0x%x\n", SectionId)); return TRUE; } Modified: trunk/reactos/boot/freeldr/freeldr/inifile/parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/inifile/parse.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/inifile/parse.c [iso-8859-1] Sat Apr 19 18:16:39 2008 @@ -232,9 +232,9 @@ Buffer[Idx] = '\0'; // Get rid of newline & linefeed characters (if any) - if((Buffer[strlen(Buffer)-1] == '\n') || (Buffer[strlen(Buffer)-1] == '\r')) + if(strlen(Buffer) && ((Buffer[strlen(Buffer)-1] == '\n') || (Buffer[strlen(Buffer)-1] == '\r'))) Buffer[strlen(Buffer)-1] = '\0'; - if((Buffer[strlen(Buffer)-1] == '\n') || (Buffer[strlen(Buffer)-1] == '\r')) + if(strlen(Buffer) && ((Buffer[strlen(Buffer)-1] == '\n') || (Buffer[strlen(Buffer)-1] == '\r'))) Buffer[strlen(Buffer)-1] = '\0'; // Send back new offset

1 0

[greatlrd] 33040: added 3 more correct prototype for dxeng.c now we crash on NTGdiDdDeleteDirectDrawObject
by greatlrd＠svn.reactos.org 19 Apr '08

19 Apr '08

Author: greatlrd Date: Sat Apr 19 17:38:54 2008 New Revision: 33040 URL: http://svn.reactos.org/svn/reactos?rev=33040&view=rev Log: added 3 more correct prototype for dxeng.c now we crash on NTGdiDdDeleteDirectDrawObject Modified: trunk/reactos/include/reactos/drivers/directx/directxint.h trunk/reactos/include/reactos/drivers/directx/dxeng.h trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/include/reactos/drivers/directx/directxint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] Sat Apr 19 17:38:54 2008 @@ -104,8 +104,8 @@ /* 0x018 */ LONG cDriverReferences; /* 0x01C */ ULONG unk_01c[3]; /* 0x028 */ LONGLONG llAssertModeTimeout; -/* 0x030 */ DWORD dwNumHeaps; -/* 0x034 */ VIDEOMEMORY *pvmList; +/* 0x030 */ DWORD dwNumHeaps; // verify it match windows xp +/* 0x034 */ VIDEOMEMORY *pvmList; // verify it match windows xp /* 0x038 */ DWORD dwNumFourCC; /* 0x03C */ PDWORD pdwFourCC; /* 0x040 */ DD_HALINFO ddHalInfo; Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] Sat Apr 19 17:38:54 2008 @@ -73,31 +73,32 @@ /* win32k.sys internal protypes for the driver functions it export */ /************************************************************************/ BOOLEAN STDCALL DxEngNUIsTermSrv(); + +PDC STDCALL DxEngLockDC(HDC hDC); +BOOLEAN STDCALL DxEngUnlockDC(PDC pDC); +DWORD STDCALL DxEngGetHdevData(HDEV, DXEGSHDEVDATA); +BOOLEAN STDCALL DxEngSetHdevData(HDEV, DXEGSHDEVDATA, DWORD); +BOOLEAN STDCALL DxEngLockHdev(HDEV hdev); +BOOLEAN STDCALL DxEngUnlockHdev(HDEV hdev); +DWORD STDCALL DxEngGetDCState(HDC hDC, DWORD type); +DWORD STDCALL DxEngReferenceHdev(HDEV hdev); + +/* prototypes are not done yet, I need gather all my notes + * to make them correct + */ BOOLEAN DxEngRedrawDesktop(); ULONG DxEngDispUniq(); ULONG DxEngVisRgnUniq(); HDEV *DxEngEnumerateHdev(HDEV *hdev); BOOL DxEngGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp); -PDC STDCALL DxEngLockDC(HDC hDC); -BOOLEAN STDCALL DxEngUnlockDC(PDC pDC); BOOLEAN DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Unuse); BOOLEAN DxEngLockShareSem(); BOOLEAN DxEngUnlockShareSem(); BOOLEAN DxEngCleanDC(HDC hdc); -DWORD STDCALL DxEngGetHdevData(HDEV, DXEGSHDEVDATA); -BOOLEAN STDCALL DxEngSetHdevData(HDEV, DXEGSHDEVDATA, DWORD); BOOLEAN DxEngIncDispUniq(); -BOOLEAN STDCALL DxEngLockHdev(HDEV hdev); -BOOLEAN DxEngUnlockHdev(HDEV hdev); -DWORD STDCALL DxEngGetDCState(HDC hDC, DWORD type); -/* prototypes are not done yet, I need gather all my notes - * to make them correct - */ DWORD DxEngCreateMemoryDC(DWORD x1); DWORD DxEngScreenAccessCheck(); - -DWORD DxEngReferenceHdev(DWORD x1); DWORD DxEngIsHdevLockedByCurrentThread(DWORD x1); DWORD DxEngUnreferenceHdev(DWORD x1); DWORD DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3); Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Sat Apr 19 17:38:54 2008 @@ -553,7 +553,8 @@ * none * *--*/ -BOOLEAN +BOOLEAN +STDCALL DxEngUnlockHdev(HDEV hDev) { PGDIDEVICE pPDev = (PGDIDEVICE)hDev; @@ -571,6 +572,19 @@ /************************************************************************/ +/* DxEngReferenceHdev */ +/************************************************************************/ +DWORD +STDCALL +DxEngReferenceHdev(HDEV hDev) +{ + UNIMPLEMENTED; + + /* ALWAYS return true */ + return TRUE; +} + +/************************************************************************/ /* DxEngNUIsTermSrv */ /************************************************************************/ @@ -640,17 +654,6 @@ return FALSE; } - - -/************************************************************************/ -/* DxEngReferenceHdev */ -/************************************************************************/ -DWORD DxEngReferenceHdev(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; -} - /************************************************************************/ /* DxEngIsHdevLockedByCurrentThread */ /************************************************************************/

1 0

[greatlrd] 33039: do not assert if DPRINT1("Object->cExclusiveLock = %d\n", Object->cExclusiveLock); this can happen in ms dxg.sys for it can lock same dc twice or more. then call to unlock it equal many times.
by greatlrd＠svn.reactos.org 19 Apr '08

19 Apr '08

Author: greatlrd Date: Sat Apr 19 17:11:39 2008 New Revision: 33039 URL: http://svn.reactos.org/svn/reactos?rev=33039&view=rev Log: do not assert if DPRINT1("Object->cExclusiveLock = %d\n", Object->cExclusiveLock); this can happen in ms dxg.sys for it can lock same dc twice or more. then call to unlock it equal many times. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Sat Apr 19 17:11:39 2008 @@ -692,7 +692,8 @@ DPRINT1("Object->cExclusiveLock = %d\n", Object->cExclusiveLock); GDIDBG_TRACECALLER(); GDIDBG_TRACELOCKER(GDI_HANDLE_GET_INDEX(hObj)); - ASSERT(FALSE); + /* do not assert here for it will call again from dxg.sys it being call twice */ + //ASSERT(FALSE); } } else

1 0

[fireball] 33038: - Remove unneeded stoneage stuff.
by fireball＠svn.reactos.org 19 Apr '08

19 Apr '08

Author: fireball Date: Sat Apr 19 16:27:16 2008 New Revision: 33038 URL: http://svn.reactos.org/svn/reactos?rev=33038&view=rev Log: - Remove unneeded stoneage stuff. Removed: trunk/reactos/dll/win32/gdi32/gdi32_specs trunk/reactos/dll/win32/ws2_32/ws2_32_specs Removed: trunk/reactos/dll/win32/gdi32/gdi32_specs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32_spec… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32_specs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/gdi32_specs (removed) @@ -1,78 +1,0 @@ -*asm: - - -*asm_final: - - -*cpp: --remap %(cpp_cpu) %{posix:-D_POSIX_SOURCE} - -*cc1: -%(cc1_spec) - -*cc1plus: - - -*endfile: - - -*link: -%{mwindows:--subsystem windows} %{mdll:--dll -e _DllMainCRTStartup@12} - -*lib: - - -*libgcc: --lgcc - -*startfile: - - -*switches_need_spaces: - - -*signed_char: -%{funsigned-char:-D__CHAR_UNSIGNED__} - -*predefines: --Di386 -D_WIN32 -DWIN32 -D__WIN32__ -D__MINGW32__ -DWINNT -D_X86_=1 -D__STDC__=1 -D__stdcall=__attribute__((__stdcall__)) -D_stdcall=__attribute__((__stdcall__)) -D__cdecl=__attribute__((__cdecl__)) -D__declspec(x)=__attribute__((x)) -Asystem(winnt) -Acpu(i386) -Amachine(i386) - -*cross_compile: -1 - -*version: -egcs-2.91.57 - -*multilib: -. ; - -*multilib_defaults: - - -*multilib_extra: - - -*multilib_matches: - - -*linker: -collect2 - -*cpp_486: -%{!ansi:-Di486} -D__i486 -D__i486__ - -*cpp_586: -%{!ansi:-Di586 -Dpentium} -D__i586 -D__i586__ -D__pentium -D__pentium__ - -*cpp_686: -%{!ansi:-Di686 -Dpentiumpro} -D__i686 -D__i686__ -D__pentiumpro -D__pentiumpro__ - -*cpp_cpu_default: -%(cpp_586) - -*cpp_cpu: --Acpu(i386) -Amachine(i386) %{!ansi:-Di386} -D__i386 -D__i386__ %{mcpu=i486:%(cpp_486)} %{m486:%(cpp_486)} %{mpentium:%(cpp_586)} %{mcpu=pentium:%(cpp_586)} %{mpentiumpro:%(cpp_686)} %{mcpu=pentiumpro:%(cpp_686)} %{!mcpu*:%{!m486:%{!mpentium*:%(cpp_cpu_default)}}} - -*cc1_cpu: -%{!mcpu*: %{m386:-mcpu=i386 -march=i386} %{mno-486:-mcpu=i386 -march=i386} %{m486:-mcpu=i486 -march=i486} %{mno-386:-mcpu=i486 -march=i486} %{mno-pentium:-mcpu=i486 -march=i486} %{mpentium:-mcpu=pentium} %{mno-pentiumpro:-mcpu=pentium} %{mpentiumpro:-mcpu=pentiumpro}} - Removed: trunk/reactos/dll/win32/ws2_32/ws2_32_specs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/ws2_32_sp… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/ws2_32_specs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/ws2_32_specs (removed) @@ -1,78 +1,0 @@ -*asm: - - -*asm_final: - - -*cpp: --remap %(cpp_cpu) %{posix:-D_POSIX_SOURCE} - -*cc1: -%(cc1_spec) - -*cc1plus: - - -*endfile: - - -*link: -%{mwindows:--subsystem windows} %{mdll:--dll -e _DllMain@12} - -*lib: - - -*libgcc: --lgcc - -*startfile: - - -*switches_need_spaces: - - -*signed_char: -%{funsigned-char:-D__CHAR_UNSIGNED__} - -*predefines: --Di386 -D_WIN32 -DWIN32 -D__WIN32__ -D__MINGW32__ -DWINNT -D_X86_=1 -D__STDC__=1 -D__stdcall=__attribute__((__stdcall__)) -D_stdcall=__attribute__((__stdcall__)) -D__cdecl=__attribute__((__cdecl__)) -D__declspec(x)=__attribute__((x)) -Asystem(winnt) -Acpu(i386) -Amachine(i386) - -*cross_compile: -1 - -*version: -egcs-2.91.57 - -*multilib: -. ; - -*multilib_defaults: - - -*multilib_extra: - - -*multilib_matches: - - -*linker: -collect2 - -*cpp_486: -%{!ansi:-Di486} -D__i486 -D__i486__ - -*cpp_586: -%{!ansi:-Di586 -Dpentium} -D__i586 -D__i586__ -D__pentium -D__pentium__ - -*cpp_686: -%{!ansi:-Di686 -Dpentiumpro} -D__i686 -D__i686__ -D__pentiumpro -D__pentiumpro__ - -*cpp_cpu_default: -%(cpp_586) - -*cpp_cpu: --Acpu(i386) -Amachine(i386) %{!ansi:-Di386} -D__i386 -D__i386__ %{mcpu=i486:%(cpp_486)} %{m486:%(cpp_486)} %{mpentium:%(cpp_586)} %{mcpu=pentium:%(cpp_586)} %{mpentiumpro:%(cpp_686)} %{mcpu=pentiumpro:%(cpp_686)} %{!mcpu*:%{!m486:%{!mpentium*:%(cpp_cpu_default)}}} - -*cc1_cpu: -%{!mcpu*: %{m386:-mcpu=i386 -march=i386} %{mno-486:-mcpu=i386 -march=i386} %{m486:-mcpu=i486 -march=i486} %{mno-386:-mcpu=i486 -march=i486} %{mno-pentium:-mcpu=i486 -march=i486} %{mpentium:-mcpu=pentium} %{mno-pentiumpro:-mcpu=pentium} %{mpentiumpro:-mcpu=pentiumpro}} -

1 0

[greatlrd] 33037: add tempory hack for alloc EDD_DIRECTDRAW_GLOBAL for win32k. this should be done for each drv, not a global for whole win32k it is only gobal for that drv, then we set the pointer to each hdc that is how it should be done.
by greatlrd＠svn.reactos.org 19 Apr '08

19 Apr '08

Author: greatlrd Date: Sat Apr 19 15:50:39 2008 New Revision: 33037 URL: http://svn.reactos.org/svn/reactos?rev=33037&view=rev Log: add tempory hack for alloc EDD_DIRECTDRAW_GLOBAL for win32k. this should be done for each drv, not a global for whole win32k it is only gobal for that drv, then we set the pointer to each hdc that is how it should be done. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Sat Apr 19 15:50:39 2008 @@ -21,6 +21,7 @@ DRVFN gpDxFuncs[DXG_INDEX_DxDdIoctl]; HANDLE ghDxGraphics = NULL; ULONG gdwDirectDrawContext; +EDD_DIRECTDRAW_GLOBAL eDdirectDraw_Global; /************************************************************************/ @@ -154,7 +155,8 @@ PGD_DDCREATEDIRECTDRAWOBJECT pfnDdCreateDirectDrawObject; NTSTATUS Status; PEPROCESS Proc = NULL; - + PDC pDC; + if (hdc == NULL) { DPRINT1("Warning : hdc is NULL\n"); @@ -170,12 +172,25 @@ return 0; } + /* FIXME this code should be add where the driver being load */ + pDC = DC_LockDc(hdc); + if (pDC == NULL) + { + DPRINT1("Warning : Failed to lock hdc\n"); + return 0; + } + /* FIXME This should be alloc for each drv and use it from each drv, not global for whole win32k */ + ((PGDIDEVICE)pDC->pPDev)->pEDDgpl = &eDdirectDraw_Global; + RtlZeroMemory(&eDdirectDraw_Global,sizeof(EDD_DIRECTDRAW_GLOBAL)); + DC_UnlockDc(pDC); + + /* get the pfnDdCreateDirectDrawObject after we load the drv */ pfnDdCreateDirectDrawObject = (PGD_DDCREATEDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdCreateDirectDrawObject].pfn; if (pfnDdCreateDirectDrawObject == NULL) { - DPRINT1("Warning: no pfnDdCreateDirectDrawObject\n"); + DPRINT1("Warning: no pfnDdCreateDirectDrawObject\n"); return DDHAL_DRIVER_NOTHANDLED; }

1 0

[greatlrd] 33036: fixed stack corutions for dxeng api they do not have STDCALL set, we need figout which have STDCALL or FASTCALL. I only set STDCALL on tested functions for dxgen this will fix the stack corruptions we did have in ms dxsys.sys, now we need setup internal struct for dx. I also add some debug data output so we can see what been requested to send back from DxEngGetHdevData
by greatlrd＠svn.reactos.org 19 Apr '08

19 Apr '08

Author: greatlrd Date: Sat Apr 19 15:17:51 2008 New Revision: 33036 URL: http://svn.reactos.org/svn/reactos?rev=33036&view=rev Log: fixed stack corutions for dxeng api they do not have STDCALL set, we need figout which have STDCALL or FASTCALL. I only set STDCALL on tested functions for dxgen this will fix the stack corruptions we did have in ms dxsys.sys, now we need setup internal struct for dx. I also add some debug data output so we can see what been requested to send back from DxEngGetHdevData Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] Sat Apr 19 15:17:51 2008 @@ -72,23 +72,24 @@ /************************************************************************/ /* win32k.sys internal protypes for the driver functions it export */ /************************************************************************/ -BOOL DxEngNUIsTermSrv(); -BOOL DxEngRedrawDesktop(); +BOOLEAN STDCALL DxEngNUIsTermSrv(); +BOOLEAN DxEngRedrawDesktop(); ULONG DxEngDispUniq(); ULONG DxEngVisRgnUniq(); HDEV *DxEngEnumerateHdev(HDEV *hdev); BOOL DxEngGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp); -PDC DxEngLockDC(HDC hDC); -BOOL DxEngUnlockDC(PDC pDC); -BOOL DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Unuse); +PDC STDCALL DxEngLockDC(HDC hDC); +BOOLEAN STDCALL DxEngUnlockDC(PDC pDC); +BOOLEAN DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Unuse); BOOLEAN DxEngLockShareSem(); BOOLEAN DxEngUnlockShareSem(); BOOLEAN DxEngCleanDC(HDC hdc); -DWORD DxEngGetHdevData(HDEV, DXEGSHDEVDATA); -BOOLEAN DxEngSetHdevData(HDEV, DXEGSHDEVDATA, DWORD); +DWORD STDCALL DxEngGetHdevData(HDEV, DXEGSHDEVDATA); +BOOLEAN STDCALL DxEngSetHdevData(HDEV, DXEGSHDEVDATA, DWORD); BOOLEAN DxEngIncDispUniq(); -BOOLEAN DxEngLockHdev(HDEV hdev); +BOOLEAN STDCALL DxEngLockHdev(HDEV hdev); BOOLEAN DxEngUnlockHdev(HDEV hdev); +DWORD STDCALL DxEngGetDCState(HDC hDC, DWORD type); /* prototypes are not done yet, I need gather all my notes * to make them correct @@ -106,7 +107,6 @@ DWORD DxEngDeleteDC(DWORD x1, DWORD x2); DWORD DxEngSetDCOwner(DWORD x1, DWORD x2); DWORD DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3); -DWORD DxEngGetDCState(HDC hDC, DWORD type); DWORD DxEngSelectBitmap(DWORD x1, DWORD x2); DWORD DxEngSetBitmapOwner(DWORD x1, DWORD x2); DWORD DxEngDeleteSurface(DWORD x1); Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Sat Apr 19 15:17:51 2008 @@ -126,6 +126,7 @@ * *--*/ PDC +STDCALL DxEngLockDC(HDC hDC) { DPRINT1("ReactX Calling : DxEngLockDC\n"); @@ -149,7 +150,8 @@ * none * *--*/ -BOOL +BOOLEAN +STDCALL DxEngUnlockDC(PDC pDC) { DPRINT1("ReactX Calling : DxEngUnlockDC\n"); @@ -234,7 +236,7 @@ * None * *--*/ -BOOL +BOOLEAN DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Test) { DPRINT1("ReactX Calling : DxEngSetDeviceGammaRamp\n"); @@ -281,6 +283,7 @@ * *--*/ DWORD +STDCALL DxEngGetHdevData(HDEV hDev, DXEGSHDEVDATA Type) { @@ -292,61 +295,80 @@ switch ( Type ) { case DxEGShDevData_Surface: + DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_Surface\n"); retVal = (DWORD) PDev->pSurface; // ptr to Surface handle. break; case DxEGShDevData_hSpooler: + DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_hSpooler\n"); retVal = (DWORD) PDev->hSpooler; // If the device is a spooler driver. break; case DxEGShDevData_DitherFmt: + DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_DitherFmt\n"); retVal = (DWORD) PDev->DevInfo.iDitherFormat; break; case DxEGShDevData_FxCaps: + DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_FxCaps\n"); retVal = (DWORD) PDev->DevInfo.flGraphicsCaps; break; case DxEGShDevData_FxCaps2: + DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_FxCaps2\n"); retVal = (DWORD) PDev->DevInfo.flGraphicsCaps2; break; case DxEGShDevData_DrvFuncs: + DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_DrvFuncs\n"); retVal = (DWORD) &PDev->DriverFunctions; break; case DxEGShDevData_dhpdev: + DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_dhpdev\n"); retVal = (DWORD) PDev->hPDev; // DHPDEV break; case DxEGShDevData_eddg: + DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_eddg\n"); retVal = (DWORD) PDev->pEDDgpl; break; case DxEGShDevData_dd_nCount: + DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_dd_nCount\n"); retVal = (DWORD) PDev->DxDd_nCount; break; case DxEGShDevData_dd_flags: + DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_dd_flags\n"); retVal = (DWORD) PDev->DxDd_Flags; break; case DxEGShDevData_disable: + DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_disable\n"); retVal = (DWORD) PDev->flFlags & PDEV_DISABLED; break; case DxEGShDevData_metadev: + DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_metadev\n"); retVal = (DWORD) PDev->flFlags & PDEV_META_DEVICE; break; case DxEGShDevData_display: + DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_display\n"); retVal = (DWORD) PDev->flFlags & PDEV_DISPLAY; break; case DxEGShDevData_Parent: + DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_Parent\n"); retVal = (DWORD) PDev->ppdevParent; break; case DxEGShDevData_OpenRefs: + DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_OpenRefs\n"); retVal = (DWORD) PDev->cPdevOpenRefs == 0; break; case DxEGShDevData_palette: + DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_palette\n"); retVal = (DWORD) PDev->GDIInfo.flRaster & RC_PALETTE; break; case DxEGShDevData_ldev: + DPRINT1("DxEGShDevData_ldev not supported yet\n"); // ATM we do not support the Loader Device driver structure. // retVal = (DWORD) PDev->pldev; break; case DxEGShDevData_GDev: + DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_GDev\n"); retVal = (DWORD) PDev->pGraphicsDev; // P"GRAPHICS_DEVICE" break; case DxEGShDevData_clonedev: + DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_clonedev\n"); retVal = (DWORD) PDev->flFlags & PDEV_CLONE_DEVICE; break; @@ -381,6 +403,7 @@ * *--*/ BOOLEAN +STDCALL DxEngSetHdevData(HDEV hDev, DXEGSHDEVDATA Type, DWORD Data) @@ -423,6 +446,7 @@ * *--*/ DWORD +STDCALL DxEngGetDCState(HDC hDC, DWORD type) { @@ -497,6 +521,7 @@ * *--*/ BOOLEAN +STDCALL DxEngLockHdev(HDEV hDev) { PGDIDEVICE pPDev = (PGDIDEVICE)hDev; @@ -550,7 +575,8 @@ /************************************************************************/ /* Notes : Check see if termal server got a connections or not */ -BOOL +BOOLEAN +STDCALL DxEngNUIsTermSrv() { /* FIXME ReactOS does not suport terminal server yet, we can not check if we got a connections or not */ @@ -563,7 +589,7 @@ /************************************************************************/ /* Notes : it always return TRUE, and it update whole the screen (redaw current desktop) */ -BOOL +BOOLEAN DxEngRedrawDesktop() { /* FIXME add redraw code */

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
40
Older →

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 April 2008