Ros-diffs April 2009

ros-diffs@reactos.org

25 participants
476 discussions

[khornicek] 40372: - IntEnumDisplaySettings returns NTSTATUS, fix the check accordingly
by khornicek＠svn.reactos.org 05 Apr '09

05 Apr '09

Author: khornicek Date: Sun Apr 5 19:15:16 2009 New Revision: 40372 URL: http://svn.reactos.org/svn/reactos?rev=40372&view=rev Log: - IntEnumDisplaySettings returns NTSTATUS, fix the check accordingly Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] Sun Apr 5 19:15:16 2009 @@ -1246,7 +1246,8 @@ RtlZeroMemory(&lpDevMode, sizeof(DEVMODEW)); lpDevMode.dmSize = sizeof(DEVMODEW); - if (!IntEnumDisplaySettings(pDeviceName, ENUM_CURRENT_SETTINGS, &lpDevMode, 0)) + Status = IntEnumDisplaySettings(pDeviceName, ENUM_CURRENT_SETTINGS, &lpDevMode, 0); + if (!NT_SUCCESS(Status)) return DISP_CHANGE_FAILED; DPRINT1("Req Mode : %d x %d x %d\n", DevMode->dmPelsWidth,DevMode->dmPelsHeight,DevMode->dmBitsPerPel);

1 0

[fireball] 40368: - Compile UniATA with stdcall default calling convention instead of cdecl.
by fireball＠svn.reactos.org 05 Apr '09

05 Apr '09

Author: fireball Date: Sun Apr 5 15:46:53 2009 New Revision: 40368 URL: http://svn.reactos.org/svn/reactos?rev=40368&view=rev Log: - Compile UniATA with stdcall default calling convention instead of cdecl. Modified: trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild Modified: trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1] Sun Apr 5 15:46:53 2009 @@ -4,6 +4,7 @@ <bootstrap installbase="$(CDOUTPUT)" /> <include base="uniata">.</include> <include base="uniata">inc</include> + <compilerflag>-mrtd</compilerflag>  <library>ntoskrnl</library> <library>hal</library>

2 1

[khornicek] 40371: - leftover from the previous commit
by khornicek＠svn.reactos.org 05 Apr '09

05 Apr '09

Author: khornicek Date: Sun Apr 5 18:41:53 2009 New Revision: 40371 URL: http://svn.reactos.org/svn/reactos?rev=40371&view=rev Log: - leftover from the previous commit Modified: trunk/reactos/boot/bootdata/packages/reactos.dff 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 5 18:41:53 2009 @@ -142,7 +142,7 @@ dll\directx\dplayx\dplayx.dll 1 dll\directx\dsound\dsound.dll 1 dll\directx\dxdiagn\dxdiagn.dll 1 -dll\directx\ddraw\ddraw.dll 1 +dll\directx\wine\ddraw\ddraw.dll 1 dll\directx\d3d8thk\d3d8thk.dll 1 dll\directx\devenum\devenum.dll 1 dll\directx\ksproxy\ksproxy.ax 1

1 0

[khornicek] 40370: - import ddraw from Wine and use it for now - sync wined3d, d3d8, d3d9 with Wine HEAD
by khornicek＠svn.reactos.org 05 Apr '09

05 Apr '09

Author: khornicek Date: Sun Apr 5 17:52:15 2009 New Revision: 40370 URL: http://svn.reactos.org/svn/reactos?rev=40370&view=rev Log: - import ddraw from Wine and use it for now - sync wined3d, d3d8, d3d9 with Wine HEAD Added: trunk/reactos/dll/directx/wine/ddraw/ (with props) trunk/reactos/dll/directx/wine/ddraw/clipper.c (with props) trunk/reactos/dll/directx/wine/ddraw/ddcomimpl.h (with props) trunk/reactos/dll/directx/wine/ddraw/ddraw.c (with props) trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild (with props) trunk/reactos/dll/directx/wine/ddraw/ddraw.spec (with props) trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h (with props) trunk/reactos/dll/directx/wine/ddraw/ddraw_thunks.c (with props) trunk/reactos/dll/directx/wine/ddraw/device.c (with props) trunk/reactos/dll/directx/wine/ddraw/direct3d.c (with props) trunk/reactos/dll/directx/wine/ddraw/executebuffer.c (with props) trunk/reactos/dll/directx/wine/ddraw/gamma.c (with props) trunk/reactos/dll/directx/wine/ddraw/light.c (with props) trunk/reactos/dll/directx/wine/ddraw/main.c (with props) trunk/reactos/dll/directx/wine/ddraw/material.c (with props) trunk/reactos/dll/directx/wine/ddraw/palette.c (with props) trunk/reactos/dll/directx/wine/ddraw/parent.c (with props) trunk/reactos/dll/directx/wine/ddraw/regsvr.c (with props) trunk/reactos/dll/directx/wine/ddraw/surface.c (with props) trunk/reactos/dll/directx/wine/ddraw/surface_thunks.c (with props) trunk/reactos/dll/directx/wine/ddraw/texture.c (with props) trunk/reactos/dll/directx/wine/ddraw/utils.c (with props) trunk/reactos/dll/directx/wine/ddraw/version.rc (with props) trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c (with props) trunk/reactos/dll/directx/wine/ddraw/viewport.c (with props) trunk/reactos/dll/directx/wine/wined3d/buffer.c (with props) trunk/reactos/dll/directx/wine/wined3d/view.c (with props) Removed: trunk/reactos/dll/directx/wine/d3d8/Makefile.in trunk/reactos/dll/directx/wine/d3d8/basetexture.c trunk/reactos/dll/directx/wine/d3d8/resource.c trunk/reactos/dll/directx/wine/d3d9/basetexture.c trunk/reactos/dll/directx/wine/d3d9/resource.c trunk/reactos/dll/directx/wine/wined3d/Makefile.in trunk/reactos/dll/directx/wine/wined3d/indexbuffer.c trunk/reactos/dll/directx/wine/wined3d/vertexbuffer.c trunk/reactos/dll/directx/wine/wined3d/wined3d.def Modified: trunk/reactos/dll/directx/directx.rbuild trunk/reactos/dll/directx/wine/d3d8/cubetexture.c trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/directx.c trunk/reactos/dll/directx/wine/d3d8/indexbuffer.c trunk/reactos/dll/directx/wine/d3d8/pixelshader.c trunk/reactos/dll/directx/wine/d3d8/stateblock.c trunk/reactos/dll/directx/wine/d3d8/surface.c trunk/reactos/dll/directx/wine/d3d8/texture.c trunk/reactos/dll/directx/wine/d3d8/vertexbuffer.c trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d8/vertexshader.c trunk/reactos/dll/directx/wine/d3d8/volume.c trunk/reactos/dll/directx/wine/d3d8/volumetexture.c trunk/reactos/dll/directx/wine/d3d9/cubetexture.c trunk/reactos/dll/directx/wine/d3d9/d3d9.rbuild trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/directx.c trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c trunk/reactos/dll/directx/wine/d3d9/pixelshader.c trunk/reactos/dll/directx/wine/d3d9/stateblock.c trunk/reactos/dll/directx/wine/d3d9/surface.c trunk/reactos/dll/directx/wine/d3d9/swapchain.c trunk/reactos/dll/directx/wine/d3d9/texture.c trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d9/volume.c trunk/reactos/dll/directx/wine/d3d9/volumetexture.c trunk/reactos/dll/directx/wine/wine.rbuild trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c trunk/reactos/dll/directx/wine/wined3d/baseshader.c trunk/reactos/dll/directx/wine/wined3d/basetexture.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/cubetexture.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c trunk/reactos/dll/directx/wine/wined3d/pixelshader.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/surface_base.c trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c trunk/reactos/dll/directx/wine/wined3d/vertexshader.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/volumetexture.c trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h trunk/reactos/dll/directx/wine/wined3d/wined3d_private_types.h trunk/reactos/include/dxsdk/d3dcaps.h trunk/reactos/include/dxsdk/ddraw.h trunk/reactos/include/reactos/wine/wined3d.idl [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/directx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/directx.rbuild… Removed: trunk/reactos/dll/directx/wine/d3d8/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/Make… Removed: trunk/reactos/dll/directx/wine/d3d8/basetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/base… Modified: trunk/reactos/dll/directx/wine/d3d8/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/cube… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/dire… Modified: trunk/reactos/dll/directx/wine/d3d8/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/inde… Modified: trunk/reactos/dll/directx/wine/d3d8/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/pixe… Removed: trunk/reactos/dll/directx/wine/d3d8/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/reso… Modified: trunk/reactos/dll/directx/wine/d3d8/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/stat… Modified: trunk/reactos/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/surf… Modified: trunk/reactos/dll/directx/wine/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/text… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d8/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Removed: trunk/reactos/dll/directx/wine/d3d9/basetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/base… Modified: trunk/reactos/dll/directx/wine/d3d9/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/cube… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/dire… Modified: trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/inde… Modified: trunk/reactos/dll/directx/wine/d3d9/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/pixe… Removed: trunk/reactos/dll/directx/wine/d3d9/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/reso… Modified: trunk/reactos/dll/directx/wine/d3d9/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/stat… Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf… Modified: trunk/reactos/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/swap… Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Added: trunk/reactos/dll/directx/wine/ddraw/clipper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/cli… Added: trunk/reactos/dll/directx/wine/ddraw/ddcomimpl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddc… Added: trunk/reactos/dll/directx/wine/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Added: trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Added: trunk/reactos/dll/directx/wine/ddraw/ddraw.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Added: trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Added: trunk/reactos/dll/directx/wine/ddraw/ddraw_thunks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Added: trunk/reactos/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dev… Added: trunk/reactos/dll/directx/wine/ddraw/direct3d.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dir… Added: trunk/reactos/dll/directx/wine/ddraw/executebuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/exe… Added: trunk/reactos/dll/directx/wine/ddraw/gamma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/gam… Added: trunk/reactos/dll/directx/wine/ddraw/light.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/lig… Added: trunk/reactos/dll/directx/wine/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mai… Added: trunk/reactos/dll/directx/wine/ddraw/material.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mat… Added: trunk/reactos/dll/directx/wine/ddraw/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/pal… Added: trunk/reactos/dll/directx/wine/ddraw/parent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/par… Added: trunk/reactos/dll/directx/wine/ddraw/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/reg… Added: trunk/reactos/dll/directx/wine/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/sur… Added: trunk/reactos/dll/directx/wine/ddraw/surface_thunks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/sur… Added: trunk/reactos/dll/directx/wine/ddraw/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/tex… Added: trunk/reactos/dll/directx/wine/ddraw/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/uti… Added: trunk/reactos/dll/directx/wine/ddraw/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ver… Added: trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ver… Added: trunk/reactos/dll/directx/wine/ddraw/viewport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/vie… Modified: trunk/reactos/dll/directx/wine/wine.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wine.rbui… Removed: trunk/reactos/dll/directx/wine/wined3d/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/M… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/baseshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/basetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Added: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Removed: trunk/reactos/dll/directx/wine/wined3d/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/i… Modified: trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/n… Modified: trunk/reactos/dll/directx/wine/wined3d/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Removed: trunk/reactos/dll/directx/wine/wined3d/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Added: trunk/reactos/dll/directx/wine/wined3d/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Removed: trunk/reactos/dll/directx/wine/wined3d/wined3d.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private_types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/include/dxsdk/d3dcaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dcaps.h?re… Modified: trunk/reactos/include/dxsdk/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ddraw.h?rev=… Modified: trunk/reactos/include/reactos/wine/wined3d.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined…

