Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 26411: Copied remotely
by cwittich＠svn.reactos.org 18 Apr '07

18 Apr '07

Author: cwittich Date: Thu Apr 19 03:49:02 2007 New Revision: 26411 URL: http://svn.reactos.org/svn/reactos?rev=26411&view=rev Log: Copied remotely Added: trunk/reactos/dll/win32/wldap32/ - copied from r26410, vendor/wine/dlls/wldap32/current/

1 0

[cwittich] 26410: Removed file/folder
by cwittich＠svn.reactos.org 18 Apr '07

18 Apr '07

Author: cwittich Date: Thu Apr 19 03:48:22 2007 New Revision: 26410 URL: http://svn.reactos.org/svn/reactos?rev=26410&view=rev Log: Removed file/folder Removed: trunk/reactos/dll/win32/wldap32/

1 0

[cwittich] 26409: Removed file/folder
by cwittich＠svn.reactos.org 18 Apr '07

18 Apr '07

Author: cwittich Date: Thu Apr 19 03:45:10 2007 New Revision: 26409 URL: http://svn.reactos.org/svn/reactos?rev=26409&view=rev Log: Removed file/folder Removed: trunk/reactos/dll/win32/wldap32/Wine-0_9_35/ trunk/reactos/dll/win32/wldap32/current/

1 0

[cwittich] 26408: add rbuild files for wldap32 and add it to bootcd
by cwittich＠svn.reactos.org 18 Apr '07

18 Apr '07

Author: cwittich Date: Thu Apr 19 03:42:27 2007 New Revision: 26408 URL: http://svn.reactos.org/svn/reactos?rev=26408&view=rev Log: add rbuild files for wldap32 and add it to bootcd Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=264… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Thu Apr 19 03:42:27 2007 @@ -49,6 +49,7 @@ <property name="BASEADDRESS_SMDLL" value="0x6b3b0000" /> <property name="BASEADDRESS_URLMON" value="0x6b3c0000" /> <property name="BASEADDRESS_SERIALUI" value="0x6b3D0000" /> + <property name="BASEADDRESS_WLDAP32" value="0x6e130000" /> <property name="BASEADDRESS_CLB" value="0x6f2b0000" /> <property name="BASEADDRESS_CARDS" value="0x701a0000" /> <property name="BASEADDRESS_WININET" value="0x70200000" /> 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 (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Thu Apr 19 03:42:27 2007 @@ -114,6 +114,7 @@ dll\directx\dxdiagn\dxdiagn.dll 1 dll\directx\ddraw\ddraw.dll 1 dll\directx\d3d8thk\d3d8thk.dll 1 +dll\directx\d3d8\d3d8.dll 1 dll\directx\d3d9\d3d9.dll 1 dll\directx\devenum\devenum.dll 1 @@ -224,6 +225,7 @@ dll\win32\winmm\wavemap\msacm32.drv 1 dll\win32\winspool\winspool.drv 1 dll\win32\wintrust\wintrust.dll 1 +dll\win32\wldap32\wldap32.dll 1 dll\win32\ws2_32\ws2_32.dll 1 dll\win32\ws2help\ws2help.dll 1 dll\win32\wshirda\wshirda.dll 1 Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Thu Apr 19 03:42:27 2007 @@ -277,6 +277,9 @@ <directory name="wintrust"> <xi:include href="wintrust/wintrust.rbuild" /> </directory> +<directory name="wldap32"> + <xi:include href="wldap32/wldap32.rbuild" /> +</directory> <directory name="ws2_32"> <xi:include href="ws2_32/ws2_32.rbuild" /> </directory>

1 0

[cwittich] 26407: Copied remotely
by cwittich＠svn.reactos.org 18 Apr '07

18 Apr '07

Author: cwittich Date: Thu Apr 19 03:41:42 2007 New Revision: 26407 URL: http://svn.reactos.org/svn/reactos?rev=26407&view=rev Log: Copied remotely Added: trunk/reactos/dll/win32/wldap32/ - copied from r26406, vendor/wine/dlls/wldap32/

1 0

[gedmurphy] 26406: import wldap32 from Wine-0.9.35
by gedmurphy＠svn.reactos.org 18 Apr '07

18 Apr '07

