Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 37649: Bug 3871: Polish translation update for netshell, usetup and reactos.exe by Maciej Bialas
by dreimer＠svn.reactos.org 26 Nov '08

26 Nov '08

Author: dreimer Date: Wed Nov 26 00:44:47 2008 New Revision: 37649 URL: http://svn.reactos.org/svn/reactos?rev=37649&view=rev Log: Bug 3871: Polish translation update for netshell,usetup and reactos.exe by Maciej Bialas Modified: trunk/reactos/base/setup/reactos/lang/pl-PL.rc trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/dll/win32/netshell/lang/pl-PL.rc Modified: trunk/reactos/base/setup/reactos/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pl… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] Wed Nov 26 00:44:47 2008 @@ -24,11 +24,11 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - CONTROL "Setup language:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11 + CONTROL "Jêzyk instalacji:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11 CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142 - CONTROL "Keyboard or input method:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 + CONTROL "Uk³ad klawiatury:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81 - LTEXT "Click Next to select the setup type.", IDC_STATIC, 10, 180 ,297, 10 + LTEXT "Nacinij Dalej aby wybraæ rodzaj instalacji.", IDC_STATIC, 10, 180 ,297, 10 END IDD_TYPEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -36,10 +36,10 @@ CAPTION "Instalator ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Type of setup", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 - CONTROL "Install ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 - CONTROL "Repair or update an installed ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 - LTEXT "Click Next to setup the devices.", IDC_STATIC, 10, 180 ,297, 10 + CONTROL "Rodzaj instalacji", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + CONTROL "Zainstaluj ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 + CONTROL "Napraw lub zaktualizuj zainstalowany wczeniej ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 + LTEXT "Nacinij Dalej aby zmieniæ ustawienia sprzêtu.", IDC_STATIC, 10, 180 ,297, 10 END IDD_DEVICEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -47,14 +47,14 @@ CAPTION "Instalator ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Device settings", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "Computer:", IDC_STATIC, 20,15, 80, 10 + CONTROL "Ustawienia sprzêtu", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Komputer:", IDC_STATIC, 20,15, 80, 10 CONTROL "", IDC_COMPUTER, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 150, 80 - LTEXT "Display:", IDC_STATIC, 20,35, 80, 10 + LTEXT "Ekran:", IDC_STATIC, 20,35, 80, 10 CONTROL "", IDC_DISPLAY, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80 - LTEXT "Keyboard:", IDC_STATIC, 20,55, 80, 10 + LTEXT "Klawiatura:", IDC_STATIC, 20,55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80 - LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180 ,277, 20 + LTEXT "Nacinij Dalej aby ustaliæ miejsce instalacji.", IDC_STATIC, 10, 180 ,277, 20 END IDD_DRIVEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -62,28 +62,28 @@ CAPTION "Instalator ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Partition for ReactOS installation", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 + CONTROL "Partycja dla instalacji ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&Create", IDC_PARTCREATE, 20,155,50,15 - PUSHBUTTON "&Delete", IDC_PARTDELETE, 76,155,50,15 - PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218,155,80,15 - LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20 + PUSHBUTTON "&Stwórz", IDC_PARTCREATE, 20,155,50,15 + PUSHBUTTON "&Usuñ", IDC_PARTDELETE, 76,155,50,15 + PUSHBUTTON "&Opcje zaawansowane...", IDC_PARTMOREOPTS, 218,155,80,15 + LTEXT "Nacinij Dalej aby rozpocz¹æ proces instalacji.", IDC_STATIC, 10, 180 ,277, 20 END IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME -CAPTION "Advanced Partition Settings" +CAPTION "Zaawansowane ustawienia partycji" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 + CONTROL "Folder instalacji", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Instalacja bootloadera", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 - CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 - CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 + CONTROL "Wgraj bootloader na dysk twardy (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Pomiñ wgrywanie bootloadera", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Anuluj", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 @@ -91,8 +91,8 @@ CAPTION "Instalator ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Setup action", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10 + CONTROL "Instalacja", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Instalacja plików...", IDC_ACTIVITY, 20, 50, 277, 10 LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 @@ -101,33 +101,33 @@ IDD_RESTARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Completing ReactOS Setup" +CAPTION "Koñczenie instalacji ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Completing the first stage of ReactOS Setup", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 + CONTROL "Koñczenie pierwszego etapu instalacji ReactOS", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Pierwszy etap instalacji ReactOS zosta³ pomylnie zakoñczony.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 + LTEXT "Po klikniêciu Zakoñcz ten komputer zostanie uruchomiony ponownie.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "Jeli w napêdzie jest p³yta CD, wyci¹gnij j¹. Nastêpnie nacinij Zakoñcz aby uruchomiæ ponownie Twój komputer.", IDC_STATIC, 10, 180, 297, 20 END STRINGTABLE BEGIN - IDS_LANGTITLE "Language Selection" - IDS_LANGSUBTITLE "Choose language for setup and final system." - IDS_TYPETITLE "Welcome to ReactOS Setup" - IDS_TYPESUBTITLE "Choose setup type." - IDS_DEVICETITLE "Setup the basic devices" - IDS_DEVICESUBTITLE "Set the settings of display and keyboard." - IDS_DRIVETITLE "Setup the installation partition and system folder" - IDS_DRIVESUBTITLE "Prepare installation partition, system folder and boot loader." - IDS_PROCESSTITLE "Prepare partition, copy files and setup system" - IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader" - IDS_RESTARTTITLE "First stage of setup finished" - IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" - IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install Reactos. Really quit?" - IDS_ABORTSETUP2 "Abort installation?" + IDS_LANGTITLE "Wybór jêzyka" + IDS_LANGSUBTITLE "Wybierz jêzyk instalacji i docelowego systemu." + IDS_TYPETITLE "Witamy w Instalatorze ReactOS" + IDS_TYPESUBTITLE "Wybierz typ instalacji." + IDS_DEVICETITLE "Ustawienia podstawowych urz¹dzeñ" + IDS_DEVICESUBTITLE "Zmieñ ustawienia ekranu i klawiatury." + IDS_DRIVETITLE "Ustaw partycjê instalacji i folder systemowy" + IDS_DRIVESUBTITLE "Przygotuj partycje instalacji, folder systemowy i bootloader." + IDS_PROCESSTITLE "Przygotuj partycjê, skopiuj pliki i zapisz ustawienia systemu" + IDS_PROCESSSUBTITLE "Przygotuj i sformatuj partycjê, skopiuj pliki, skopiuj i zainstaluj bootloader" + IDS_RESTARTTITLE "Pierwszy etap instalacji zakoñczony sukcesem" + IDS_RESTARTSUBTITLE "Pierwszy etap instalacji zosta³ zakoñczony, uruchom ponownie komputer aby przejæ do drugiego etapu" + IDS_ABORTSETUP "Instalacja ReactOS nie zosta³a ukoñczona na tym komputerze. Jeli teraz zakoñczysz instalacjê, bêdziesz musia³ uruchomiæ Instalator ponownie, aby zainstalowaæ Reactos. Na pewno zakoñczyæ?" + IDS_ABORTSETUP2 "Przerwaæ instalacjê?" END /* EOF */ Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Wed Nov 26 00:44:47 2008 @@ -967,7 +967,7 @@ { 50, 0, - "\xB3 Please wait... ", + "\xB3 Prosz© czeka... ", TEXT_TYPE_STATUS }, { @@ -1087,7 +1087,7 @@ { 6, 8, - "Please select a layout to be installed by default.", + "Prosz© wybra domylnie instalowany ukad klawiatury.", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/dll/win32/netshell/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/pl-PL.rc [iso-8859-1] Wed Nov 26 00:44:47 2008 @@ -70,27 +70,27 @@ IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "Network Connection Details" +CAPTION "Szczegó³y po³¹czenia sieciowego" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + LTEXT "&Szczegó³y po³¹czenia sieciowego:", -1, 15, 9, 170, 12 CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 - PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 + PUSHBUTTON "&Zamknij", IDC_CLOSE, 125, 165, 62, 14 END STRINGTABLE DISCARDABLE BEGIN - IDS_PHYSICAL_ADDRESS "Physical Address" - IDS_IP_ADDRESS "IP Address" - IDS_SUBNET_MASK "Subnet Mask" - IDS_DEF_GATEWAY "Default Gateway" - IDS_DHCP_SERVER "DHCP Server" - IDS_LEASE_OBTAINED "Lease Obtained" - IDS_LEASE_EXPIRES "Lease Expires" - IDS_DNS_SERVERS "DNS Servers" - IDS_WINS_SERVERS "WINS Servers" - IDS_PROPERTY "Property" - IDS_VALUE "Value" + IDS_PHYSICAL_ADDRESS "Adres fizyczny" + IDS_IP_ADDRESS "Adres IP" + IDS_SUBNET_MASK "Maska podsieci" + IDS_DEF_GATEWAY "Brama domylna" + IDS_DHCP_SERVER "Serwer DHCP" + IDS_LEASE_OBTAINED "Dzier¿awa uzyskana" + IDS_LEASE_EXPIRES "Dzier¿awa wygasa" + IDS_DNS_SERVERS "Serwery DNS" + IDS_WINS_SERVERS "Serwery WINS" + IDS_PROPERTY "W³aciwoci" + IDS_VALUE "Wartoæ" IDS_NETWORKCONNECTION "Po³¹czenie sieciowe" IDS_SHV_COLUMN_NAME "Nazwa" IDS_SHV_COLUMN_TYPE "Typ"

1 0

[greatlrd] 37648: fix gdi32 build wrong rbuild syntax
by greatlrd＠svn.reactos.org 26 Nov '08

26 Nov '08

Author: greatlrd Date: Wed Nov 26 00:42:39 2008 New Revision: 37648 URL: http://svn.reactos.org/svn/reactos?rev=37648&view=rev Log: fix gdi32 build wrong rbuild syntax Modified: branches/reactx/reactos/dll/win32/gdi32/gdi32.rbuild Modified: branches/reactx/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Wed Nov 26 00:42:39 2008 @@ -21,7 +21,8 @@ <file>heap.c</file> <if property="REACTX_EMU" value="1"> <file>gdientryhelgl.c</file> - <else> + </if> + <if property="REACTX_EMU" value="0"> <file>gdientry.c</file> </if> <file>hacks.c</file>

1 0

[greatlrd] 37647: part 2 of 2 This is a experiment with opengl over gdientry1-16, we do not known if this experiment is good or bad idea. if it works fine and show it is good idea, it will mabe be in trunk later
by greatlrd＠svn.reactos.org 26 Nov '08

26 Nov '08