1 0

[dgoette] 40369: * move language folder out of 'inc/' * remove that human readable stuff, it doesn't make much sense in the way it was used here * start cleaning up the mess with variables
by dgoette＠svn.reactos.org 05 Apr '09

05 Apr '09

1 0

[cgutman] 40367: - Distinguish between cleanup and close properly - On cleanup, we cancel all requests - On close, we remove the address file from the list, free the port and listener (if present), then free the address file itself
by cgutman＠svn.reactos.org 05 Apr '09

05 Apr '09

Author: cgutman Date: Sun Apr 5 11:23:25 2009 New Revision: 40367 URL: http://svn.reactos.org/svn/reactos?rev=40367&view=rev Log: - Distinguish between cleanup and close properly - On cleanup, we cancel all requests - On close, we remove the address file from the list, free the port and listener (if present), then free the address file itself Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Sun Apr 5 11:23:25 2009 @@ -139,11 +139,11 @@ } -VOID DeleteAddress(PADDRESS_FILE AddrFile) -/* - * FUNCTION: Deletes an address file object - * ARGUMENTS: - * AddrFile = Pointer to address file object to delete +NTSTATUS FileCloseAddress(PTDI_REQUEST Request) +/* + * FUNCTION: Closes an address file object + * ARGUMENTS: + * AddrFile = Pointer to address file object to close */ { KIRQL OldIrql; @@ -151,15 +151,15 @@ PLIST_ENTRY NextEntry; PDATAGRAM_SEND_REQUEST SendRequest; PDATAGRAM_RECEIVE_REQUEST ReceiveRequest; + PADDRESS_FILE AddrFile = Request->Handle.AddressHandle; TI_DbgPrint(MID_TRACE, ("Called.\n")); - /* Remove address file from the global list */ - TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); - RemoveEntryList(&AddrFile->ListEntry); - TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); - TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); + + /* Set address file object exclusive to us */ + AF_SET_BUSY(AddrFile); + AF_CLR_VALID(AddrFile); /* FIXME: Kill TCP connections on this address file object */ @@ -197,9 +197,9 @@ TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); - (*AddrFile->Free)(AddrFile); - - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); + TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); + + return STATUS_SUCCESS; } @@ -339,7 +339,7 @@ * RETURNS: * Status of operation */ -NTSTATUS FileCloseAddress( +NTSTATUS FileFreeAddress( PTDI_REQUEST Request) { KIRQL OldIrql; @@ -350,13 +350,10 @@ AddrFile = Request->Handle.AddressHandle; - TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); - - /* Set address file object exclusive to us */ - AF_SET_BUSY(AddrFile); - AF_CLR_VALID(AddrFile); - - TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); + /* Remove address file from the global list */ + TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); + RemoveEntryList(&AddrFile->ListEntry); + TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); /* Protocol specific handling */ switch (AddrFile->Protocol) { @@ -372,33 +369,9 @@ UDPFreePort( AddrFile->Port ); break; } - - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - - return Status; -} - - -/* - * FUNCTION: Closes an address file object - * ARGUMENTS: - * Request = Pointer to TDI request structure for this request - * RETURNS: - * Status of operation - */ -NTSTATUS FileFreeAddress( - PTDI_REQUEST Request) -{ - PADDRESS_FILE AddrFile; - NTSTATUS Status = STATUS_SUCCESS; - - AddrFile = Request->Handle.AddressHandle; - - TI_DbgPrint(MID_TRACE, ("Called.\n")); - - DeleteAddress(AddrFile); - - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); + TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); + + (*AddrFile->Free)(AddrFile); return Status; }

1 0

[cgutman] 40366: - Implement a DispatchCleanup routine and properly separate cleanup from close
by cgutman＠svn.reactos.org 05 Apr '09

05 Apr '09

Author: cgutman Date: Sun Apr 5 11:08:47 2009 New Revision: 40366 URL: http://svn.reactos.org/svn/reactos?rev=40366&view=rev Log: - Implement a DispatchCleanup routine and properly separate cleanup from close Modified: trunk/reactos/drivers/network/afd/afd/main.c Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Sun Apr 5 11:08:47 2009 @@ -167,9 +167,8 @@ return Status; } -VOID DestroySocket( PAFD_FCB FCB ) { +VOID CleanupSocket( PAFD_FCB FCB ) { UINT i; - BOOLEAN ReturnEarly = FALSE; PAFD_IN_FLIGHT_REQUEST InFlightRequest[IN_FLIGHT_REQUESTS]; AFD_DbgPrint(MIN_TRACE,("Called (%x)\n", FCB)); @@ -188,46 +187,60 @@ if( InFlightRequest[i]->InFlightRequest ) { AFD_DbgPrint(MID_TRACE,("Cancelling in flight irp %d (%x)\n", i, InFlightRequest[i]->InFlightRequest)); - if (!IoCancelIrp(InFlightRequest[i]->InFlightRequest)) - ReturnEarly = TRUE; + IoCancelIrp(InFlightRequest[i]->InFlightRequest); } } + FCB->State = SOCKET_STATE_CREATED; + + if( FCB->EventSelect ) { + ObDereferenceObject( FCB->EventSelect ); + FCB->EventSelect = NULL; + } + if( FCB->Context ) { + ExFreePool( FCB->Context ); + FCB->Context = NULL; + } + if( FCB->Recv.Window ) { + ExFreePool( FCB->Recv.Window ); + FCB->Recv.Window = NULL; + } + if( FCB->Send.Window ) { + ExFreePool( FCB->Send.Window ); + FCB->Send.Window = NULL; + } + if( FCB->AddressFrom ) { + ExFreePool( FCB->AddressFrom ); + FCB->AddressFrom = NULL; + } + if( FCB->LocalAddress ) { + ExFreePool( FCB->LocalAddress ); + FCB->LocalAddress = NULL; + } + if( FCB->RemoteAddress ) { + ExFreePool( FCB->RemoteAddress ); + FCB->RemoteAddress = NULL; + } + if( FCB->Connection.Object ) { + NtClose(FCB->Connection.Handle); + ObDereferenceObject(FCB->Connection.Object); + FCB->Connection.Object = NULL; + } + if( FCB->AddressFile.Object ) { + NtClose(FCB->AddressFile.Handle); + ObDereferenceObject(FCB->AddressFile.Object); + FCB->AddressFile.Object = NULL; + } + SocketStateUnlock( FCB ); - - if( ReturnEarly ) - return; - - if( FCB->Context ) - ExFreePool(FCB->Context); - if( FCB->Recv.Window ) - ExFreePool( FCB->Recv.Window ); - if( FCB->Send.Window ) - ExFreePool( FCB->Send.Window ); - if( FCB->AddressFrom ) - ExFreePool( FCB->AddressFrom ); - if( FCB->LocalAddress ) - ExFreePool( FCB->LocalAddress ); - if( FCB->RemoteAddress ) - ExFreePool( FCB->RemoteAddress ); +} + +VOID DestroySocket( PAFD_FCB FCB ) { if( FCB->TdiDeviceName.Buffer ) ExFreePool(FCB->TdiDeviceName.Buffer); - if (FCB->Connection.Object) - { - NtClose(FCB->Connection.Handle); - ObDereferenceObject(FCB->Connection.Object); - } - if (FCB->AddressFile.Object) - { - NtClose(FCB->AddressFile.Handle); - ObDereferenceObject(FCB->AddressFile.Object); - } - ExFreePool(FCB); AFD_DbgPrint(MIN_TRACE,("Deleted (%x)\n", FCB)); - - AFD_DbgPrint(MIN_TRACE,("Leaving\n")); } static NTSTATUS NTAPI @@ -244,12 +257,6 @@ AFD_DbgPrint(MID_TRACE,("FCB %x\n", FCB)); - FCB->PollState |= AFD_EVENT_CLOSE; - PollReeval( FCB->DeviceExt, FileObject ); - KillSelectsForFCB( FCB->DeviceExt, FileObject, FALSE ); - - if( FCB->EventSelect ) ObDereferenceObject( FCB->EventSelect ); - FileObject->FsContext = NULL; SocketStateUnlock( FCB ); @@ -260,6 +267,28 @@ IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); AFD_DbgPrint(MID_TRACE, ("Returning success.\n")); + + return STATUS_SUCCESS; +} + +static NTSTATUS NTAPI +AfdCleanupSocket(PDEVICE_OBJECT DeviceObject, PIRP Irp, + PIO_STACK_LOCATION IrpSp) +{ + PFILE_OBJECT FileObject = IrpSp->FileObject; + PAFD_FCB FCB = FileObject->FsContext; + + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); + + CleanupSocket( FCB ); + + KillSelectsForFCB( FCB->DeviceExt, FileObject, FALSE ); + + SocketStateUnlock( FCB ); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); return STATUS_SUCCESS; } @@ -344,6 +373,9 @@ /* Ditto the borrowing */ return AfdCloseSocket(DeviceObject, Irp, IrpSp); + case IRP_MJ_CLEANUP: + return AfdCleanupSocket(DeviceObject, Irp, IrpSp); + /* write data */ case IRP_MJ_WRITE: return AfdConnectedSocketWriteData( DeviceObject, Irp, IrpSp, TRUE ); @@ -519,6 +551,7 @@ /* register driver routines */ DriverObject->MajorFunction[IRP_MJ_CLOSE] = AfdDispatch; DriverObject->MajorFunction[IRP_MJ_CREATE] = AfdDispatch; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = AfdDispatch; DriverObject->MajorFunction[IRP_MJ_WRITE] = AfdDispatch; DriverObject->MajorFunction[IRP_MJ_READ] = AfdDispatch; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = AfdDispatch;

1 0

[jmorlan] 40365: - Simplified code for CD, PUSHD, and POPD commands and also fixed some bugs.
by jmorlan＠svn.reactos.org 05 Apr '09

05 Apr '09