Author: gedmurphy Date: Thu Apr 19 03:12:19 2007 New Revision: 26406 URL: http://svn.reactos.org/svn/reactos?rev=26406&view=rev Log: import wldap32 from Wine-0.9.35 Added: vendor/wine/dlls/wldap32/ vendor/wine/dlls/wldap32/Wine-0_9_35/ vendor/wine/dlls/wldap32/Wine-0_9_35/Makefile.in vendor/wine/dlls/wldap32/Wine-0_9_35/add.c vendor/wine/dlls/wldap32/Wine-0_9_35/ber.c vendor/wine/dlls/wldap32/Wine-0_9_35/bind.c vendor/wine/dlls/wldap32/Wine-0_9_35/compare.c vendor/wine/dlls/wldap32/Wine-0_9_35/control.c vendor/wine/dlls/wldap32/Wine-0_9_35/delete.c vendor/wine/dlls/wldap32/Wine-0_9_35/dn.c vendor/wine/dlls/wldap32/Wine-0_9_35/error.c vendor/wine/dlls/wldap32/Wine-0_9_35/extended.c vendor/wine/dlls/wldap32/Wine-0_9_35/init.c vendor/wine/dlls/wldap32/Wine-0_9_35/main.c vendor/wine/dlls/wldap32/Wine-0_9_35/misc.c vendor/wine/dlls/wldap32/Wine-0_9_35/modify.c vendor/wine/dlls/wldap32/Wine-0_9_35/modrdn.c vendor/wine/dlls/wldap32/Wine-0_9_35/option.c vendor/wine/dlls/wldap32/Wine-0_9_35/page.c vendor/wine/dlls/wldap32/Wine-0_9_35/parse.c vendor/wine/dlls/wldap32/Wine-0_9_35/rename.c vendor/wine/dlls/wldap32/Wine-0_9_35/search.c vendor/wine/dlls/wldap32/Wine-0_9_35/value.c vendor/wine/dlls/wldap32/Wine-0_9_35/winldap_private.h vendor/wine/dlls/wldap32/Wine-0_9_35/wldap32.h vendor/wine/dlls/wldap32/Wine-0_9_35/wldap32.rc vendor/wine/dlls/wldap32/Wine-0_9_35/wldap32.spec vendor/wine/dlls/wldap32/Wine-0_9_35/wldap32_De.rc vendor/wine/dlls/wldap32/Wine-0_9_35/wldap32_En.rc vendor/wine/dlls/wldap32/Wine-0_9_35/wldap32_Es.rc vendor/wine/dlls/wldap32/Wine-0_9_35/wldap32_Fr.rc vendor/wine/dlls/wldap32/Wine-0_9_35/wldap32_Ko.rc vendor/wine/dlls/wldap32/Wine-0_9_35/wldap32_Nl.rc vendor/wine/dlls/wldap32/Wine-0_9_35/wldap32_No.rc vendor/wine/dlls/wldap32/Wine-0_9_35/wldap32_Ru.rc vendor/wine/dlls/wldap32/Wine-0_9_35/wldap32_Tr.rc vendor/wine/dlls/wldap32/current/ vendor/wine/dlls/wldap32/current/Makefile.in vendor/wine/dlls/wldap32/current/add.c vendor/wine/dlls/wldap32/current/ber.c vendor/wine/dlls/wldap32/current/bind.c vendor/wine/dlls/wldap32/current/compare.c vendor/wine/dlls/wldap32/current/control.c vendor/wine/dlls/wldap32/current/delete.c vendor/wine/dlls/wldap32/current/dn.c vendor/wine/dlls/wldap32/current/error.c vendor/wine/dlls/wldap32/current/extended.c vendor/wine/dlls/wldap32/current/init.c vendor/wine/dlls/wldap32/current/main.c vendor/wine/dlls/wldap32/current/misc.c vendor/wine/dlls/wldap32/current/modify.c vendor/wine/dlls/wldap32/current/modrdn.c vendor/wine/dlls/wldap32/current/option.c vendor/wine/dlls/wldap32/current/page.c vendor/wine/dlls/wldap32/current/parse.c vendor/wine/dlls/wldap32/current/rename.c vendor/wine/dlls/wldap32/current/search.c vendor/wine/dlls/wldap32/current/value.c vendor/wine/dlls/wldap32/current/winldap_private.h vendor/wine/dlls/wldap32/current/wldap32.h vendor/wine/dlls/wldap32/current/wldap32.rc vendor/wine/dlls/wldap32/current/wldap32.spec vendor/wine/dlls/wldap32/current/wldap32_De.rc vendor/wine/dlls/wldap32/current/wldap32_En.rc vendor/wine/dlls/wldap32/current/wldap32_Es.rc vendor/wine/dlls/wldap32/current/wldap32_Fr.rc vendor/wine/dlls/wldap32/current/wldap32_Ko.rc vendor/wine/dlls/wldap32/current/wldap32_Nl.rc vendor/wine/dlls/wldap32/current/wldap32_No.rc vendor/wine/dlls/wldap32/current/wldap32_Ru.rc vendor/wine/dlls/wldap32/current/wldap32_Tr.rc [This mail would be too long, it was shortened to contain the URLs only.] Added: vendor/wine/dlls/wldap32/Wine-0_9_35/Makefile.in URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/Mak… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/add.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/add… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/ber.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/ber… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/bind.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/bin… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/compare.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/com… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/control.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/con… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/delete.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/del… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/dn.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/dn.… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/error.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/err… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/extended.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/ext… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/init.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/ini… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/main.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/mai… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/misc.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/mis… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/modify.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/mod… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/modrdn.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/mod… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/option.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/opt… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/page.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/pag… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/parse.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/par… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/rename.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/ren… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/search.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/sea… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/value.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/val… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/winldap_private.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/win… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/wldap32.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/wld… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/wldap32.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/wld… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/wldap32.spec URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/wld… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/wldap32_De.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/wld… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/wldap32_En.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/wld… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/wldap32_Es.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/wld… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/wldap32_Fr.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/wld… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/wldap32_Ko.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/wld… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/wldap32_Nl.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/wld… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/wldap32_No.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/wld… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/wldap32_Ru.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/wld… Added: vendor/wine/dlls/wldap32/Wine-0_9_35/wldap32_Tr.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/Wine-0_9_35/wld… Added: vendor/wine/dlls/wldap32/current/Makefile.in URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/Makefil… Added: vendor/wine/dlls/wldap32/current/add.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/add.c?r… Added: vendor/wine/dlls/wldap32/current/ber.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/ber.c?r… Added: vendor/wine/dlls/wldap32/current/bind.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/bind.c?… Added: vendor/wine/dlls/wldap32/current/compare.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/compare… Added: vendor/wine/dlls/wldap32/current/control.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/control… Added: vendor/wine/dlls/wldap32/current/delete.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/delete.… Added: vendor/wine/dlls/wldap32/current/dn.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/dn.c?re… Added: vendor/wine/dlls/wldap32/current/error.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/error.c… Added: vendor/wine/dlls/wldap32/current/extended.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/extende… Added: vendor/wine/dlls/wldap32/current/init.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/init.c?… Added: vendor/wine/dlls/wldap32/current/main.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/main.c?… Added: vendor/wine/dlls/wldap32/current/misc.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/misc.c?… Added: vendor/wine/dlls/wldap32/current/modify.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/modify.… Added: vendor/wine/dlls/wldap32/current/modrdn.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/modrdn.… Added: vendor/wine/dlls/wldap32/current/option.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/option.… Added: vendor/wine/dlls/wldap32/current/page.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/page.c?… Added: vendor/wine/dlls/wldap32/current/parse.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/parse.c… Added: vendor/wine/dlls/wldap32/current/rename.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/rename.… Added: vendor/wine/dlls/wldap32/current/search.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/search.… Added: vendor/wine/dlls/wldap32/current/value.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/value.c… Added: vendor/wine/dlls/wldap32/current/winldap_private.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/winldap… Added: vendor/wine/dlls/wldap32/current/wldap32.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/wldap32… Added: vendor/wine/dlls/wldap32/current/wldap32.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/wldap32… Added: vendor/wine/dlls/wldap32/current/wldap32.spec URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/wldap32… Added: vendor/wine/dlls/wldap32/current/wldap32_De.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/wldap32… Added: vendor/wine/dlls/wldap32/current/wldap32_En.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/wldap32… Added: vendor/wine/dlls/wldap32/current/wldap32_Es.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/wldap32… Added: vendor/wine/dlls/wldap32/current/wldap32_Fr.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/wldap32… Added: vendor/wine/dlls/wldap32/current/wldap32_Ko.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/wldap32… Added: vendor/wine/dlls/wldap32/current/wldap32_Nl.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/wldap32… Added: vendor/wine/dlls/wldap32/current/wldap32_No.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/wldap32… Added: vendor/wine/dlls/wldap32/current/wldap32_Ru.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/wldap32… Added: vendor/wine/dlls/wldap32/current/wldap32_Tr.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/wldap32/current/wldap32…

1 0

[jimtabor] 26405: Correct pointer in LDC.
by jimtabor＠svn.reactos.org 18 Apr '07

18 Apr '07

Author: jimtabor Date: Wed Apr 18 23:52:40 2007 New Revision: 26405 URL: http://svn.reactos.org/svn/reactos?rev=26405&view=rev Log: Correct pointer in LDC. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Wed Apr 18 23:52:40 2007 @@ -119,7 +119,7 @@ HDC hDC; ULONG Flags; INT iType; - PVOID pEmfDC; /* Pointer to ENHMETAHEADER structure */ + PVOID pvEmfDC; /* Pointer to ENHMETAFILE structure */ ABORTPROC pAbortProc; /* AbortProc for Printing */ } LDC, *PLDC;

1 0

[jimtabor] 26404: Correct statment for NtGdiGetObject.
by jimtabor＠svn.reactos.org 18 Apr '07

18 Apr '07

Author: jimtabor Date: Wed Apr 18 23:51:33 2007 New Revision: 26404 URL: http://svn.reactos.org/svn/reactos?rev=26404&view=rev Log: Correct statment for NtGdiGetObject. Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Wed Apr 18 23:51:33 2007 @@ -640,7 +640,7 @@ HRGN hrgn ); -/* Should be done in user-mode using shared GDI Objects. */ +/* Should be NtGdiExtGetObjectW. */ INT STDCALL NtGdiGetObject(HGDIOBJ hGDIObj, INT BufSize, LPVOID Object);