Author: greatlrd Date: Wed Nov 26 00:31:28 2008 New Revision: 37647 URL: http://svn.reactos.org/svn/reactos?rev=37647&view=rev Log: part 2 of 2 This is a experiment with opengl over gdientry1-16, we do not known if this experiment is good or bad idea. if it works fine and show it is good idea, it will mabe be in trunk later Added: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryglhel.c (with props) Modified: branches/reactx/reactos/dll/win32/gdi32/gdi32.rbuild Modified: branches/reactx/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Wed Nov 26 00:31:28 2008 @@ -19,7 +19,11 @@ </directory> <directory name="misc"> <file>heap.c</file> + <if property="REACTX_EMU" value="1"> + <file>gdientryhelgl.c</file> + <else> <file>gdientry.c</file> + </if> <file>hacks.c</file> <file>historic.c</file> <file>misc.c</file> Added: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryglhel.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryglhel.c (added) +++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryglhel.c [iso-8859-1] Wed Nov 26 00:31:28 2008 @@ -1,0 +1,2312 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS GDI32 + * PURPOSE: GDI DirectX inteface + * FILE: lib/gdi32/misc/gdientry.c + * PROGRAMERS: Alex Ionescu (alex(a)relsoft.net) + * Magnus Olsen (magnus(a)greatlord.com) + */ + +/* INCLUDES ******************************************************************/ + +#include "precomp.h" +#include <ddraw.h> +#include <ddrawi.h> +#include <ddrawint.h> +#include <ddrawgdi.h> +#include <ntgdi.h> +#include <d3dhal.h> + +/* DATA **********************************************************************/ + +HANDLE ghDirectDraw; +ULONG gcDirectDraw; + +#define GetDdHandle(Handle) ((HANDLE)Handle ? (HANDLE)Handle : ghDirectDraw) + + + +/* CALLBACKS *****************************************************************/ + +/* + * @implemented + * + * DdAddAttachedSurface + */ +DWORD +WINAPI +DdAddAttachedSurface(LPDDHAL_ADDATTACHEDSURFACEDATA Attach) +{ + + /* Fixme for opengl hel emulations */ + return 0; + /* Call win32k */ +#if 0 + return NtGdiDdAddAttachedSurface((HANDLE)Attach->lpDDSurface->hDDSurface, + (HANDLE)Attach->lpSurfAttached->hDDSurface, + (PDD_ADDATTACHEDSURFACEDATA)Attach); +#endif +} + +/* + * @implemented + * + * DdBlt + */ +DWORD +WINAPI +DdBlt(LPDDHAL_BLTDATA Blt) +{ + HANDLE Surface = 0; + + /* Fixme for opengl hel emulations */ + return 0; + +#if 0 + /* Use the right surface */ + if (Blt->lpDDSrcSurface) + { + Surface = (HANDLE)Blt->lpDDSrcSurface->hDDSurface; + } + + /* Call win32k */ + return NtGdiDdBlt((HANDLE)Blt->lpDDDestSurface->hDDSurface, Surface, (PDD_BLTDATA)Blt); +#endif +} + +/* + * @implemented + * + * DdDestroySurface + */ +DWORD +WINAPI +DdDestroySurface(LPDDHAL_DESTROYSURFACEDATA pDestroySurface) +{ + /* Fixme for opengl hel emulations */ + return 0; + +#if 0 + DWORD Return = DDHAL_DRIVER_NOTHANDLED; + BOOL RealDestroy; + + if (pDestroySurface->lpDDSurface->hDDSurface) + { + /* Check if we shoudl really destroy it */ + RealDestroy = !(pDestroySurface->lpDDSurface->dwFlags & DDRAWISURF_DRIVERMANAGED) || + !(pDestroySurface->lpDDSurface->dwFlags & DDRAWISURF_INVALID); + + /* Call win32k */ + Return = NtGdiDdDestroySurface((HANDLE)pDestroySurface->lpDDSurface->hDDSurface, RealDestroy); + } + + return Return; +#endif +} + +/* + * @implemented + * + * DdFlip + */ +DWORD +WINAPI +DdFlip(LPDDHAL_FLIPDATA Flip) +{ + + /* Fixme for opengl hel emulations */ + return 0; + +#if 0 + /* Note : + * See http://msdn2.microsoft.com/en-us/library/ms794213.aspx and + * http://msdn2.microsoft.com/en-us/library/ms792675.aspx + */ + + HANDLE hSurfaceCurrentLeft = NULL; + HANDLE hSurfaceTargetLeft = NULL; + + /* Auto flip off or on */ + if (Flip->dwFlags & DDFLIP_STEREO ) + { + if ( (Flip->lpSurfTargLeft) && + (Flip->lpSurfCurrLeft)) + { + /* Auto flip on */ + hSurfaceTargetLeft = (HANDLE) Flip->lpSurfTargLeft->hDDSurface; + hSurfaceCurrentLeft = (HANDLE) Flip->lpSurfCurrLeft->hDDSurface; + } + } + + /* Call win32k */ + return NtGdiDdFlip( (HANDLE) Flip->lpSurfCurr->hDDSurface, + (HANDLE) Flip->lpSurfTarg->hDDSurface, + hSurfaceCurrentLeft, + hSurfaceTargetLeft, + (PDD_FLIPDATA) Flip); +#endif +} + +/* + * @implemented + * + * DdLock + */ +DWORD +WINAPI +DdLock(LPDDHAL_LOCKDATA Lock) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + /* Call win32k */ + return NtGdiDdLock((HANDLE)Lock->lpDDSurface->hDDSurface, + (PDD_LOCKDATA)Lock, + (HANDLE)Lock->lpDDSurface->hDC); +#endif +} + +/* + * @implemented + * + * DdUnlock + */ +DWORD +WINAPI +DdUnlock(LPDDHAL_UNLOCKDATA Unlock) +{ + /* Call win32k */ + return NtGdiDdUnlock((HANDLE)Unlock->lpDDSurface->hDDSurface, + (PDD_UNLOCKDATA)Unlock); +} + +/* + * @implemented + * + * DdGetBltStatus + */ +DWORD +WINAPI +DdGetBltStatus(LPDDHAL_GETBLTSTATUSDATA GetBltStatus) +{ + /* Fixme for opengl hel emulations */ + return 0; + +#if 0 + /* Call win32k */ + return NtGdiDdGetBltStatus((HANDLE)GetBltStatus->lpDDSurface->hDDSurface, + (PDD_GETBLTSTATUSDATA)GetBltStatus); +#endif +} + +/* + * @implemented + * + * DdGetBltStatus + */ +DWORD +WINAPI +DdGetFlipStatus(LPDDHAL_GETFLIPSTATUSDATA GetFlipStatus) +{ + /* Fixme for opengl hel emulations */ + return 0; + +#if 0 + /* Call win32k */ + return NtGdiDdGetFlipStatus((HANDLE)GetFlipStatus->lpDDSurface->hDDSurface, + (PDD_GETFLIPSTATUSDATA)GetFlipStatus); +#endif + +} + +/* + * @implemented + * + * DdUpdateOverlay + */ +DWORD +WINAPI +DdUpdateOverlay(LPDDHAL_UPDATEOVERLAYDATA UpdateOverlay) +{ + /* Fixme for opengl hel emulations */ + return 0; + +#if 0 + /* We have to handle this manually here */ + if (UpdateOverlay->dwFlags & DDOVER_KEYDEST) + { + /* Use the override */ + UpdateOverlay->dwFlags &= ~DDOVER_KEYDEST; + UpdateOverlay->dwFlags |= DDOVER_KEYDESTOVERRIDE; + + /* Set the overlay */ + UpdateOverlay->overlayFX.dckDestColorkey = + UpdateOverlay->lpDDDestSurface->ddckCKDestOverlay; + } + if (UpdateOverlay->dwFlags & DDOVER_KEYSRC) + { + /* Use the override */ + UpdateOverlay->dwFlags &= ~DDOVER_KEYSRC; + UpdateOverlay->dwFlags |= DDOVER_KEYSRCOVERRIDE; + + /* Set the overlay */ + UpdateOverlay->overlayFX.dckSrcColorkey = + UpdateOverlay->lpDDSrcSurface->ddckCKSrcOverlay; + } + + /* Call win32k */ + return NtGdiDdUpdateOverlay((HANDLE)UpdateOverlay->lpDDDestSurface->hDDSurface, + (HANDLE)UpdateOverlay->lpDDSrcSurface->hDDSurface, + (PDD_UPDATEOVERLAYDATA)UpdateOverlay); +#endif +} + +/* + * @implemented + * + * DdSetOverlayPosition + */ +DWORD +WINAPI +DdSetOverlayPosition(LPDDHAL_SETOVERLAYPOSITIONDATA SetOverlayPosition) +{ + /* Fixme for opengl hel emulations */ + return 0; + +#if 0 + /* Call win32k */ + return NtGdiDdSetOverlayPosition( (HANDLE)SetOverlayPosition->lpDDSrcSurface->hDDSurface, + (HANDLE)SetOverlayPosition->lpDDDestSurface->hDDSurface, + (PDD_SETOVERLAYPOSITIONDATA) SetOverlayPosition); +#endif +} + +/* + * @implemented + * + * DdWaitForVerticalBlank + */ +DWORD +WINAPI +DdWaitForVerticalBlank(LPDDHAL_WAITFORVERTICALBLANKDATA WaitForVerticalBlank) +{ + /* Fixme for opengl hel emulations */ + return 0; + +#if 0 + /* Call win32k */ + return NtGdiDdWaitForVerticalBlank(GetDdHandle( + WaitForVerticalBlank->lpDD->hDD), + (PDD_WAITFORVERTICALBLANKDATA) + WaitForVerticalBlank); +#endif +} + +/* + * @implemented + * + * DdCanCreateSurface + */ +DWORD +WINAPI +DdCanCreateSurface(LPDDHAL_CANCREATESURFACEDATA CanCreateSurface) +{ + /* Fixme for opengl hel emulations */ + return 0; + +#if 0 + /* + * Note : This functions are basic same, in win32k + * NtGdiDdCanCreateD3DBuffer and NtGdiDdCanCreateSurface are mergs + * toghter in win32k at end and retrurn same data, it is still sepreated + * at user mode but in kmode it is not. + */ + + /* Call win32k */ + return NtGdiDdCanCreateSurface(GetDdHandle(CanCreateSurface->lpDD->hDD), + (PDD_CANCREATESURFACEDATA)CanCreateSurface); +#endif +} + +/* + * @implemented + * + * DdCreateSurface + */ +DWORD +WINAPI +DdCreateSurface(LPDDHAL_CREATESURFACEDATA pCreateSurface) +{ + /* Fixme for opengl hel emulations */ + return 0; + +#if 0 + DWORD Return = DDHAL_DRIVER_NOTHANDLED; + ULONG SurfaceCount = pCreateSurface->dwSCnt; + DD_SURFACE_LOCAL DdSurfaceLocal; + DD_SURFACE_MORE DdSurfaceMore; + DD_SURFACE_GLOBAL DdSurfaceGlobal; + + HANDLE hPrevSurface, hSurface; + + PDD_SURFACE_LOCAL pDdSurfaceLocal = NULL; + PDD_SURFACE_MORE pDdSurfaceMore = NULL; + PDD_SURFACE_GLOBAL pDdSurfaceGlobal = NULL; + + PDD_SURFACE_LOCAL ptmpDdSurfaceLocal = NULL; + PDD_SURFACE_MORE ptmpDdSurfaceMore = NULL; + PDD_SURFACE_GLOBAL ptmpDdSurfaceGlobal = NULL; + PHANDLE phSurface = NULL, puhSurface = NULL; + ULONG i; + LPDDSURFACEDESC pSurfaceDesc = NULL; + + /* TODO : Speed optimze, most games/dx apps/program does not want 1 surface, they want lest 2 + * so we need incress the stack so it can contain 2 surface instead of one, this will incress + * the speed of the apps when it trying alloc buffer. How to incress the surface stack space + * we need create a own struct for DD_SURFACE_LOCAL DdSurfaceLocal, DD_SURFACE_MORE DdSurfaceMore + * DD_SURFACE_GLOBAL DdSurfaceGlobal. HANDLE hPrevSurface, hSurface. like + * struct { DD_SURFACE_LOCAL DdSurfaceLocal1, DD_SURFACE_LOCAL DdSurfaceLocal2 } + * lest so it contain two surface. maybe 4. we need watch what is most common here before + * we create the size activate this IF when you start doing the optimze and please also + * take report from user which value they got here + */ +#if 1 + { + char buffer[1024]; \ + sprintf ( buffer, "Function %s : Optimze max to %d Surface ? (%s:%d)\n", __FUNCTION__, (int)SurfaceCount,__FILE__,__LINE__ ); + OutputDebugStringA(buffer); + } +#endif + + /* Check how many surfaces there are */ + if (SurfaceCount != 1) + { + /* We got more that one surface so we need alloc memory for them */ + pDdSurfaceLocal = (PDD_SURFACE_LOCAL) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (sizeof(DD_SURFACE_LOCAL) * SurfaceCount )); + pDdSurfaceMore = (PDD_SURFACE_MORE) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (sizeof(DD_SURFACE_MORE) * SurfaceCount )); + pDdSurfaceGlobal = (PDD_SURFACE_GLOBAL) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (sizeof(DD_SURFACE_GLOBAL) * SurfaceCount )); + phSurface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (sizeof(HANDLE) * SurfaceCount )); + puhSurface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (sizeof(HANDLE) * SurfaceCount )); + + /* check if we sueese alloc all memory we need */ + if ((pDdSurfaceLocal == NULL) || (pDdSurfaceMore == NULL) || (pDdSurfaceGlobal == NULL) || (phSurface == NULL) || (puhSurface == NULL)) + { + pCreateSurface->ddRVal = DDERR_OUTOFMEMORY; + + if ( pDdSurfaceLocal != NULL ) + { + HeapFree(GetProcessHeap(), 0, pDdSurfaceLocal); + } + + if ( pDdSurfaceMore != NULL ) + { + HeapFree(GetProcessHeap(), 0, pDdSurfaceMore); + } + + if ( phSurface != NULL ) + { + HeapFree(GetProcessHeap(), 0, phSurface); + } + + if ( puhSurface != NULL ) + { + HeapFree(GetProcessHeap(), 0, puhSurface); + } + + return DDHAL_DRIVER_HANDLED; + } + } + else + { + /* We'll use what we have on the stack */ + pDdSurfaceLocal = &DdSurfaceLocal; + pDdSurfaceMore = &DdSurfaceMore; + pDdSurfaceGlobal = &DdSurfaceGlobal; + phSurface = &hPrevSurface; + puhSurface = &hSurface; + + /* Clear the structures */ + RtlZeroMemory(&DdSurfaceLocal, sizeof(DdSurfaceLocal)); + RtlZeroMemory(&DdSurfaceGlobal, sizeof(DdSurfaceGlobal)); + RtlZeroMemory(&DdSurfaceMore, sizeof(DdSurfaceMore)); + } + + /* check if we got a surface or not */ + if (SurfaceCount!=0) + { + /* Loop for each surface */ + ptmpDdSurfaceGlobal = pDdSurfaceGlobal; + ptmpDdSurfaceLocal = pDdSurfaceLocal; + ptmpDdSurfaceMore = pDdSurfaceMore; + pSurfaceDesc = pCreateSurface->lpDDSurfaceDesc; + + for (i = 0; i < SurfaceCount; i++) + { + LPDDRAWI_DDRAWSURFACE_LCL lcl = pCreateSurface->lplpSList[i]; + LPDDRAWI_DDRAWSURFACE_GBL gpl = pCreateSurface->lplpSList[i]->lpGbl; + + phSurface[i] = (HANDLE)lcl->hDDSurface; + ptmpDdSurfaceLocal->ddsCaps.dwCaps = lcl->ddsCaps.dwCaps; + + ptmpDdSurfaceLocal->dwFlags = (ptmpDdSurfaceLocal->dwFlags & + (0xB0000000 | DDRAWISURF_INMASTERSPRITELIST | + DDRAWISURF_HELCB | DDRAWISURF_FRONTBUFFER | + DDRAWISURF_BACKBUFFER | DDRAWISURF_INVALID | + DDRAWISURF_DCIBUSY | DDRAWISURF_DCILOCK)) | + (lcl->dwFlags & DDRAWISURF_DRIVERMANAGED); + + ptmpDdSurfaceGlobal->wWidth = gpl->wWidth; + ptmpDdSurfaceGlobal->wHeight = gpl->wHeight; + ptmpDdSurfaceGlobal->lPitch = gpl->lPitch; + ptmpDdSurfaceGlobal->fpVidMem = gpl->fpVidMem; + ptmpDdSurfaceGlobal->dwBlockSizeX = gpl->dwBlockSizeX; + ptmpDdSurfaceGlobal->dwBlockSizeY = gpl->dwBlockSizeY; + + if (lcl->dwFlags & DDRAWISURF_HASPIXELFORMAT) + { + RtlCopyMemory( &ptmpDdSurfaceGlobal->ddpfSurface , + &gpl->ddpfSurface, + sizeof(DDPIXELFORMAT)); + + ptmpDdSurfaceGlobal->ddpfSurface.dwSize = sizeof(DDPIXELFORMAT); + } + else + { + RtlCopyMemory( &ptmpDdSurfaceGlobal->ddpfSurface , + &gpl->lpDD->vmiData.ddpfDisplay, + sizeof(DDPIXELFORMAT)); + } + + /* Note if lcl->lpSurfMore is NULL zero out + * ptmpDdSurfaceMore->ddsCapsEx.dwCaps2, + * dwCaps3, dwCaps4, ptmpDdSurfaceMore->dwSurfaceHandle + */ + if (lcl->lpSurfMore) + { + ptmpDdSurfaceMore->ddsCapsEx.dwCaps2 = lcl->lpSurfMore->ddsCapsEx.dwCaps2; + ptmpDdSurfaceMore->ddsCapsEx.dwCaps3 = lcl->lpSurfMore->ddsCapsEx.dwCaps3; + ptmpDdSurfaceMore->ddsCapsEx.dwCaps4 = lcl->lpSurfMore->ddsCapsEx.dwCaps4; + ptmpDdSurfaceMore->dwSurfaceHandle = lcl->lpSurfMore->dwSurfaceHandle; + } + + + /* count to next SurfaceCount */ + ptmpDdSurfaceGlobal = (PDD_SURFACE_GLOBAL) (((PBYTE) ((ULONG_PTR) ptmpDdSurfaceGlobal)) + sizeof(DD_SURFACE_GLOBAL)); + ptmpDdSurfaceLocal = (PDD_SURFACE_LOCAL) (((PBYTE) ((ULONG_PTR) ptmpDdSurfaceLocal)) + sizeof(DD_SURFACE_LOCAL)); + ptmpDdSurfaceMore = (PDD_SURFACE_MORE) (((PBYTE) ((ULONG_PTR) ptmpDdSurfaceMore)) + sizeof(DD_SURFACE_MORE)); + } + } + + /* Call win32k now */ + pCreateSurface->ddRVal = DDERR_GENERIC; + + Return = NtGdiDdCreateSurface(GetDdHandle(pCreateSurface->lpDD->hDD), + (HANDLE *)phSurface, + pSurfaceDesc, + pDdSurfaceGlobal, + pDdSurfaceLocal, + pDdSurfaceMore, + (PDD_CREATESURFACEDATA)pCreateSurface, + puhSurface); + + if (SurfaceCount == 0) + { + pCreateSurface->ddRVal = DDERR_GENERIC; + } + else + { + ptmpDdSurfaceMore = pDdSurfaceMore; + ptmpDdSurfaceGlobal = pDdSurfaceGlobal; + ptmpDdSurfaceLocal = pDdSurfaceLocal; + + for (i=0;i<SurfaceCount;i++) + { + LPDDRAWI_DDRAWSURFACE_LCL lcl = pCreateSurface->lplpSList[i]; + LPDDRAWI_DDRAWSURFACE_GBL gpl = pCreateSurface->lplpSList[i]->lpGbl; + + gpl->lPitch = ptmpDdSurfaceGlobal->lPitch; + gpl->fpVidMem = ptmpDdSurfaceGlobal->fpVidMem; + gpl->dwBlockSizeX = ptmpDdSurfaceGlobal->dwBlockSizeX; + gpl->dwBlockSizeY = ptmpDdSurfaceGlobal->dwBlockSizeY; + + if (lcl->dwFlags & DDRAWISURF_HASPIXELFORMAT) + { + RtlCopyMemory( &gpl->ddpfSurface, &ptmpDdSurfaceGlobal->ddpfSurface , sizeof(DDPIXELFORMAT)); + } + + if (pCreateSurface->ddRVal != DD_OK) + { + gpl->fpVidMem = 0; + if (lcl->hDDSurface) + { + NtGdiDdDeleteSurfaceObject( (HANDLE)lcl->hDDSurface); + } + lcl->hDDSurface = 0; + } + else + { + + lcl->hDDSurface = (ULONG_PTR) puhSurface[i]; + } + + lcl->ddsCaps.dwCaps = ptmpDdSurfaceLocal->ddsCaps.dwCaps; + if (lcl->lpSurfMore) + { + lcl->lpSurfMore->ddsCapsEx.dwCaps2 = ptmpDdSurfaceMore->ddsCapsEx.dwCaps2; + lcl->lpSurfMore->ddsCapsEx.dwCaps3 = ptmpDdSurfaceMore->ddsCapsEx.dwCaps3; + lcl->lpSurfMore->ddsCapsEx.dwCaps4 = ptmpDdSurfaceMore->ddsCapsEx.dwCaps4; + } + + /* count to next SurfaceCount */ + ptmpDdSurfaceGlobal = (PDD_SURFACE_GLOBAL) (((PBYTE) ((ULONG_PTR) ptmpDdSurfaceGlobal)) + sizeof(DD_SURFACE_GLOBAL)); + ptmpDdSurfaceLocal = (PDD_SURFACE_LOCAL) (((PBYTE) ((ULONG_PTR) ptmpDdSurfaceLocal)) + sizeof(DD_SURFACE_LOCAL)); + ptmpDdSurfaceMore = (PDD_SURFACE_MORE) (((PBYTE) ((ULONG_PTR) ptmpDdSurfaceMore)) + sizeof(DD_SURFACE_MORE)); + } + } + + /* Check if we have to free all our local allocations */ + if (SurfaceCount > 1) + { + if ( pDdSurfaceLocal != NULL ) + { + HeapFree(GetProcessHeap(), 0, pDdSurfaceLocal); + } + + if ( pDdSurfaceMore != NULL ) + { + HeapFree(GetProcessHeap(), 0, pDdSurfaceMore); + } + + if ( phSurface != NULL ) + { + HeapFree(GetProcessHeap(), 0, phSurface); + } + + if ( puhSurface != NULL ) + { + HeapFree(GetProcessHeap(), 0, puhSurface); + } + } + + /* Return */ + return Return; +#endif +} + +/* + * @implemented + * + * DdSetColorKey + */ +DWORD +WINAPI +DdSetColorKey(LPDDHAL_SETCOLORKEYDATA pSetColorKey) +{ + /* Fixme for opengl hel emulations */ + return 0; + +#if 0 + /* Call win32k */ + return NtGdiDdSetColorKey((HANDLE)pSetColorKey->lpDDSurface->hDDSurface, + (PDD_SETCOLORKEYDATA)pSetColorKey); +#endif +} + +/* + * @implemented + * + * DdGetScanLine + */ +DWORD +WINAPI +DdGetScanLine(LPDDHAL_GETSCANLINEDATA pGetScanLine) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + /* Call win32k */ + return NtGdiDdGetScanLine(GetDdHandle(pGetScanLine->lpDD->hDD), + (PDD_GETSCANLINEDATA)pGetScanLine); +#endif +} + + +/* + * @implemented + * + * DvpCreateVideoPort + */ +BOOL +WINAPI +DvpCreateVideoPort(LPDDHAL_CREATEVPORTDATA pDvdCreatePort) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + pDvdCreatePort->lpVideoPort->hDDVideoPort = + NtGdiDvpCreateVideoPort(GetDdHandle(pDvdCreatePort->lpDD->lpGbl->hDD), + (PDD_CREATEVPORTDATA) pDvdCreatePort); +#endif + return TRUE; +} + +/* + * @implemented + * + * DvpCreateVideoPort + */ +DWORD +WINAPI +DvpDestroyVideoPort(LPDDHAL_DESTROYVPORTDATA pDvdDestoryPort) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + return NtGdiDvpDestroyVideoPort(pDvdDestoryPort->lpVideoPort->hDDVideoPort, (PDD_DESTROYVPORTDATA)pDvdDestoryPort); +#endif +} + +/* + * @implemented + * + * DvpCreateVideoPort + */ +DWORD +WINAPI +DvpFlipVideoPort(LPDDHAL_FLIPVPORTDATA pDvdPortFlip) +{ + /* Fixme for opengl hel emulations */ + return 0; + +#if 0 + return NtGdiDvpFlipVideoPort(pDvdPortFlip->lpVideoPort->hDDVideoPort, + (HANDLE)pDvdPortFlip->lpSurfCurr->hDDSurface, + (HANDLE)pDvdPortFlip->lpSurfTarg->hDDSurface, + (PDD_FLIPVPORTDATA) pDvdPortFlip); +#endif +} + +/* + * @implemented + * + * DvpGetVideoPortBandwidth + */ +DWORD +WINAPI +DvpGetVideoPortBandwidth(LPDDHAL_GETVPORTBANDWIDTHDATA pDvdPortBandWidth) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + return NtGdiDvpGetVideoPortBandwidth(pDvdPortBandWidth->lpVideoPort->hDDVideoPort, (PDD_GETVPORTBANDWIDTHDATA)pDvdPortBandWidth); +#endif +} + +/* + * @implemented + * + * DvpColorControl + */ +DWORD +WINAPI +DvpColorControl(LPDDHAL_VPORTCOLORDATA pDvdPortColorControl) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + return NtGdiDvpColorControl(pDvdPortColorControl->lpVideoPort->hDDVideoPort, (PDD_VPORTCOLORDATA) pDvdPortColorControl); +#endif +} + +/* + * @implemented + * + * DvpGetVideoSignalStatus + */ +DWORD +WINAPI +DvpGetVideoSignalStatus(LPDDHAL_GETVPORTSIGNALDATA pDvdPortVideoSignalStatus) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + return NtGdiDvpGetVideoSignalStatus(pDvdPortVideoSignalStatus->lpVideoPort->hDDVideoPort, (PDD_GETVPORTSIGNALDATA) pDvdPortVideoSignalStatus); +#endif +} + +/* + * @implemented + * + * DvpGetVideoPortFlipStatus + */ +DWORD +WINAPI +DvpGetVideoPortFlipStatus(LPDDHAL_GETVPORTFLIPSTATUSDATA pDvdPortVideoPortFlipStatus) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + return NtGdiDvpGetVideoPortFlipStatus(GetDdHandle(pDvdPortVideoPortFlipStatus->lpDD->lpGbl->hDD), (PDD_GETVPORTFLIPSTATUSDATA) pDvdPortVideoPortFlipStatus); +#endif + +} + +/* + * @implemented + * + * DvpCanCreateVideoPort + */ +DWORD +WINAPI +DvpCanCreateVideoPort(LPDDHAL_CANCREATEVPORTDATA pDvdCanCreateVideoPort) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + return NtGdiDvpCanCreateVideoPort(GetDdHandle(pDvdCanCreateVideoPort->lpDD->lpGbl->hDD), (PDD_CANCREATEVPORTDATA) pDvdCanCreateVideoPort); +#endif +} +/* + * @implemented + * + * DvpWaitForVideoPortSync + */ +DWORD +WINAPI +DvpWaitForVideoPortSync(LPDDHAL_WAITFORVPORTSYNCDATA pDvdWaitForVideoPortSync) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + return NtGdiDvpWaitForVideoPortSync(pDvdWaitForVideoPortSync->lpVideoPort->hDDVideoPort, (PDD_WAITFORVPORTSYNCDATA) pDvdWaitForVideoPortSync); +#endif +} + +/* + * @implemented + * + * DvpUpdateVideoPort + */ +DWORD +WINAPI +DvpUpdateVideoPort(LPDDHAL_UPDATEVPORTDATA pDvdUpdateVideoPort) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + /* + * Windows XP limit to max 10 handles of videoport surface and Vbi + * ReactOS doing same to keep compatible, if it is more that 10 + * videoport surface or vbi the stack will be curpted in windows xp + * ReactOS safe guard againts that + * + */ + + HANDLE phSurfaceVideo[10]; + HANDLE phSurfaceVbi[10]; + + if (pDvdUpdateVideoPort->dwFlags != DDRAWI_VPORTSTOP) + { + DWORD dwNumAutoflip; + DWORD dwNumVBIAutoflip; + + /* Take copy of lplpDDSurface for the handle value will be modify in dxg */ + dwNumAutoflip = pDvdUpdateVideoPort->dwNumAutoflip; + if ((dwNumAutoflip == 0) && + (pDvdUpdateVideoPort->lplpDDSurface == 0)) + { + dwNumAutoflip++; + } + + if (dwNumAutoflip != 0) + { + if (dwNumAutoflip>10) + { + dwNumAutoflip = 10; + } + memcpy(phSurfaceVideo,pDvdUpdateVideoPort->lplpDDSurface,dwNumAutoflip*sizeof(HANDLE)); + } + + /* Take copy of lplpDDVBISurface for the handle value will be modify in dxg */ + dwNumVBIAutoflip = pDvdUpdateVideoPort->dwNumVBIAutoflip; + if ( (dwNumVBIAutoflip == 0) && + (pDvdUpdateVideoPort->lplpDDVBISurface == 0) ) + { + dwNumVBIAutoflip++; + } + + if (dwNumVBIAutoflip != 0) + { + if (dwNumVBIAutoflip>10) + { + dwNumVBIAutoflip = 10; + } + memcpy(phSurfaceVbi,pDvdUpdateVideoPort->lplpDDVBISurface,dwNumVBIAutoflip*sizeof(HANDLE)); + } + } + + /* Call Win32k */ + return NtGdiDvpUpdateVideoPort(pDvdUpdateVideoPort->lpVideoPort->hDDVideoPort,phSurfaceVideo,phSurfaceVbi, (PDD_UPDATEVPORTDATA)pDvdUpdateVideoPort); +#endif +} + +/* + * @implemented + * + * DvpWaitForVideoPortSync + */ +DWORD +WINAPI +DvpGetVideoPortField(LPDDHAL_FLIPVPORTDATA pDvdGetVideoPortField) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + return NtGdiDvpGetVideoPortField(pDvdGetVideoPortField->lpVideoPort->hDDVideoPort, (PDD_GETVPORTFIELDDATA)pDvdGetVideoPortField); +#endif +} + +/* + * @implemented + * + * DvpWaitForVideoPortSync + */ +DWORD +WINAPI +DvpGetVideoPortInputFormats(LPDDHAL_GETVPORTINPUTFORMATDATA pDvdGetVideoPortInputFormat) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + return NtGdiDvpGetVideoPortInputFormats(pDvdGetVideoPortInputFormat->lpVideoPort->hDDVideoPort, (PDD_GETVPORTINPUTFORMATDATA) pDvdGetVideoPortInputFormat); +#endif +} + +/* + * @implemented + * + * DvpGetVideoPortLine + */ +DWORD +WINAPI +DvpGetVideoPortLine(LPDDHAL_GETVPORTLINEDATA pDvdGetVideoPortLine) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + return NtGdiDvpGetVideoPortLine(pDvdGetVideoPortLine->lpVideoPort->hDDVideoPort, (PDD_GETVPORTLINEDATA)pDvdGetVideoPortLine); +#endif +} + +/* + * @implemented + * + * DvpGetVideoPortOutputFormats + */ +DWORD +WINAPI +DvpGetVideoPortOutputFormats(LPDDHAL_GETVPORTLINEDATA pDvdGetVideoPortOutputFormat) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + return NtGdiDvpGetVideoPortLine(pDvdGetVideoPortOutputFormat->lpVideoPort->hDDVideoPort, (PDD_GETVPORTLINEDATA)pDvdGetVideoPortOutputFormat); +#endif +} + +/* + * @implemented + * + * DvpGetVideoPortConnectInfo + */ +DWORD +WINAPI +DvpGetVideoPortConnectInfo(LPDDHAL_GETVPORTCONNECTDATA pDvdGetVideoPortInfo) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + return NtGdiDvpGetVideoPortConnectInfo( GetDdHandle( pDvdGetVideoPortInfo->lpDD->lpGbl->hDD) , (PDD_GETVPORTCONNECTDATA) pDvdGetVideoPortInfo); +#endif +} + +/* + * @implemented + * + * DdGetAvailDriverMemory + */ +DWORD +WINAPI +DdGetAvailDriverMemory(LPDDHAL_GETAVAILDRIVERMEMORYDATA pDdGetAvailDriverMemory) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + return NtGdiDdGetAvailDriverMemory(GetDdHandle( pDdGetAvailDriverMemory->lpDD->hDD), (PDD_GETAVAILDRIVERMEMORYDATA) pDdGetAvailDriverMemory); +#endif +} + +/* + * @implemented + * + * DdAlphaBlt + */ +DWORD +WINAPI +DdAlphaBlt(LPDDHAL_BLTDATA pDdAlphaBlt) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + HANDLE hDDSrcSurface = 0; + + if (pDdAlphaBlt->lpDDSrcSurface != 0) + { + hDDSrcSurface = (HANDLE) pDdAlphaBlt->lpDDSrcSurface->hDDSurface; + } + + return NtGdiDdAlphaBlt((HANDLE)pDdAlphaBlt->lpDDDestSurface->hDDSurface, hDDSrcSurface, (PDD_BLTDATA)&pDdAlphaBlt); +#endif +} + +/* + * @implemented + * + * DdCreateSurfaceEx + */ +DWORD +WINAPI +DdCreateSurfaceEx(LPDDHAL_CREATESURFACEEXDATA pDdCreateSurfaceEx) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + pDdCreateSurfaceEx->ddRVal = NtGdiDdCreateSurfaceEx( GetDdHandle(pDdCreateSurfaceEx->lpDDLcl->lpGbl->hDD), + (HANDLE)pDdCreateSurfaceEx->lpDDSLcl->hDDSurface, + pDdCreateSurfaceEx->lpDDSLcl->lpSurfMore->dwSurfaceHandle); + return TRUE; +#endif +} + +/* + * @implemented + * + * DdColorControl + */ +DWORD +WINAPI +DdColorControl(LPDDHAL_COLORCONTROLDATA pDdColorControl) +{ + /* Fixme for opengl hel emulations */ + return 0; + +#if 0 + return NtGdiDdColorControl( (HANDLE) pDdColorControl->lpDDSurface->hDDSurface, (PDD_COLORCONTROLDATA) &pDdColorControl); +#endif +} + +/* + * @implemented + * + * DdSetExclusiveMode + */ +DWORD +WINAPI +DdSetExclusiveMode(LPDDHAL_SETEXCLUSIVEMODEDATA pDdSetExclusiveMode) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + return NtGdiDdSetExclusiveMode( GetDdHandle(pDdSetExclusiveMode->lpDD->hDD), (PDD_SETEXCLUSIVEMODEDATA) &pDdSetExclusiveMode); +#endif +} + +/* + * @implemented + * + * DdFlipToGDISurface + */ +DWORD +WINAPI +DdFlipToGDISurface(LPDDHAL_FLIPTOGDISURFACEDATA pDdFlipToGDISurface) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + return NtGdiDdFlipToGDISurface( GetDdHandle(pDdFlipToGDISurface->lpDD->hDD), (PDD_FLIPTOGDISURFACEDATA) &pDdFlipToGDISurface); +#endif +} + +/* TODO */ +DWORD +WINAPI +DdGetDriverInfo(LPDDHAL_GETDRIVERINFODATA pData) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + DDHAL_GETDRIVERINFODATA pDrvInfoData; + DWORD retValue = DDHAL_DRIVER_NOTHANDLED; + HANDLE hDD; + + /* FIXME add SEH around this functions */ + + RtlZeroMemory(&pDrvInfoData, sizeof (DDHAL_GETDRIVERINFODATA)); + RtlCopyMemory(&pDrvInfoData.guidInfo, &pData->guidInfo, sizeof(GUID)); + + hDD = GetDdHandle(pData->dwContext); + + pDrvInfoData.dwSize = sizeof (DDHAL_GETDRIVERINFODATA); + pDrvInfoData.ddRVal = DDERR_GENERIC; + pDrvInfoData.dwContext = (ULONG_PTR)hDD; + + + /* Videoport Callbacks check and setup for DirectX/ ReactX */ + if (IsEqualGUID(&pData->guidInfo, &GUID_VideoPortCallbacks)) + { + DDHAL_DDVIDEOPORTCALLBACKS pDvdPort; + DDHAL_DDVIDEOPORTCALLBACKS* pUserDvdPort = (DDHAL_DDVIDEOPORTCALLBACKS *)pData->lpvData; + + /* Clear internal out buffer and set it up*/ + RtlZeroMemory(&pDvdPort, DDVIDEOPORTCALLBACKSSIZE); + pDvdPort.dwSize = DDVIDEOPORTCALLBACKSSIZE; + + /* set up internal buffer */ + pDrvInfoData.lpvData = (PVOID)&pDvdPort; + pDrvInfoData.dwExpectedSize = DDVIDEOPORTCALLBACKSSIZE ; + + /* Call win32k */ + retValue = NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)&pDrvInfoData); + + /* Setup user out buffer and convert kmode callbacks to user mode */ + pUserDvdPort->dwSize = DDVIDEOPORTCALLBACKSSIZE; + pUserDvdPort->dwFlags = pDrvInfoData.dwFlags = 0; + + pUserDvdPort->dwFlags = (pDrvInfoData.dwFlags & ~(DDHAL_VPORT32_CREATEVIDEOPORT | DDHAL_VPORT32_FLIP | + DDHAL_VPORT32_DESTROY | DDHAL_VPORT32_UPDATE | DDHAL_VPORT32_WAITFORSYNC)) | + (DDHAL_VPORT32_CREATEVIDEOPORT | DDHAL_VPORT32_FLIP | + DDHAL_VPORT32_DESTROY | DDHAL_VPORT32_UPDATE); + + pData->dwActualSize = DDVIDEOPORTCALLBACKSSIZE; + pUserDvdPort->CreateVideoPort = (LPDDHALVPORTCB_CREATEVIDEOPORT) DvpCreateVideoPort; + pUserDvdPort->FlipVideoPort = (LPDDHALVPORTCB_FLIP) DvpFlipVideoPort; + pUserDvdPort->DestroyVideoPort = (LPDDHALVPORTCB_DESTROYVPORT) DvpDestroyVideoPort; + pUserDvdPort->UpdateVideoPort = (LPDDHALVPORTCB_UPDATE) DvpUpdateVideoPort; + + if (pDvdPort.CanCreateVideoPort) + { + pUserDvdPort->CanCreateVideoPort = (LPDDHALVPORTCB_CANCREATEVIDEOPORT) DvpCanCreateVideoPort; + } + + if (pDvdPort.GetVideoPortBandwidth) + { + pUserDvdPort->GetVideoPortBandwidth = (LPDDHALVPORTCB_GETBANDWIDTH) DvpGetVideoPortBandwidth; + } + + if (pDvdPort.GetVideoPortInputFormats) + { + pUserDvdPort->GetVideoPortInputFormats = (LPDDHALVPORTCB_GETINPUTFORMATS) DvpGetVideoPortInputFormats; + } + + if (pDvdPort.GetVideoPortOutputFormats) + { + pUserDvdPort->GetVideoPortOutputFormats = (LPDDHALVPORTCB_GETOUTPUTFORMATS) DvpGetVideoPortOutputFormats; + } + + if (pDvdPort.GetVideoPortField) + { + pUserDvdPort->GetVideoPortField = (LPDDHALVPORTCB_GETFIELD) DvpGetVideoPortField; + } + + if (pDvdPort.GetVideoPortLine) + { + pUserDvdPort->GetVideoPortLine = (LPDDHALVPORTCB_GETLINE) DvpGetVideoPortLine; + } + + if (pDvdPort.GetVideoPortConnectInfo) + { + pUserDvdPort->GetVideoPortConnectInfo = (LPDDHALVPORTCB_GETVPORTCONNECT) DvpGetVideoPortConnectInfo; + } + + if (pDvdPort.GetVideoPortFlipStatus) + { + pUserDvdPort->GetVideoPortFlipStatus = (LPDDHALVPORTCB_GETFLIPSTATUS) DvpGetVideoPortFlipStatus; + } + + if (pDvdPort.WaitForVideoPortSync) + { + pUserDvdPort->WaitForVideoPortSync = (LPDDHALVPORTCB_WAITFORSYNC) DvpWaitForVideoPortSync; + } + + if (pDvdPort.GetVideoSignalStatus) + { + pUserDvdPort->GetVideoSignalStatus = (LPDDHALVPORTCB_GETSIGNALSTATUS) DvpGetVideoSignalStatus; + } + + if (pDvdPort.ColorControl) + { + pUserDvdPort->ColorControl = (LPDDHALVPORTCB_COLORCONTROL) DvpColorControl; + } + + /* Windows XP never repot back the true return value, + * it only report back if we have a driver or not + * ReactOS keep this behoir to be compatible with + * Windows XP + */ + pData->ddRVal = retValue; + } + + /* Color Control Callbacks check and setup for DirectX/ ReactX */ + if (IsEqualGUID(&pData->guidInfo, &GUID_ColorControlCallbacks)) + { + DDHAL_DDCOLORCONTROLCALLBACKS pColorControl; + DDHAL_DDCOLORCONTROLCALLBACKS* pUserColorControl = (DDHAL_DDCOLORCONTROLCALLBACKS *)pData->lpvData; + + /* Clear internal out buffer and set it up*/ + RtlZeroMemory(&pColorControl, DDCOLORCONTROLCALLBACKSSIZE); + pColorControl.dwSize = DDCOLORCONTROLCALLBACKSSIZE; + + /* set up internal buffer */ + pDrvInfoData.lpvData = (PVOID)&pColorControl; + pDrvInfoData.dwExpectedSize = DDCOLORCONTROLCALLBACKSSIZE ; + + /* Call win32k */ + retValue = NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)&pDrvInfoData); + + pData->dwActualSize = DDCOLORCONTROLCALLBACKSSIZE; + pData->dwFlags = pDrvInfoData.dwFlags; + + pUserColorControl->dwSize = DDCOLORCONTROLCALLBACKSSIZE; + pUserColorControl->dwFlags = pUserColorControl->dwFlags; + + if (pColorControl.ColorControl != NULL) + { + pUserColorControl->ColorControl = (LPDDHALCOLORCB_COLORCONTROL) DdColorControl; + } + + /* Windows XP never repot back the true return value, + * it only report back if we have a driver or not + * ReactOS keep this behoir to be compatible with + * Windows XP + */ + pData->ddRVal = retValue; + } + + /* Misc Callbacks check and setup for DirectX/ ReactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_MiscellaneousCallbacks)) + { + DDHAL_DDMISCELLANEOUSCALLBACKS pMisc; + DDHAL_DDMISCELLANEOUSCALLBACKS* pUserMisc = (DDHAL_DDMISCELLANEOUSCALLBACKS *)pData->lpvData; + + /* Clear internal out buffer and set it up*/ + RtlZeroMemory(&pMisc, DDMISCELLANEOUSCALLBACKSSIZE); + pMisc.dwSize = DDMISCELLANEOUSCALLBACKSSIZE; + + /* set up internal buffer */ + pDrvInfoData.lpvData = (PVOID)&pMisc; + pDrvInfoData.dwExpectedSize = DDMISCELLANEOUSCALLBACKSSIZE ; + + /* Call win32k */ + retValue = NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)&pDrvInfoData); + + pData->dwActualSize = DDMISCELLANEOUSCALLBACKSSIZE; + + /* Only one callbacks are supported */ + pUserMisc->dwFlags = pMisc.dwFlags & DDHAL_MISCCB32_GETAVAILDRIVERMEMORY; + pUserMisc->GetAvailDriverMemory = (LPDDHAL_GETAVAILDRIVERMEMORY) DdGetAvailDriverMemory; + + /* This callbacks are only for win9x and theirfor it is not longer use in NT or ReactOS + * pUserMisc->UpdateNonLocalHeap; + * pUserMisc->GetHeapAlignment; + * pUserMisc->GetSysmemBltStatus; */ + + /* Windows XP never repot back the true return value, + * it only report back if we have a driver or not + * ReactOS keep this behoir to be compatible with + * Windows XP + */ + pData->ddRVal = retValue; + } + + /* Misc 2 Callbacks check and setup for DirectX/ ReactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_Miscellaneous2Callbacks)) + { + DDHAL_DDMISCELLANEOUS2CALLBACKS pMisc; + DDHAL_DDMISCELLANEOUS2CALLBACKS* pUserMisc = (DDHAL_DDMISCELLANEOUS2CALLBACKS *)pData->lpvData; + + /* Clear internal out buffer and set it up*/ + RtlZeroMemory(&pMisc, DDMISCELLANEOUS2CALLBACKSSIZE); + pMisc.dwSize = DDMISCELLANEOUS2CALLBACKSSIZE; + + /* set up internal buffer */ + pDrvInfoData.lpvData = (PVOID)&pMisc; + pDrvInfoData.dwExpectedSize = DDMISCELLANEOUS2CALLBACKSSIZE ; + + /* Call win32k */ + retValue = NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)&pDrvInfoData); + + pData->dwActualSize = DDMISCELLANEOUS2CALLBACKSSIZE; + + pUserMisc->dwFlags = pMisc.dwFlags; + + /* This functions are not documneted in MSDN for this struct, here is directx/reactx alpha blend */ + if ( pMisc.Reserved ) + { + pUserMisc->Reserved = (LPVOID) DdAlphaBlt; + } + + if ( pMisc.CreateSurfaceEx ) + { + pUserMisc->CreateSurfaceEx = (LPDDHAL_CREATESURFACEEX) DdCreateSurfaceEx; + } + + if ( pMisc.GetDriverState ) + { + pUserMisc->GetDriverState = (LPDDHAL_GETDRIVERSTATE) NtGdiDdGetDriverState; + } + + /* NOTE : pUserMisc->DestroyDDLocal is outdated and are not beign tuch */ + + /* Windows XP never repot back the true return value, + * it only report back if we have a driver or not + * ReactOS keep this behoir to be compatible with + * Windows XP + */ + pData->ddRVal = retValue; + } + + /* NT Callbacks check and setup for DirectX/ ReactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_NTCallbacks)) + { + /* MS does not have DHAL_* version of this callbacks + * so we are force using PDD_* callbacks here + */ + DD_NTCALLBACKS pNtKernel; + PDD_NTCALLBACKS pUserNtKernel = (PDD_NTCALLBACKS)pData->lpvData; + + /* Clear internal out buffer and set it up*/ + RtlZeroMemory(&pNtKernel, sizeof(DD_NTCALLBACKS)); + pNtKernel.dwSize = sizeof(DD_NTCALLBACKS); + + /* set up internal buffer */ + pDrvInfoData.lpvData = (PVOID)&pNtKernel; + pDrvInfoData.dwExpectedSize = sizeof(DD_NTCALLBACKS) ; + + /* Call win32k */ + retValue = NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)&pDrvInfoData); + + pData->dwActualSize = sizeof(DD_NTCALLBACKS); + + pUserNtKernel->dwSize = sizeof(DD_NTCALLBACKS); + pUserNtKernel->dwFlags = pNtKernel.dwFlags; + pUserNtKernel->FreeDriverMemory = 0; + + if (pNtKernel.SetExclusiveMode) + { + pUserNtKernel->SetExclusiveMode = (PDD_SETEXCLUSIVEMODE) DdSetExclusiveMode; + } + + if (pNtKernel.FlipToGDISurface) + { + pUserNtKernel->FlipToGDISurface = (PDD_FLIPTOGDISURFACE) DdFlipToGDISurface; + } + + /* Windows XP never repot back the true return value, + * it only report back if we have a driver or not + * ReactOS keep this behoir to be compatible with + * Windows XP + */ + pData->ddRVal = retValue; + } + + /* D3D Callbacks version 2 check and setup for DirectX/ ReactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_D3DCallbacks2)) + { + // FIXME GUID_D3DCallbacks2 + } + + /* D3D Callbacks version 3 check and setup for DirectX/ ReactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_D3DCallbacks3)) + { + // FIXME GUID_D3DCallbacks3 + } + + /* D3DParseUnknownCommand Callbacks check and setup for DirectX/ ReactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_D3DParseUnknownCommandCallback)) + { + // FIXME GUID_D3DParseUnknownCommandCallback + } + + /* MotionComp Callbacks check and setup for DirectX/ ReactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_MotionCompCallbacks)) + { + // FIXME GUID_MotionCompCallbacks + } + + /* FIXME VPE2 Callbacks check and setup for DirectX/ ReactX */ + //else if (IsEqualGUID(&pData->guidInfo, &GUID_VPE2Callbacks)) + //{ + // FIXME GUID_VPE2Callbacks + //} + else + { + /* set up internal buffer */ + pDrvInfoData.dwExpectedSize = pData->dwExpectedSize; + pDrvInfoData.lpvData = pData->lpvData; + + /* We do not cover all callbacks for user mode, they are only cover by kmode */ + retValue = NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)&pDrvInfoData); + + /* Setup return data */ + pData->dwActualSize = pDrvInfoData.dwActualSize; + pData->lpvData = pDrvInfoData.lpvData; + /* Windows XP never repot back the true return value, + * it only report back if we have a driver or not + * ReactOS keep this behoir to be compatible with + * Windows XP + */ + pData->ddRVal = retValue; + } + + return retValue; +#endif +} + + +/* + * @implemented + * + * D3dContextCreate + */ +BOOL +WINAPI +D3dContextCreate(LPD3DHAL_CONTEXTCREATEDATA pdcci) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + HANDLE hSurfZ = NULL; + + if (pdcci->lpDDSZLcl) + { + hSurfZ = (HANDLE)pdcci->lpDDSZLcl->hDDSurface; + } + + return NtGdiD3dContextCreate(GetDdHandle(pdcci->lpDDLcl->hDD), + (HANDLE)pdcci->lpDDSLcl->hDDSurface, + hSurfZ, + (D3DNTHAL_CONTEXTCREATEI *)pdcci); +#endif +} + +/* + * @implemented + * + * DdCanCreateD3DBuffer + */ +DWORD +WINAPI +DdCanCreateD3DBuffer(LPDDHAL_CANCREATESURFACEDATA CanCreateD3DBuffer) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + /* + * Note : This functions are basic same, in win32k + * NtGdiDdCanCreateD3DBuffer and NtGdiDdCanCreateSurface are mergs + * toghter in win32k at end and retrurn same data, it is still sepreated + * at user mode but in kmode it is not. + */ + + /* Call win32k */ + return NtGdiDdCanCreateD3DBuffer(GetDdHandle(CanCreateD3DBuffer->lpDD->hDD), + (PDD_CANCREATESURFACEDATA)CanCreateD3DBuffer); +#endif +} + + +/* + * @implemented + * + * DdCreateD3DBuffer + */ +DWORD +WINAPI +DdCreateD3DBuffer(LPDDHAL_CREATESURFACEDATA pCreateSurface) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + HANDLE puhSurface = 0; + DDRAWI_DDRAWSURFACE_GBL *pSurfGBL; + DDRAWI_DDRAWSURFACE_LCL *pSurfLcl; + DD_SURFACE_GLOBAL puSurfaceGlobalData; + DD_SURFACE_MORE puSurfaceMoreData; + DD_SURFACE_LOCAL puSurfaceLocalData; + DWORD retValue; + + /* Zero all local memory pointer */ + RtlZeroMemory(&puSurfaceGlobalData, sizeof(DD_SURFACE_GLOBAL) ); + RtlZeroMemory(&puSurfaceMoreData, sizeof(DD_SURFACE_MORE) ) ; + RtlZeroMemory(&puSurfaceLocalData, sizeof(DD_SURFACE_LOCAL) ); + + pCreateSurface->dwSCnt = 1; + pSurfLcl = pCreateSurface->lplpSList[0]; + pSurfGBL = pSurfLcl->lpGbl; + + /* Convert DDRAWI_DDRAWSURFACE_GBL to DD_SURFACE_GLOBAL */ + puSurfaceGlobalData.wWidth = pSurfGBL->wWidth; + puSurfaceGlobalData.wHeight = pSurfGBL->wHeight; + puSurfaceGlobalData.dwLinearSize = pSurfGBL->dwLinearSize; + puSurfaceGlobalData.fpVidMem = pSurfGBL->fpVidMem; + puSurfaceGlobalData.dwBlockSizeX = pSurfGBL->dwBlockSizeX; + puSurfaceGlobalData.dwBlockSizeY = pSurfGBL->dwBlockSizeY; + + /* Convert DDRAWI_DDRAWSURFACE_MORE to DD_SURFACE_MORE */ + puSurfaceMoreData.dwSurfaceHandle = pSurfLcl->lpSurfMore->dwSurfaceHandle; + puSurfaceMoreData.ddsCapsEx.dwCaps2 = pSurfLcl->lpSurfMore->ddsCapsEx.dwCaps2; + puSurfaceMoreData.ddsCapsEx.dwCaps3 = pSurfLcl->lpSurfMore->ddsCapsEx.dwCaps3; + puSurfaceMoreData.ddsCapsEx.dwCaps4 = pSurfLcl->lpSurfMore->ddsCapsEx.dwCaps4; + + /* Convert DDRAWI_DDRAWSURFACE_LCL to DD_SURFACE_LOCAL */ + puSurfaceLocalData.dwFlags = pSurfLcl->dwFlags; + puSurfaceLocalData.ddsCaps.dwCaps = pSurfLcl->ddsCaps.dwCaps; + + /* Call win32k */ + retValue = NtGdiDdCreateD3DBuffer( GetDdHandle(pCreateSurface->lpDD->hDD), + (HANDLE*)&pSurfLcl->hDDSurface, + pCreateSurface->lpDDSurfaceDesc, + &puSurfaceGlobalData, + &puSurfaceLocalData, + &puSurfaceMoreData, + (DD_CREATESURFACEDATA *) pCreateSurface, + &puhSurface); + + /* Setup surface handle if we got one back */ + if ( puhSurface != NULL ) + { + pCreateSurface->lplpSList[0]->hDDSurface = (ULONG_PTR)puhSurface; + } + + /* Convert DD_SURFACE_GLOBAL to DDRAWI_DDRAWSURFACE_GBL */ + pSurfGBL->dwLinearSize = puSurfaceGlobalData.dwLinearSize; + pSurfGBL->fpVidMem = puSurfaceGlobalData.fpVidMem; + pSurfGBL->dwBlockSizeX = puSurfaceGlobalData.dwBlockSizeX; + pSurfGBL->dwBlockSizeY = puSurfaceGlobalData.dwBlockSizeY; + + return retValue; +#endif +} + +/* + * @implemented + * + * DdDestroyD3DBuffer + */ +DWORD +WINAPI +DdDestroyD3DBuffer(LPDDHAL_DESTROYSURFACEDATA pDestroySurface) +{ + /* Fixme for opengl hel emulations */ + return 0; + +#if 0 + DWORD retValue = 0; + if ( pDestroySurface->lpDDSurface->hDDSurface) + { + /* Call win32k */ + retValue = NtGdiDdDestroyD3DBuffer((HANDLE)pDestroySurface->lpDDSurface->hDDSurface); + } + + return retValue; +#endif +} + +/* + * @implemented + * + * DdLockD3D + */ +DWORD +WINAPI +DdLockD3D(LPDDHAL_LOCKDATA Lock) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + /* Call win32k */ + return NtGdiDdLockD3D((HANDLE)Lock->lpDDSurface->hDDSurface, (PDD_LOCKDATA)Lock); +#endif +} + +/* + * @implemented + * + * DdUnlockD3D + */ +DWORD +WINAPI +DdUnlockD3D(LPDDHAL_UNLOCKDATA Unlock) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + /* Call win32k */ + return NtGdiDdUnlock((HANDLE)Unlock->lpDDSurface->hDDSurface, + (PDD_UNLOCKDATA)Unlock); +#endif +} + + +/* PRIVATE FUNCTIONS *********************************************************/ + +BOOL +WINAPI +bDDCreateSurface(LPDDRAWI_DDRAWSURFACE_LCL pSurface, + BOOL bComplete) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + DD_SURFACE_LOCAL SurfaceLocal; + DD_SURFACE_GLOBAL SurfaceGlobal; + DD_SURFACE_MORE SurfaceMore; + + /* Zero struct */ + RtlZeroMemory(&SurfaceLocal, sizeof(DD_SURFACE_LOCAL)); + RtlZeroMemory(&SurfaceGlobal, sizeof(DD_SURFACE_GLOBAL)); + RtlZeroMemory(&SurfaceMore, sizeof(DD_SURFACE_MORE)); + + /* Set up SurfaceLocal struct */ + SurfaceLocal.ddsCaps.dwCaps = pSurface->ddsCaps.dwCaps; + SurfaceLocal.dwFlags = pSurface->dwFlags; + + /* Set up SurfaceMore struct */ + RtlMoveMemory(&SurfaceMore.ddsCapsEx, + &pSurface->ddckCKDestBlt, + sizeof(DDSCAPSEX)); + SurfaceMore.dwSurfaceHandle = (DWORD)pSurface->dbnOverlayNode.object_int->lpVtbl; + + /* Set up SurfaceGlobal struct */ + SurfaceGlobal.fpVidMem = pSurface->lpGbl->fpVidMem; + SurfaceGlobal.dwLinearSize = pSurface->lpGbl->dwLinearSize; + SurfaceGlobal.wHeight = pSurface->lpGbl->wHeight; + SurfaceGlobal.wWidth = pSurface->lpGbl->wWidth; + + /* Check if we have a pixel format */ + if (pSurface->dwFlags & DDSD_PIXELFORMAT) + { + /* Use global one */ + SurfaceGlobal.ddpfSurface = pSurface->lpGbl->lpDD->vmiData.ddpfDisplay; + SurfaceGlobal.ddpfSurface.dwSize = sizeof(DDPIXELFORMAT); + } + else + { + /* Use local one */ + SurfaceGlobal.ddpfSurface = pSurface->lpGbl->lpDD->vmiData.ddpfDisplay; + } + + /* Create the object */ + pSurface->hDDSurface = (DWORD)NtGdiDdCreateSurfaceObject(GetDdHandle(pSurface->lpGbl->lpDD->hDD), + (HANDLE)pSurface->hDDSurface, + &SurfaceLocal, + &SurfaceMore, + &SurfaceGlobal, + bComplete); + + /* Return status */ + if (pSurface->hDDSurface) return TRUE; + return FALSE; +#endif +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + * + * GDIEntry 1 + */ +BOOL +WINAPI +DdCreateDirectDrawObject(LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, + HDC hdc) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + BOOL Return = FALSE; + + /* Check if the global hDC (hdc == 0) is being used */ + if (!hdc) + { + /* We'll only allow this if the global object doesn't exist yet */ + if (!ghDirectDraw) + { + /* Create the DC */ + if ((hdc = CreateDCW(L"Display", NULL, NULL, NULL))) + { + /* Create the DDraw Object */ + ghDirectDraw = NtGdiDdCreateDirectDrawObject(hdc); + + /* Delete our DC */ + DeleteDC(hdc); + } + } + + /* If we created the object, or had one ...*/ + if (ghDirectDraw) + { + /* Increase count and set success */ + gcDirectDraw++; + Return = TRUE; + } + + /* Zero the handle */ + pDirectDrawGlobal->hDD = 0; + } + else + { + /* Using the per-process object, so create it */ + pDirectDrawGlobal->hDD = (ULONG_PTR)NtGdiDdCreateDirectDrawObject(hdc); + + /* Set the return value */ + Return = pDirectDrawGlobal->hDD ? TRUE : FALSE; + } + + /* Return to caller */ + return Return; +#endif +} + +/* + * @implemented + * + * GDIEntry 2 + */ +BOOL +WINAPI +DdQueryDirectDrawObject(LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, + LPDDHALINFO pHalInfo, + LPDDHAL_DDCALLBACKS pDDCallbacks, + LPDDHAL_DDSURFACECALLBACKS pDDSurfaceCallbacks, + LPDDHAL_DDPALETTECALLBACKS pDDPaletteCallbacks, + LPD3DHAL_CALLBACKS pD3dCallbacks, + LPD3DHAL_GLOBALDRIVERDATA pD3dDriverData, + LPDDHAL_DDEXEBUFCALLBACKS pD3dBufferCallbacks, + LPDDSURFACEDESC pD3dTextureFormats, + LPDWORD pdwFourCC, + LPVIDMEM pvmList) + { + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + PVIDEOMEMORY VidMemList = NULL; + DD_HALINFO HalInfo; + D3DNTHAL_CALLBACKS D3dCallbacks; + D3DNTHAL_GLOBALDRIVERDATA D3dDriverData; + DD_D3DBUFCALLBACKS D3dBufferCallbacks; + DWORD CallbackFlags[3]; + DWORD dwNumHeaps=0, FourCCs=0; + DWORD Flags; + BOOL retVal = TRUE; + + /* Clear the structures */ + RtlZeroMemory(&HalInfo, sizeof(DD_HALINFO)); + RtlZeroMemory(&D3dCallbacks, sizeof(D3DNTHAL_CALLBACKS)); + RtlZeroMemory(&D3dDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA)); + RtlZeroMemory(&D3dBufferCallbacks, sizeof(DD_D3DBUFCALLBACKS)); + RtlZeroMemory(CallbackFlags, sizeof(DWORD)*3); + + /* Note : XP always alloc 24*sizeof(VIDEOMEMORY) of pvmlist so we change it to it */ + if ( (pvmList != NULL) && + (pHalInfo->vmiData.dwNumHeaps != 0) ) + { + VidMemList = (PVIDEOMEMORY) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (sizeof(VIDEOMEMORY) * 24 ) * pHalInfo->vmiData.dwNumHeaps); + } + + + /* Do the query */ + if (!NtGdiDdQueryDirectDrawObject(GetDdHandle(pDirectDrawGlobal->hDD), + &HalInfo, + CallbackFlags, + &D3dCallbacks, + &D3dDriverData, + &D3dBufferCallbacks, + pD3dTextureFormats, + &dwNumHeaps, + VidMemList, + &FourCCs, + pdwFourCC)) + { + /* We failed, free the memory and return */ + retVal = FALSE; + goto cleanup; + } + + /* Clear the incoming pointer */ + RtlZeroMemory(pHalInfo, sizeof(DDHALINFO)); + + /* Convert all the data */ + pHalInfo->dwSize = sizeof(DDHALINFO); + pHalInfo->lpDDCallbacks = pDDCallbacks; + pHalInfo->lpDDSurfaceCallbacks = pDDSurfaceCallbacks; + pHalInfo->lpDDPaletteCallbacks = pDDPaletteCallbacks; + + /* Check for NT5+ D3D Data */ + if ( (D3dCallbacks.dwSize != 0) && + (D3dDriverData.dwSize != 0) ) + { + /* Write these down */ + pHalInfo->lpD3DGlobalDriverData = (ULONG_PTR)pD3dDriverData; + pHalInfo->lpD3DHALCallbacks = (ULONG_PTR)pD3dCallbacks; + + /* Check for Buffer Callbacks */ + if (D3dBufferCallbacks.dwSize) + { + /* Write this one too */ + pHalInfo->lpDDExeBufCallbacks = pD3dBufferCallbacks; + } + } + + /* Continue converting the rest */ + pHalInfo->vmiData.dwFlags = HalInfo.vmiData.dwFlags; + pHalInfo->vmiData.dwDisplayWidth = HalInfo.vmiData.dwDisplayWidth; + pHalInfo->vmiData.dwDisplayHeight = HalInfo.vmiData.dwDisplayHeight; + pHalInfo->vmiData.lDisplayPitch = HalInfo.vmiData.lDisplayPitch; + pHalInfo->vmiData.fpPrimary = 0; + + RtlCopyMemory( &pHalInfo->vmiData.ddpfDisplay, + &HalInfo.vmiData.ddpfDisplay, + sizeof(DDPIXELFORMAT)); + + pHalInfo->vmiData.dwOffscreenAlign = HalInfo.vmiData.dwOffscreenAlign; + pHalInfo->vmiData.dwOverlayAlign = HalInfo.vmiData.dwOverlayAlign; + pHalInfo->vmiData.dwTextureAlign = HalInfo.vmiData.dwTextureAlign; + pHalInfo->vmiData.dwZBufferAlign = HalInfo.vmiData.dwZBufferAlign; + pHalInfo->vmiData.dwAlphaAlign = HalInfo.vmiData.dwAlphaAlign; + + pHalInfo->vmiData.dwNumHeaps = dwNumHeaps; + pHalInfo->vmiData.pvmList = pvmList; + + RtlCopyMemory( &pHalInfo->ddCaps, + &HalInfo.ddCaps, + sizeof(DDCORECAPS )); + + pHalInfo->ddCaps.dwNumFourCCCodes = FourCCs; + pHalInfo->lpdwFourCC = pdwFourCC; + + /* always force rope 0x1000 for hal it mean only source copy is supported */ + pHalInfo->ddCaps.dwRops[6] = 0x1000; + + /* Set the HAL flags what ReactX got from the driver + * Windows XP force setting DDHALINFO_GETDRIVERINFOSET if the driver does not set it + * and ReactX doing same to keep compatible with drivers, but the driver are + * force support DdGetDriverInfo acoriding MSDN but it seam some driver do not set + * this flag even it is being supported. that is mean. It is small hack to keep + * bad driver working, that trust this is always being setting by it self at end + */ + pHalInfo->dwFlags = (HalInfo.dwFlags & ~DDHALINFO_GETDRIVERINFOSET) | DDHALINFO_GETDRIVERINFOSET; + pHalInfo->GetDriverInfo = (LPDDHAL_GETDRIVERINFO) DdGetDriverInfo; + + /* Now check if we got any DD callbacks */ + if (pDDCallbacks) + { + /* Zero the structure */ + RtlZeroMemory(pDDCallbacks, sizeof(DDHAL_DDCALLBACKS)); + pDDCallbacks->dwSize = sizeof(DDHAL_DDCALLBACKS); + + /* Set the flags for this structure + * Windows XP force setting DDHAL_CB32_CREATESURFACE if the driver does not set it + * and ReactX doing same to keep compatible with drivers, but the driver are + * force support pDDCallbacks acoriding MSDN but it seam some driver do not set + * this flag even it is being supported. that is mean. It is small hack to keep + * bad driver working, that trust this is always being setting by it self at end + */ + Flags = (CallbackFlags[0] & ~DDHAL_CB32_CREATESURFACE) | DDHAL_CB32_CREATESURFACE; + pDDCallbacks->dwFlags = Flags; + + /* Write the always-on functions */ + pDDCallbacks->CreateSurface = DdCreateSurface; + + /* Now write the pointers, if applicable */ + if (Flags & DDHAL_CB32_WAITFORVERTICALBLANK) + { + pDDCallbacks->WaitForVerticalBlank = DdWaitForVerticalBlank; + } + if (Flags & DDHAL_CB32_CANCREATESURFACE) + { + pDDCallbacks->CanCreateSurface = DdCanCreateSurface; + } + if (Flags & DDHAL_CB32_GETSCANLINE) + { + pDDCallbacks->GetScanLine = DdGetScanLine; + } + } + + /* Check for DD Surface Callbacks */ + if (pDDSurfaceCallbacks) + { + /* Zero the structures */ + RtlZeroMemory(pDDSurfaceCallbacks, sizeof(DDHAL_DDSURFACECALLBACKS)); + pDDSurfaceCallbacks->dwSize = sizeof(DDHAL_DDSURFACECALLBACKS); + + /* Set the flags for this structure + * Windows XP force setting DDHAL_SURFCB32_LOCK, DDHAL_SURFCB32_UNLOCK, + * DDHAL_SURFCB32_SETCOLORKEY, DDHAL_SURFCB32_DESTROYSURFACE if the driver + * does not set it and ReactX doing same to keep compatible with drivers, + * but the driver are force support pDDSurfaceCallbacks acoriding MSDN but it seam + * some driver do not set this flag even it is being supported. that is mean. + * It is small hack to keep bad driver working, that trust this is always being + * setting by it self at end + */ + + Flags = (CallbackFlags[1] & ~(DDHAL_SURFCB32_LOCK | DDHAL_SURFCB32_UNLOCK | + DDHAL_SURFCB32_SETCOLORKEY | DDHAL_SURFCB32_DESTROYSURFACE)) | + (DDHAL_SURFCB32_LOCK | DDHAL_SURFCB32_UNLOCK | + DDHAL_SURFCB32_SETCOLORKEY | DDHAL_SURFCB32_DESTROYSURFACE); + + pDDSurfaceCallbacks->dwFlags = Flags; + + /* Write the always-on functions */ + pDDSurfaceCallbacks->Lock = DdLock; + pDDSurfaceCallbacks->Unlock = DdUnlock; + pDDSurfaceCallbacks->SetColorKey = DdSetColorKey; + pDDSurfaceCallbacks->DestroySurface = DdDestroySurface; + + /* Write the optional ones */ + if (Flags & DDHAL_SURFCB32_FLIP) + { + pDDSurfaceCallbacks->Flip = DdFlip; + } + if (Flags & DDHAL_SURFCB32_BLT) + { + pDDSurfaceCallbacks->Blt = DdBlt; + } + if (Flags & DDHAL_SURFCB32_GETBLTSTATUS) + { + pDDSurfaceCallbacks->GetBltStatus = DdGetBltStatus; + } + if (Flags & DDHAL_SURFCB32_GETFLIPSTATUS) + { + pDDSurfaceCallbacks->GetFlipStatus = DdGetFlipStatus; + } + if (Flags & DDHAL_SURFCB32_UPDATEOVERLAY) + { + pDDSurfaceCallbacks->UpdateOverlay = DdUpdateOverlay; + } + if (Flags & DDHAL_SURFCB32_SETOVERLAYPOSITION) + { + pDDSurfaceCallbacks->SetOverlayPosition = DdSetOverlayPosition; + } + if (Flags & DDHAL_SURFCB32_ADDATTACHEDSURFACE) + { + pDDSurfaceCallbacks->AddAttachedSurface = DdAddAttachedSurface; + } + } + + /* Check for DD Palette Callbacks, This interface are dead for user mode, + * only what it can support are being report back. + */ + if (pDDPaletteCallbacks) + { + /* Zero the struct */ + RtlZeroMemory(pDDPaletteCallbacks, sizeof(DDHAL_DDPALETTECALLBACKS)); + + /* Write the header */ + pDDPaletteCallbacks->dwSize = sizeof(DDHAL_DDPALETTECALLBACKS); + pDDPaletteCallbacks->dwFlags = CallbackFlags[2]; + } + + if (pD3dCallbacks) + { + /* Zero the struct */ + RtlZeroMemory(pD3dCallbacks, sizeof(DDHAL_DDEXEBUFCALLBACKS)); + + /* Check if we have one */ + if (D3dCallbacks.dwSize) + { + /* Write the header */ + pD3dCallbacks->dwSize = sizeof(DDHAL_DDEXEBUFCALLBACKS); + + /* Now check for each callback */ + if (D3dCallbacks.ContextCreate) + { + pD3dCallbacks->ContextCreate = (LPD3DHAL_CONTEXTCREATECB) D3dContextCreate; + } + if (D3dCallbacks.ContextDestroy) + { + pD3dCallbacks->ContextDestroy = (LPD3DHAL_CONTEXTDESTROYCB) NtGdiD3dContextDestroy; + } + if (D3dCallbacks.ContextDestroyAll) + { + pD3dCallbacks->ContextDestroyAll = (LPD3DHAL_CONTEXTDESTROYALLCB) NtGdiD3dContextDestroyAll; + } + } + } + + /* Check for D3D Driver Data */ + if (pD3dDriverData) + { + /* Copy the struct */ + RtlMoveMemory(pD3dDriverData, &D3dDriverData, sizeof(D3DHAL_GLOBALDRIVERDATA)); + + /* Write the pointer to the texture formats */ + pD3dDriverData->lpTextureFormats = pD3dTextureFormats; + } + + /* Check for D3D Buffer Callbacks */ + if (pD3dBufferCallbacks) + { + /* Zero the struct */ + RtlZeroMemory(pD3dBufferCallbacks, sizeof(DDHAL_DDEXEBUFCALLBACKS)); + + if ( D3dBufferCallbacks.dwSize) + { + pD3dBufferCallbacks->dwSize = D3dBufferCallbacks.dwSize; + + pD3dBufferCallbacks->dwFlags = D3dBufferCallbacks.dwFlags; + if ( D3dBufferCallbacks.CanCreateD3DBuffer) + { + pD3dBufferCallbacks->CanCreateExecuteBuffer = (LPDDHALEXEBUFCB_CANCREATEEXEBUF)DdCanCreateD3DBuffer; + } + + if ( D3dBufferCallbacks.CanCreateD3DBuffer) + { + pD3dBufferCallbacks->CreateExecuteBuffer = (LPDDHALEXEBUFCB_CREATEEXEBUF) DdCreateD3DBuffer; + } + + if ( D3dBufferCallbacks.DestroyD3DBuffer ) + { + pD3dBufferCallbacks->DestroyExecuteBuffer = (LPDDHALEXEBUFCB_DESTROYEXEBUF) DdDestroyD3DBuffer; + } + + if ( D3dBufferCallbacks.LockD3DBuffer ) + { + pD3dBufferCallbacks->LockExecuteBuffer = (LPDDHALEXEBUFCB_LOCKEXEBUF) DdLockD3D; + } + + if ( D3dBufferCallbacks.UnlockD3DBuffer ) + { + pD3dBufferCallbacks->UnlockExecuteBuffer = (LPDDHALEXEBUFCB_UNLOCKEXEBUF) DdUnlockD3D; + } + + } + } + + /* FIXME VidMemList */ + +cleanup: + if (VidMemList) + { + HeapFree(GetProcessHeap(), 0, VidMemList); + } + + return retVal; +#endif +} + +/* + * @implemented + * + * GDIEntry 3 + */ +BOOL +WINAPI +DdDeleteDirectDrawObject(LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + BOOL Return = FALSE; + + /* If this is the global object */ + if(pDirectDrawGlobal->hDD) + { + /* Free it */ + Return = NtGdiDdDeleteDirectDrawObject((HANDLE)pDirectDrawGlobal->hDD); + if (Return == TRUE) + { + pDirectDrawGlobal->hDD = 0; + } + } + else if (ghDirectDraw) + { + /* Always success here */ + Return = TRUE; + + /* Make sure this is the last instance */ + if (!(--gcDirectDraw)) + { + /* Delete the object */ + Return = NtGdiDdDeleteDirectDrawObject(ghDirectDraw); + if (Return == TRUE) + { + ghDirectDraw = 0; + } + } + } + + /* Return */ + return Return; +#endif +} + +/* + * @implemented + * + * GDIEntry 4 + */ +BOOL +WINAPI +DdCreateSurfaceObject( LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, + BOOL bPrimarySurface) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + return bDDCreateSurface(pSurfaceLocal, TRUE); +#endif +} + + +/* + * @implemented + * + * GDIEntry 5 + */ +BOOL +WINAPI +DdDeleteSurfaceObject(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + BOOL Return = FALSE; + + /* Make sure there is one */ + if (pSurfaceLocal->hDDSurface) + { + /* Delete it */ + Return = NtGdiDdDeleteSurfaceObject((HANDLE)pSurfaceLocal->hDDSurface); + pSurfaceLocal->hDDSurface = 0; + } + + return Return; +#endif +} + +/* + * @implemented + * + * GDIEntry 6 + */ +BOOL +WINAPI +DdResetVisrgn(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, + HWND hWnd) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + /* Call win32k directly */ + return NtGdiDdResetVisrgn((HANDLE) pSurfaceLocal->hDDSurface, hWnd); +#endif +} + +/* + * @implemented + * + * GDIEntry 7 + */ +HDC +WINAPI +DdGetDC(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, + LPPALETTEENTRY pColorTable) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + /* Call win32k directly */ + return NtGdiDdGetDC(pColorTable, (HANDLE) pSurfaceLocal->hDDSurface); +#endif +} + +/* + * @implemented + * + * GDIEntry 8 + */ +BOOL +WINAPI +DdReleaseDC(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + /* Call win32k directly */ + return NtGdiDdReleaseDC((HANDLE) pSurfaceLocal->hDDSurface); +#endif +} + +/* + * @unimplemented + * GDIEntry 9 + */ +HBITMAP +STDCALL +DdCreateDIBSection(HDC hdc, + CONST BITMAPINFO *pbmi, + UINT iUsage, + VOID **ppvBits, + HANDLE hSectionApp, + DWORD dwOffset) +{ + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @implemented + * + * GDIEntry 10 + */ +BOOL +WINAPI +DdReenableDirectDrawObject(LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, + BOOL *pbNewMode) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + /* Call win32k directly */ + return NtGdiDdReenableDirectDrawObject(GetDdHandle(pDirectDrawGlobal->hDD), + pbNewMode); +#endif +} + + +/* + * @implemented + * + * GDIEntry 11 + */ +BOOL +STDCALL +DdAttachSurface( LPDDRAWI_DDRAWSURFACE_LCL pSurfaceFrom, + LPDDRAWI_DDRAWSURFACE_LCL pSurfaceTo) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + /* Create Surface if it does not exits one */ + if (!pSurfaceFrom->hDDSurface) + { + if (!bDDCreateSurface(pSurfaceFrom, FALSE)) + { + return FALSE; + } + } + + /* Create Surface if it does not exits one */ + if (!pSurfaceTo->hDDSurface) + { + if (!bDDCreateSurface(pSurfaceTo, FALSE)) + { + return FALSE; + } + } + + /* Call win32k */ + return NtGdiDdAttachSurface((HANDLE)pSurfaceFrom->hDDSurface, + (HANDLE)pSurfaceTo->hDDSurface); +#endif +} + +/* + * @implemented + * + * GDIEntry 12 + */ +VOID +STDCALL +DdUnattachSurface(LPDDRAWI_DDRAWSURFACE_LCL pSurface, + LPDDRAWI_DDRAWSURFACE_LCL pSurfaceAttached) +{ + /* Fixme for opengl hel emulations */ + return ; +#if 0 + /* Call win32k */ + NtGdiDdUnattachSurface((HANDLE)pSurface->hDDSurface, + (HANDLE)pSurfaceAttached->hDDSurface); +#endif +} + +/* + * @implemented + * + * GDIEntry 13 + */ +ULONG +STDCALL +DdQueryDisplaySettingsUniqueness() +{ + return GdiSharedHandleTable->flDeviceUniq; +} + +/* + * @implemented + * + * GDIEntry 14 + */ +HANDLE +WINAPI +DdGetDxHandle(LPDDRAWI_DIRECTDRAW_LCL pDDraw, + LPDDRAWI_DDRAWSURFACE_LCL pSurface, + BOOL bRelease) +{ + /* Fixme for opengl hel emulations */ + return 0; +#if 0 + HANDLE hDD = NULL; + HANDLE hSurface = (HANDLE)pSurface->hDDSurface; + + /* Check if we already have a surface */ + if (!pSurface) + { + /* We don't have one, use the DirectDraw Object handle instead */ + hSurface = NULL; + hDD = GetDdHandle(pDDraw->lpGbl->hDD); + } + + /* Call the API */ + return (HANDLE)NtGdiDdGetDxHandle(hDD, hSurface, bRelease); +#endif +} + +/* + * @implemented + * + * GDIEntry 15 + */ +BOOL +WINAPI +DdSetGammaRamp(LPDDRAWI_DIRECTDRAW_LCL pDDraw, + HDC hdc, + LPVOID lpGammaRamp) +{ + /* Fixme for opengl hel emulations */ + return 0; + +#if 0 + /* Call win32k directly */ + return NtGdiDdSetGammaRamp(GetDdHandle(pDDraw->lpGbl->hDD), + hdc, + lpGammaRamp); +#endif +} + + + + + Propchange: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryglhel.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 37646: part 1 of 2 This is a experiment with opengl over gdientry1-16, we do not known if this experiment is good or bad idea. if it works fine and show it is good idea, it will mabe be in trunk later
by greatlrd＠svn.reactos.org 26 Nov '08

26 Nov '08

Author: greatlrd Date: Wed Nov 26 00:30:33 2008 New Revision: 37646 URL: http://svn.reactos.org/svn/reactos?rev=37646&view=rev Log: part 1 of 2 This is a experiment with opengl over gdientry1-16, we do not known if this experiment is good or bad idea. if it works fine and show it is good idea, it will mabe be in trunk later Modified: branches/reactx/reactos/config.template.rbuild Modified: branches/reactx/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/config.template.… ============================================================================== --- branches/reactx/reactos/config.template.rbuild [iso-8859-1] (original) +++ branches/reactx/reactos/config.template.rbuild [iso-8859-1] Wed Nov 26 00:30:33 2008 @@ -85,4 +85,10 @@ --> <property name="_ELF_" value="0" /> + +<property name="REACTX_EMU" value="0" /> + + </group>

1 0

[hyperion] 37645: Add comments about workarounds for GCC bugs
by hyperion＠svn.reactos.org 25 Nov '08

25 Nov '08

Author: hyperion Date: Tue Nov 25 15:13:57 2008 New Revision: 37645 URL: http://svn.reactos.org/svn/reactos?rev=37645&view=rev Log: Add comments about workarounds for GCC bugs Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Tue Nov 25 15:13:57 2008 @@ -33,7 +33,11 @@ <library>bootvid</library> <library>wdmguid</library> <dependency>bugcodes</dependency> - +  <directory name="ke"> <if property="ARCH" value="i386"> <directory name="i386"> @@ -465,5 +469,7 @@ </directory> <file>ntoskrnl.rc</file> <linkerscript>ntoskrnl_$(ARCH).lnk</linkerscript> + +  <compilerflag>-fno-unit-at-a-time</compilerflag> </group>

1 0

[dgoette] 37644: * switch back from rdf * implement moving entries only at one place, simplyfy backend code * trim whitespaces from entry names * insert 'http://' if no protocoll for homepage is given
by dgoette＠svn.reactos.org 25 Nov '08

25 Nov '08

Author: dgoette Date: Tue Nov 25 13:10:11 2008 New Revision: 37644 URL: http://svn.reactos.org/svn/reactos?rev=37644&view=rev Log: * switch back from rdf * implement moving entries only at one place, simplyfy backend code * trim whitespaces from entry names * insert 'http://' if no protocoll for homepage is given Modified: branches/danny-web/reactos.org/htdocs/roscms/custom.php branches/danny-web/reactos.org/htdocs/roscms/index.php branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Export_Page.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Activate.class.p… branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Login.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_LostPassword.cla… branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Profile.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_ProfileEdit.clas… branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Register.class.p… branches/danny-web/reactos.org/htdocs/roscms/lib/Login.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Security.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Subsystem_PHPBB.class.php Modified: branches/danny-web/reactos.org/htdocs/roscms/custom.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/custom.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/custom.php [iso-8859-1] Tue Nov 25 13:10:11 2008 @@ -25,7 +25,6 @@ $roscms_intern_webserver_pages = "/reactos/"; $roscms_intern_webserver_roscms = "/reactos/roscms/"; - $roscms_SET_path_ex = $roscms_intern_webserver_roscms."index.php/"; $roscms_intern_page_link = $roscms_intern_webserver_roscms . "?page="; $roscms_standard_language="en"; // en/de/fr/... Modified: branches/danny-web/reactos.org/htdocs/roscms/index.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/index.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/index.php [iso-8859-1] Tue Nov 25 13:10:11 2008 @@ -47,28 +47,13 @@ $rpm_page=""; $rpm_lang=""; - if (array_key_exists("page", $_GET)) $rpm_page=htmlspecialchars($_GET["page"]); if (array_key_exists("lang", $_GET)) $rpm_lang=htmlspecialchars($_GET["lang"]); require("lang.php"); // lang code outsourced require("custom.php"); // custom on-screen information - - $rdf_URI_tree = $_SERVER['REQUEST_URI']; - $rdf_URI_tree = str_replace($roscms_intern_webserver_roscms,'',$rdf_URI_tree); - $rdf_URI_tree = str_replace('index.php/','',$rdf_URI_tree); - - $rdf_URI_tree_split = explode('/', $rdf_URI_tree); - - $rdf_uri_2 = @$rdf_URI_tree_split[1]; - $rdf_uri_3 = @$rdf_URI_tree_split[2]; - - if ($rpm_page != "") { - $rdf_URI_tree_split[0] = $rpm_page; - } - - $rdf_uri_str = $rdf_URI_tree_split[0]."/"; + $RosCMS_GET_d_use = ""; // data usage (where the data will be used) @@ -77,10 +62,6 @@ $RosCMS_GET_d_value2 = ""; // data transport value $RosCMS_GET_d_value3 = ""; // data transport value $RosCMS_GET_d_value4 = ""; // data transport value - - $RosCMS_GET_d_id = ""; // data_id - $RosCMS_GET_d_r_id = ""; // data rev id - $RosCMS_GET_d_r_lang = ""; // data rev language (e.g. "en", "de", etc.) if (array_key_exists("d_u", $_GET)) $RosCMS_GET_d_use=htmlspecialchars($_GET["d_u"]); if (array_key_exists("d_fl", $_GET)) $RosCMS_GET_d_flag=htmlspecialchars($_GET["d_fl"]); @@ -88,10 +69,6 @@ if (array_key_exists("d_val2", $_GET)) $RosCMS_GET_d_value2=htmlspecialchars($_GET["d_val2"]); if (array_key_exists("d_val3", $_GET)) $RosCMS_GET_d_value3=htmlspecialchars($_GET["d_val3"]); if (array_key_exists("d_val4", $_GET)) $RosCMS_GET_d_value4=htmlspecialchars($_GET["d_val4"]); - - if (array_key_exists("d_id", $_GET)) $RosCMS_GET_d_id=htmlspecialchars($_GET["d_id"]); - if (array_key_exists("d_r_id", $_GET)) $RosCMS_GET_d_r_id=htmlspecialchars($_GET["d_r_id"]); - if (array_key_exists("d_r_lang", $_GET)) $RosCMS_GET_d_r_lang=htmlspecialchars($_GET["d_r_lang"]); if (isset($_GET['d_arch']) && $_GET['d_arch'] == true) { @@ -111,12 +88,12 @@ echo str_replace("\r",'',$text); } - -switch ($rdf_URI_tree_split[0]) { +// select page +switch (@$_GET['page']) { // Login user case 'login': - switch (@$rdf_URI_tree_split[1]) { + switch (@$_GET['subpage']) { case 'lost': new HTML_User_LostPassword(); break; @@ -136,12 +113,12 @@ // Register new user case 'register': - if (@$rdf_URI_tree_split[1] == 'captcha') { - new CaptchaSecurityImages(); - } - else { - new HTML_User_Register(); - } + new HTML_User_Register(); + break; + + // Captcha + case 'captcha': + new CaptchaSecurityImages(); break; // User Profile (view | edit) @@ -149,7 +126,7 @@ case 'user': default: // select action - switch (@$rdf_URI_tree_split[1]) { + switch (@$_GET['subpage']) { case 'edit': case 'activate': new HTML_User_ProfileEdit(); Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php [iso-8859-1] Tue Nov 25 13:10:11 2008 @@ -114,7 +114,7 @@ * @param int rev_id * @access public */ - public static function updateRevision( $data_id, $rev_id, $lang, $version, $user_name, $date, $time, $new_data_name, $new_data_type ) + public static function updateRevision( $data_id, $rev_id, $lang, $version, $user_name, $date, $time ) { global $h_a; global $h_a2; @@ -184,7 +184,6 @@ // date + time (check for Y-m-d and valid-date) + (H:i:s) if (preg_match('/^([12][0-9]{3})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/', $date,$date_matches) && checkdate($date_matches[2], $date_matches[3], $date_matches[1]) && preg_match('/^([01][0-9]|2[0-3])(:[0-5][0-9]){2}$/',$time) && ($data['rev_date'] != $date || $data['rev_time'] != $time) ) { - // $stmt=DBConnection::getInstance()->prepare("UPDATE data_revision".$h_a." SET rev_datetime = :datetime, rev_date = :date, rev_time = :time WHERE rev_id = :rev_id LIMIT 1"); $stmt->bindValue('datetime',$date." ".$time,PDO::PARAM_STR); @@ -193,40 +192,6 @@ $stmt->bindParam('rev_id',$rev_id,PDO::PARAM_INT); $stmt->execute(); Log::writeMedium('entry date+time changed: '.$data['rev_date'].' '.$data['rev_time'].' => '.$date.' '.$time.Log::prepareInfo($data_id, $rev_id).'{alterentry}'); - } - - // move revision to another data - //@CHECKME is that correct behaviour - if ($new_data_name != '' && $new_data_type != '') { - - $stmt=DBConnection::getInstance()->prepare("SELECT data_id FROM data_".$h_a2." WHERE data_name = :name AND data_type = :type LIMIT 1"); - $stmt->bindParam('name',$new_data_name,PDO::PARAM_STR); - $stmt->bindParam('type',$new_data_type,PDO::PARAM_STR); - $stmt->execute(); - $new_data_id = $stmt->fetchColumn(); - - if ($new_data_id > 0) { - $stmt=DBConnection::getInstance()->prepare("UPDATE data_revision".$h_a." SET data_id = :new_data_id WHERE rev_id = :rev_id LIMIT 1"); - $stmt->bindParam('new_data_id',$new_data_id,PDO::PARAM_INT); - $stmt->bindParam('rev_id',$rev_id,PDO::PARAM_INT); - $stmt->execute(); - - $stmt=DBConnection::getInstance()->prepare("SELECT COUNT(*) FROM data_revision".$h_a." WHERE data_id = :data_id"); - $stmt->bindParam('data_id',$data_id,PDO::PARAM_INT); - $stmt->execute(); - $data_count = $stmt->fetchColumn(); - - - Log::writeMedium('entry moved to another data-id: '.$data_id.' => '.$new_data_id.Log::prepareInfo($data_id, $rev_id).'{alterentry}'); - - - if ($data_count === 0) { - $stmt=DBConnection::getInstance()->prepare("DELETE FROM data_".$h_a2." WHERE data_id = :data_id LIMIT 1"); - $stmt->bindParam('data_id',$data_id,PDO::PARAM_INT); - $stmt->execute(); - Log::writeMedium('unused data-id deleted: '.$data_id.Log::prepareInfo($data_id, $rev_id).'{alterentry}'); - } - } } } // end of member function getCookieDomain @@ -498,6 +463,17 @@ return; } + // update data type + if ($data_type != '' && $data_type != $data['data_type']) { + $stmt=DBConnection::getInstance()->prepare("UPDATE data_".$h_a2." SET data_type = :type_new WHERE data_id = :data_id LIMIT 1"); + $stmt->bindParam('type_new',$data_type,PDO::PARAM_STR); + $stmt->bindParam('data_id',$data_id,PDO::PARAM_INT); + $stmt->execute(); + Log::writeMedium('data-type changed: '.$data['data_type'].' => '.$data_type.Log::prepareInfo($data_id).'{altersecurityfields}'); + $new_data_type = $data_type; + } + + // update data name if ($data_name != '' && $data_name != $data['data_name']) { $stmt=DBConnection::getInstance()->prepare("UPDATE data_".$h_a2." SET data_name = :name_new WHERE data_id = :id LIMIT 1"); $stmt->bindParam('name_new',$data_name,PDO::PARAM_STR); @@ -506,77 +482,75 @@ Log::writeMedium('data-name changed: '.$data['data_name'].' => '.$data_name.Log::prepareInfo($data_id).'{altersecurityfields}'); + // update dependent entries if ($update_links == true) { - if ($data_type == '') { - $data_type = $data['data_type']; + if ($new_data_type == '') { + $new_data_type = $data['data_type']; } - switch ($data_type) { + // old type + switch ($data['data_type']) { case 'content': - $type_short = 'cont'; + $new_type_short = 'cont'; break; case 'template': - $type_short = 'templ'; + $new_type_short = 'templ'; break; case 'script': - $type_short = 'inc'; + $new_type_short = 'inc'; break; case 'system': - $type_short = 'sys'; + $new_type_short = 'sys'; break; case 'page': default: - $type_short = 'no'; + $new_type_short = 'no'; break; } - // prepare for usage in while loop - $stmt_update=DBConnection::getInstance()->prepare("UPDATE data_text".$h_a." SET text_content = :content WHERE text_id = :text_id LIMIT 1"); + // new type + switch ($new_data_type) { + case 'content': + $old_type_short = 'cont'; + break; + case 'template': + $old_type_short = 'templ'; + break; + case 'script': + $old_type_short = 'inc'; + break; + case 'system': + $old_type_short = 'sys'; + break; + case 'page': + default: + $old_type_short = 'no'; + break; + } // update text content with new name //@ADD check, for only updating dependent entries - $stmt=DBConnection::getInstance()->prepare("SELECT text_id, text_content FROM data_text".$h_a." ORDER BY text_id ASC"); + $stmt=DBConnection::getInstance()->prepare("UPDATE data_text".$h_a." SET text_content = REPLACE(REPLACE(text_content, :old_type_name, :new_type_name), :old_link, :new_link) WHERE text_content LIKE :search1 OR text_content LIKE :search2 ORDER BY text_id ASC"); + $stmt->bindParam('search1','%[#'.$old_type_short.'_'.$data['data_name'].']%',PDO::PARAM_STR); + $stmt->bindParam('search2','%[#link_'.$data['data_name'].']%',PDO::PARAM_STR); + $stmt->bindParam('old_type_name','[#'.$old_type_short.'_'.$data['data_name'].']',PDO::PARAM_STR); + $stmt->bindParam('new_type_name','[#'.$new_type_short.'_'.$data_name.']',PDO::PARAM_STR); + $stmt->bindParam('old_link','[#link_'.$data['data_name'].']',PDO::PARAM_STR); + $stmt->bindParam('new_link','[#link_'.$data_name.']',PDO::PARAM_STR); $stmt->execute(); - while ($text = $stmt->fetch(PDO::FETCH_ASSOC)) { - $text_content = $text['text_content']; - - // update imports - if ($type_short != 'no') { - $text_content = str_replace('[#'.$type_short.'_'.$data['data_name'].']', '[#'.$type_short.'_'.$data_name.']', $text_content); - } - - // update links - if ($data['data_type'] == 'page') { - $text_content = str_replace('[#link_'.$data['data_name'].']', '[#link_'.$data_name.']', $text_content); - } - - // write update, if something has changed - if ($text['text_content'] != $text_content) { - $stmt_update->bindParam('content',$text_content,PDO::PARAM_STR); - $stmt_update->bindParam('text_id',$text['text_id'],PDO::PARAM_INT); - $stmt_update->execute(); - } - } // while Log::writeMedium('data-interlinks updated due data-name change'.Log::prepareInfo($data_id).'{altersecurityfields}'); } } // end data_name changes - if ($data_type != '' && $data_type != $data['data_type']) { - $stmt=DBConnection::getInstance()->prepare("UPDATE data_".$h_a2." SET data_type = :type_new WHERE data_id = :data_id LIMIT 1"); - $stmt->bindParam('type_new',$data_type,PDO::PARAM_STR); - $stmt->bindParam('data_id',$data_id,PDO::PARAM_INT); - $stmt->execute(); - Log::writeMedium('data-type changed: '.$data['data_type'].' => '.$data_type.Log::prepareInfo($data_id).'{altersecurityfields}'); - } // end data_type changes - + // change ACL if ($data_acl != '' && $data_acl != $data['data_acl']) { $stmt=DBConnection::getInstance()->prepare("UPDATE data_".$h_a2." SET data_acl = :acl_new WHERE data_id = :data_id LIMIT 1"); $stmt->bindParam('acl_new',$data_acl); $stmt->bindParam('data_id',$data_id); $stmt->execute(); Log::writeMedium('data-acl changed: '.$data['data_acl'].' => '.$data_acl.Log::prepareInfo($data_id).'{altersecurityfields}'); - } // end data_acl changes + } } // end of member function getCookieDomain @@ -595,7 +569,7 @@ { $thisuser = &ThisUser::getInstance(); - $data_name = @htmlspecialchars($_GET['d_name']); + $data_name = trim(@htmlspecialchars($_GET['d_name'])); $stmt=DBConnection::getInstance()->prepare("SELECT data_id FROM data_ WHERE data_name = :name AND data_type = :type LIMIT 1"); $stmt->bindParam('name',$data_name,PDO::PARAM_STR); Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php [iso-8859-1] Tue Nov 25 13:10:11 2008 @@ -31,7 +31,7 @@ const FIELDS = 1; const HISTORY = 2; const SECURITY = 3; - const ENTRY = 4; + const REVISION = 4; const DEPENCIES= 5; // types of new entries @@ -52,8 +52,6 @@ global $roscms_standard_language; global $RosCMS_GET_d_value, $RosCMS_GET_d_value2, $RosCMS_GET_d_value3, $RosCMS_GET_d_value4; - global $RosCMS_GET_d_id, $RosCMS_GET_d_r_id; - global $RosCMS_GET_d_r_lang; switch ($action) { @@ -117,18 +115,18 @@ // update Field details case 'alterfields2': - Data::updateText($RosCMS_GET_d_r_id, $RosCMS_GET_d_value, $RosCMS_GET_d_value2, @$_GET['d_arch']); + Data::updateText($_GET['d_r_id'], $RosCMS_GET_d_value, $RosCMS_GET_d_value2, @$_GET['d_arch']); $this->show(); break; - // show entry details + // show revision details case 'showentry': - $this->showEntryDetails(self::ENTRY); - break; - - // update Entry details + $this->showEntryDetails(self::REVISION); + break; + + // update revision details case 'alterentry': - Data::updateRevision($RosCMS_GET_d_id, $RosCMS_GET_d_r_id,$RosCMS_GET_d_value,$RosCMS_GET_d_value2,$RosCMS_GET_d_value3,$RosCMS_GET_d_value4,htmlspecialchars(@$_GET["d_val5"]),htmlspecialchars(@$_GET["d_val6"]),htmlspecialchars(@$_GET["d_val7"])); + Data::updateRevision($_GET['d_id'], $_GET['d_r_id'],$RosCMS_GET_d_value,$RosCMS_GET_d_value2,$RosCMS_GET_d_value3,$RosCMS_GET_d_value4,htmlspecialchars(@$_GET["d_val5"])); $this->show(); break; @@ -139,13 +137,13 @@ // update Security details case 'altersecurity': - Data::update($RosCMS_GET_d_id, $RosCMS_GET_d_value, $RosCMS_GET_d_value2, $RosCMS_GET_d_value3, $RosCMS_GET_d_value4); + Data::update($_GET['d_id'], $RosCMS_GET_d_value, $RosCMS_GET_d_value2, $RosCMS_GET_d_value3, $RosCMS_GET_d_value4); $this->show(); break; // add new tag case 'addtag': - Tag::add($RosCMS_GET_d_id, $RosCMS_GET_d_r_id, $RosCMS_GET_d_value, $RosCMS_GET_d_value2, $RosCMS_GET_d_value3); + Tag::add(, $_GET['d_r_id'], $RosCMS_GET_d_value, $RosCMS_GET_d_value2, $RosCMS_GET_d_value3); $this->showEntryDetails(self::METADATA); break; @@ -164,23 +162,23 @@ // update tag by id case 'changetag': Tag::deleteById($RosCMS_GET_d_value4, $RosCMS_GET_d_value3); - Tag::add($RosCMS_GET_d_id, $RosCMS_GET_d_r_id, $RosCMS_GET_d_value, $RosCMS_GET_d_value2, $RosCMS_GET_d_value3); - echo Tag::getIdByUser($RosCMS_GET_d_id, $RosCMS_GET_d_r_id, $RosCMS_GET_d_value, $thisuser->id()); + Tag::add($_GET['d_id'], $_GET['d_r_id'], $RosCMS_GET_d_value, $RosCMS_GET_d_value2, $RosCMS_GET_d_value3); + echo Tag::getIdByUser($_GET['d_id'], $_GET['d_r_id'], $RosCMS_GET_d_value, $thisuser->id()); break; // update tag by name/user case 'changetag2': case 'changetag3': - Tag::deleteByName($RosCMS_GET_d_id, $RosCMS_GET_d_r_id, $RosCMS_GET_d_value , $RosCMS_GET_d_value3); - Tag::add($RosCMS_GET_d_id, $RosCMS_GET_d_r_id, $RosCMS_GET_d_value , $RosCMS_GET_d_value2, $RosCMS_GET_d_value3); - echo Tag::getIdByName($RosCMS_GET_d_id, $RosCMS_GET_d_r_id, $RosCMS_GET_d_value, $RosCMS_GET_d_value3); + Tag::deleteByName($_GET['d_id'], $_GET['d_r_id'], $RosCMS_GET_d_value , $RosCMS_GET_d_value3); + Tag::add($_GET['d_id'], $_GET['d_r_id'], $RosCMS_GET_d_value , $RosCMS_GET_d_value2, $RosCMS_GET_d_value3); + echo Tag::getIdByName($_GET['d_id'], $_GET['d_r_id'], $RosCMS_GET_d_value, $RosCMS_GET_d_value3); break; // Change Tags around Data entry case 'changetags': // only call function if some entries are given ($_GET['d_val'] holds number of id's) if ($_GET['d_val'] > 0) { - Data::evalAction($RosCMS_GET_d_value2 /* entry rev_id's */, $RosCMS_GET_d_value3 /* action */, $RosCMS_GET_d_r_lang, $RosCMS_GET_d_value4); + Data::evalAction($RosCMS_GET_d_value2 /* entry rev_id's */, $RosCMS_GET_d_value3 /* action */, $_GET['d_r_lang'], $RosCMS_GET_d_value4); } break; @@ -206,8 +204,6 @@ */ protected function performDefaultAction() { - global $RosCMS_GET_d_r_lang; - // normal (contains NO "tr") if (!isset($_GET['d_r_id']) || strpos($_GET['d_r_id'], 'tr') === false) { $this->show(); @@ -224,7 +220,7 @@ if (Security::hasRight($revision['data_id'], 'trans')) { // copy existing entry to new language - if (Data::copy($revision['data_id'], $revision['rev_id'], 1 /* copy mode */, $RosCMS_GET_d_r_lang)) { + if (Data::copy($revision['data_id'], $revision['rev_id'], 1 /* copy mode */, $_GET['d_r_lang'])) { $stmt=DBConnection::getInstance()->prepare("SELECT data_id, rev_id, rev_language FROM data_revision WHERE data_id = :data_id AND rev_usrid = :user_id AND rev_version = 0 AND rev_language = :lang AND rev_date = :date ORDER BY rev_id DESC LIMIT 1"); $stmt->bindParam('data_id',$revision['data_id'],PDO::PARAM_STR); $stmt->bindParam('user_id',ThisUser::getInstance()->id(),PDO::PARAM_INT); @@ -290,7 +286,7 @@ $stext_num++; echo_strip(' - <label for="estext"'.$stext_num.'" class="frmeditheadline" style="font-weight: bold;">'); echo ucfirst($stext['stext_name']);echo_strip(':</label> + <label for="estext"'.$stext_num.'" class="frmeditheadline" style="font-weight: bold;">'.$stext['stext_name'].':</label> <span id="edstext'.$stext_num.'" style="display:none;">'.$stext['stext_name'].'</span><br /> <input name="estext"'.$stext_num.'" type="text" id="estext'.$stext_num.'" size="50" maxlength="250" value="');echo $stext['stext_content'].'" /><br /><br />'; } @@ -311,7 +307,7 @@ $text_num++; echo_strip(' - <label class="frmeditheadline" for="elm'.$text_num.'">');echo ucfirst($text['text_name']); echo_strip('</label> + <label class="frmeditheadline" for="elm'.$text_num.'">'.$text['text_name'].'</label> <button type="button" id="butRTE'.$text_num.'" onclick="'."toggleEditor('elm".$text_num."', this.id)".'">Rich Text</button> <span id="swraped'.$text_num.'"> <input id="wraped'.$text_num.'" type="checkbox" onclick="'."toggleWordWrap(this.id, 'elm".$text_num."');".'" checked="checked" /> @@ -654,11 +650,11 @@ } echo ' | '; - if ($mode == self::ENTRY) { - echo '<strong>Entry</strong>'; + if ($mode == self::REVISION) { + echo '<strong>Revision</strong>'; } else { - echo '<span class="detailmenu" onclick="'."bshowentry(".$this->data_id.",".$this->rev_id.", '".$thisuser->id()."')".'">Entry</span>'; + echo '<span class="detailmenu" onclick="'."bshowentry(".$this->data_id.",".$this->rev_id.", '".$thisuser->id()."')".'">Revision</span>'; } } @@ -696,8 +692,8 @@ case self::FIELDS: $this->showEntryDetailsFields(); break; - case self::ENTRY: - $this->showEntryDetailsEntry(); + case self::REVISION: + $this->showEntryDetailsRevision(); break; } @@ -1018,7 +1014,7 @@ * * @access private */ - private function showEntryDetailsEntry( ) + private function showEntryDetailsRevision( ) { global $h_a, $h_a2; @@ -1057,16 +1053,6 @@ <div class="frmeditheadline">Time</div><br /> <input type="text" name="vertime" id="vertime" size="8" maxlength="8" value="'.$revision['rev_time'].'" /> (hour:minute:second) <img src="images/attention.gif" width="22" height="22" /><br /> - <br /> - <div class="frmeditheadline">Move Entry</div><br /> - <input type="text" name="chgdataname" id="chgdataname" size="25" maxlength="100" value="'.$revision['data_name'].'" /> - <select id="cbmchgdatatype"> - <option value="page"'.(($revision['data_type'] == 'page') ? ' selected="selected"' : '').'>Page</option> - <option value="content"'.(($revision['data_type'] == 'content') ? ' selected="selected"' : '').'>Content</option> - <option value="template"'.(($revision['data_type'] == 'template') ? ' selected="selected"' : '').'>Template</option> - <option value="script"'.(($revision['data_type'] == 'script') ? ' selected="selected"' : '').'>Script</option> - <option value="system"'.(($revision['data_type'] == 'system') ? ' selected="selected"' : '').'>System</option> - </select> <img src="images/attention.gif" width="22" height="22" /><br /> <br /> <br /> <button type="button" id="beditsaveentry" onclick="editsaveentrychanges('.$this->data_id.','.$this->rev_id.')">Save Changes</button>   Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Export_Page.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Export_Page.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Export_Page.class.php [iso-8859-1] Tue Nov 25 13:10:11 2008 @@ -52,7 +52,6 @@ public function page( ) { global $RosCMS_GET_d_value, $RosCMS_GET_d_value2,$RosCMS_GET_d_value3; - global $RosCMS_GET_d_r_lang; global $roscms_standard_language; $dynamic_num = $RosCMS_GET_d_value3; @@ -66,7 +65,7 @@ default: if (empty($_GET['d_r_id']) || strpos($_GET['d_r_id'], 'tr') >= 0) { // translation mode (contains "tr") - $RosCMS_GET_d_value2 = $RosCMS_GET_d_r_lang; + $RosCMS_GET_d_value2 = $_GET['d_r_lang']; } // remove "tr" so that it also work in translation view Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User.class.php [iso-8859-1] Tue Nov 25 13:10:11 2008 @@ -56,8 +56,7 @@ { global $roscms_intern_webserver_pages; global $roscms_intern_webserver_roscms; - global $roscms_SET_path_ex; - global $rdf_uri_str; + global $roscms_intern_page_link; global $rpm_lang; global $roscms_langres; @@ -82,8 +81,8 @@ <div class="navTitle">'.$roscms_langres['Account'].'</div> <ol> <li title="'.$thisuser->name().'"> Nick: '.substr($thisuser->name(), 0, 9).'</li> - <li><a href="'.$roscms_SET_path_ex.'my/">My Profile</a></li> - <li><a href="'.$roscms_SET_path_ex.'search/">User Search</a></li> + <li><a href="'.$roscms_intern_page_link.'my">My Profile</a></li> + <li><a href="'.$roscms_intern_page_link.'search">User Search</a></li> <li><a href="'.$roscms_intern_webserver_pages.'peoplemap/">User Map</a></li>'); if ($thisuser->securityLevel() > 0) { echo '<li><a href="'.$roscms_intern_webserver_roscms.'?page=data&branch=welcome">RosCMS Interface</a></li>'; @@ -97,8 +96,8 @@ echo_strip(' <div class="navTitle">'.$roscms_langres['Account'].'</div> <ol> - <li><a href="'.$roscms_SET_path_ex.'login/">Login</a></li> - <li><a href="'.$roscms_SET_path_ex.'register/">Register</a></li> + <li><a href="'.$roscms_intern_page_link.'login">Login</a></li> + <li><a href="'.$roscms_intern_page_link.'register">Register</a></li> </ol> <br />'); } @@ -121,7 +120,7 @@ <ol> <li> <div style="text-align:center;"> - <select id="select" size="1" name="select" class="selectbox" style="width:140px" onchange="'."window.location.href = '".$roscms_SET_path_ex.$rdf_uri_str."?lang=' + this.options[this.selectedIndex].value".'"> + <select id="select" size="1" name="select" class="selectbox" style="width:140px" onchange="'."window.location.href = '".$roscms_intern_webserver_roscms.'?'.$_SERVER['QUERY_STRING']."&lang=' + this.options[this.selectedIndex].value".'"> <optgroup label="current language">'); $stmt=DBConnection::getInstance()->prepare("SELECT lang_name FROM languages WHERE lang_id = :lang_id"); Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Activate.class.p… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Activate.class.p… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Activate.class.p… [iso-8859-1] Tue Nov 25 13:10:11 2008 @@ -45,22 +45,21 @@ */ protected function body( ) { - global $rdf_uri_3; - global $roscms_SET_path_ex; + global $roscms_intern_page_link; global $rdf_logon_system_name; $err_message = ''; // error message box text $mail_exists = false; // email already exists in the database (true = email exists) $activation_code_exists = false; // pwd-id exists in the database (true = pwd-id exists) - $activation_code = $rdf_uri_3; + $activation_code = @$_GET['code']; echo_strip(' <h1>Activate myReactOS Account</h1> <div class="u-h1">Activate myReactOS Account</div> - <div class="u-h2">Already a member? <a href="'.$roscms_SET_path_ex.'login/">Login now</a>!<br /> - Don\'t have a '.$rdf_logon_system_name.' account yet? <a href="'.$roscms_SET_path_ex.'register/">Join now</a>, it\'s free and just takes a minute.</div> - <form action="'.$roscms_SET_path_ex.'login/activate/" method="post"> + <div class="u-h2">Already a member? <a href="'.$roscms_intern_page_link.'login">Login now</a>!<br /> + Don\'t have a '.$rdf_logon_system_name.' account yet? <a href="'.$roscms_intern_page_link.'register">Join now</a>, it\'s free and just takes a minute.</div> + <form action="'.$roscms_intern_page_link.'login&subpage=activate" method="post"> <div align="center"> <div style="background: #e1eafb none repeat scroll 0%; width: 300px;"> <div class="corner1"> @@ -111,7 +110,7 @@ echo_strip(' <div class="login-title">Account activated</div> - <div><a href="'.$roscms_SET_path_ex.'login/" style="color:red !important; text-decoration:underline;">Login now</a>!</div>'); + <div><a href="'.$roscms_intern_page_link.'login" style="color:red !important; text-decoration:underline;">Login now</a>!</div>'); } elseif ($activation_code_exists) { echo_strip(' Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Login.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Login.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Login.class.php [iso-8859-1] Tue Nov 25 13:10:11 2008 @@ -48,7 +48,7 @@ */ protected function body( ) { - global $roscms_SET_path_ex; + global $roscms_intern_page_link; global $rdf_login_cookie_usrkey; global $rdf_login_cookie_seckey; global $rdf_login_cookie_usrname; @@ -192,7 +192,7 @@ exit; } - header('Location: '.$roscms_SET_path_ex.'my/'); + header('Location: '.$roscms_intern_page_link.'my'); exit; } } // end of member function body @@ -210,12 +210,12 @@ global $rdf_login_cookie_usrpwd; global $rdf_login_cookie_loginname; global $rdf_name; - global $roscms_SET_path_ex; + global $roscms_intern_page_link; //@ADD comment -> why do we need this $random_string_security = ''; - if (isset($_GET['sec']) && $_GET['sec'] == "security") { + if (isset($_GET['sec']) && $_GET['sec'] == 'security') { $random_string_security = self::makeKey(); setcookie($rdf_login_cookie_seckey, $random_string_security, 0, '/', Cookie::getDomain()); } @@ -228,7 +228,7 @@ $target_clean = $matches[1]; } - echo '<form action="'.$roscms_SET_path_ex.'login/" method="post">'; + echo '<form action="'.$roscms_intern_page_link.'login" method="post">'; if ($target_clean != '' ) { echo_strip(' @@ -240,7 +240,7 @@ echo_strip(' <h1>Login</h1> <div class="u-h1">Login to '.$rdf_name.'</div> - <div class="u-h2">You don\'t have a '.$rdf_name.' account yet? <a href="'.$roscms_SET_path_ex.'register/">Join now</a>, it\'s free and just takes a minute.</div> + <div class="u-h2">You don\'t have a '.$rdf_name.' account yet? <a href="'.$roscms_intern_page_link.'register">Join now</a>, it\'s free and just takes a minute.</div> <div> <div style="margin: 0px auto; background: #e1eafb none repeat scroll 0%; width: 300px;"> <div class="corner1"> @@ -266,7 +266,7 @@ <input name="'.$rdf_login_cookie_usrpwd.'" type="password" class="input" tabindex="2" id="'.$rdf_login_cookie_usrpwd.'" size="50" maxlength="50" /> </div>'); - if (isset($_GET['sec']) && ($_GET['sec'] == '' || $_GET['sec'] == 'standard')) { + if (empty($_GET['sec']) || $_GET['sec'] == 'standard') { echo_strip(' <div class="login-options"> <input name="loginoption1" type="checkbox" id="loginoption1" value="save"'.(isset($_COOKIE[$rdf_login_cookie_loginname]) ? 'checked' : '').' tabindex="3" /> @@ -306,16 +306,16 @@ echo '<div style="margin:10px;text-align:center;">'; - if (isset($_GET['sec']) && ($_GET['sec'] == '' || $_GET['sec'] == 'standard')) { - echo '<a href="'.$roscms_SET_path_ex.'login/?sec=security'.(($target_clean != '') ? '&target='.urlencode($target_clean) : '').'">Use enhanced security</a>'; + if (empty($_GET['sec']) || $_GET['sec'] == 'standard') { + echo '<a href="'.$roscms_intern_page_link.'login&sec=security'.(($target_clean != '') ? '&target='.urlencode($target_clean) : '').'">Use enhanced security</a>'; } else { - echo '<a href="'.$roscms_SET_path_ex.'login/?sec=standard'.(($target_clean != '') ? '&target='.urlencode($target_clean) : '').'">Use standard security</a>'; + echo '<a href="'.$roscms_intern_page_link.'login&sec=standard'.(($target_clean != '') ? '&target='.urlencode($target_clean) : '').'">Use standard security</a>'; } echo_strip(' <br /> - <a href="'.$roscms_SET_path_ex.'login/lost/">Lost username or password?</a> + <a href="'.$roscms_intern_page_link.'login&subpage=lost">Lost username or password?</a> </div> </div> </form>'); Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_LostPassword.cla… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_LostPassword.cla… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_LostPassword.cla… [iso-8859-1] Tue Nov 25 13:10:11 2008 @@ -45,8 +45,7 @@ */ protected function body( ) { - global $rdf_uri_3; - global $roscms_SET_path_ex; + global $roscms_intern_page_link, $roscms_intern_webserver_roscms; global $rdf_name, $rdf_name_long; global $rdf_register_user_pwd_min, $rdf_register_user_pwd_max; global $rdf_support_email_str; @@ -55,25 +54,25 @@ $mail_exists = false; // email already exists in the database (true = email exists) $password_id_exists = null; // pwd-id exists in the database (true = pwd-id exists) - $activation_code = $rdf_uri_3; + $activation_code = @$_GET['code']; $mail_exists = isset($_POST['registerpost']) && isset($_POST['useremail']) && $_POST['useremail'] != '' && ROSUser::hasEmail($_POST['useremail']); $password_id_exists = ROSUser::hasPasswordReset($activation_code); if (strlen($activation_code > 6)) { echo_strip(' - <h1><a href="'.$roscms_SET_path_ex.'login/">Login</a> > Reset your Password</h1> + <h1><a href="'.$roscms_intern_page_link.'login">Login</a> > Reset your Password</h1> <div class="u-h1">Reset your Password</div> <div class="u-h2">Have you forgotten your password of your '.$rdf_name.' account? Don\'t panic. You have already requested us that we reset your password. Now it\'s your turn to enter a new password for your '.$rdf_name.' account.</div>'); } else { echo_strip(' - <h1><a href="'.$roscms_SET_path_ex.'login/">Login</a> > Lost Username or Password?</h1> + <h1><a href="'.$roscms_intern_page_link.'login">Login</a> > Lost Username or Password?</h1> <div class="u-h1">Lost Username or Password?</div> <div class="u-h2">Have you forgotten your username and/or password of your '.$rdf_name.' account? Don\'t panic. We can send you your username and let you reset your password. All you need is your email address.</div>'); } echo_strip(' - <form action="'.$roscms_SET_path_ex.'login/lost/" method="post"> + <form action="'.$roscms_intern_page_link.'login&subpage=lost" method="post"> <div style="text-align: center;"> <div style="margin:0px auto; background: #e1eafb none repeat scroll 0%; width: 300px;"> <div class="corner1"> @@ -105,7 +104,7 @@ echo_strip(' <div class="login-title">Password changed</div> - <div><a href="'.$roscms_SET_path_ex.'login/" style="color:red !important; text-decoration:underline;">Login now</a>!</div>'); + <div><a href="'.$roscms_intern_page_link.'login" style="color:red !important; text-decoration:underline;">Login now</a>!</div>'); } elseif (strlen($activation_code) < 6 && isset($_POST['registerpost']) && !empty($_POST['useremail']) && EMail::isValid($_POST['useremail']) && !empty($_POST['usercaptcha']) && !empty($_SESSION['rdf_security_code']) && strtolower($_SESSION['rdf_security_code']) == strtolower($_POST['usercaptcha']) && $mail_exists) { @@ -128,7 +127,7 @@ $subject = $rdf_name_long.' - Lost username or password?'; // Email message - $message = $rdf_name_long." - Lost username or password?\n\n\nYou have requested your ".$rdf_name." account login data.\n\nYou haven't requested your account login data? Oops, then someone has tried the 'Lost username or password?' function with your email address, just ignore this email.\n\n\nUsername: ".$user['user_name']."\n\n\nLost your password? Reset your password: ".$roscms_SET_path_ex."login/lost/".$activation_code."/\n\n\nBest regards,\nThe ".$rdf_name." Team\n\n\n(please do not reply as this is an auto generated email!)"; + $message = $rdf_name_long." - Lost username or password?\n\n\nYou have requested your ".$rdf_name." account login data.\n\nYou haven't requested your account login data? Oops, then someone has tried the 'Lost username or password?' function with your email address, just ignore this email.\n\n\nUsername: ".$user['user_name']."\n\n\nLost your password? Reset your password: ".$roscms_intern_page_link."login&subpage=lost&code=".$activation_code."/\n\n\nBest regards,\nThe ".$rdf_name." Team\n\n\n(please do not reply as this is an auto generated email!)"; // send the Email if (EMail::send($_POST['useremail'], $subject, $message)) { @@ -197,14 +196,14 @@ function CaptchaReload() { ++BypassCacheNumber; - document.getElementById('captcha').src = '".$roscms_SET_path_ex."register/captcha/' + BypassCacheNumber; + document.getElementById('captcha').src = '".$roscms_intern_page_link."captcha' + BypassCacheNumber; } document.write('".'<br /><span style="color:#817A71;">If you can\'t read this, try <a href="javascript:CaptchaReload()">another one</a>.</span>'."'); -->".' </script>'; echo_strip(' - <img id="captcha" src="'.$roscms_SET_path_ex.'register/captcha" style="padding-top:10px;" alt="If you can\'t read this, try another one or email '.$rdf_support_email_str.' for help." title="Are you human?" /> + <img id="captcha" src="'.$roscms_intern_page_link.'captcha" style="padding-top:10px;" alt="If you can\'t read this, try another one or email '.$rdf_support_email_str.' for help." title="Are you human?" /> <br />'); if (isset($_POST['registerpost'])) { @@ -217,7 +216,7 @@ </div> <div class="login-button"> <input type="submit" name="submit" value="Send" tabindex="8" /><br /> - <input type="button" onclick="'."window.location=".$roscms_SET_path_ex."'".'" tabindex="9" value="Cancel" name="cancel" style="color:#777777;" /> + <input type="button" onclick="'."window.location=".$roscms_intern_webserver_roscms."'".'" tabindex="9" value="Cancel" name="cancel" style="color:#777777;" /> <input name="registerpost" type="hidden" id="registerpost" value="reg" /> </div>'); } Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Profile.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Profile.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Profile.class.php [iso-8859-1] Tue Nov 25 13:10:11 2008 @@ -49,8 +49,7 @@ */ protected function body( ) { - global $rdf_uri_2; - global $roscms_SET_path_ex; + global $roscms_intern_page_link; if ($this->search) { @@ -73,13 +72,14 @@ } // more than one user was found (or none) - if ($users_found != 1 && ($rdf_uri_2 == '' || isset($_GET['search']) && $_GET['search'] != '')) { + if ($users_found != 1 && (empty($_GET['user_name']) || !empty($_GET['search']))) { echo_strip(' - <h1><a href="'.$roscms_SET_path_ex.'my/">myReactOS</a> > Profile Search</h1> + <h1><a href="'.$roscms_intern_page_link.'my">myReactOS</a> > Profile Search</h1> <div class="u-h1">Profile Search</div> - <form id="form1" name="form1" method="get" action="'.$roscms_SET_path_ex.'search/"> + <form id="form1" method="get" action="'.$roscms_intern_page_link.'search"> + <input type="hidden" name="page" id="page" value="search" /> <input name="search" type="text" id="search" value="'.@htmlentities($_GET['search']).'" /> - <input name="cmdsearch" type="submit" id="cmdsearch" value="Search" /> + <button type="submit">Search</button> </form> <br />'); @@ -93,7 +93,7 @@ $stmt->execute(); while ($search = $stmt->fetch(PDO::FETCH_ASSOC)) { - echo '<li><a style="font-weight:bold;" href="'.$roscms_SET_path_ex.'search/'.$search['user_name'].'">'.$search['user_name'].'</a>'; + echo '<li><a style="font-weight:bold;" href="'.$roscms_intern_page_link.'search&phrase'.$search['user_name'].'">'.$search['user_name'].'</a>'; if ($search['user_fullname']) { echo '<br />'.$search['user_fullname']; } @@ -106,7 +106,7 @@ else { if (empty($user_id)|| $user_id === false) { $stmt=DBConnection::getInstance()->prepare("SELECT user_id FROM users WHERE user_name = :user_name LIMIT 1"); - $stmt->bindParam('user_name',rawurldecode($rdf_uri_2)); + $stmt->bindParam('user_name',rawurldecode(@$_GET['user_name'])); $stmt->execute(); $user_id = $stmt->fetchColumn(); } @@ -125,7 +125,7 @@ */ private function profile( $user_id = null ) { - global $roscms_SET_path_ex; + global $roscms_intern_page_link; global $roscms_intern_webserver_pages; global $rdf_name; @@ -226,7 +226,7 @@ echo_strip(' <div class="login-form"> <div class="u-desc">Private Website</div> - <div class="u-title"><a href="'.$profile['user_website'].'" rel="nofollow">.'.htmlspecialchars($profile['user_website']).'</a></div> + <div class="u-title"><a href="'.$profile['user_website'].'" rel="nofollow">'.htmlspecialchars($profile['user_website']).'</a></div> </div>'); } @@ -268,14 +268,14 @@ if ($profile['user_id'] == $thisuser->id()) { echo_strip(' <div> </div> - <div class="u-link"><a href="'.$roscms_SET_path_ex.'my/edit/">Edit My Profile</a></div> + <div class="u-link"><a href="'.$roscms_intern_page_link.'my&subpage=edit">Edit My Profile</a></div> <div> </div>'); } else { echo_strip(' <div> </div> <div> - <a href="'.$roscms_SET_path_ex.'search/" style="color:#333333 !important; text-decoration:underline; font-weight:bold;"> + <a href="'.$roscms_intern_page_link.'search" style="color:#333333 !important; text-decoration:underline; font-weight:bold;"> <strong>» Profile Search</strong> </a> </div> Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_ProfileEdit.clas… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_ProfileEdit.clas… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_ProfileEdit.clas… [iso-8859-1] Tue Nov 25 13:10:11 2008 @@ -34,7 +34,6 @@ public function __construct() { Login::required(); - session_start(); parent::__construct(); } @@ -46,8 +45,7 @@ */ protected function body( ) { - global $roscms_SET_path_ex; - global $rdf_uri_3; + global $roscms_intern_page_link; global $rdf_name_long; global $rdf_name; global $rdf_register_user_pwd_min; @@ -55,16 +53,15 @@ global $rdf_register_user_name_max; global $roscms_intern_webserver_pages; - $activation_code = $rdf_uri_3; - - $err_message = ''; // error message box text + $activation_code = @$_GET['code']; + $existemail = false; // email already exists in the database (true = email exists) $safepwd = ''; // unsafe password, common cracked passwords ("" = not checked; "true" = fine; "false" = match with a db entry => protected name) $password_change = false; // new password if ($activation_code != '' && strlen($activation_code) > 6) { echo_strip(' - <h1><a href="'.$roscms_SET_path_ex.'my/">myReactOS</a> > <a href="'.$roscms_SET_path_ex.'my/edit/">Edit My Profile</a> > Activate E-Mail Address</h1> + <h1><a href="'.$roscms_intern_page_link.'my">myReactOS</a> > <a href="'.$roscms_intern_page_link.'my&subpage=edit">Edit My Profile</a> > Activate E-Mail Address</h1> <div class="u-h1">Activate E-Mail Address</div> <div class="u-h2"> So you have a new email address and would like to keep your '.$rdf_name.' account up-to-date? That is a very good idea. To confirm your email address change, please enter your new email address again. @@ -72,13 +69,13 @@ } else { echo_strip(' - <h1><a href="'.$roscms_SET_path_ex.'my/">myReactOS</a> > Edit My Profile</h1> + <h1><a href="'.$roscms_intern_page_link.'my">myReactOS</a> > Edit My Profile</h1> <div class="u-h1">Edit My Profile</div> <div class="u-h2">Update your user account profile data to reflect the current state.</div>'); } echo_strip(' - <form action="'.$roscms_SET_path_ex.'my/edit/" method="post"> + <form action="'.$roscms_intern_page_link.'my&subpage=edit" method="post"> <div style="text-align:center;"> <div style="margin: 0px auto; background: #e1eafb none repeat scroll 0%; width: 300px;"> <div class="corner1"> @@ -104,7 +101,7 @@ echo_strip(' <div class="login-title">E-Mail Address Changed</div> <div> - <a href="'.$roscms_SET_path_ex.'my/" style="color: red !important; text-decoration:underline;">My Profile</a> + <a href="'.$roscms_intern_page_link.'my" style="color: red !important; text-decoration:underline;">My Profile</a> </div>'); return; } @@ -164,6 +161,11 @@ $stmt->bindValue('activation_code',htmlspecialchars($_POST['useremail']).$account_act_code,PDO::PARAM_STR); $stmt->bindParam('user_id',$profile['user_id'],PDO::PARAM_INT); $stmt->execute(); + } + + // validate website + if (!preg_match('#://#',$_POST['userwebsite'])) { + $_POST['userwebsite'] = 'http://'.$_POST['userwebsite']; } // update account data @@ -189,7 +191,7 @@ $subject = $rdf_name_long." - Email Address Activation"; // message - $message = $rdf_name_long." - Email Address Activation\n\n\nYou have requested an email address change for your account on ".$rdf_name.". The next step in order to enable the new email address for the account is to activate it by using the hyperlink below.\n\n\nCurrent E-Mail Address: ".$profile['user_email']."\nNew E-Mail Address: ".$_POST['useremail']."\n\nActivation-Hyperlink: ".$roscms_SET_path_ex."my/activate/".$account_act_code."/\n\n\nBest regards,\nThe ".$rdf_name." Team\n\n\n(please do not reply as this is an auto generated email!)"; + $message = $rdf_name_long." - Email Address Activation\n\n\nYou have requested an email address change for your account on ".$rdf_name.". The next step in order to enable the new email address for the account is to activate it by using the hyperlink below.\n\n\nCurrent E-Mail Address: ".$profile['user_email']."\nNew E-Mail Address: ".$_POST['useremail']."\n\nActivation-Hyperlink: ".$roscms_intern_page_link."my&subpage=activate&code=".$account_act_code."/\n\n\nBest regards,\nThe ".$rdf_name." Team\n\n\n(please do not reply as this is an auto generated email!)"; // send the mail if (EMail::send($_POST['useremail'], $subject, $message)) { @@ -204,11 +206,9 @@ echo '<div>Password changed.</div>'; } - echo '<div><a href="'.$roscms_SET_path_ex.'my/" style="color:red !important; text-decoration:underline;">My Profile</a></div>'; + echo '<div><a href="'.$roscms_intern_page_link.'my" style="color:red !important; text-decoration:underline;">My Profile</a></div>'; ROSUser::syncSubsystems($profile['user_id']); - - unset($_SESSION['rdf_security_code']); } elseif ($activation_code != '' && strlen($activation_code) > 6) { echo_strip(' @@ -220,7 +220,7 @@ <div class="login-button"> <input type="submit" name="submit" value="Save" tabindex="16" /> <br /> - <input type="button" onclick="'."window.location='".$roscms_SET_path_ex."'".'" tabindex="17" value="Cancel" name="cancel" style="color:#777777;" /> + <input type="button" onclick="'."window.location='".$roscms_intern_webserver_pages."'".'" tabindex="17" value="Cancel" name="cancel" style="color:#777777;" /> <input name="registerpost" type="hidden" id="registerpost" value="reg" /> </div>'); } @@ -274,7 +274,7 @@ if (isset($_POST['registerpost']) && $existemail && $_POST['useremail'] != $profile['user_email']) { echo_strip(' <br /> - <em>That email address is already with an account. Do you have several accounts? Please <a href="'.$roscms_SET_path_ex.'login/" style="color:red !important; text-decoration:underline;"><strong>login</strong></a>!</em>'); + <em>That email address is already with an account. Do you have several accounts? Please <a href="'.$roscms_intern_page_link.'login" style="color:red !important; text-decoration:underline;"><strong>login</strong></a>!</em>'); } echo_strip(' @@ -380,7 +380,7 @@ <div class="login-button"> <input type="submit" name="submit" value="Save" tabindex="16" /> - <input type="button" onclick="'.("window.location='".$roscms_SET_path_ex."'").'" tabindex="17" value="Cancel" name="cancel" style="color:#777777;" /> + <input type="button" onclick="'.("window.location='".$roscms_intern_webserver_roscms."'").'" tabindex="17" value="Cancel" name="cancel" style="color:#777777;" /> <input name="registerpost" type="hidden" id="registerpost" value="reg" /> </div>'); } Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Register.class.p… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Register.class.p… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Register.class.p… [iso-8859-1] Tue Nov 25 13:10:11 2008 @@ -47,7 +47,7 @@ { global $rdf_name; global $rdf_logon_system_name; - global $roscms_SET_path_ex; + global $roscms_intern_page_link, $roscms_intern_webserver_roscms; global $rdf_support_email_str; global $rdf_register_user_name_min, $rdf_register_user_name_max; @@ -62,11 +62,11 @@ <div class="u-h1">Register to '.$rdf_name.'</div> <span class="u-h2">Become a member of the '.$rdf_name.' Community. </span> The <span class="u-h2">'.$rdf_logon_system_name.'</span> account offers single sign-on for all <span class="u-h2">'.$rdf_name.'</span> web services. <ul> - <li>Already a member? <a href="'.$roscms_SET_path_ex.'login/">Login now</a>! </li> - <li><a href="'.$roscms_SET_path_ex.'login/lost/">Lost username or password?</a></li> + <li>Already a member? <a href="'.$roscms_intern_page_link.'login">Login now</a>! </li> + <li><a href="'.$roscms_intern_page_link.'login&subpage=lost">Lost username or password?</a></li> </ul> - <form action="'.$roscms_SET_path_ex.'register/" method="post"> + <form action="'.$roscms_intern_page_link.'register" method="post"> <div> <div style="margin: 0px auto; background: #e1eafb none repeat scroll 0%; width: 300px;"> <div class="corner1"> @@ -160,7 +160,7 @@ $subject = $rdf_name_long." - Account Activation"; // message - $message = $rdf_name_long." - Account Activation\n\n\nYou have registered an account on ".$rdf_name.". The next step in order to enable the account is to activate it by using the hyperlink below.\n\nYou haven't registered an account? Oops, then someone has tried to register an account with your email address. Just ignore this email, no one can use it anyway as it is not activated and the account will get deleted soon.\n\n\nUsername: ".$_POST['username']."\nPassword: ".$_POST['userpwd1']."\n\nActivation-Hyperlink: ".$roscms_SET_path_ex."login/activate/".$account_act_code."/\n\n\nBest regards,\nThe ".$rdf_name." Team\n\n\n(please do not reply as this is an auto generated email!)"; + $message = $rdf_name_long." - Account Activation\n\n\nYou have registered an account on ".$rdf_name.". The next step in order to enable the account is to activate it by using the hyperlink below.\n\nYou haven't registered an account? Oops, then someone has tried to register an account with your email address. Just ignore this email, no one can use it anyway as it is not activated and the account will get deleted soon.\n\n\nUsername: ".$_POST['username']."\nPassword: ".$_POST['userpwd1']."\n\nActivation-Hyperlink: ".$roscms_intern_page_link."login&subpage=activate&code=".$account_act_code."/\n\n\nBest regards,\nThe ".$rdf_name." Team\n\n\n(please do not reply as this is an auto generated email!)"; // send the mail if (Email::send($_POST['useremail'], $subject, $message)) { @@ -221,7 +221,7 @@ if (isset($_POST['registerpost']) && $mail_exists) { echo_strip(' <br /> - <em>That email address is already with an account. Please <a href="'.$roscms_SET_path_ex.'login/" style="color:red !important; font-weight: bold; text-decoration:underline;">login</a>!</em>'); + <em>That email address is already with an account. Please <a href="'.$roscms_intern_page_link.'login" style="color:red !important; font-weight: bold; text-decoration:underline;">login</a>!</em>'); } echo_strip(' @@ -237,14 +237,14 @@ function CaptchaReload() { ++BypassCacheNumber; - document.getElementById('captcha').src = '".$roscms_SET_path_ex.">register/captcha/' + BypassCacheNumber; + document.getElementById('captcha').src = '".$roscms_intern_page_link."captcha' + BypassCacheNumber; } - document.write(<![CDATA['<br /><span style=\"color:#817A71; \">If you can't read this, try <a href=\"javascript:CaptchaReload()\">another one</a>.</span>']]>); + document.write('<br /><span style=\"color:#817A71; \">If you can't read this, try <a href=\"javascript:CaptchaReload()\">another one</a>.</span>'); -->";echo_strip(' </script> - <img id="captcha" src="'.$roscms_SET_path_ex.'register/captcha" style="padding-top:10px;" alt="If you can\'t read this, try another one or email '.$rdf_support_email_str.' for help." title="Are you human?" /> + <img id="captcha" src="'.$roscms_intern_page_link.'captcha" style="padding-top:10px;" alt="If you can\'t read this, try another one or email '.$rdf_support_email_str.' for help." title="Are you human?" /> <br />'); if (isset($_POST['registerpost'])) { echo_strip(' @@ -256,7 +256,7 @@ </div> <div class="login-button"> <input type="submit" name="submit" value="Register" tabindex="8" /> - <input type="button" onclick="'."window.location='".$roscms_SET_path_ex."'".'" tabindex="9" value="Cancel" name="cancel" style="color:#777777;" /> + <input type="button" onclick="'."window.location='".$roscms_intern_webserver_roscms."'".'" tabindex="9" value="Cancel" name="cancel" style="color:#777777;" /> <input name="registerpost" type="hidden" id="registerpost" value="reg" /> </div>'); } // end registration form Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Login.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Login.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Login.class.php [iso-8859-1] Tue Nov 25 13:10:11 2008 @@ -123,7 +123,7 @@ public static function out( $target = '' ) { global $rdf_login_cookie_usrkey; - global $roscms_SET_path_ex; + global $roscms_intern_page_link; if (isset($_COOKIE[$rdf_login_cookie_usrkey])) { @@ -147,7 +147,7 @@ exit; } - header('Location: '.$roscms_SET_path_ex); + header('Location: '.$roscms_intern_page_link.'my'); exit; } // end of member function login Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Security.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Security.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Security.class.php [iso-8859-1] Tue Nov 25 13:10:11 2008 @@ -166,7 +166,7 @@ while($usergroup = $stmt->fetch(PDO::FETCH_ASSOC)) { // - $pos = strpos($rights['sec_allow'], "|".$usergroup['usergroupmember_usergroupid']."|"); + $pos = strpos($rights['sec_allow'], '|'.$usergroup['usergroupmember_usergroupid'].'|'); if ($pos !== false) { $acl_allow = true; } @@ -179,7 +179,7 @@ while($usergroup = $stmt->fetch(PDO::FETCH_ASSOC)) { // - $pos = strpos($rights['sec_deny'], "|".$usergroup['usergroupmember_usergroupid']."|"); + $pos = strpos($rights['sec_deny'], '|'.$usergroup['usergroupmember_usergroupid'].'|'); if ($pos !== false) { $acl_deny = true; } @@ -206,6 +206,7 @@ return $rights_list; } // end of member function getRightsList + /** * checks if the user has the given right to do things * @@ -221,11 +222,11 @@ return false; } - // return if the requested kind of right is in the rights list for the user $pos = strpos(self::getRightsList($data_id), '|'.$kind.'|'); return ($pos !== false); } // end of member function hasRight + /** * gives a short overview about user rights Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Subsystem_PHPBB.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Subsystem_PHPBB.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Subsystem_PHPBB.class.php [iso-8859-1] Tue Nov 25 13:10:11 2008 @@ -74,7 +74,7 @@ $inconsistencies = 0; $stmt=DBConnection::getInstance()->prepare("SELECT u.user_id, u.user_name, u.user_email, u.user_register, p.username AS subsys_name, p.user_email AS subsys_email, FROM_UNIXTIME(p.user_regdate) AS subsys_register FROM users u, subsys_mappings m, ".$this->user_table." p WHERE m.map_roscms_userid = u.user_id AND m.map_subsys_name = 'phpbb' AND p.user_id = m.map_subsys_userid AND (u.user_name != p.username OR u.user_email != p.user_email OR u.user_register != FROM_UNIXTIME(p.user_regdate)) "); - $stmt->execute() or die("DB error (subsys_phpbb #1)"); + $stmt->execute() or die('DB error (subsys_phpbb #1)'); while ($mapping = $stmt->fetch(PDO::FETCH_ASSOC)) { echo 'Info mismatch for RosCMS userid '.$mapping['user_id'].': '; @@ -112,7 +112,7 @@ $stmt->bindParam('user_name',$user_name,PDO::PARAM_STR); $stmt->bindParam('user_email',$user_email,PDO::PARAM_STR); $stmt->bindParam('user_id',$subsys_user,PDO::PARAM_INT); - $stmt->execute() or die("DB error (subsys_phpbb #7)"); + $stmt->execute() or die('DB error (subsys_phpbb #7)'); if ($stmt->fetchColumn() > 0) { echo 'User name ('.$user_name.') and/or email address ('.$user_email.') collision<br />'; return false; @@ -124,7 +124,7 @@ $stmt->bindParam('reg_date',$user_register,PDO::PARAM_STR); $stmt->bindParam('user_email',$user_email,PDO::PARAM_STR); $stmt->bindParam('user_id',$user_id,PDO::PARAM_INT); - $stmt->execute() or die("DB error (subsys_phpbb #8)"); + $stmt->execute() or die('DB error (subsys_phpbb #8)'); return true; } // end of member function updateUserPrivate @@ -143,7 +143,7 @@ { // Determine the next available userid $stmt=DBConnection::getInstance()->prepare("SELECT MAX(user_id) FROM ".$this->user_table); - $stmt->execute() or die("DB error (subsys_phpbb #20)"); + $stmt->execute() or die('DB error (subsys_phpbb #20)'); $phpbb_user_id = $stmt->fetchColumn() + 1; $dbh = DBConnection::getInstance(); @@ -153,27 +153,27 @@ $stmt->bindValue('user_clean_name',strtolower($name),PDO::PARAM_STR); $stmt->bindParam('user_email',$email,PDO::PARAM_STR); $stmt->bindParam('reg_date',$register,PDO::PARAM_STR); - $stmt->execute() or die("DB error (subsys_phpbb #10)"); + $stmt->execute() or die('DB error (subsys_phpbb #10)'); // Put the user in the REGISTERED group $stmt=DBConnection::getInstance()->prepare("SELECT group_id FROM ".self::DB_NAME.".phpbb_groups WHERE group_name = 'REGISTERED' LIMIT 1"); - $stmt->execute() or die("DB error (subsys_phpbb #18)"); + $stmt->execute() or die('DB error (subsys_phpbb #18)'); $group_id = $stmt->fetchColumn(); if($group_id === false){ - die("DB error (subsys_phpbb #20)"); + die('DB error (subsys_phpbb #20)'); } $stmt=DBConnection::getInstance()->prepare("INSERT INTO ".self::DB_NAME.".phpbb_user_group (group_id, user_id, user_pending) VALUES (:group_id, :user_id, 0)"); $stmt->bindParam('group_id',$group_id,PDO::PARAM_INT); $stmt->bindParam('user_id',$phpbb_user_id,PDO::PARAM_INT); - $stmt->execute() or die("DB error (subsys_phpbb #19)"); + $stmt->execute() or die('DB error (subsys_phpbb #19)'); // Finally, insert a row in the mapping table - $query=DBConnection::getInstance()->prepare("INSERT INTO subsys_mappings (map_roscms_userid, map_subsys_name, map_subsys_userid) VALUES(:roscms_user, 'phpbb', :phpbb_user)"); + $stmt=DBConnection::getInstance()->prepare("INSERT INTO subsys_mappings (map_roscms_userid, map_subsys_name, map_subsys_userid) VALUES(:roscms_user, 'phpbb', :phpbb_user)"); $stmt->bindParam('roscms_user',$id,PDO::PARAM_INT); $stmt->bindParam('phpbb_user',$phpbb_user_id,PDO::PARAM_INT); - $stmt->execute() or die("DB error (subsys_phpbb #11)"); + $stmt->execute() or die('DB error (subsys_phpbb #11)'); return true; } // end of member function addUser @@ -194,14 +194,14 @@ // First, try to match on email address $stmt=DBConnection::getInstance()->prepare("SELECT user_id FROM ".$this->user_table." WHERE LOWER(user_email) = LOWER(:user_email)"); $stmt->bindParam('user_email',$user['email'],PDO::PARAM_STR); - $stmt->execute() or die("DB error (subsys_phpbb #5)"); + $stmt->execute() or die('DB error (subsys_phpbb #5)'); $phpbb_user_id = $stmt->fetchColumn(); if ($phpbb_user_id === false) { // That failed. Let's try to match on user name then $stmt=DBConnection::getInstance()->prepare("SELECT user_id FROM ".$this->user_table." WHERE LOWER(username) = LOWER(:user_name)"); $stmt->bindParam('user_name',$user['name'],PDO::PARAM_STR); - $stmt->execute() or die("DB error (subsys_phpbb #6)"); + $stmt->execute() or die('DB error (subsys_phpbb #6)'); $phpbb_user_id = $stmt->fetchColumn(); } @@ -221,7 +221,7 @@ $stmt=DBConnection::getInstance()->prepare("INSERT INTO subsys_mappings (map_roscms_userid, map_subsys_name, map_subsys_userid) VALUES(:roscms_user, 'phpbb', :phpbb_user)"); $stmt->bindParam('roscms_user',$user_id,PDO::PARAM_INT); $stmt->bindParam('phpbb_user',$phpbb_user_id,PDO::PARAM_INT); - $stmt->execute() or die("DB error (subsys_phpbb #9)"); + $stmt->execute() or die('DB error (subsys_phpbb #9)'); return true; }