Author: jmorlan Date: Sun Apr 5 05:50:24 2009 New Revision: 40365 URL: http://svn.reactos.org/svn/reactos?rev=40365&view=rev Log: - Simplified code for CD, PUSHD, and POPD commands and also fixed some bugs. Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/dirstack.c trunk/reactos/base/shell/cmd/internal.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sun Apr 5 05:50:24 2009 @@ -1653,10 +1653,6 @@ SetConsoleMode (hIn, ENABLE_PROCESSED_INPUT); -#ifdef INCLUDE_CMD_CHDIR - InitLastPath (); -#endif - for (ptr = cmdLine; *ptr; ptr++) { if (*ptr == _T('/')) @@ -1791,10 +1787,6 @@ DestroyDirectoryStack (); #endif -#ifdef INCLUDE_CMD_CHDIR - FreeLastPath (); -#endif - #ifdef FEATURE_HISTORY CleanHistory(); #endif Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Sun Apr 5 05:50:24 2009 @@ -329,7 +329,7 @@ /* Prototypes for MISC.C */ INT GetRootPath(TCHAR *InPath,TCHAR *OutPath,INT size); -BOOL SetRootPath(TCHAR *InPath); +BOOL SetRootPath(TCHAR *oldpath,TCHAR *InPath); TCHAR cgetchar (VOID); BOOL CheckCtrlBreak (INT); BOOL add_entry (LPINT ac, LPTSTR **arg, LPCTSTR entry); Modified: trunk/reactos/base/shell/cmd/dirstack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dirstack.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/dirstack.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dirstack.c [iso-8859-1] Sun Apr 5 05:50:24 2009 @@ -22,7 +22,7 @@ { struct tagDIRENTRY *prev; struct tagDIRENTRY *next; - LPTSTR pszPath; + TCHAR szPath[1]; } DIRENTRY, *LPDIRENTRY; @@ -34,11 +34,7 @@ static INT PushDirectory (LPTSTR pszPath) { - LPDIRENTRY lpDir; - - nErrorLevel = 0; - - lpDir = (LPDIRENTRY)cmd_alloc (sizeof (DIRENTRY)); + LPDIRENTRY lpDir = cmd_alloc(FIELD_OFFSET(DIRENTRY, szPath[_tcslen(pszPath) + 1])); if (!lpDir) { error_out_of_memory (); @@ -46,67 +42,34 @@ } lpDir->prev = NULL; + lpDir->next = lpStackTop; if (lpStackTop == NULL) - { - lpDir->next = NULL; lpStackBottom = lpDir; - } else - { - lpDir->next = lpStackTop; lpStackTop->prev = lpDir; - } lpStackTop = lpDir; - lpDir->pszPath = (LPTSTR)cmd_alloc ((_tcslen(pszPath)+1)*sizeof(TCHAR)); - if (!lpDir->pszPath) - { - cmd_free (lpDir); - error_out_of_memory (); - return -1; - } - - _tcscpy (lpDir->pszPath, pszPath); + _tcscpy(lpDir->szPath, pszPath); nStackDepth++; - return 0; + return nErrorLevel = 0; } static VOID PopDirectory (VOID) { - LPDIRENTRY lpDir; - - nErrorLevel = 0; - - if (nStackDepth == 0) - return; - - lpDir = lpStackTop; + LPDIRENTRY lpDir = lpStackTop; lpStackTop = lpDir->next; if (lpStackTop != NULL) lpStackTop->prev = NULL; else lpStackBottom = NULL; - cmd_free (lpDir->pszPath); cmd_free (lpDir); nStackDepth--; -} - - -static VOID -GetDirectoryStackTop (LPTSTR pszPath) -{ - nErrorLevel = 0; - - if (lpStackTop) - _tcsncpy (pszPath, lpStackTop->pszPath, MAX_PATH); - else - *pszPath = _T('\0'); } @@ -143,8 +106,6 @@ INT CommandPushd (LPTSTR rest) { TCHAR curPath[MAX_PATH]; - TCHAR newPath[MAX_PATH]; - BOOL bChangePath = FALSE; if (!_tcsncmp (rest, _T("/?"), 2)) { @@ -152,22 +113,15 @@ return 0; } - nErrorLevel = 0; + GetCurrentDirectory (MAX_PATH, curPath); if (rest[0] != _T('\0')) { - GetFullPathName (rest, MAX_PATH, newPath, NULL); - bChangePath = IsValidPathName (newPath); + if (!SetRootPath(NULL, rest)) + return 1; } - GetCurrentDirectory (MAX_PATH, curPath); - if (PushDirectory (curPath)) - return 0; - - if (bChangePath) - _tchdir(newPath); - - return 0; + return PushDirectory(curPath); } @@ -176,25 +130,20 @@ */ INT CommandPopd (LPTSTR rest) { - TCHAR szPath[MAX_PATH]; - + INT ret = 0; if (!_tcsncmp(rest, _T("/?"), 2)) { ConOutResPuts(STRING_DIRSTACK_HELP2); return 0; } - nErrorLevel = 0; + if (nStackDepth == 0) + return 1; - if (GetDirectoryStackDepth () == 0) - return 0; - - GetDirectoryStackTop (szPath); + ret = _tchdir(lpStackTop->szPath) != 0; PopDirectory (); - _tchdir(szPath); - - return 0; + return ret; } @@ -223,8 +172,7 @@ while (lpDir != NULL) { - ConOutPuts (lpDir->pszPath); - + ConOutPuts(lpDir->szPath); lpDir = lpDir->prev; } Modified: trunk/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/internal.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] Sun Apr 5 05:50:24 2009 @@ -140,21 +140,6 @@ #include <precomp.h> #ifdef INCLUDE_CMD_CHDIR - -static LPTSTR lpLastPath; - - -VOID InitLastPath (VOID) -{ - lpLastPath = NULL; -} - - -VOID FreeLastPath (VOID) -{ - if (lpLastPath) - cmd_free (lpLastPath); -} /* help functions for getting current path from drive without changing drive. Return code 0 = ok, 1 = fail. @@ -166,12 +151,8 @@ INT GetRootPath(TCHAR *InPath,TCHAR *OutPath,INT size) { - INT retcode = 1; - - if (_tcslen(InPath)>1) + if (InPath[0] && InPath[1] == _T(':')) { - if (InPath[1]==_T(':')) - { INT t=0; if ((InPath[0] >= _T('0')) && (InPath[0] <= _T('9'))) @@ -190,76 +171,41 @@ t = (InPath[0] - _T('A')) +1; } - if (_tgetdcwd(t,OutPath,size) != NULL) - { - return 0; - } - } - } - - /* fail */ - if (_tcslen(InPath)>1) - { - if (InPath[1]==_T(':')) - return 1; + return _tgetdcwd(t,OutPath,size) == NULL; } /* Get current directory */ - retcode = GetCurrentDirectory(size,OutPath); - if (retcode==0) - return 1; - - return 0; -} - - -BOOL SetRootPath(TCHAR *InPath) -{ - TCHAR oldpath[MAX_PATH]; + return !GetCurrentDirectory(size,OutPath); +} + + +BOOL SetRootPath(TCHAR *oldpath, TCHAR *InPath) +{ TCHAR OutPath[MAX_PATH]; TCHAR OutPathTemp[MAX_PATH]; - TCHAR OutPathTemp2[MAX_PATH]; - BOOL fail; - - - /* Get The current directory path and save it */ - fail = GetCurrentDirectory(MAX_PATH,oldpath); - if (!fail) - return 1; - - /* Get current drive directory path if C: was only pass down*/ - - if (_tcsncicmp(&InPath[1],_T(":\\"),2)!=0) - { - if (!GetRootPath(InPath,OutPathTemp,MAX_PATH)) - _tcscpy(OutPathTemp,InPath); - } - else - { - _tcscpy(OutPathTemp,InPath); - } - - _tcsupr(OutPathTemp); + /* The use of both of these together will correct the case of a path where as one alone or GetFullPath will not. Exameple: c:\windows\SYSTEM32 => C:\WINDOWS\system32 */ - GetFullPathName(OutPathTemp, MAX_PATH, OutPathTemp2, NULL); - GetPathCase(OutPathTemp2, OutPath); - - fail = SetCurrentDirectory(OutPath); - if (!fail) - return 1; - - - - SetCurrentDirectory(OutPath); - GetCurrentDirectory(MAX_PATH,OutPath); - _tchdir(OutPath); - - if (_tcsncicmp(OutPath,oldpath,2)!=0) - SetCurrentDirectory(oldpath); - - return 0; + if (GetFullPathName(InPath, MAX_PATH, OutPathTemp, NULL)) + { + GetPathCase(OutPathTemp, OutPath); + + /* Use _tchdir, since unlike SetCurrentDirectory it updates + * the current-directory-on-drive environment variables. */ + if (_tchdir(OutPath) != 0) + { + ConErrFormatMessage(GetLastError()); + nErrorLevel = 1; + return FALSE; + } + + /* Keep original drive in ordinary CD/CHDIR (without /D switch). */ + if (oldpath != NULL && _tcsncicmp(OutPath, oldpath, 2) != 0) + SetCurrentDirectory(oldpath); + } + + return TRUE; } @@ -269,16 +215,8 @@ */ INT cmd_chdir (LPTSTR param) { - - WIN32_FIND_DATA f; - HANDLE hFile; + TCHAR szCurrent[MAX_PATH]; BOOL bChangeDrive = FALSE; - TCHAR szPath[MAX_PATH]; - TCHAR szFinalPath[MAX_PATH]; - TCHAR * tmpPath; - TCHAR szCurrent[MAX_PATH]; - INT i; - /* Filter out special cases first */ @@ -289,131 +227,45 @@ return 0; } - /* Set Error Level to Success */ + /* Remove " */ + StripQuotes(param); + + /* Set Error Level to Success */ nErrorLevel = 0; + + /* Print Current Directory on a disk */ + if (_tcslen(param) == 2 && param[1] == _T(':')) + { + if (GetRootPath(param, szCurrent, MAX_PATH)) + { + error_invalid_drive(); + return 1; + } + ConOutPuts(szCurrent); + return 0; + } + + /* Get Current Directory */ + GetCurrentDirectory(MAX_PATH, szCurrent); + if (param[0] == _T('\0')) + { + ConOutPuts(szCurrent); + return 0; + } /* Input String Contains /D Switch */ if (!_tcsncicmp(param, _T("/D"), 2)) { bChangeDrive = TRUE; - tmpPath = _tcsstr(param,_T(" ")); - if(!tmpPath) - { - /* Didnt find an directories */ - ConErrResPrintf(STRING_ERROR_PATH_NOT_FOUND); - nErrorLevel = 1; - return 1; - } - tmpPath++; - _tcscpy(szPath,tmpPath); - } - else - { - _tcscpy(szPath,param); - } - - /* Print Current Directory on a disk */ - if (_tcslen(szPath) == 2 && szPath[1] == _T(':')) - { - if(GetRootPath(szPath,szCurrent,MAX_PATH)) - { - nErrorLevel = 1; - return 1; - } - ConOutPuts(szCurrent); - return 0; - } - - /* Get Current Directory */ - GetRootPath(_T("."),szCurrent,MAX_PATH); - - /* Remove " */ - i = 0; - while(i < (INT)_tcslen(szPath)) - { - if(szPath[i] == _T('\"')) - memmove(&szPath[i],&szPath[i + 1], _tcslen(&szPath[i]) * sizeof(TCHAR)); - else - i++; - } - - tmpPath = szPath; - while (_istspace (*tmpPath)) - tmpPath++; - _tcscpy(szPath,tmpPath); - - if (szPath[0] == _T('\0')) - { - ConOutPuts(szCurrent); - return 0; - } - - - /* change to full path if relative path was given */ - GetFullPathName(szPath,MAX_PATH,szFinalPath,NULL); - - if(szFinalPath[_tcslen(szFinalPath) - 1] == _T('\\') && _tcslen(szFinalPath) > 3) - szFinalPath[_tcslen(szFinalPath) - 1] = _T('\0'); - - /* Handle Root Directory Alone*/ - if (_tcslen(szFinalPath) == 3 && szFinalPath[1] == _T(':')) - { - if(!SetRootPath(szFinalPath)) - { - /* Change prompt if it is one the same drive or /D */ - if(bChangeDrive || !_tcsncicmp(szFinalPath,szCurrent,1)) - SetCurrentDirectory(szFinalPath); - return 0; - } - /* Didnt find an directories */ - ConErrResPrintf(STRING_ERROR_PATH_NOT_FOUND); - nErrorLevel = 1; + param += 2; + while (_istspace(*param)) + param++; + } + + if (!SetRootPath(bChangeDrive ? NULL : szCurrent, param)) return 1; - } - - /* Get a list of all the files */ - hFile = FindFirstFile (szFinalPath, &f); - - do - { - if(hFile == INVALID_HANDLE_VALUE) - { - ConErrFormatMessage (GetLastError(), szFinalPath); - nErrorLevel = 1; - return 1; - } - - /* Strip the paths back to the folder they are in */ - for(i = (_tcslen(szFinalPath) - 1); i > -1; i--) - if(szFinalPath[i] != _T('\\')) - szFinalPath[i] = _T('\0'); - else - break; - - _tcscat(szFinalPath,f.cFileName); - - if ((f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY) - { - if(!SetRootPath(szFinalPath)) - { - /* Change for /D */ - if(bChangeDrive) - { - _tcsupr(szFinalPath); - GetPathCase(szFinalPath, szPath); - SetCurrentDirectory(szPath); - } - return 0; - } - - } - }while(FindNextFile (hFile, &f)); - - /* Didnt find an directories */ - ConErrResPrintf(STRING_ERROR_PATH_NOT_FOUND); - nErrorLevel = 1; - return 1; + return 0; } #endif

1 0

[dgoette] 40364: * use compatDB's home site as general home site * get home site into class structure * get conditions into class structure * remove some unused files
by dgoette＠svn.reactos.org 04 Apr '09

04 Apr '09

Author: dgoette Date: Sun Apr 5 03:49:40 2009 New Revision: 40364 URL: http://svn.reactos.org/svn/reactos?rev=40364&view=rev Log: * use compatDB's home site as general home site * get home site into class structure * get conditions into class structure * remove some unused files Added: branches/danny-web/reactos.org/htdocs/compat/lib/view/Conditions.class.php (contents, props changed) - copied, changed from r40325, branches/danny-web/reactos.org/htdocs/compat/inc/conditions.php branches/danny-web/reactos.org/htdocs/compat/lib/view/Home.class.php (contents, props changed) - copied, changed from r40336, branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_home.php Removed: branches/danny-web/reactos.org/htdocs/compat/inc/comp.php branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_home.php branches/danny-web/reactos.org/htdocs/compat/inc/comp/sub/search_bar.php branches/danny-web/reactos.org/htdocs/compat/inc/comp/sub/search_box.php branches/danny-web/reactos.org/htdocs/compat/inc/conditions.php branches/danny-web/reactos.org/htdocs/compat/inc/home.php Modified: branches/danny-web/reactos.org/htdocs/compat/index.php branches/danny-web/reactos.org/htdocs/compat/lib/view/About.class.php Removed: branches/danny-web/reactos.org/htdocs/compat/inc/comp.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp.php (removed) @@ -1,80 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - -?> -<h1><a href="<?php echo $RSDB_intern_index_php ?>?page=home">ReactOS Support Database</a> > -<?php - - switch ($RSDB_SET_sec) { - case "home": // Home - default: - include("inc/comp/comp_home.php"); - break; - // Browse Database - case "category": // Category - include("inc/tree/tree_category.php"); - break; - case "name": // Name - include("inc/tree/tree_name.php"); - break; - case "vendor": // Vendor/Company - include("inc/tree/tree_vendor.php"); - break; - case "rank": // Rank - include("inc/tree/tree_rank.php"); - break; - - case "search": // Search - if ($RSDB_SET_group != "") { - $RSDB_SET_sec="name"; - include("inc/tree/tree_name.php"); - } - else { - include("inc/comp/comp_search.php"); - } - break; - - case "submit": // Category - include("inc/comp/comp_item_submit.php"); - break; - case "stats": // Statistics - echo 'depracted'; - break; - case "help": // Vendor/Company - include("inc/comp/comp_help.php"); - break; - } - -?> Removed: branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_home.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_home.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_home.php (removed) @@ -1,219 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - - echo $RSDB_intern_code_view_name; ?> -<script language="JavaScript" type="text/JavaScript"> - -</script> -<style type="text/css"> - -</style><body onLoad="MM_preloadImages('media/icons/buttons/button_comp_search_m.jpg','media/icons/buttons/button_comp_category_m.jpg','media/icons/buttons/button_comp_name_m.jpg','media/icons/buttons/button_comp_vendor_m.jpg','media/icons/buttons/button_comp_rank_m.jpg','media/icons/buttons/button_comp_submit_m.jpg')"> -<a href="<?php echo $RSDB_intern_index_php; ?>?page=about"><img src="media/pictures/compatibility_small.jpg" vspace="1" border="0" align="right"></a> -</h1> -<p>ReactOS Software and Hardware Compatibility Database</p> - -<h1>Compatibility Database - Overview </h1> -<h2>Compatibility Database - Overview</h2> -<table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td width="100%" valign="top"> -<p><font size="2">The ReactOS Compatibility Database (CompDB) has stored a lot of information about application and driver compatibility - with ReactOS.</font></p> -<div id="StartList" align="center" style="display: none"> -<a href="<?php echo $RSDB_intern_link_db_sec; ?>category&cat=0&ajax=true" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('CompCategory','','media/icons/buttons/button_comp_category_m.jpg',1)"><img src="media/icons/buttons/button_comp_category.jpg" alt="Browse by Category" name="CompCategory" width="232" height="50" border="0"></a><br> -<a href="<?php echo $RSDB_intern_link_db_sec; ?>name&letter=all&ajax=true" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('CompName','','media/icons/buttons/button_comp_name_m.jpg',1)"><img src="media/icons/buttons/button_comp_name.jpg" alt="Browse by Name" name="CompName" width="232" height="50" border="0"></a><br> -<a href="<?php echo $RSDB_intern_link_db_sec; ?>vendor&letter=all&ajax=true" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('CompVendor','','media/icons/buttons/button_comp_vendor_m.jpg',1)"><img src="media/icons/buttons/button_comp_vendor.jpg" alt="Browse by Vendor" name="CompVendor" width="232" height="50" border="0"></a><br> -<a href="<?php echo $RSDB_intern_link_db_sec; ?>rank&ajax=true" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('CompRank','','media/icons/buttons/button_comp_rank_m.jpg',1)"><img src="media/icons/buttons/button_comp_rank.jpg" alt="Browse by Rank" name="CompRank" width="232" height="50" border="0"></a><br> -<a href="<?php echo $RSDB_intern_link_db_sec; ?>submit&ajax=true" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('SubApp','','media/icons/buttons/button_comp_submit_m.jpg',1)"><img src="media/icons/buttons/button_comp_submit.jpg" alt="Submit Application" name="SubApp" width="232" height="50" border="0"></a><br> - <table width="231" height="49" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td width="231" height="49" align="right" valign="middle" nowrap background="media/icons/buttons/button_comp_search.jpg"> - <table width="100%" border="0"> - <tr> - <td width="110"> </td> - <td><input name="searchinput" type="text" id="searchinput" tabindex="0" onBlur="loadItemList(this.value,'table','comp','ajaxload','sresult')" onKeyUp="loadItemList(this.value,'table','comp','ajaxload','sresult')" size="10" maxlength="50" style="background-color: #FFFFFF; color: #000000; font-family: Verdana; font-size: x-small; font-style: normal; border-left : 1px solid #FFFFFF; border-right : 1px solid #FFFFFF; border-top : 1px solid #FFFFFF; border-bottom : 1px solid #FFFFFF;" /><img id="ajaxload" src="images/ajax_loading.gif" style="display: none"> - <script language="JavaScript" type="text/JavaScript"> -  - </script> - <?php - //include("inc/comp/sub/search_box.php"); - ?> - </td> - </tr> - </table> - </td> - </tr> - </table> -</div> -<div align="center"> - <noscript> - <a href="<?php echo $RSDB_intern_link_db_sec; ?>category&cat=0&ajax=false"><img src="media/icons/buttons/button_comp_category.jpg" alt="Browse by Category" name="CompCategory" width="232" height="50" border="0"></a><br> - <a href="<?php echo $RSDB_intern_link_db_sec; ?>name&letter=all&ajax=false"><img src="media/icons/buttons/button_comp_name.jpg" alt="Browse by Name" name="CompName" width="232" height="50" border="0"></a><br> - <a href="<?php echo $RSDB_intern_link_db_sec; ?>vendor&letter=all&ajax=false"><img src="media/icons/buttons/button_comp_vendor.jpg" alt="Browse by Vendor" name="CompVendor" width="232" height="50" border="0"></a><br> - <a href="<?php echo $RSDB_intern_link_db_sec; ?>rank&ajax=false"><img src="media/icons/buttons/button_comp_rank.jpg" alt="Browse by Rank" name="CompRank" width="232" height="50" border="0"></a><br> - <a href="<?php echo $RSDB_intern_link_db_sec; ?>submit&ajax=false"><img src="media/icons/buttons/button_comp_submit.jpg" alt="Submit Application" name="SubApp" width="232" height="50" border="0"></a><br> - <a href="<?php echo $RSDB_intern_link_db_sec; ?>search&ajax=false"><img src="media/icons/buttons/button_comp_search_noscript.jpg" alt="Search by Query" name="CompSearch" width="232" height="50" border="0"></a><br> - </noscript> -</div> -</td> - <td align="right" valign="top"><img src="media/pictures/compatibility.jpg" alt="ReactOS Compatibility Database" height="300" width="400"></td> - </tr> -</table> -<div id="sresult" style="display: none"></div> -<h3>Features</h3> -<p>Some of the <strong>features of the Compatibility Database</strong> are:</p> -<ul> - <li>Browse through the database in several different ways (by <a href="<?php echo $RSDB_intern_link_db_sec; ?>category&cat=0">category</a>, <a href="<?php echo $RSDB_intern_link_db_sec; ?>name&letter=all">name</a>, <a href="<?php echo $RSDB_intern_link_db_sec; ?>vendor&letter=all">vendor</a>, <a href="<?php echo $RSDB_intern_link_db_sec; ?>rank">ranks</a>, <a href="<?php echo $RSDB_intern_link_db_sec; ?>search">search</a>).</li> - <li>Submit application entries, compatibility test reports, vendor information, screenshots and forum messages. </li> - <li>Ability to vote on test reports, forum messages, screenshots, etc.</li> - <li>Ability to customize the layout, several settings (like personal threshold, etc.) and behaviour of the Support Database.</li> - <li>Ability to sign up to be an application maintainer.<br /> -</li> -</ul> -<h3>Recent submissions<font color="#B5E196"></font></h3> -<p>There are <a href="<?php echo $RSDB_intern_link_db_sec; ?>stats"><b> - <?php - - $stmt=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_comp = '1'"); - $stmt->execute(); - $result_count_cat = $stmt->fetch(); - echo $result_count_cat[0]; - - -?> applications and drivers</b></a> currently in the database.</p> - -<div style="margin:0; margin-top:10px; width:520px; margin-right:10px; border:1px solid #dfdfdf; padding:0em 1em 1em 1em; background-color:#EAF0F8;"> -<br /> -<table width="500" border="0" cellpadding="1" cellspacing="1"> - <tr bgcolor="#5984C3"> - <td width="15%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Time</strong></font></div></td> - <td width="50%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Application</strong></font></div></td> - <td width="35%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Function</strong></font></div></td> - </tr> - <?php - $cellcolor1="#E2E2E2"; - $cellcolor2="#EEEEEE"; - $cellcolorcounter="0"; - - $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp_testresults WHERE test_visible = '1' ORDER BY test_id DESC LIMIT 5"); - $stmt->execute(); - while($result_date_entry_records = $stmt->fetch(PDO::FETCH_ASSOC)) { -?> - <tr bgcolor="<?php - $cellcolorcounter++; - if ($cellcolorcounter == "1") { - echo $cellcolor1; - $farbe = $cellcolor1; - } - elseif ($cellcolorcounter == "2") { - $cellcolorcounter="0"; - echo $cellcolor2; - $farbe = $cellcolor2; - } - ?>"> - <td><div align="center"><font size="1" face="Arial, Helvetica, sans-serif"> - <?php - echo $result_date_entry_records['test_user_submit_timestamp']; - - ?> - </font></div></td> - <td><font size="2" face="Arial, Helvetica, sans-serif">   - <?php - $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp WHERE comp_id = :comp_id LIMIT 1"); - $stmt->bindParam('comp_id',$result_date_entry_records['test_comp_id'],PDO::PARAM_STR); - $stmt->execute(); - $result_date_vendor = $stmt->fetch(PDO::PARAM_STR); - echo "<b><a href=\"". $RSDB_intern_link_item_comp.$result_date_vendor['comp_id'] ."&item2=tests\">".$result_date_vendor['comp_name']."</a></b>"; - - ?> - </font></td> - <td><div align="left"><font size="2" face="Arial, Helvetica, sans-serif">  - <?php - echo Star::drawSmall($result_date_entry_records['test_result_function'], 1, 5, ""); - ?> - </font></div></td> - </tr> - <?php - } -?> -</table> -</div> -<?php - if ($RSDB_intern_user_id <= 0) { -?> - <p><font size="2">Some of the features of the ReactOS Compatibility Database require that you have a <a href="<?php echo $RSDB_intern_loginsystem_fullpath; ?>?page=register">myReactOS account</a> and are <a href="<?php echo $RSDB_intern_loginsystem_fullpath; ?>?page=login">logged in</a>.</font></p> -<?php - } -?> -<script language="JavaScript" type="text/JavaScript"> - -</script> Removed: branches/danny-web/reactos.org/htdocs/compat/inc/comp/sub/search_bar.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/sub/search_bar.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp/sub/search_bar.php (removed) @@ -1,244 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - -?> <div class="navTitle">Search</div> - <div class="navBox"><form method="get" action="#" style="padding:0;margin:0"> - <div style="text-align:center;"> - - <input name="q" value="" size="12" maxlength="80" class="searchInput" type="text" /><input name="domains" value="http://www.reactos.org" type="hidden" /><input name="sitesearch" value="http://www.reactos.org" type="hidden" /> - <input name="btnG" value="Go" type="submit" class="button" /> - - - </div></form> - </div> - <ol> - <div id="outputItemListShort" style="display: none"></div> - </ol> -<p></p> -<script type="text/javascript" language="javascript"> - -</script> Removed: branches/danny-web/reactos.org/htdocs/compat/inc/comp/sub/search_box.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/sub/search_box.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/comp/sub/search_box.php (removed) @@ -1,241 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - -?><input name="searchinput" type="text" id="searchinput" tabindex="0" onblur="loadItemList(this.value)" onkeyup="loadItemList(this.value)" size="10" maxlength="50" style="background-color: #FFFFFF; color: #000000; font-family: Verdana; font-size: x-small; font-style: normal; border-left : 1px solid #FFFFFF; border-right : 1px solid #FFFFFF; border-top : 1px solid #FFFFFF; border-bottom : 1px solid #FFFFFF;" /><img id="ajaxload" src="images/ajax_loading.gif" style="display: none"> -<?php /* -<p><label for="searchinput" accesskey="s">Search: </label></p><input name="bSearch" type="button" disabled="true" id="bSearch" value="Search" style="display: inline" /> -<noscript> -Sorry, currently the search function is only usable with ECMAScript enabled! The noscript methode will be available soon! -</noscript> */ ?> -<script type="text/javascript" language="javascript"> - -</script> Removed: branches/danny-web/reactos.org/htdocs/compat/inc/conditions.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/conditions.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/conditions.php (removed) @@ -1,41 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - -?> -<h1><a href="<?php echo $RSDB_intern_index_php ?>?page=home">ReactOS Support Database</a> > Submit Conditions</h1> -<h2>Submit Conditions</h2> -<p><font size="2">The ReactOS administrator and moderator team of the ReactOS homepage will attempt to remove or edit any generally objectionable material as quickly as possible, it is impossible to review every message/comment/entry/etc. Therefore you acknowledge that all posts/comment/entry/etc. made to the ReactOS homepage express the views and opinions of the author and not the administrators, moderators or webmaster (except for posts/comment/entry/etc. by these people) and hence will not be held liable. </font></p> -<p><font size="2">You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-oriented or any other material that may violate any applicable laws. Doing so may lead to you being immediately and permanently banned (and your service provider being informed). The IP address of all posts is recorded to aid in enforcing these conditions. You agree that the webmaster, administrator and moderator team of the ReactOS homepage have the right to remove, edit, move or close any topic/entry/etc. at any time should they see fit. As a user you agree to any information you have entered above being stored in a database. While this information will not be disclosed to any third party without your consent the webmaster, administrator and moderator team cannot be held responsible for any hacking attempt that may lead to the data being compromised. </font></p> -<p> <font size="2"><strong>By submitting anything to the "ReactOS Support Database" you agree that you have read the "Submit Conditions" text above and to be bound by these conditions.</strong></font></p> Removed: branches/danny-web/reactos.org/htdocs/compat/inc/home.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/home.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/inc/home.php (removed) @@ -1,50 +1,0 @@ -<?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - -?> -<h1><?php echo $RSDB_langres['RSDB_name']; ?></h1> -<p><?php echo $RSDB_langres['CONTENT_description']; ?></p> -<h1><?php echo $RSDB_langres['TEXT_overview']; ?></h1> -<h2><img src="media/pictures/supportdb.jpg" alt="ReactOS Support Database" align="right" height="130" width="290"><?php echo $RSDB_langres['TEXT_about']; ?></h2> - -<p><?php echo $RSDB_langres['CONTENT_about_short']; ?> <a href="<?php echo $RSDB_intern_index_php; ?>?page=about"><?php echo $RSDB_langres['TEXT_more']; ?></a> </p> -<h2><?php echo $RSDB_langres['TEXT_sections']; ?></h2> -<h3><?php echo $RSDB_langres['TEXT_compdb']; ?></h3> -<p> - <?php echo $RSDB_langres['CONTENT_compdb_description']; ?> <a href="<?php echo $RSDB_intern_link_db_view_comp; ?>&sec=home"><?php echo $RSDB_langres['TEXT_more']; ?></a> -</p> - -<p> </p> - Modified: branches/danny-web/reactos.org/htdocs/compat/index.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/index.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/index.php [iso-8859-1] Sun Apr 5 03:49:40 2009 @@ -250,43 +250,68 @@ // echo "<hr />db: ".$RSDB_SET_page.", sec: ".$RSDB_SET_sec."<hr />"; switch ($RSDB_SET_page) { - case "home": // Frontpage - //require($RSDB_intern_path_server.$RSDB_intern_loginsystem_path."inc/login.php"); - $rpm_page_title="Support Database - Overview"; - include("inc/header.php"); // Head - create_head($rpm_page_title, $rpm_logo, $RSDB_langres); - include("inc/structure.php"); // Layout-Structure - create_structure($rpm_page); - include("inc/home.php"); // Content - include("inc/footer.php"); // Body - break; - case "about": // RSDB About Page - new About(); - break; - case "conditions": // RSDB Submit Conditions Page - $rpm_page_title="Support Database - Submit Conditions"; - include("inc/header.php"); // Head - create_head($rpm_page_title, $rpm_logo, $RSDB_langres); - include("inc/structure.php"); // Layout-Structure - create_structure($rpm_page); - include("inc/conditions.php"); // Content - include("inc/footer.php"); // Body - break; - default: - case "db": // developer interface - //require($RSDB_intern_path_server.$RSDB_intern_loginsystem_path."inc/login.php"); - $rpm_page_title="Support Database - Compatibility"; - $RSDB_intern_section_script = "inc/comp.php"; - - include("inc/header.php"); - create_head($rpm_page_title, $rpm_logo, $RSDB_langres); - include("inc/structure.php"); - create_structure($rpm_page); - - include($RSDB_intern_section_script); - - include("inc/footer.php"); - + + // Frontpage + case 'home': + new Home(); + break; + + // RSDB About Page + case 'about': + new About(); + break; + + // RSDB Submit Conditions Page + case 'conditions': + new Conditions(); + break; + + case 'comp': + switch ($RSDB_SET_sec) { + + // Browse Database + case "category": + include("inc/tree/tree_category.php"); + break; + + // Name + case "name": + include("inc/tree/tree_name.php"); + break; + + // Vendor/Company + case "vendor": + include("inc/tree/tree_vendor.php"); + break; + + // Rank + case "rank": + include("inc/tree/tree_rank.php"); + break; + + // Search + case "search": + if ($RSDB_SET_group != "") { + $RSDB_SET_sec="name"; + include("inc/tree/tree_name.php"); + } + else { + include("inc/comp/comp_search.php"); + } + break; + + // Category + case "submit": + include("inc/comp/comp_item_submit.php"); + break; + + // Vendor/Company + case "help": + include("inc/comp/comp_help.php"); + break; + } + + default: break; case "dat": // export data switch ($RSDB_SET_export) { Modified: branches/danny-web/reactos.org/htdocs/compat/lib/view/About.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/lib/view/About.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/lib/view/About.class.php [iso-8859-1] Sun Apr 5 03:49:40 2009 @@ -27,9 +27,10 @@ protected function body( ) { global $RSDB_langres; + global $RSDB_intern_index_php; echo ' - <h1><a href="<?php echo $RSDB_intern_index_php ?>?page=home">ReactOS Support Database</a> > '.$RSDB_langres['TEXT_about_rsdb'].'</h1> + <h1><a href="'.$RSDB_intern_index_php.'?page=about">ReactOS Compatability Database</a> > '.$RSDB_langres['TEXT_about_rsdb'].'</h1> <h2>'.$RSDB_langres['TEXT_about_rsdb'].'</h2> <p>'.$RSDB_langres['CONTENT_about_rsdb'].'</p> <p>'.$RSDB_langres['CONTENT_about_webteam'].'</p> Copied: branches/danny-web/reactos.org/htdocs/compat/lib/view/Conditions.class.php (from r40325, branches/danny-web/reactos.org/htdocs/compat/inc/conditions.php) URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/conditions.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/lib/view/Conditions.class.php [iso-8859-1] Sun Apr 5 03:49:40 2009 @@ -18,24 +18,36 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ + +class Conditions extends HTML +{ - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } -?> -<h1><a href="<?php echo $RSDB_intern_index_php ?>?page=home">ReactOS Support Database</a> > Submit Conditions</h1> -<h2>Submit Conditions</h2> -<p><font size="2">The ReactOS administrator and moderator team of the ReactOS homepage will attempt to remove or edit any generally objectionable material as quickly as possible, it is impossible to review every message/comment/entry/etc. Therefore you acknowledge that all posts/comment/entry/etc. made to the ReactOS homepage express the views and opinions of the author and not the administrators, moderators or webmaster (except for posts/comment/entry/etc. by these people) and hence will not be held liable. </font></p> -<p><font size="2">You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-oriented or any other material that may violate any applicable laws. Doing so may lead to you being immediately and permanently banned (and your service provider being informed). The IP address of all posts is recorded to aid in enforcing these conditions. You agree that the webmaster, administrator and moderator team of the ReactOS homepage have the right to remove, edit, move or close any topic/entry/etc. at any time should they see fit. As a user you agree to any information you have entered above being stored in a database. While this information will not be disclosed to any third party without your consent the webmaster, administrator and moderator team cannot be held responsible for any hacking attempt that may lead to the data being compromised. </font></p> -<p> <font size="2"><strong>By submitting anything to the "ReactOS Support Database" you agree that you have read the "Submit Conditions" text above and to be bound by these conditions.</strong></font></p> + protected function body( ) + { + global $RSDB_intern_index_php; + + echo ' + <h1> + <a href="'.$RSDB_intern_index_php.'?page=about">ReactOS Compatability Database</a> + > Submit Conditions + </h1> + <h2>Submit Conditions</h2> + <p style="font-size:2;"> + The ReactOS administrator and moderator team of the ReactOS homepage will attempt to remove or edit any generally objectionable material as quickly as possible, it is impossible to review every message/comment/entry/etc. Therefore you acknowledge that all posts/comment/entry/etc. made to the ReactOS homepage express the views and opinions of the author and not the administrators, moderators or webmaster (except for posts/comment/entry/etc. by these people) and hence will not be held liable. + </p> + <p style="font-size:2;"> + You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-oriented or any other material that may violate any applicable laws. Doing so may lead to you being immediately and permanently banned (and your service provider being informed). The IP address of all posts is recorded to aid in enforcing these conditions. You agree that the webmaster, administrator and moderator team of the ReactOS homepage have the right to remove, edit, move or close any topic/entry/etc. at any time should they see fit. As a user you agree to any information you have entered above being stored in a database. While this information will not be disclosed to any third party without your consent the webmaster, administrator and moderator team cannot be held responsible for any hacking attempt that may lead to the data being compromised. + </p> + <p> + <strong> + By submitting anything to the "ReactOS Support Database" you agree that you have read the "Submit Conditions" text above and to be bound by these conditions. + </strong> + </p>'; + } // end of member function body + + + +} // end of Conditions + Propchange: branches/danny-web/reactos.org/htdocs/compat/lib/view/Conditions.class.php ------------------------------------------------------------------------------ svn:mergeinfo = Copied: branches/danny-web/reactos.org/htdocs/compat/lib/view/Home.class.php (from r40336, branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_home.php) URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/co… ============================================================================== --- branches/danny-web/reactos.org/htdocs/compat/inc/comp/comp_home.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/compat/lib/view/Home.class.php [iso-8859-1] Sun Apr 5 03:49:40 2009 @@ -18,202 +18,212 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* - * ReactOS Support Database System - RSDB - * - * (c) by Klemens Friedl <frik85> - * - * 2005 - 2006 - */ - - - // To prevent hacking activity: - if ( !defined('RSDB') ) - { - die(" "); - } - - echo $RSDB_intern_code_view_name; ?> -<script language="JavaScript" type="text/JavaScript"> - -</script> -<style type="text/css"> - -</style><body onLoad="MM_preloadImages('media/icons/buttons/button_comp_search_m.jpg','media/icons/buttons/button_comp_category_m.jpg','media/icons/buttons/button_comp_name_m.jpg','media/icons/buttons/button_comp_vendor_m.jpg','media/icons/buttons/button_comp_rank_m.jpg','media/icons/buttons/button_comp_submit_m.jpg')"> -<a href="<?php echo $RSDB_intern_index_php; ?>?page=about"><img src="media/pictures/compatibility_small.jpg" vspace="1" border="0" align="right"></a> -</h1> -<p>ReactOS Software and Hardware Compatibility Database</p> - -<h1>Compatibility Database - Overview </h1> -<h2>Compatibility Database - Overview</h2> -<table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td width="100%" valign="top"> -<p><font size="2">The ReactOS Compatibility Database (CompDB) has stored a lot of information about application and driver compatibility - with ReactOS.</font></p> -<div id="StartList" align="center" style="display: none"> -<a href="<?php echo $RSDB_intern_link_db_sec; ?>category&cat=0&ajax=true" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('CompCategory','','media/icons/buttons/button_comp_category_m.jpg',1)"><img src="media/icons/buttons/button_comp_category.jpg" alt="Browse by Category" name="CompCategory" width="232" height="50" border="0"></a><br> -<a href="<?php echo $RSDB_intern_link_db_sec; ?>name&letter=all&ajax=true" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('CompName','','media/icons/buttons/button_comp_name_m.jpg',1)"><img src="media/icons/buttons/button_comp_name.jpg" alt="Browse by Name" name="CompName" width="232" height="50" border="0"></a><br> -<a href="<?php echo $RSDB_intern_link_db_sec; ?>vendor&letter=all&ajax=true" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('CompVendor','','media/icons/buttons/button_comp_vendor_m.jpg',1)"><img src="media/icons/buttons/button_comp_vendor.jpg" alt="Browse by Vendor" name="CompVendor" width="232" height="50" border="0"></a><br> -<a href="<?php echo $RSDB_intern_link_db_sec; ?>rank&ajax=true" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('CompRank','','media/icons/buttons/button_comp_rank_m.jpg',1)"><img src="media/icons/buttons/button_comp_rank.jpg" alt="Browse by Rank" name="CompRank" width="232" height="50" border="0"></a><br> -<a href="<?php echo $RSDB_intern_link_db_sec; ?>submit&ajax=true" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('SubApp','','media/icons/buttons/button_comp_submit_m.jpg',1)"><img src="media/icons/buttons/button_comp_submit.jpg" alt="Submit Application" name="SubApp" width="232" height="50" border="0"></a><br> - <table width="231" height="49" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td width="231" height="49" align="right" valign="middle" nowrap background="media/icons/buttons/button_comp_search.jpg"> - <table width="100%" border="0"> + +class Home extends HTML +{ + + + + protected function body( ) + { + global $RSDB_intern_code_view_name; + global $RSDB_intern_index_php; + global $RSDB_intern_link_db_sec; + global $RSDB_intern_user_id; + global $RSDB_intern_loginsystem_fullpath; + global $RSDB_intern_link_item_comp; + + echo ' + <script type="text/JavaScript"> +  + </script> + <style type="text/css"> +  + </style> + <body onLoad="'."MM_preloadImages('media/icons/buttons/button_comp_search_m.jpg', 'media/icons/buttons/button_comp_category_m.jpg', 'media/icons/buttons/button_comp_name_m.jpg', 'media/icons/buttons/button_comp_vendor_m.jpg', 'media/icons/buttons/button_comp_rank_m.jpg', 'media/icons/buttons/button_comp_submit_m.jpg');".'"> + + <h1>Compatibility Database - Overview</h1> + <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> - <td width="110"> </td> - <td><input name="searchinput" type="text" id="searchinput" tabindex="0" onBlur="loadItemList(this.value,'table','comp','ajaxload','sresult')" onKeyUp="loadItemList(this.value,'table','comp','ajaxload','sresult')" size="10" maxlength="50" style="background-color: #FFFFFF; color: #000000; font-family: Verdana; font-size: x-small; font-style: normal; border-left : 1px solid #FFFFFF; border-right : 1px solid #FFFFFF; border-top : 1px solid #FFFFFF; border-bottom : 1px solid #FFFFFF;" /><img id="ajaxload" src="images/ajax_loading.gif" style="display: none"> - <script language="JavaScript" type="text/JavaScript"> -  - </script> - <?php - //include("inc/comp/sub/search_box.php"); - ?> - </td> + <td width="100%" valign="top"> + <p style="font-size:2;">The ReactOS Compatibility Database (CompDB) has stored a lot of information about application and driver compatibility with ReactOS.</p> + <div id="StartList" style="display: none;text-align:center;"> + <a href="'.$RSDB_intern_link_db_sec.'category&cat=0&ajax=true" onMouseOut="'."MM_swapImgRestore()".'" onMouseOver="'."MM_swapImage('CompCategory', '', 'media/icons/buttons/button_comp_category_m.jpg', 1);".'"> + <img src="media/icons/buttons/button_comp_category.jpg" alt="Browse by Category" name="CompCategory" width="232" height="50" border="0" /> + </a> + <br /> + <a href="'.$RSDB_intern_link_db_sec.'name&letter=all&ajax=true" onMouseOut="'."MM_swapImgRestore()".'" onMouseOver="'."MM_swapImage('CompName', '', 'media/icons/buttons/button_comp_name_m.jpg', 1);".'"> + <img src="media/icons/buttons/button_comp_name.jpg" alt="Browse by Name" name="CompName" width="232" height="50" border="0" /> + </a> + <br /> + <a href="'.$RSDB_intern_link_db_sec.'vendor&letter=all&ajax=true" onMouseOut="'."MM_swapImgRestore()".'" onMouseOver="'."MM_swapImage('CompVendor', '', 'media/icons/buttons/button_comp_vendor_m.jpg', 1);".'"> + <img src="media/icons/buttons/button_comp_vendor.jpg" alt="Browse by Vendor" name="CompVendor" width="232" height="50" border="0" /> + </a> + <br /> + <a href="'.$RSDB_intern_link_db_sec.'rank&ajax=true" onMouseOut="'."MM_swapImgRestore()".'" onMouseOver="'."MM_swapImage('CompRank', '', 'media/icons/buttons/button_comp_rank_m.jpg', 1);".'"> + <img src="media/icons/buttons/button_comp_rank.jpg" alt="Browse by Rank" name="CompRank" width="232" height="50" border="0" /> + </a> + <br /> + <a href="'.$RSDB_intern_link_db_sec.'submit&ajax=true" onMouseOut="'."MM_swapImgRestore()".'" onMouseOver="'."MM_swapImage('SubApp', '', 'media/icons/buttons/button_comp_submit_m.jpg', 1)".'"> + <img src="media/icons/buttons/button_comp_submit.jpg" alt="Submit Application" name="SubApp" width="232" height="50" border="0" /> + </a> + <br /> + <table width="231" height="49" border="0" cellpadding="0" cellspacing="0" style="margin: 0px auto;"> + <tr> + <td width="231" height="49" align="right" valign="middle" nowrap background="media/icons/buttons/button_comp_search.jpg"> + <table width="100%" border="0"> + <tr> + <td width="110"> </td> + <td> + <input name="searchinput" type="text" id="searchinput" tabindex="0" onBlur="'."loadItemList(this.value, 'table', 'comp', 'ajaxload', 'sresult');".'" onKeyUp="'."loadItemList(this.value, 'table', 'comp', 'ajaxload', 'sresult');".'" size="10" maxlength="50" style="background-color: #FFFFFF; color: #000000; font-family: Verdana; font-size: x-small; font-style: normal; border-left : 1px solid #FFFFFF; border-right : 1px solid #FFFFFF; border-top : 1px solid #FFFFFF; border-bottom : 1px solid #FFFFFF;" /> + <img id="ajaxload" src="images/ajax_loading.gif" style="display: none" /> + <script language="JavaScript" type="text/JavaScript"> +  + </script> + </td> + </tr> + </table> + </td> + </tr> + </table> + </div> + <div style="text-align:center;"> + <noscript> + <a href="'.$RSDB_intern_link_db_sec.'category&cat=0&ajax=false"> + <img src="media/icons/buttons/button_comp_category.jpg" alt="Browse by Category" name="CompCategory" width="232" height="50" border="0" /> + </a> + <br /> + <a href="'.$RSDB_intern_link_db_sec.'name&letter=all&ajax=false"> + <img src="media/icons/buttons/button_comp_name.jpg" alt="Browse by Name" name="CompName" width="232" height="50" border="0" /> + </a> + <br /> + <a href="'.$RSDB_intern_link_db_sec.'vendor&letter=all&ajax=false"> + <img src="media/icons/buttons/button_comp_vendor.jpg" alt="Browse by Vendor" name="CompVendor" width="232" height="50" border="0" /> + </a> + <br /> + <a href="'.$RSDB_intern_link_db_sec.'rank&ajax=false"> + <img src="media/icons/buttons/button_comp_rank.jpg" alt="Browse by Rank" name="CompRank" width="232" height="50" border="0" /> + </a> + <br /> + <a href="'.$RSDB_intern_link_db_sec.'submit&ajax=false"> + <img src="media/icons/buttons/button_comp_submit.jpg" alt="Submit Application" name="SubApp" width="232" height="50" border="0" /> + </a> + <br /> + <a href="'.$RSDB_intern_link_db_sec.'search&ajax=false"> + <img src="media/icons/buttons/button_comp_search_noscript.jpg" alt="Search by Query" name="CompSearch" width="232" height="50" border="0" /> + </a> + <br /> + </noscript> + </div> + </td> + <td style="text-align:right;vertical-align:top;"> + <img src="media/pictures/compatibility.jpg" alt="ReactOS Compatibility Database" height="300" width="400" /> + </td> </tr> </table> - </td> - </tr> - </table> -</div> -<div align="center"> - <noscript> - <a href="<?php echo $RSDB_intern_link_db_sec; ?>category&cat=0&ajax=false"><img src="media/icons/buttons/button_comp_category.jpg" alt="Browse by Category" name="CompCategory" width="232" height="50" border="0"></a><br> - <a href="<?php echo $RSDB_intern_link_db_sec; ?>name&letter=all&ajax=false"><img src="media/icons/buttons/button_comp_name.jpg" alt="Browse by Name" name="CompName" width="232" height="50" border="0"></a><br> - <a href="<?php echo $RSDB_intern_link_db_sec; ?>vendor&letter=all&ajax=false"><img src="media/icons/buttons/button_comp_vendor.jpg" alt="Browse by Vendor" name="CompVendor" width="232" height="50" border="0"></a><br> - <a href="<?php echo $RSDB_intern_link_db_sec; ?>rank&ajax=false"><img src="media/icons/buttons/button_comp_rank.jpg" alt="Browse by Rank" name="CompRank" width="232" height="50" border="0"></a><br> - <a href="<?php echo $RSDB_intern_link_db_sec; ?>submit&ajax=false"><img src="media/icons/buttons/button_comp_submit.jpg" alt="Submit Application" name="SubApp" width="232" height="50" border="0"></a><br> - <a href="<?php echo $RSDB_intern_link_db_sec; ?>search&ajax=false"><img src="media/icons/buttons/button_comp_search_noscript.jpg" alt="Search by Query" name="CompSearch" width="232" height="50" border="0"></a><br> - </noscript> -</div> -</td> - <td align="right" valign="top"><img src="media/pictures/compatibility.jpg" alt="ReactOS Compatibility Database" height="300" width="400"></td> - </tr> -</table> -<div id="sresult" style="display: none"></div> -<h3>Features</h3> -<p>Some of the <strong>features of the Compatibility Database</strong> are:</p> -<ul> - <li>Browse through the database in several different ways (by <a href="<?php echo $RSDB_intern_link_db_sec; ?>category&cat=0">category</a>, <a href="<?php echo $RSDB_intern_link_db_sec; ?>name&letter=all">name</a>, <a href="<?php echo $RSDB_intern_link_db_sec; ?>vendor&letter=all">vendor</a>, <a href="<?php echo $RSDB_intern_link_db_sec; ?>rank">ranks</a>, <a href="<?php echo $RSDB_intern_link_db_sec; ?>search">search</a>).</li> - <li>Submit application entries, compatibility test reports, vendor information, screenshots and forum messages. </li> - <li>Ability to vote on test reports, forum messages, screenshots, etc.</li> - <li>Ability to customize the layout, several settings (like personal threshold, etc.) and behaviour of the Support Database.</li> - <li>Ability to sign up to be an application maintainer.<br /> -</li> -</ul> -<h3>Recent submissions<font color="#B5E196"></font></h3> -<p>There are <a href="<?php echo $RSDB_intern_link_db_sec; ?>stats"><b> - <?php - - $stmt=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_comp = '1'"); - $stmt->execute(); - $result_count_cat = $stmt->fetch(); - echo $result_count_cat[0]; - - -?> applications and drivers</b></a> currently in the database.</p> - -<div style="margin:0; margin-top:10px; width:520px; margin-right:10px; border:1px solid #dfdfdf; padding:0em 1em 1em 1em; background-color:#EAF0F8;"> -<br /> -<table width="500" border="0" cellpadding="1" cellspacing="1"> - <tr bgcolor="#5984C3"> - <td width="15%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Time</strong></font></div></td> - <td width="50%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Application</strong></font></div></td> - <td width="35%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Function</strong></font></div></td> - </tr> - <?php - $cellcolor1="#E2E2E2"; - $cellcolor2="#EEEEEE"; - $cellcolorcounter="0"; - - $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp_testresults WHERE test_visible = '1' ORDER BY test_id DESC LIMIT 5"); - $stmt->execute(); - while($result_date_entry_records = $stmt->fetch(PDO::FETCH_ASSOC)) { -?> - <tr bgcolor="<?php - $cellcolorcounter++; - if ($cellcolorcounter == "1") { - echo $cellcolor1; - $farbe = $cellcolor1; - } - elseif ($cellcolorcounter == "2") { - $cellcolorcounter="0"; - echo $cellcolor2; - $farbe = $cellcolor2; - } - ?>"> - <td><div align="center"><font size="1" face="Arial, Helvetica, sans-serif"> - <?php - echo $result_date_entry_records['test_user_submit_timestamp']; - - ?> - </font></div></td> - <td><font size="2" face="Arial, Helvetica, sans-serif">   - <?php - $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp WHERE comp_id = :comp_id LIMIT 1"); - $stmt->bindParam('comp_id',$result_date_entry_records['test_comp_id'],PDO::PARAM_STR); + <div id="sresult" style="display: none"></div> + <h3>Features</h3> + <p>Some of the <strong>features of the Compatibility Database</strong> are:</p> + <ul> + <li>Browse through the database in several different ways (by <a href="'.$RSDB_intern_link_db_sec.'category&cat=0">category</a>, <a href="'.$RSDB_intern_link_db_sec.'name&letter=all">name</a>, <a href="'.$RSDB_intern_link_db_sec.'vendor&letter=all">vendor</a>, <a href="'.$RSDB_intern_link_db_sec.'rank">ranks</a>, <a href="'.$RSDB_intern_link_db_sec.'search">search</a>).</li> + <li>Submit application entries, compatibility test reports, vendor information, screenshots and forum messages. </li> + <li>Ability to vote on test reports, forum messages, screenshots, etc.</li> + <li>Ability to customize the layout, several settings (like personal threshold, etc.) and behaviour of the Support Database.</li> + <li>Ability to sign up to be an application maintainer.<br /></li> + </ul> + <h3>Recent submissions</h3>'; + + // get number of entries + $stmt=CDBConnection::getInstance()->prepare("SELECT COUNT(*) FROM rsdb_groups WHERE grpentr_visible = '1' AND grpentr_comp = '1'"); $stmt->execute(); - $result_date_vendor = $stmt->fetch(PDO::PARAM_STR); - echo "<b><a href=\"". $RSDB_intern_link_item_comp.$result_date_vendor['comp_id'] ."&item2=tests\">".$result_date_vendor['comp_name']."</a></b>"; - - ?> - </font></td> - <td><div align="left"><font size="2" face="Arial, Helvetica, sans-serif">  - <?php - echo Star::drawSmall($result_date_entry_records['test_result_function'], 1, 5, ""); - ?> - </font></div></td> - </tr> - <?php - } -?> -</table> -</div> -<?php - if ($RSDB_intern_user_id <= 0) { -?> - <p><font size="2">Some of the features of the ReactOS Compatibility Database require that you have a <a href="<?php echo $RSDB_intern_loginsystem_fullpath; ?>?page=register">myReactOS account</a> and are <a href="<?php echo $RSDB_intern_loginsystem_fullpath; ?>?page=login">logged in</a>.</font></p> -<?php - } -?> -<script language="JavaScript" type="text/JavaScript"> - -</script> + echo ' + <p>There are <a href="'.$RSDB_intern_link_db_sec.'stats"><strong>'.$stmt->fetchColumn().' applications and drivers</strong></a> currently in the database.</p> + <div style="margin:0; margin-top:10px; width:520px; margin-right:10px; border:1px solid #dfdfdf; padding:0em 1em 1em 1em; background-color:#EAF0F8;"> + <br /> + <table width="500" border="0" cellpadding="1" cellspacing="1"> + <tr bgcolor="#5984C3"> + <td width="15%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Time</strong></font></div></td> + <td width="50%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Application</strong></font></div></td> + <td width="35%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Function</strong></font></div></td> + </tr>'; + + //@MOVEME to css + $cellcolor1='#E2E2E2'; + $cellcolor2='#EEEEEE'; + $cellcolorcounter=0; + + // show latest tests + $stmt=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp_testresults WHERE test_visible = '1' ORDER BY test_id DESC LIMIT 5"); + $stmt->execute(); + while ($entry = $stmt->fetch(PDO::FETCH_ASSOC)) { + + // get programm name to the test + $stmt_comp=CDBConnection::getInstance()->prepare("SELECT * FROM rsdb_item_comp WHERE comp_id = :comp_id LIMIT 1"); + $stmt_comp->bindParam('comp_id',$entry['test_comp_id'],PDO::PARAM_STR); + $stmt_comp->execute(); + $comp = $stmt_comp->fetchOnce(PDO::FETCH_ASSOC); + + $cellcolorcounter++; + echo ' + <tr style="background-color:'.($cellcolorcounter%2 ? $cellcolor1 : $cellcolor2).';"> + <td style="text-align: center;font-size:1;">'.$entry['test_user_submit_timestamp'].'</td> + <td style="font-size:2;"> <strong><a href="'.$RSDB_intern_link_item_comp.$comp['comp_id'].'&item2=tests">'.$comp['comp_name'].'</a></strong></td> + <td style="font-size:2;"> '.Star::drawSmall($entry['test_result_function'], 1, 5, '').'</td> + </tr>'; + } + + echo ' + </table> + </div>'; + + // print some login blah to guest users + if ($RSDB_intern_user_id <= 0) { + echo '<p style="font-size:2;">Some of the features of the ReactOS Compatibility Database require that you have a <a href="'.$RSDB_intern_loginsystem_fullpath.'?page=register">myReactOS account</a> and are <a href="'.$RSDB_intern_loginsystem_fullpath.'?page=login">logged in</a>.</p>'; + } + + echo ' + <script type="text/JavaScript"> +  + </script>'; + } // end of member function body + + + +} // end of Home Propchange: branches/danny-web/reactos.org/htdocs/compat/lib/view/Home.class.php ------------------------------------------------------------------------------ svn:mergeinfo =