1 0

[cwittich] 26403: fix a bug and some warnings in ddraw
by cwittich＠svn.reactos.org 18 Apr '07

18 Apr '07

Author: cwittich Date: Wed Apr 18 23:51:21 2007 New Revision: 26403 URL: http://svn.reactos.org/svn/reactos?rev=26403&view=rev Log: fix a bug and some warnings in ddraw Modified: trunk/reactos/dll/directx/ddraw/cleanup.c trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/main/surface_main.c trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/cleanup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/cleanup.c (original) +++ trunk/reactos/dll/directx/ddraw/cleanup.c Wed Apr 18 23:51:21 2007 @@ -15,7 +15,7 @@ VOID Cleanup(LPDIRECTDRAW7 iface) { - LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + //LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; DX_WINDBG_trace(); 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 Wed Apr 18 23:51:21 2007 @@ -171,7 +171,8 @@ LPDDRAWI_DDRAWSURFACE_LCL *lpLcl; DWORD dwHowManySurface = 1; DWORD i; - LPDDRAWI_DDRAWSURFACE_LCL *xlpLcl; + //LPDDRAWI_DDRAWSURFACE_LCL *xlpLcl; + if (pUnkOuter!=NULL) { return CLASS_E_NOAGGREGATION; @@ -232,7 +233,7 @@ } /* Calc how many surface we need setup */ - if (pDDSD->ddsCaps.dwCaps &DDSD_BACKBUFFERCOUNT) + if (pDDSD->ddsCaps.dwCaps & DDSD_BACKBUFFERCOUNT) { /* One primary + xx backbuffer */ dwHowManySurface |= pDDSD->dwBackBufferCount; Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/sur… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Wed Apr 18 23:51:21 2007 @@ -497,7 +497,7 @@ This = (LPDDRAWI_DDRAWSURFACE_INT)iface; - *phDC = This->lpLcl->lpSurfMore->lpDD_lcl->hDC; + *phDC = (HDC)This->lpLcl->lpSurfMore->lpDD_lcl->hDC; return DD_OK; } 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 Wed Apr 18 23:51:21 2007 @@ -926,7 +926,7 @@ } /* we need check the GUID lpGUID what type it is */ - if (pGUID != DDCREATE_HARDWAREONLY) + if (pGUID != (LPGUID)DDCREATE_HARDWAREONLY) { if (pGUID !=NULL) {

1 0

[cwittich] 26402: disable IntEngGradientFillTriangle because of an endless loop and add a FIXME
by cwittich＠svn.reactos.org 18 Apr '07

18 Apr '07

Author: cwittich Date: Wed Apr 18 23:07:11 2007 New Revision: 26402 URL: http://svn.reactos.org/svn/reactos?rev=26402&view=rev Log: disable IntEngGradientFillTriangle because of an endless loop and add a FIXME Modified: trunk/reactos/subsystems/win32/win32k/eng/gradient.c Modified: trunk/reactos/subsystems/win32/win32k/eng/gradient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/gradient.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/gradient.c Wed Apr 18 23:07:11 2007 @@ -318,19 +318,19 @@ { SURFOBJ *OutputObj; PTRIVERTEX v1, v2, v3; - RECT_ENUM RectEnum; - BOOL EnumMore; - ULONG i; + //RECT_ENUM RectEnum; + //BOOL EnumMore; + //ULONG i; POINTL Translate; INTENG_ENTER_LEAVE EnterLeave; RECTL FillRect; - ULONG Color; - - BOOL sx[NLINES]; - LONG x[NLINES], dx[NLINES], dy[NLINES], incx[NLINES], ex[NLINES], destx[NLINES]; - LONG c[NLINES][3], dc[NLINES][3], ec[NLINES][3], ic[NLINES][3]; /* colors on lines */ - LONG g, gx, gxi, gc[3], gd[3], ge[3], gi[3]; /* colors in triangle */ - LONG sy, y, bt; + //ULONG Color; + + //BOOL sx[NLINES]; + //LONG x[NLINES], dx[NLINES], dy[NLINES], incx[NLINES], ex[NLINES], destx[NLINES]; + //LONG c[NLINES][3], dc[NLINES][3], ec[NLINES][3], ic[NLINES][3]; /* colors on lines */ + //LONG g, gx, gxi, gc[3], gd[3], ge[3], gi[3]; /* colors in triangle */ + //LONG sy, y, bt; v1 = (pVertex + gTriangle->Vertex1); v2 = (pVertex + gTriangle->Vertex2); @@ -353,100 +353,102 @@ } DbgPrint("Triangle: (%i,%i) (%i,%i) (%i,%i)\n", v1->x, v1->y, v2->x, v2->y, v3->x, v3->y); + /* FIXME: commented out because of an endless loop - fix triangles first */ + DbgPrint("FIXME: IntEngGradientFillTriangle is broken"); if(!IntEngEnter(&EnterLeave, psoDest, &FillRect, FALSE, &Translate, &OutputObj)) { return FALSE; } - if(VCMPCLRS(v1, v2, v3)) - { - CLIPOBJ_cEnumStart(pco, FALSE, CT_RECTANGLES, CD_RIGHTDOWN, 0); - do - { - EnumMore = CLIPOBJ_bEnum(pco, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum); - for (i = 0; i < RectEnum.c && RectEnum.arcl[i].top <= prclExtents->bottom; i++) - { - if(IntGdiIntersectRect((PRECT)&FillRect, (PRECT)&RectEnum.arcl[i], (PRECT)prclExtents)) - { - BOOL InY; - - DOINIT(v1, v3, 0); - DOINIT(v1, v2, 1); - DOINIT(v2, v3, 2); - - y = v1->y; - sy = v1->y + pptlDitherOrg->y; - bt = min(v3->y + pptlDitherOrg->y, FillRect.bottom); - - while(sy < bt) - { - InY = !(sy < FillRect.top || sy >= FillRect.bottom); - GOLINE(v1, v3, 0); - DOLINE(v1, v3, 0); - ENDLINE(v1, v3, 0); - - GOLINE(v1, v2, 1); - DOLINE(v1, v2, 1); - FILLLINE(0, 1); - ENDLINE(v1, v2, 1); - - GOLINE(v2, v3, 2); - DOLINE(v2, v3, 2); - FILLLINE(0, 2); - ENDLINE(23, v3, 2); - - y++; - sy++; - } - } - } - } while(EnumMore); - - return IntEngLeave(&EnterLeave); - } - - /* fill triangle with one solid color */ - - Color = XLATEOBJ_iXlate(pxlo, RGB(v1->Red >> 8, v1->Green >> 8, v1->Blue >> 8)); - CLIPOBJ_cEnumStart(pco, FALSE, CT_RECTANGLES, CD_RIGHTDOWN, 0); - do - { - EnumMore = CLIPOBJ_bEnum(pco, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum); - for (i = 0; i < RectEnum.c && RectEnum.arcl[i].top <= prclExtents->bottom; i++) - { - if(IntGdiIntersectRect((PRECT)&FillRect, (PRECT)&RectEnum.arcl[i], (PRECT)prclExtents)) - { - S_INITLINE(v1, v3, 0); - S_INITLINE(v1, v2, 1); - S_INITLINE(v2, v3, 2); - - y = v1->y; - sy = v1->y + pptlDitherOrg->y; - bt = min(v3->y + pptlDitherOrg->y, FillRect.bottom); - - while(sy < bt) - { - S_GOLINE(v1, v3, 0); - S_DOLINE(v1, v3, 0); - S_ENDLINE(v1, v3, 0); - - S_GOLINE(v1, v2, 1); - S_DOLINE(v1, v2, 1); - S_FILLLINE(0, 1); - S_ENDLINE(v1, v2, 1); - - S_GOLINE(v2, v3, 2); - S_DOLINE(v2, v3, 2); - S_FILLLINE(0, 2); - S_ENDLINE(23, v3, 2); - - y++; - sy++; - } - } - } - } while(EnumMore); + //if(VCMPCLRS(v1, v2, v3)) + //{ + // CLIPOBJ_cEnumStart(pco, FALSE, CT_RECTANGLES, CD_RIGHTDOWN, 0); + // do + // { + // EnumMore = CLIPOBJ_bEnum(pco, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum); + // for (i = 0; i < RectEnum.c && RectEnum.arcl[i].top <= prclExtents->bottom; i++) + // { + // if(IntGdiIntersectRect((PRECT)&FillRect, (PRECT)&RectEnum.arcl[i], (PRECT)prclExtents)) + // { + // BOOL InY; + + // DOINIT(v1, v3, 0); + // DOINIT(v1, v2, 1); + // DOINIT(v2, v3, 2); + + // y = v1->y; + // sy = v1->y + pptlDitherOrg->y; + // bt = min(v3->y + pptlDitherOrg->y, FillRect.bottom); + + // while(sy < bt) + // { + // InY = !(sy < FillRect.top || sy >= FillRect.bottom); + // GOLINE(v1, v3, 0); + // DOLINE(v1, v3, 0); + // ENDLINE(v1, v3, 0); + + // GOLINE(v1, v2, 1); + // DOLINE(v1, v2, 1); + // FILLLINE(0, 1); + // ENDLINE(v1, v2, 1); + + // GOLINE(v2, v3, 2); + // DOLINE(v2, v3, 2); + // FILLLINE(0, 2); + // ENDLINE(23, v3, 2); + + // y++; + // sy++; + // } + // } + // } + // } while(EnumMore); + + // return IntEngLeave(&EnterLeave); + //} + + ///* fill triangle with one solid color */ + + //Color = XLATEOBJ_iXlate(pxlo, RGB(v1->Red >> 8, v1->Green >> 8, v1->Blue >> 8)); + //CLIPOBJ_cEnumStart(pco, FALSE, CT_RECTANGLES, CD_RIGHTDOWN, 0); + //do + //{ + // EnumMore = CLIPOBJ_bEnum(pco, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum); + // for (i = 0; i < RectEnum.c && RectEnum.arcl[i].top <= prclExtents->bottom; i++) + // { + // if(IntGdiIntersectRect((PRECT)&FillRect, (PRECT)&RectEnum.arcl[i], (PRECT)prclExtents)) + // { + // S_INITLINE(v1, v3, 0); + // S_INITLINE(v1, v2, 1); + // S_INITLINE(v2, v3, 2); + + // y = v1->y; + // sy = v1->y + pptlDitherOrg->y; + // bt = min(v3->y + pptlDitherOrg->y, FillRect.bottom); + + // while(sy < bt) + // { + // S_GOLINE(v1, v3, 0); + // S_DOLINE(v1, v3, 0); + // S_ENDLINE(v1, v3, 0); + + // S_GOLINE(v1, v2, 1); + // S_DOLINE(v1, v2, 1); + // S_FILLLINE(0, 1); + // S_ENDLINE(v1, v2, 1); + + // S_GOLINE(v2, v3, 2); + // S_DOLINE(v2, v3, 2); + // S_FILLLINE(0, 2); + // S_ENDLINE(23, v3, 2); + + // y++; + // sy++; + // } + // } + // } + //} while(EnumMore); return IntEngLeave(&EnterLeave); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs