Ros-diffs May 2007

ros-diffs@reactos.org

17 participants
322 discussions

[greatlrd] 26746: fixing a path issue so it is compatible with linux

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun May 13 12:38:22 2007 New Revision: 26746 URL: http://svn.reactos.org/svn/reactos?rev=26746&view=rev Log: fixing a path issue so it is compatible with linux Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h 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 Sun May 13 12:38:22 2007 @@ -9,8 +9,8 @@ #include <d3dhal.h> #include <ddrawgdi.h> -#include "Ddraw\ddraw.h" -#include "Surface\surface.h" +#include "Ddraw/ddraw.h" +#include "Surface/surface.h" /* DirectDraw startup code only internal use */ extern DDRAWI_DIRECTDRAW_GBL ddgbl;

17 years, 5 months

[arty] 26745: Removed.

by arty＠svn.reactos.org

Author: arty Date: Sun May 13 11:25:25 2007 New Revision: 26745 URL: http://svn.reactos.org/svn/reactos?rev=26745&view=rev Log: Removed. Removed: branches/powerpc/reactos/boot/freeldr/freeldr/include/mmu.h Removed: branches/powerpc/reactos/boot/freeldr/freeldr/include/mmu.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/include/mmu.h (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/include/mmu.h (removed) @@ -1,25 +1,0 @@ -#ifndef FREELDR_MMU_H -#define FREELDR_MMU_H - -extern int mmu_handle; - -int GetDEC(); -int GetMSR(); -int GetPhys( int addr ); -int GetPhysHalf( int addr ); -int GetPhysByte( int addr ); -void SetPhys( int addr, int val ); -void SetPhysHalf( int addr, int val ); -void SetPhysByte( int addr, int val ); -int GetSR(int n); -void GetBat( int bat, int inst, int *batHi, int *batLo ); -void SetBat( int bat, int inst, int batHi, int batLo ); -int GetSDR1(); -void SetSDR1( int newsdr ); -int BatHit( int bath, int batl, int virt ); -int BatTranslate( int bath, int batl, int virt ); -/* translate address */ -int PpcVirt2phys( int virt, int inst ); -BOOLEAN InsertPageEntry( int virt, int phys, int slot, int sdr ); - -#endif/*FREELDR_MMU_H*/

17 years, 5 months

[arty] 26744: Sizeable work, some WIP - locore library for working the mmu - work on prep etc - we now get to kernel space in BE

by arty＠svn.reactos.org

Author: arty Date: Sun May 13 11:24:36 2007 New Revision: 26744 URL: http://svn.reactos.org/svn/reactos?rev=26744&view=rev Log: Sizeable work, some WIP - locore library for working the mmu - work on prep etc - we now get to kernel space in BE Added: branches/powerpc/reactos/include/reactos/ppcmmu/ branches/powerpc/reactos/include/reactos/ppcmmu/mmu.h branches/powerpc/reactos/include/reactos/ppcmmu/mmuutil.h branches/powerpc/reactos/lib/mmu/ branches/powerpc/reactos/lib/mmu/makefile branches/powerpc/reactos/lib/mmu/mmuobject.c branches/powerpc/reactos/lib/mmu/mmuobject.h branches/powerpc/reactos/lib/mmu/mmutest.c branches/powerpc/reactos/lib/mmu/mmuutil.c Removed: branches/powerpc/reactos/tools/ppc-build/alink/Alinksrc.txt branches/powerpc/reactos/tools/ppc-build/alink/Makefile branches/powerpc/reactos/tools/ppc-build/alink/alink.cpp branches/powerpc/reactos/tools/ppc-build/alink/alink.h branches/powerpc/reactos/tools/ppc-build/alink/alink.mak branches/powerpc/reactos/tools/ppc-build/alink/alink2.mak branches/powerpc/reactos/tools/ppc-build/alink/coff.cpp branches/powerpc/reactos/tools/ppc-build/alink/cofflib.cpp branches/powerpc/reactos/tools/ppc-build/alink/combine.cpp branches/powerpc/reactos/tools/ppc-build/alink/elf.cpp branches/powerpc/reactos/tools/ppc-build/alink/license-note.txt branches/powerpc/reactos/tools/ppc-build/alink/objload.cpp branches/powerpc/reactos/tools/ppc-build/alink/output.cpp branches/powerpc/reactos/tools/ppc-build/alink/readme.txt branches/powerpc/reactos/tools/ppc-build/alink/tests/ branches/powerpc/reactos/tools/ppc-build/alink/util.cpp branches/powerpc/reactos/tools/ppc-build/compdvr/ Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_base.rbuild branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_main.rbuild branches/powerpc/reactos/boot/freeldr/freeldr/windows/conversion.c branches/powerpc/reactos/boot/freeldr/freeldr/windows/wlregistry.c branches/powerpc/reactos/include/reactos/elf/elf-powerpc.h branches/powerpc/reactos/tools/ppc-build/elfpe/header.cpp branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… Modified: branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… Modified: branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… Modified: branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… Modified: branches/powerpc/reactos/boot/freeldr/freeldr/windows/conversion.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… Modified: branches/powerpc/reactos/boot/freeldr/freeldr/windows/wlregistry.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… Modified: branches/powerpc/reactos/include/reactos/elf/elf-powerpc.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/reactos… Added: branches/powerpc/reactos/include/reactos/ppcmmu/mmu.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/reactos… Added: branches/powerpc/reactos/include/reactos/ppcmmu/mmuutil.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/reactos… Added: branches/powerpc/reactos/lib/mmu/makefile URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/mmu/makefil… Added: branches/powerpc/reactos/lib/mmu/mmuobject.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/mmu/mmuobje… Added: branches/powerpc/reactos/lib/mmu/mmuobject.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/mmu/mmuobje… Added: branches/powerpc/reactos/lib/mmu/mmutest.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/mmu/mmutest… Added: branches/powerpc/reactos/lib/mmu/mmuutil.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/mmu/mmuutil… Removed: branches/powerpc/reactos/tools/ppc-build/alink/Alinksrc.txt URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… Removed: branches/powerpc/reactos/tools/ppc-build/alink/Makefile URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… Removed: branches/powerpc/reactos/tools/ppc-build/alink/alink.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… Removed: branches/powerpc/reactos/tools/ppc-build/alink/alink.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… Removed: branches/powerpc/reactos/tools/ppc-build/alink/alink.mak URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… Removed: branches/powerpc/reactos/tools/ppc-build/alink/alink2.mak URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… Removed: branches/powerpc/reactos/tools/ppc-build/alink/coff.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… Removed: branches/powerpc/reactos/tools/ppc-build/alink/cofflib.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… Removed: branches/powerpc/reactos/tools/ppc-build/alink/combine.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… Removed: branches/powerpc/reactos/tools/ppc-build/alink/elf.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… Removed: branches/powerpc/reactos/tools/ppc-build/alink/license-note.txt URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… Removed: branches/powerpc/reactos/tools/ppc-build/alink/objload.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… Removed: branches/powerpc/reactos/tools/ppc-build/alink/output.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… Removed: branches/powerpc/reactos/tools/ppc-build/alink/readme.txt URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… Removed: branches/powerpc/reactos/tools/ppc-build/alink/util.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/header.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… Modified: branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc.lost%…

17 years, 5 months

[tkreuzer] 26743: handle FW_DONTCARE in GetFontScore. Fixes gray/thin display of dialogbox elements' text.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 13 06:31:00 2007 New Revision: 26743 URL: http://svn.reactos.org/svn/reactos?rev=26743&view=rev Log: handle FW_DONTCARE in GetFontScore. Fixes gray/thin display of dialogbox elements' text. Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Sun May 13 06:31:00 2007 @@ -3923,15 +3923,22 @@ { Score += 25; } - if (LogFont->lfWeight < Otm->otmTextMetrics.tmWeight) + if (LogFont->lfWeight != FW_DONTCARE) + { + if (LogFont->lfWeight < Otm->otmTextMetrics.tmWeight) { WeightDiff = Otm->otmTextMetrics.tmWeight - LogFont->lfWeight; } + else + { + WeightDiff = LogFont->lfWeight - Otm->otmTextMetrics.tmWeight; + } + Score += (1000 - WeightDiff) / (1000 / 25); + } else - { - WeightDiff = LogFont->lfWeight - Otm->otmTextMetrics.tmWeight; - } - Score += (1000 - WeightDiff) / (1000 / 25); + { + Score += 25; + } ExFreePool(Otm);

17 years, 5 months

[tkreuzer] 26742: On win XP the gdi handle index can be > 0x3fff, so change GDI_HANDLE_INDEX_MASK to 0x0000ffff to not fail on win XP on higher handle index.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 13 04:57:09 2007 New Revision: 26742 URL: http://svn.reactos.org/svn/reactos?rev=26742&view=rev Log: On win XP the gdi handle index can be > 0x3fff, so change GDI_HANDLE_INDEX_MASK to 0x0000ffff to not fail on win XP on higher handle index. Modified: trunk/rostests/win32/gdi32/gditest.h Modified: trunk/rostests/win32/gdi32/gditest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/gdi32/gditest.h?rev… ============================================================================== --- trunk/rostests/win32/gdi32/gditest.h (original) +++ trunk/rostests/win32/gdi32/gditest.h Sun May 13 04:57:09 2007 @@ -19,7 +19,7 @@ printf("Test failed in %s:%d (%s)\n", __FILE__, __LINE__, #x);\ }; -#define GDI_HANDLE_INDEX_MASK 0x00003fff // (GDI_HANDLE_COUNT - 1) +#define GDI_HANDLE_INDEX_MASK 0x0000ffff // (GDI_HANDLE_COUNT - 1) #define GDI_HANDLE_TYPE_MASK 0x007f0000 #define GDI_HANDLE_STOCK_MASK 0x00800000 #define GDI_HANDLE_REUSE_MASK 0xff000000

17 years, 5 months

[dgorbachev] 26741: Check result of ANSI -> Unicode conversion, which can fail in the case of memory shortage.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun May 13 02:54:58 2007 New Revision: 26741 URL: http://svn.reactos.org/svn/reactos?rev=26741&view=rev Log: Check result of ANSI -> Unicode conversion, which can fail in the case of memory shortage. Modified: trunk/reactos/dll/ntdll/ldr/utils.c 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 Sun May 13 02:54:58 2007 @@ -1329,12 +1329,18 @@ PLDR_DATA_TABLE_ENTRY* Module, BOOLEAN Load) { + ANSI_STRING AnsiDllName; UNICODE_STRING DllName; NTSTATUS Status; DPRINT("LdrpGetOrLoadModule() called for %s\n", Name); - RtlCreateUnicodeStringFromAsciiz (&DllName, Name); + RtlInitAnsiString(&AnsiDllName, Name); + Status = RtlAnsiStringToUnicodeString(&DllName, &AnsiDllName, TRUE); + if (!NT_SUCCESS(Status)) + { + return Status; + } Status = LdrFindEntryForName (&DllName, Module, Load); if (Load && !NT_SUCCESS(Status))

17 years, 5 months

[mbosma] 26740: Add it to build.

by mbosma＠svn.reactos.org

Author: mbosma Date: Sat May 12 23:43:23 2007 New Revision: 26740 URL: http://svn.reactos.org/svn/reactos?rev=26740&view=rev Log: Add it to build. Modified: trunk/rostests/dxtest/directory.rbuild Modified: trunk/rostests/dxtest/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/directory.rbuild?r… ============================================================================== --- trunk/rostests/dxtest/directory.rbuild (original) +++ trunk/rostests/dxtest/directory.rbuild Sat May 12 23:43:23 2007 @@ -1,3 +1,7 @@ +<directory name="ddraw"> + <xi:include href="ddraw/ddraw.rbuild" /> +</directory> + <directory name="win32kdxtest"> <xi:include href="win32kdxtest/win32kdxtest.rbuild" /> </directory>

17 years, 5 months

[mbosma] 26739: Start of ddraw test case.

by mbosma＠svn.reactos.org

Author: mbosma Date: Sat May 12 23:43:01 2007 New Revision: 26739 URL: http://svn.reactos.org/svn/reactos?rev=26739&view=rev Log: Start of ddraw test case. Added: trunk/rostests/dxtest/ddraw/ddraw.rbuild trunk/rostests/dxtest/ddraw/ddraw_test.c (with props) trunk/rostests/dxtest/ddraw/ddrawtest.h (with props) trunk/rostests/dxtest/ddraw/testlist.cpp (with props) trunk/rostests/dxtest/ddraw/tests/ trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp (with props) Added: trunk/rostests/dxtest/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/ddraw.rbuild… ============================================================================== --- trunk/rostests/dxtest/ddraw/ddraw.rbuild (added) +++ trunk/rostests/dxtest/ddraw/ddraw.rbuild Sat May 12 23:43:01 2007 @@ -1,0 +1,12 @@ +<module name="ddraw_test" type="win32cui" allowwarnings="true"> + <include base="ddraw_test">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>ddraw</library> + <library>dxguid</library> + <file>ddraw_test.c</file> + <file>testlist.cpp</file> +</module> Added: trunk/rostests/dxtest/ddraw/ddraw_test.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/ddraw_test.c… ============================================================================== --- trunk/rostests/dxtest/ddraw/ddraw_test.c (added) +++ trunk/rostests/dxtest/ddraw/ddraw_test.c Sat May 12 23:43:01 2007 @@ -1,0 +1,51 @@ +#include <stdio.h> +#include <stdlib.h> + +#include "ddrawtest.h" + +INT NumTests(void); + +int main(int argc, char *argv[]) +{ + INT Num = NumTests(); + INT i, j; + INT passed, failed, opassed, ofailed; + + opassed = 0; + ofailed = 0; + printf("DirectDraw tests\n"); + if (argc > 1) + { + for (i = 1; i < argc; i++) + { + for (j = 0; j < NumTests(); j++) + { + if (stricmp(argv[i], TestList[j].Test) == 0) + { + passed = 0; + failed = 0; + TestList[j].Proc(&passed, &failed); + opassed += passed; + ofailed += failed; + printf(" tests: %d, passed: %d, failed: %d\n\n", passed+failed, passed, failed); + } + } + } + } + else + { + for (i = 0; i < Num; i++) + { + passed = 0; + failed = 0; + printf("Test: %s\n", TestList[i].Test); + TestList[i].Proc(&passed, &failed); + opassed += passed; + ofailed += failed; + printf(" tests: %d, passed: %d, failed: %d\n\n", passed+failed, passed, failed); + } + } + printf("\nOverall tests: %d, passed: %d, failed: %d\n", opassed+ofailed, opassed, ofailed); + + return ofailed; +} Propchange: trunk/rostests/dxtest/ddraw/ddraw_test.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/dxtest/ddraw/ddraw_test.c ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: trunk/rostests/dxtest/ddraw/ddrawtest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/ddrawtest.h?… ============================================================================== --- trunk/rostests/dxtest/ddraw/ddrawtest.h (added) +++ trunk/rostests/dxtest/ddraw/ddrawtest.h Sat May 12 23:43:01 2007 @@ -1,0 +1,34 @@ +#ifndef _DDRAWTEST_H +#define _DDRAWTEST_H + +#define WINVER 0x501 + +#include <stdio.h> +#include <windows.h> +#include <ddraw.h> + +#define TEST(x) \ + if (x)\ + {\ + (*passed)++;\ + } else {\ + (*failed)++;\ + printf("Test failed in %s:%d (%s)\n", __FILE__, __LINE__, #x);\ + }; + + +/* The type definitions */ +typedef BOOL (*TESTPROC)(INT*, INT*); + +typedef struct tagTEST +{ + CHAR* Test; + TESTPROC Proc; +} TEST, *PTEST; + + +extern TEST TestList[]; + +#endif /* _DDRAWTEST_H */ + +/* EOF */ Propchange: trunk/rostests/dxtest/ddraw/ddrawtest.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/dxtest/ddraw/ddrawtest.h ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: trunk/rostests/dxtest/ddraw/testlist.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/testlist.cpp… ============================================================================== --- trunk/rostests/dxtest/ddraw/testlist.cpp (added) +++ trunk/rostests/dxtest/ddraw/testlist.cpp Sat May 12 23:43:01 2007 @@ -1,0 +1,23 @@ +#ifndef _DDRAWTESTLIST_H +#define _DDRAWTESTLIST_H + +#include "ddrawtest.h" + +/* include the tests */ +#include "tests/CreateDDraw.cpp" + +/* The List of tests */ +TEST TestList[] = +{ + { "CreateDDraw", Test_CreateDDraw } +}; + +/* The function that gives us the number of tests */ +extern "C" INT NumTests(void) +{ + return sizeof(TestList) / sizeof(TEST); +} + +#endif /* _DDRAWTESTLIST_H */ + +/* EOF */ Propchange: trunk/rostests/dxtest/ddraw/testlist.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/dxtest/ddraw/testlist.cpp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Create… ============================================================================== --- trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp (added) +++ trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp Sat May 12 23:43:01 2007 @@ -1,0 +1,19 @@ +#include "ddrawtest.h" + +PCHAR DDErrorString (HRESULT hResult); + +BOOL Test_CreateDDraw (INT* passed, INT* failed) +{ + LPDIRECTDRAW7 DirectDraw; + IDirectDraw* DirectDraw2; + + // FIXME: Test first parameter + + TEST (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, (IUnknown*)0xdeadbeef) == CLASS_E_NOAGGREGATION); + TEST (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw4, NULL) == DDERR_INVALIDPARAMS); + TEST (DirectDrawCreateEx(NULL, NULL, IID_IDirectDraw7, NULL) == DDERR_INVALIDPARAMS); + TEST (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) == DD_OK); + TEST (DirectDrawCreate(NULL ,&DirectDraw2, NULL) == DD_OK); + + return TRUE; +} Propchange: trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision

17 years, 5 months

[greatlrd] 26738: commit some bugfix for ddraw createsurface, fixing comping as well

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat May 12 23:20:54 2007 New Revision: 26738 URL: http://svn.reactos.org/svn/reactos?rev=26738&view=rev Log: commit some bugfix for ddraw createsurface, fixing comping as well Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/Surface/surface.h trunk/reactos/dll/directx/ddraw/rosdraw.h Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Sat May 12 23:20:54 2007 @@ -29,6 +29,7 @@ { /* DirectDraw7 Vtable */ This->lpVtbl = &DirectDraw7_Vtable; + This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags + DDRAWILCL_DIRECTDRAW7; *obj = &This->lpVtbl; } else @@ -155,11 +156,11 @@ if (pDDSD->dwSize == sizeof(DDSURFACEDESC)) { - CopyDDSurfDescToDDSurfDesc2(&dd_desc_v2,pDDSD); + CopyDDSurfDescToDDSurfDesc2(&dd_desc_v2, (LPDDSURFACEDESC)pDDSD); } else if (pDDSD->dwSize == sizeof(DDSURFACEDESC2)) { - RtlCopyMemory(&dd_desc_v2,pDDSD,sizeof(DDSURFACEDESC2)); + RtlCopyMemory(&dd_desc_v2, pDDSD,sizeof(DDSURFACEDESC2)); } else { @@ -168,13 +169,13 @@ } /* check if this process belong to this ddraw */ - if ( dd_int->lcl->dwProcessId != GetCurrentProcessId() ) + if ( dd_int->lpLcl->dwProcessId != GetCurrentProcessId() ) { /* FIXME send back right return code */ return DDERR_GENERIC; } - ret = internal_CreateSurface(dd_int,dd_desc_v2,ppSurf,pUnkOuter); + ret = Internal_CreateSurface(dd_int,&dd_desc_v2, ppSurf,pUnkOuter); LeaveCriticalSection(&ddcs); return ret; Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Sat May 12 23:20:54 2007 @@ -10,11 +10,19 @@ #include "rosdraw.h" HRESULT -Internal_CreateSurface(LPDDRAWI_DIRECTDRAW_INT pDDraw, - LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, - LPDDSURFACEDESC2 pDDSD) -{ - return DDERR_GENERIC; +Internal_CreateSurface( LPDDRAWI_DIRECTDRAW_INT pDDraw, LPDDSURFACEDESC2 pDDSD, + LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) +{ + if (!pDDraw->lpLcl->dwLocalFlags & DDRAWILCL_DIRECTDRAW7) + { + /* it is directdraw 1-6 so no DirectD3D support */ + } + else + { + /* directdraw 7 support */ + } + + return DDERR_GENERIC; } void CopyDDSurfDescToDDSurfDesc2(LPDDSURFACEDESC2 dst_pDesc, LPDDSURFACEDESC src_pDesc) Modified: trunk/reactos/dll/directx/ddraw/Surface/surface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface.h (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface.h Sat May 12 23:20:54 2007 @@ -71,4 +71,4 @@ HRESULT CreateOverlaySurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That, LPDDSURFACEDESC2 pDDSD); HRESULT CreateBackBufferSurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That, LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, LPDDSURFACEDESC2 pDDSD); HRESULT CreatePrimarySurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That,LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, LPDDSURFACEDESC2 pDDSD); -HRESULT Internal_CreateSurface(LPDDRAWI_DIRECTDRAW_INT, LPDDRAWI_DDRAWSURFACE_LCL*, LPDDSURFACEDESC2); + 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 May 12 23:20:54 2007 @@ -24,6 +24,8 @@ HRESULT WINAPI StartDirectDrawHel(LPDIRECTDRAW* iface, BOOL reenable); HRESULT WINAPI Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface, REFIID id, BOOL ex); HRESULT WINAPI ReCreateDirectDraw(LPDIRECTDRAW* iface); +HRESULT Internal_CreateSurface( LPDDRAWI_DIRECTDRAW_INT pDDraw, LPDDSURFACEDESC2 pDDSD, + LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter); /* convert DDSURFACEDESC to DDSURFACEDESC2 */ void CopyDDSurfDescToDDSurfDesc2(LPDDSURFACEDESC2 dst_pDesc, LPDDSURFACEDESC src_pDesc);

17 years, 5 months

[greatlrd] 26737: fixing smaller bugs

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat May 12 22:33:28 2007 New Revision: 26737 URL: http://svn.reactos.org/svn/reactos?rev=26737&view=rev Log: fixing smaller bugs Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Sat May 12 22:33:28 2007 @@ -130,10 +130,13 @@ DX_WINDBG_trace(); + /* FIXME vaildate input pointers or warp everthing with SEH */ + if (pUnkOuter) - return DDERR_GENERIC; - - /* FIXME vaildate input pointers or warp everthing with SEH */ + { + /* FIXME send back right return code */ + return DDERR_GENERIC; + } EnterCriticalSection(&ddcs); @@ -164,12 +167,20 @@ return DDERR_INVALIDPARAMS; } - /* FIXME add one gbl check with one pDDSD check */ - ret = Internal_CreateSurface(dd_int,ppSurf,&dd_desc_v2); + /* check if this process belong to this ddraw */ + if ( dd_int->lcl->dwProcessId != GetCurrentProcessId() ) + { + /* FIXME send back right return code */ + return DDERR_GENERIC; + } + + ret = internal_CreateSurface(dd_int,dd_desc_v2,ppSurf,pUnkOuter); LeaveCriticalSection(&ddcs); return ret; } + + IDirectDraw7Vtbl DirectDraw7_Vtable = { Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Sat May 12 22:33:28 2007 @@ -21,6 +21,7 @@ { RtlZeroMemory(dst_pDesc,sizeof(DDSURFACEDESC2)); RtlCopyMemory(dst_pDesc,src_pDesc,sizeof(DDSURFACEDESC)); + dst_pDesc->dwSize = sizeof(DDSURFACEDESC2); }

17 years, 5 months

← Newer
1
...
16
17
18
19
20
21
22
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2007