1 0

[fireball] 40363: Evgeniy Boltik <bstsoft@narod.ru> - Enable and use mask support in UserDrawIconEx, fully compatible with Windows, based on tests in bug 4336. - Remove IntSet[Text/Bk]Color hacks from UserDrawIconEx, no longer required due to fix in CreateCompatibleDC. - Change a few comments in the code of UserDrawIconEx. See issue #4336 for more details.
by fireball＠svn.reactos.org 04 Apr '09

04 Apr '09

Author: fireball Date: Sat Apr 4 22:52:14 2009 New Revision: 40363 URL: http://svn.reactos.org/svn/reactos?rev=40363&view=rev Log: Evgeniy Boltik <bstsoft(a)narod.ru> - Enable and use mask support in UserDrawIconEx, fully compatible with Windows, based on tests in bug 4336. - Remove IntSet[Text/Bk]Color hacks from UserDrawIconEx, no longer required due to fix in CreateCompatibleDC. - Change a few comments in the code of UserDrawIconEx. See issue #4336 for more details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Sat Apr 4 22:52:14 2009 @@ -1388,8 +1388,6 @@ return FALSE; } - -/* FIXME: ReactOS specific hack */ BOOL UserDrawIconEx( HDC hDc, @@ -1405,7 +1403,6 @@ BOOL Ret = FALSE; HBITMAP hbmMask, hbmColor; BITMAP bmpMask, bmpColor; - COLORREF oldFg, oldBg; BOOL DoFlickerFree; SIZE IconSize; @@ -1413,8 +1410,10 @@ HGDIOBJ hOldOffBrush = 0; HGDIOBJ hOldOffBmp = 0; HBITMAP hbmOff = 0; - HDC hdcMem = 0; - HGDIOBJ hOldMem; + HDC hdcMask = 0; + HGDIOBJ hOldMask = NULL; + HDC hdcImage = 0; + HGDIOBJ hOldImage = NULL; BOOL bAlpha = FALSE; hbmMask = pIcon->IconInfo.hbmMask; @@ -1452,7 +1451,8 @@ PFN_DIB_GetPixel fnSource_GetPixel = NULL; INT x, y; - //Find alpha into icon + /* In order to correctly display 32 bit icons Windows first scans the image, + because information about transparency is not stored in any image's headers */ psurfOff = SURFACE_LockSurface(hbmColor ? hbmColor : hbmMask); if (psurfOff) { @@ -1549,60 +1549,62 @@ else hdcOff = hDc; - hdcMem = NtGdiCreateCompatibleDC(hDc); - if (!hdcMem) - { - DPRINT1("NtGdiCreateCompatibleDC() failed!\n"); - goto cleanup; - } - - oldFg = IntGdiSetTextColor(hdcOff, RGB(0, 0, 0)); - oldBg = IntGdiSetBkColor(hdcOff, RGB(255, 255, 255)); - - if (diFlags & DI_MASK) - { - hOldMem = NtGdiSelectBitmap(hdcMem, hbmMask); - if (!hOldMem) + if (diFlags & DI_IMAGE) + { + hdcImage = NtGdiCreateCompatibleDC(hDc); + if (!hdcImage) + { + DPRINT1("NtGdiCreateCompatibleDC() failed!\n"); + goto cleanup; + } + hOldImage = NtGdiSelectBitmap(hdcImage, (hbmColor ? hbmColor : hbmMask)); + if (!hOldImage) { DPRINT("NtGdiSelectBitmap() failed!\n"); goto cleanup; } - - NtGdiStretchBlt(hdcOff, - (DoFlickerFree || bAlpha ? 0 : xLeft), - (DoFlickerFree || bAlpha ? 0 : yTop), - cxWidth, - cyHeight, - hdcMem, - 0, - 0, - IconSize.cx, - IconSize.cy, - ((diFlags & DI_IMAGE) ? SRCAND : SRCCOPY), - 0); - - NtGdiSelectBitmap(hdcMem, hOldMem); - } - - if(diFlags & DI_IMAGE) - { - hOldMem = NtGdiSelectBitmap(hdcMem, (hbmColor ? hbmColor : hbmMask)); - - NtGdiStretchBlt(hdcOff, - (DoFlickerFree || bAlpha ? 0 : xLeft), - (DoFlickerFree || bAlpha ? 0 : yTop), - cxWidth, - cyHeight, - hdcMem, - 0, - (hbmColor ? 0 : IconSize.cy), - IconSize.cx, - IconSize.cy, - ((diFlags & DI_MASK) ? SRCINVERT : SRCCOPY), - 0); - - NtGdiSelectBitmap(hdcMem, hOldMem); - } + } + + /* If DI_IMAGE flag is specified and hbmMask exists, then always use mask for drawing */ + if (diFlags & DI_MASK || (diFlags & DI_IMAGE && hbmMask)) + { + hdcMask = NtGdiCreateCompatibleDC(hDc); + if (!hdcMask) + { + DPRINT1("NtGdiCreateCompatibleDC() failed!\n"); + goto cleanup; + } + + hOldMask = NtGdiSelectBitmap(hdcMask, hbmMask); + if (!hOldMask) + { + DPRINT("NtGdiSelectBitmap() failed!\n"); + goto cleanup; + } + } + + if (hdcMask || hdcImage) + { + GreStretchBltMask(hdcOff, + (DoFlickerFree || bAlpha) ? 0 : xLeft, + (DoFlickerFree || bAlpha) ? 0 : yTop, + cxWidth, + cyHeight, + hdcImage ? hdcImage : hdcMask, + 0, + ((diFlags & DI_MASK && !(diFlags & DI_IMAGE)) || + (diFlags & DI_IMAGE && hbmColor) ? 0 : IconSize.cy), + IconSize.cx, + IconSize.cy, + SRCCOPY, + 0, + hdcImage ? hdcMask : NULL); + } + + if (hOldMask) NtGdiSelectBitmap(hdcMask, hOldMask); + if (hOldImage) NtGdiSelectBitmap(hdcImage, hOldImage); + if (hdcImage) NtGdiDeleteObjectApp(hdcImage); + if (hdcMask) NtGdiDeleteObjectApp(hdcMask); if (bAlpha) { @@ -1673,9 +1675,6 @@ cyHeight, hdcOff, 0, 0, SRCCOPY, 0, 0); } - IntGdiSetTextColor(hdcOff, oldFg); - IntGdiSetBkColor(hdcOff, oldBg); - Ret = TRUE; cleanup: @@ -1687,7 +1686,6 @@ if(hdcOff) NtGdiDeleteObjectApp(hdcOff); } - if(hdcMem) NtGdiDeleteObjectApp(hdcMem); return Ret; }

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
48
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 2009