1 0

[sginsberg] 37643: - Remove blue's implicit dependency on windef.h
by sginsberg＠svn.reactos.org 25 Nov '08

25 Nov '08

Author: sginsberg Date: Tue Nov 25 11:11:42 2008 New Revision: 37643 URL: http://svn.reactos.org/svn/reactos?rev=37643&view=rev Log: - Remove blue's implicit dependency on windef.h Modified: trunk/reactos/drivers/setup/blue/blue.c trunk/reactos/drivers/setup/blue/blue.h trunk/reactos/drivers/setup/blue/font.c Modified: trunk/reactos/drivers/setup/blue/blue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/blue.c?… ============================================================================== --- trunk/reactos/drivers/setup/blue/blue.c [iso-8859-1] (original) +++ trunk/reactos/drivers/setup/blue/blue.c [iso-8859-1] Tue Nov 25 11:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: services/dd/blue/blue.c @@ -103,7 +102,7 @@ static VOID FASTCALL ScrSetRegisters(const VGA_REGISTERS *Registers) { - UINT i; + UINT32 i; /* Update misc output register */ WRITE_PORT_UCHAR(MISC, Registers->Misc); @@ -692,7 +691,7 @@ { PCONSOLE_DRAW ConsoleDraw; PUCHAR Src, Dest; - UINT SrcDelta, DestDelta, i, Offset; + UINT32 SrcDelta, DestDelta, i, Offset; ConsoleDraw = (PCONSOLE_DRAW) MmGetSystemAddressForMdl(Irp->MdlAddress); Src = (PUCHAR) (ConsoleDraw + 1); @@ -725,7 +724,7 @@ case IOCTL_CONSOLE_LOADFONT: { - UINT CodePage = (UINT)*(PULONG)Irp->AssociatedIrp.SystemBuffer; + UINT32 CodePage = (UINT32)*(PULONG)Irp->AssociatedIrp.SystemBuffer; // Upload a font for the codepage if needed ScrLoadFontTable(CodePage); Modified: trunk/reactos/drivers/setup/blue/blue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/blue.h?… ============================================================================== --- trunk/reactos/drivers/setup/blue/blue.h [iso-8859-1] (original) +++ trunk/reactos/drivers/setup/blue/blue.h [iso-8859-1] Tue Nov 25 11:11:42 2008 @@ -97,5 +97,5 @@ #define PELINDEX (PUCHAR)0x3c8 #define PELDATA (PUCHAR)0x3c9 -void ScrLoadFontTable(UINT CodePage); -NTSTATUS ExtractFont(UINT CodePage, PUCHAR FontBitField); +void ScrLoadFontTable(UINT32 CodePage); +NTSTATUS ExtractFont(UINT32 CodePage, PUCHAR FontBitField); Modified: trunk/reactos/drivers/setup/blue/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/font.c?… ============================================================================== --- trunk/reactos/drivers/setup/blue/font.c [iso-8859-1] (original) +++ trunk/reactos/drivers/setup/blue/font.c [iso-8859-1] Tue Nov 25 11:11:42 2008 @@ -18,15 +18,15 @@ VOID OpenBitPlane(); VOID CloseBitPlane(); -VOID LoadFont(PBYTE Bitplane, PUCHAR FontBitfield); +VOID LoadFont(PUCHAR Bitplane, PUCHAR FontBitfield); /* FUNCTIONS ****************************************************************/ VOID -ScrLoadFontTable(UINT CodePage) +ScrLoadFontTable(UINT32 CodePage) { PHYSICAL_ADDRESS BaseAddress; - PBYTE Bitplane; + PUCHAR Bitplane; PUCHAR FontBitfield = NULL; NTSTATUS Status = STATUS_SUCCESS; @@ -38,7 +38,7 @@ /* get pointer to video memory */ BaseAddress.QuadPart = BITPLANE_BASE; - Bitplane = (PBYTE)MmMapIoSpace (BaseAddress, 0xFFFF, MmNonCached); + Bitplane = (PUCHAR)MmMapIoSpace (BaseAddress, 0xFFFF, MmNonCached); Status = ExtractFont(CodePage, FontBitfield); if (NT_SUCCESS(Status)) @@ -54,7 +54,7 @@ /* PRIVATE FUNCTIONS *********************************************************/ -NTSTATUS ExtractFont(UINT CodePage, PUCHAR FontBitField) +NTSTATUS ExtractFont(UINT32 CodePage, PUCHAR FontBitField) { BOOLEAN bFoundFile = FALSE; HANDLE Handle; @@ -231,9 +231,9 @@ } VOID -LoadFont(PBYTE Bitplane, PUCHAR FontBitfield) -{ - UINT i,j; +LoadFont(PUCHAR Bitplane, PUCHAR FontBitfield) +{ + UINT32 i,j; for (i=0; i<256; i++) {

1 0

[sginsberg] 37642: - FIX is declared in winddi.h, don't redeclare
by sginsberg＠svn.reactos.org 25 Nov '08

25 Nov '08

Author: sginsberg Date: Tue Nov 25 11:08:48 2008 New Revision: 37642 URL: http://svn.reactos.org/svn/reactos?rev=37642&view=rev Log: - FIX is declared in winddi.h, don't redeclare Modified: trunk/rostests/apitests/gdi32api/gdi.h Modified: trunk/rostests/apitests/gdi32api/gdi.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/gdi.h?r… ============================================================================== --- trunk/rostests/apitests/gdi32api/gdi.h [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/gdi.h [iso-8859-1] Tue Nov 25 11:08:48 2008 @@ -38,15 +38,6 @@ /** Not really an object type. Forces GDI_FreeObj to be silent. */ #define GDI_OBJECT_TYPE_SILENT 0x80000000 - - -/* Number Representation */ - -typedef LONG FIX; - - - - HDC WINAPI GdiConvertBitmap(HDC hdc); HBRUSH WINAPI GdiConvertBrush(HBRUSH hbr); HDC WINAPI GdiConvertDC(HDC hdc);

1 0

[sginsberg] 37641: - Remove Freeldr's dependency on windef.h - Explicitly include winerror.h
by sginsberg＠svn.reactos.org 25 Nov '08

25 Nov '08

Author: sginsberg Date: Tue Nov 25 10:55:43 2008 New Revision: 37641 URL: http://svn.reactos.org/svn/reactos?rev=37641&view=rev Log: - Remove Freeldr's dependency on windef.h - Explicitly include winerror.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c trunk/reactos/boot/freeldr/freeldr/fs/ext2.c trunk/reactos/boot/freeldr/freeldr/fs/fat.c trunk/reactos/boot/freeldr/freeldr/fs/iso.c trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/include/winldr.h trunk/reactos/boot/freeldr/freeldr/mm/meminit.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c [iso-8859-1] Tue Nov 25 10:55:43 2008 @@ -25,6 +25,12 @@ #define NDEBUG #include <debug.h> +/* non-standard specifier from windef.h -- please deprecate */ +#undef PACKED +#ifdef __GNUC__ +#define PACKED __attribute__((packed)) +#endif + typedef struct { UCHAR Signature[4]; // (ret) signature ("VESA") Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] Tue Nov 25 10:55:43 2008 @@ -21,6 +21,12 @@ #define NDEBUG #include <debug.h> + +/* non-standard specifier from windef.h -- please deprecate */ +#undef PACKED +#ifdef __GNUC__ +#define PACKED __attribute__((packed)) +#endif typedef struct { Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] Tue Nov 25 10:55:43 2008 @@ -21,6 +21,12 @@ #define NDEBUG #include <debug.h> + +/* non-standard specifier from windef.h -- please deprecate */ +#undef PACKED +#ifdef __GNUC__ +#define PACKED __attribute__((packed)) +#endif #define VIDEOPORT_PALETTE_READ 0x03C7 #define VIDEOPORT_PALETTE_WRITE 0x03C8 Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/ex… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] Tue Nov 25 10:55:43 2008 @@ -182,7 +182,7 @@ */ BOOLEAN Ext2LookupFile(PCSTR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer) { - UINT i; + UINT32 i; ULONG NumberOfPathParts; CHAR PathPart[261]; PVOID DirectoryBuffer; Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] Tue Nov 25 10:55:43 2008 @@ -784,7 +784,7 @@ */ BOOLEAN FatLookupFile(PCSTR FileName, PFAT_FILE_INFO FatFileInfoPointer) { - UINT i; + UINT32 i; ULONG NumberOfPathParts; CHAR PathPart[261]; PVOID DirectoryBuffer; @@ -922,9 +922,9 @@ BOOLEAN FatGetFatEntry(ULONG Cluster, ULONG* ClusterPointer) { ULONG fat = 0; - UINT FatOffset; - UINT ThisFatSecNum; - UINT ThisFatEntOffset; + UINT32 FatOffset; + UINT32 ThisFatSecNum; + UINT32 ThisFatEntOffset; DbgPrint((DPRINT_FILESYSTEM, "FatGetFatEntry() Retrieving FAT entry for cluster %d.\n", Cluster)); Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/is… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/iso.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/iso.c [iso-8859-1] Tue Nov 25 10:55:43 2008 @@ -172,7 +172,7 @@ */ static BOOLEAN IsoLookupFile(PCSTR FileName, PISO_FILE_INFO IsoFileInfoPointer) { - UINT i; + UINT32 i; ULONG NumberOfPathParts; CHAR PathPart[261]; PVOID DirectoryBuffer; Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Tue Nov 25 10:55:43 2008 @@ -84,6 +84,7 @@ #include <ver.h> #include <cmdline.h> #include <bget.h> +#include <winerror.h> /* Needed by boot manager */ #include <bootmgr.h> #include <oslist.h> Modified: trunk/reactos/boot/freeldr/freeldr/include/winldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/winldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/winldr.h [iso-8859-1] Tue Nov 25 10:55:43 2008 @@ -27,7 +27,7 @@ // ReactOS Loading Functions // /////////////////////////////////////////////////////////////////////////////////////// -VOID LoadAndBootWindows(PCSTR OperatingSystemName, WORD OperatingSystemVersion); +VOID LoadAndBootWindows(PCSTR OperatingSystemName, USHORT OperatingSystemVersion); /* Entry-point to kernel */ typedef VOID (NTAPI *KERNEL_ENTRY_POINT) (PLOADER_PARAMETER_BLOCK LoaderBlock); Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] Tue Nov 25 10:55:43 2008 @@ -476,8 +476,8 @@ VOID MmFixupSystemMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG* MapCount) { - UINT Index; - UINT Index2; + UINT32 Index; + UINT32 Index2; // Loop through each entry in the array for (Index=0; Index<*MapCount; Index++) Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Tue Nov 25 10:55:43 2008 @@ -77,7 +77,7 @@ PCHAR Options, PCHAR SystemPath, PCHAR BootPath, - WORD VersionToBoot) + USHORT VersionToBoot) { /* Examples of correct options and paths */ //CHAR Options[] = "/DEBUGPORT=COM1 /BAUDRATE=115200"; @@ -417,7 +417,7 @@ VOID -LoadAndBootWindows(PCSTR OperatingSystemName, WORD OperatingSystemVersion) +LoadAndBootWindows(PCSTR OperatingSystemName, USHORT OperatingSystemVersion) { CHAR MsgBuffer[256]; CHAR SystemPath[512], SearchPath[512];

1 0

[gschneider] 37640: - Enhance test with icon drawing - Tests some configurations of DrawIcon and DrawIconEx, highlighting another problem in 32bpp - Reference TransparentBlt and AlphaBlend directly
by gschneider＠svn.reactos.org 25 Nov '08

25 Nov '08

Author: gschneider Date: Tue Nov 25 10:50:25 2008 New Revision: 37640 URL: http://svn.reactos.org/svn/reactos?rev=37640&view=rev Log: - Enhance test with icon drawing - Tests some configurations of DrawIcon and DrawIconEx, highlighting another problem in 32bpp - Reference TransparentBlt and AlphaBlend directly Added: trunk/rostests/dibtests/vbltest/test_inv32.ico (with props) Modified: trunk/rostests/dibtests/vbltest/vbltest.c trunk/rostests/dibtests/vbltest/vbltest.rbuild trunk/rostests/dibtests/vbltest/vbltest.rc Added: trunk/rostests/dibtests/vbltest/test_inv32.ico URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/vbltest/test_inv… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/dibtests/vbltest/test_inv32.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/rostests/dibtests/vbltest/vbltest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/vbltest/vbltest.… ============================================================================== --- trunk/rostests/dibtests/vbltest/vbltest.c [iso-8859-1] (original) +++ trunk/rostests/dibtests/vbltest/vbltest.c [iso-8859-1] Tue Nov 25 10:50:25 2008 @@ -8,7 +8,18 @@ #include <windows.h> #include <tchar.h> +BOOL WINAPI GdiAlphaBlend( + HDC hdcDst, int xDst, int yDst, int wDst, int hDst, + HDC hdcSrc, int xSrc, int ySrc, int wSrc, int hSrc, + BLENDFUNCTION blendFunction); + +BOOL WINAPI GdiTransparentBlt( + HDC hdcDst, int xDst, int yDst, int wDst, int hDst, + HDC hdcSrc, int xSrc, int ySrc, int wSrc, int hSrc, + UINT crTransparent); + #define CURRENT_BMPS 4 +#define CURRENT_ICONS 1 #define SCALE 1.5 #define OFFSET 5 @@ -19,6 +30,7 @@ WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { static HBITMAP hbmList[CURRENT_BMPS]; + static HICON hicList[CURRENT_ICONS]; switch (message) { @@ -28,6 +40,7 @@ hbmList[1] = (HBITMAP)LoadImage(hInst, MAKEINTRESOURCE(400), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); hbmList[2] = (HBITMAP)LoadImage(hInst, MAKEINTRESOURCE(800), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); hbmList[3] = (HBITMAP)LoadImage(hInst, MAKEINTRESOURCE(2400), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + hicList[0] = (HICON)LoadIcon(hInst, MAKEINTRESOURCE(3200)); break; } @@ -38,7 +51,6 @@ BITMAP bitmap; BLENDFUNCTION bfunc; int x = 0, y = 0, i; - hdc = BeginPaint(hWnd, &ps); hdcMem = CreateCompatibleDC(hdc); @@ -47,6 +59,7 @@ bfunc.BlendOp = AC_SRC_OVER; bfunc.SourceConstantAlpha = 128; + /* bitmaps */ for(i = 0; i < CURRENT_BMPS; i++) { y = 0; @@ -66,19 +79,47 @@ y += bitmap.bmHeight*SCALE + OFFSET; /* transparent blt, transparency: grey */ - TransparentBlt(hdc, x, y, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, 128*256*256+128*256+128); + GdiTransparentBlt(hdc, x, y, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, 128*256*256+128*256+128); y += bitmap.bmHeight + OFFSET; /* transparent blt, transparency: grey, scaled */ - TransparentBlt(hdc, x, y, bitmap.bmWidth*SCALE, bitmap.bmHeight*SCALE, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, 128*256*256+128*256+128); + GdiTransparentBlt(hdc, x, y, bitmap.bmWidth*SCALE, bitmap.bmHeight*SCALE, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, 128*256*256+128*256+128); y += bitmap.bmHeight*SCALE + OFFSET; - + /* alpha blend, org size */ - AlphaBlend(hdc, x, y, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, bfunc); + GdiAlphaBlend(hdc, x, y, bitmap.bmWidth, bitmap.bmHeight, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, bfunc); y += bitmap.bmHeight + OFFSET; /* alpha blend, scaled */ - AlphaBlend(hdc, x, y, bitmap.bmWidth*SCALE, bitmap.bmHeight*SCALE, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, bfunc); + GdiAlphaBlend(hdc, x, y, bitmap.bmWidth*SCALE, bitmap.bmHeight*SCALE, hdcMem, 0, 0, bitmap.bmWidth, bitmap.bmHeight, bfunc); + y += bitmap.bmHeight*SCALE + OFFSET; + + x += bitmap.bmWidth*SCALE + OFFSET; + } + + /* icons */ + for(i = 0; i < CURRENT_ICONS; i++) + { + y = 0; + /* pure icon */ + DrawIcon(hdc, x, y, hicList[i]); + y += bitmap.bmHeight + OFFSET; + + /* normal icon using Ex */ + DrawIconEx(hdc, x, y, hicList[i], 0, 0, 0, NULL, DI_NORMAL); + y += bitmap.bmHeight + OFFSET; + + /* normal icon using Ex with bigger size */ + DrawIconEx(hdc, x, y, hicList[i], bitmap.bmWidth, bitmap.bmHeight, 0, NULL, DI_NORMAL); + y += bitmap.bmHeight + OFFSET; + + /* only icon using Ex */ + DrawIconEx(hdc, x, y, hicList[i], 0, 0, 0, NULL, DI_IMAGE); + y += bitmap.bmHeight + OFFSET; + + /* mask using Ex */ + DrawIconEx(hdc, x, y, hicList[i], 0, 0, 0, NULL, DI_MASK); + y += bitmap.bmHeight + OFFSET; x += bitmap.bmWidth*SCALE + OFFSET; } Modified: trunk/rostests/dibtests/vbltest/vbltest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/vbltest/vbltest.… ============================================================================== --- trunk/rostests/dibtests/vbltest/vbltest.rbuild [iso-8859-1] (original) +++ trunk/rostests/dibtests/vbltest/vbltest.rbuild [iso-8859-1] Tue Nov 25 10:50:25 2008 @@ -2,9 +2,8 @@ <define name="__USE_W32API" /> <include base="vbltest">.</include> <library>kernel32</library> + <library>user32</library> <library>gdi32</library> - <library>user32</library> - <library>msimg32</library> <file>vbltest.c</file> <file>vbltest.rc</file> </module> Modified: trunk/rostests/dibtests/vbltest/vbltest.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/vbltest/vbltest.… ============================================================================== --- trunk/rostests/dibtests/vbltest/vbltest.rc [iso-8859-1] (original) +++ trunk/rostests/dibtests/vbltest/vbltest.rc [iso-8859-1] Tue Nov 25 10:50:25 2008 @@ -2,3 +2,5 @@ 400 BITMAP "test_inv04.bmp" 800 BITMAP "test_inv08.bmp" 2400 BITMAP "test_inv24.bmp" +3200 ICON "test_inv32.ico" +

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs