Ros-diffs May 2006

ros-diffs@reactos.org

19 participants
377 discussions

[gedmurphy] 21776: - convert the screensaver to tchar and build as unicode. - gets around the ANSI bug in the config dialog
by gedmurphy＠svn.reactos.org 02 May '06

02 May '06

Author: gedmurphy Date: Wed May 3 01:01:43 2006 New Revision: 21776 URL: http://svn.reactos.ru/svn/reactos?rev=21776&view=rev Log: - convert the screensaver to tchar and build as unicode. - gets around the ANSI bug in the config dialog Modified: trunk/reactos/base/applications/screensavers/matrix/config.c trunk/reactos/base/applications/screensavers/matrix/globals.h trunk/reactos/base/applications/screensavers/matrix/matrix.c trunk/reactos/base/applications/screensavers/matrix/matrix.rbuild trunk/reactos/base/applications/screensavers/matrix/message.c trunk/reactos/base/applications/screensavers/matrix/message.h trunk/reactos/base/applications/screensavers/matrix/password.c trunk/reactos/base/applications/screensavers/matrix/screensave.c trunk/reactos/base/applications/screensavers/matrix/settings.c Modified: trunk/reactos/base/applications/screensavers/matrix/config.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/screensav… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/config.c (original) +++ trunk/reactos/base/applications/screensavers/matrix/config.c Wed May 3 01:01:43 2006 @@ -5,6 +5,7 @@ // #include <windows.h> #include <commctrl.h> +#include <tchar.h> #include "resource.h" #include "globals.h" #include "message.h" @@ -32,7 +33,7 @@ lf.lfCharSet = ANSI_CHARSET; lf.lfPitchAndFamily = 0; - lf.lfFaceName[0] = '\0'; + lf.lfFaceName[0] = _T('\0'); hdc = GetDC(0); EnumFontFamiliesEx(hdc, &lf, (FONTENUMPROC)EnumFontProc, (LONG)hwndCombo, 0); @@ -54,7 +55,7 @@ // BOOL CALLBACK ConfigDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - static char buf[256]; + static TCHAR buf[256]; HWND hwndCombo, hwndCtrl; int index, items, val; RECT rect; Modified: trunk/reactos/base/applications/screensavers/matrix/globals.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/screensav… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/globals.h (original) +++ trunk/reactos/base/applications/screensavers/matrix/globals.h Wed May 3 01:01:43 2006 @@ -5,7 +5,7 @@ extern "C" { #endif -#define APPNAME "MATRIX ScreenSaver 2.0" +#define APPNAME _T("MATRIX ScreenSaver 2.0") #define DENSITY 24 #define DENSITY_MAX 50 @@ -32,9 +32,9 @@ #define FONT_MIN 8 #define FONT_MAX 30 -extern char g_szMessages[MAX_MESSAGES][MAXMSG_LENGTH]; +extern TCHAR g_szMessages[MAX_MESSAGES][MAXMSG_LENGTH]; extern int g_nFontSize; -extern char g_szFontName[]; +extern TCHAR g_szFontName[]; extern BOOL g_fFontBold; extern int g_nNumMessages; extern int g_nCurrentMessage; Modified: trunk/reactos/base/applications/screensavers/matrix/matrix.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/screensav… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/matrix.c (original) +++ trunk/reactos/base/applications/screensavers/matrix/matrix.c Wed May 3 01:01:43 2006 @@ -5,6 +5,7 @@ // #include <windows.h> #include <windowsx.h> +#include <tchar.h> #include "globals.h" #include "message.h" #include "matrix.h" Modified: trunk/reactos/base/applications/screensavers/matrix/matrix.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/screensav… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/matrix.rbuild (original) +++ trunk/reactos/base/applications/screensavers/matrix/matrix.rbuild Wed May 3 01:01:43 2006 @@ -8,6 +8,8 @@ <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__REACTOS__" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> <library>kernel32</library> <library>user32</library> Modified: trunk/reactos/base/applications/screensavers/matrix/message.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/screensav… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/message.c (original) +++ trunk/reactos/base/applications/screensavers/matrix/message.c Wed May 3 01:01:43 2006 @@ -35,7 +35,7 @@ // // Set a new message based on font and text // -void SetMatrixMessage(MATRIX_MESSAGE *msg, HFONT hFont, char *text) +void SetMatrixMessage(MATRIX_MESSAGE *msg, HFONT hFont, TCHAR *text) { HDC hdc; RECT rect; @@ -198,7 +198,7 @@ // // Set current font used for messages // -void SetMessageFont(HWND hwnd, char *szFontName, int nPointSize, BOOL fBold) +void SetMessageFont(HWND hwnd, TCHAR *szFontName, int nPointSize, BOOL fBold) { int lfHeight; HDC hdc; Modified: trunk/reactos/base/applications/screensavers/matrix/message.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/screensav… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/message.h (original) +++ trunk/reactos/base/applications/screensavers/matrix/message.h Wed May 3 01:01:43 2006 @@ -22,7 +22,7 @@ } MATRIX_MESSAGE; -void SetMessageFont(HWND hwnd, char *szFontName, int nPointSize, BOOL fBold); +void SetMessageFont(HWND hwnd, TCHAR *szFontName, int nPointSize, BOOL fBold); MATRIX_MESSAGE *InitMatrixMessage(HWND hwnd, int width, int height); #ifdef __cplusplus Modified: trunk/reactos/base/applications/screensavers/matrix/password.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/screensav… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/password.c (original) +++ trunk/reactos/base/applications/screensavers/matrix/password.c Wed May 3 01:01:43 2006 @@ -4,9 +4,10 @@ // Password support for Win9x // #include <windows.h> +#include <tchar.h> typedef BOOL (WINAPI *VERIFYSCREENSAVEPWD)(HWND hwnd); -typedef VOID (WINAPI *PWDCHANGEPASSWORD)(LPCSTR lpcRegkeyname, HWND hwnd,UINT uiReserved1,UINT uiReserved2); +typedef VOID (WINAPI *PWDCHANGEPASSWORD)(LPCTSTR lpcRegkeyname, HWND hwnd,UINT uiReserved1,UINT uiReserved2); BOOL VerifyPassword(HWND hwnd) { @@ -22,7 +23,7 @@ if(GetVersion() < 0x80000000) return TRUE; - hpwdcpl = LoadLibrary("PASSWORD.CPL"); + hpwdcpl = LoadLibrary(_T("PASSWORD.CPL")); if(hpwdcpl == NULL) { @@ -47,7 +48,7 @@ BOOL ChangePassword(HWND hwnd) { // This only ever gets called under '95, when started with the /a option. - HINSTANCE hmpr = LoadLibrary("MPR.DLL"); + HINSTANCE hmpr = LoadLibrary(_T("MPR.DLL")); PWDCHANGEPASSWORD PwdChangePassword; if(hmpr == NULL) @@ -61,7 +62,7 @@ return FALSE; } - PwdChangePassword("SCRSAVE", hwnd, 0, 0); + PwdChangePassword(_T("SCRSAVE"), hwnd, 0, 0); FreeLibrary(hmpr); return TRUE; Modified: trunk/reactos/base/applications/screensavers/matrix/screensave.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/screensav… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/screensave.c (original) +++ trunk/reactos/base/applications/screensavers/matrix/screensave.c Wed May 3 01:01:43 2006 @@ -11,6 +11,7 @@ // #include <windows.h> #include <windowsx.h> +#include <tchar.h> #include "globals.h" #include "message.h" #include "matrix.h" @@ -58,7 +59,7 @@ SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, TRUE, &nPreviousState, 0); // Dynamically locate API call from USER32 - not present in all versions - hUser32 = GetModuleHandle("USER32.DLL"); + hUser32 = GetModuleHandle(_T("USER32.DLL")); pfnEnumDisplayMonitors = (PVOID)GetProcAddress(hUser32, "EnumDisplayMonitors"); // If we're running Win2k+ then the API is available...so call it! @@ -99,7 +100,7 @@ // -p <hwnd> (preview) // -c <hwnd> (configure) // -BOOL ParseCommandLine(PSTR szCmdLine, int *chOption, HWND *hwndParent) +BOOL ParseCommandLine(LPSTR szCmdLine, int *chOption, HWND *hwndParent) { int ch = *szCmdLine++; @@ -150,10 +151,10 @@ switch(chOption) { - case 's': return ScreenSaver(NULL); // screen save - case 'p': return ScreenSaver(hwndParent); // preview in small window - case 'a': return ChangePassword(hwndParent); // ask for password - case 'c': return Configure(hwndParent); // configuration dialog + case _T('s'): return ScreenSaver(NULL); // screen save + case _T('p'): return ScreenSaver(hwndParent); // preview in small window + case _T('a'): return ChangePassword(hwndParent); // ask for password + case _T('c'): return Configure(hwndParent); // configuration dialog default: return Configure(hwndParent); // configuration dialog } Modified: trunk/reactos/base/applications/screensavers/matrix/settings.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/screensav… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/settings.c (original) +++ trunk/reactos/base/applications/screensavers/matrix/settings.c Wed May 3 01:01:43 2006 @@ -4,14 +4,15 @@ // Load/Save settings from registry // #include <windows.h> +#include <tchar.h> #include "globals.h" #include "message.h" #include "matrix.h" -char g_szMessages[MAX_MESSAGES][MAXMSG_LENGTH]; +TCHAR g_szMessages[MAX_MESSAGES][MAXMSG_LENGTH]; int g_nNumMessages = 0; int g_nMessageSpeed = 5; -char g_szFontName[512] = "Arial"; +TCHAR g_szFontName[512] = _T("Arial"); int g_nMatrixSpeed = 150; int g_nDensity = 32; @@ -27,61 +28,61 @@ HKEY hkey; LONG value; ULONG len; - char *hugechar = malloc(4096); - char *hptr = hugechar; + TCHAR *hugechar = malloc(4096); + TCHAR *hptr = hugechar; if(hugechar == 0) return; - hugechar[0] = '\0'; + hugechar[0] = _T('\0'); - RegCreateKeyEx(HKEY_CURRENT_USER, "Software\\Catch22\\Matrix Screen Saver", 0, - "", 0, KEY_READ, NULL, &hkey, NULL); + RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Catch22\\Matrix Screen Saver"), 0, + _T(""), 0, KEY_READ, NULL, &hkey, NULL); len = sizeof value; - if(ERROR_SUCCESS == RegQueryValueEx(hkey, "MessageSpeed", 0, 0, (BYTE *)&value, &len)) + if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("MessageSpeed"), 0, 0, (BYTE *)&value, &len)) { if(value >= MSGSPEED_MIN && value <= MSGSPEED_MAX) g_nMessageSpeed = value; } - if(ERROR_SUCCESS == RegQueryValueEx(hkey, "MatrixSpeed", 0, 0, (BYTE *)&value, &len)) + if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("MatrixSpeed"), 0, 0, (BYTE *)&value, &len)) { if(value >= SPEED_MIN && value <= SPEED_MAX) g_nMatrixSpeed = value; } - if(ERROR_SUCCESS == RegQueryValueEx(hkey, "Density", 0, 0, (BYTE *)&value, &len)) + if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("Density"), 0, 0, (BYTE *)&value, &len)) { if(value >= DENSITY_MIN && value <= DENSITY_MAX) g_nDensity = value; } - if(ERROR_SUCCESS == RegQueryValueEx(hkey, "FontSize", 0, 0, (BYTE *)&value, &len)) + if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("FontSize"), 0, 0, (BYTE *)&value, &len)) { if(value >= FONT_MIN && value <= FONT_MAX) g_nFontSize = value; } - if(ERROR_SUCCESS == RegQueryValueEx(hkey, "FontBold", 0, 0, (BYTE *)&value, &len)) + if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("FontBold"), 0, 0, (BYTE *)&value, &len)) g_fFontBold = (value == 0 ? FALSE : TRUE); - if(ERROR_SUCCESS == RegQueryValueEx(hkey, "Randomize", 0, 0, (BYTE *)&value, &len)) + if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("Randomize"), 0, 0, (BYTE *)&value, &len)) g_fRandomizeMessages = (value == 0 ? FALSE : TRUE); len = 4096; - if(ERROR_SUCCESS == RegQueryValueEx(hkey, "FontName", 0, 0, (BYTE *)hugechar, &len)) + if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("FontName"), 0, 0, (BYTE *)hugechar, &len)) { if(len > 0) lstrcpy(g_szFontName, hugechar); else - lstrcpy(g_szFontName, "Arial"); + lstrcpy(g_szFontName, _T("Arial")); } len = 4096; - if(ERROR_SUCCESS == RegQueryValueEx(hkey, "Messages", 0, 0 , (BYTE *)hugechar, &len)) + if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("Messages"), 0, 0 , (BYTE *)hugechar, &len)) { while(len > 0 && *hptr && isascii(*hptr)) { @@ -96,7 +97,7 @@ else { /* built-in coded message for first run */ - lstrcpyn(g_szMessages[0], "ReactOS", MAXMSG_LENGTH); + lstrcpyn(g_szMessages[0], _T("ReactOS"), MAXMSG_LENGTH); } RegCloseKey(hkey); @@ -106,8 +107,8 @@ void SaveSettings() { HKEY hkey; - char *hugechar = malloc(4096); - char *msgptr = hugechar; + TCHAR *hugechar = malloc(4096); + TCHAR *msgptr = hugechar; int totallen = 0; int i,len; LONG value; @@ -115,31 +116,31 @@ if(hugechar == 0) return; - hugechar[0] = '\0'; + hugechar[0] = _T('\0'); msgptr = hugechar; - RegCreateKeyEx(HKEY_CURRENT_USER, "Software\\Catch22\\Matrix Screen Saver", 0, - "", 0, KEY_WRITE, NULL, &hkey, NULL); + RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Catch22\\Matrix Screen Saver"), 0, + _T(""), 0, KEY_WRITE, NULL, &hkey, NULL); value = g_nMessageSpeed; - RegSetValueEx(hkey, "MessageSpeed", 0, REG_DWORD, (BYTE *)&value, sizeof value); + RegSetValueEx(hkey, _T("MessageSpeed"), 0, REG_DWORD, (BYTE *)&value, sizeof value); value = g_nMatrixSpeed; - RegSetValueEx(hkey, "MatrixSpeed", 0, REG_DWORD, (BYTE *)&value, sizeof value); + RegSetValueEx(hkey, _T("MatrixSpeed"), 0, REG_DWORD, (BYTE *)&value, sizeof value); value = g_nDensity; - RegSetValueEx(hkey, "Density", 0, REG_DWORD, (BYTE *)&value, sizeof value); + RegSetValueEx(hkey, _T("Density"), 0, REG_DWORD, (BYTE *)&value, sizeof value); value = g_nFontSize; - RegSetValueEx(hkey, "FontSize", 0, REG_DWORD, (BYTE *)&value, sizeof value); + RegSetValueEx(hkey, _T("FontSize"), 0, REG_DWORD, (BYTE *)&value, sizeof value); value = g_fRandomizeMessages; - RegSetValueEx(hkey, "Randomize", 0, REG_DWORD, (BYTE *)&value, sizeof value); + RegSetValueEx(hkey, _T("Randomize"), 0, REG_DWORD, (BYTE *)&value, sizeof value); value = g_fFontBold; - RegSetValueEx(hkey, "FontBold", 0, REG_DWORD, (BYTE *)&value, sizeof value); + RegSetValueEx(hkey, _T("FontBold"), 0, REG_DWORD, (BYTE *)&value, sizeof value); - RegSetValueEx(hkey, "FontName", 0, REG_SZ, (BYTE *)g_szFontName, lstrlen(g_szFontName)); + RegSetValueEx(hkey, _T("FontName"), 0, REG_SZ, (BYTE *)g_szFontName, lstrlen(g_szFontName)); for(i = 0; i < g_nNumMessages; i++) { @@ -153,10 +154,10 @@ } } - *msgptr = '\0'; + *msgptr = _T('\0'); totallen++; - RegSetValueEx(hkey, "Messages", 0, REG_MULTI_SZ, (BYTE *)hugechar, totallen); + RegSetValueEx(hkey, _T("Messages"), 0, REG_MULTI_SZ, (BYTE *)hugechar, totallen); RegCloseKey(hkey); free(hugechar);

1 0

[mbosma] 21775: Add a case for cached memory to MmPageOutPhysicalAdress. Please review me !
by mbosma＠svn.reactos.org 02 May '06

02 May '06

Author: mbosma Date: Tue May 2 23:23:43 2006 New Revision: 21775 URL: http://svn.reactos.ru/svn/reactos?rev=21775&view=rev Log: Add a case for cached memory to MmPageOutPhysicalAdress. Please review me ! Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/rmap.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.ru/svn/reactos/branches/cache_manager_rewrite/reactos/nt… ============================================================================== --- branches/cache_manager_rewrite/reactos/ntoskrnl/mm/rmap.c (original) +++ branches/cache_manager_rewrite/reactos/ntoskrnl/mm/rmap.c Tue May 2 23:23:43 2006 @@ -299,6 +299,18 @@ */ Status = MmPageOutVirtualMemory(AddressSpace, MemoryArea, Address, PageOp); + } + else if (Type == MEMORY_AREA_CACHE_SEGMENT) + { + /* + * We do not need to write the page to the pagefile if is a + * cache segment: It will be reloaded from the original file + */ + MmDeleteVirtualMapping(AddressSpace->Process, (PVOID)Address, FALSE, NULL, NULL); + MmUnlockAddressSpace(AddressSpace); + while(MmUnsharePage(Page)); + MmDeleteAllRmaps(Page, NULL, NULL); + MmReleasePageMemoryConsumer(MC_CACHE, Page); } else {

1 0

[mbosma] 21774: DbgPrint => DPRINT1
by mbosma＠svn.reactos.org 02 May '06

02 May '06

Author: mbosma Date: Tue May 2 23:13:57 2006 New Revision: 21774 URL: http://svn.reactos.ru/svn/reactos?rev=21774&view=rev Log: DbgPrint => DPRINT1 Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/freelist.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.ru/svn/reactos/branches/cache_manager_rewrite/reactos/nt… ============================================================================== --- branches/cache_manager_rewrite/reactos/ntoskrnl/mm/freelist.c (original) +++ branches/cache_manager_rewrite/reactos/ntoskrnl/mm/freelist.c Tue May 2 23:13:57 2006 @@ -936,12 +936,12 @@ if (MmPageArray[Pfn].Flags.Type != MM_PHYSICAL_PAGE_USED) { - DbgPrint("Sharing free page\n"); + DPRINT1("Sharing free page %lx\n", Pfn); KEBUGCHECK(0); } if (MmPageArray[Pfn].ShareCount == 0xffffffff) { - DbgPrint("Maximum share count reached\n"); + DPRINT1("Maximum share count reached\n"); KEBUGCHECK(0); } MmPageArray[Pfn].ShareCount++;

1 0

[mbosma] 21773: Maintain the linked list CcInUseCacheViewListHead
by mbosma＠svn.reactos.org 02 May '06

02 May '06

Author: mbosma Date: Tue May 2 23:00:43 2006 New Revision: 21773 URL: http://svn.reactos.ru/svn/reactos?rev=21773&view=rev Log: Maintain the linked list CcInUseCacheViewListHead Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/cc/copy.c branches/cache_manager_rewrite/reactos/ntoskrnl/cc/pin.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.ru/svn/reactos/branches/cache_manager_rewrite/reactos/nt… ============================================================================== --- branches/cache_manager_rewrite/reactos/ntoskrnl/cc/copy.c (original) +++ branches/cache_manager_rewrite/reactos/ntoskrnl/cc/copy.c Tue May 2 23:00:43 2006 @@ -181,6 +181,9 @@ Bcb->CacheView[Index]->SectionData.Section = Bcb->Section; Bcb->CacheView[Index]->SectionData.Segment = Bcb->Section->Segment; + RemoveEntryList (&Bcb->CacheView[Index]->ListEntry); + InsertHeadList (&CcInUseCacheViewListHead, &Bcb->CacheView[Index]->ListEntry); + Status = MmMapViewInSystemCache (Bcb->CacheView[Index]); if (!NT_SUCCESS (Status)) @@ -329,6 +332,9 @@ Bcb->CacheView[Index]->SectionData.ViewOffset = Index * CACHE_VIEW_SIZE; Bcb->CacheView[Index]->SectionData.Section = Bcb->Section; Bcb->CacheView[Index]->SectionData.Segment = Bcb->Section->Segment; + + RemoveEntryList (&Bcb->CacheView[Index]->ListEntry); + InsertHeadList (&CcInUseCacheViewListHead, &Bcb->CacheView[Index]->ListEntry); Status = MmMapViewInSystemCache (Bcb->CacheView[Index]); @@ -574,6 +580,9 @@ Bcb->CacheView[Index]->SectionData.Section = Bcb->Section; Bcb->CacheView[Index]->SectionData.Segment = Bcb->Section->Segment; + RemoveEntryList (&Bcb->CacheView[Index]->ListEntry); + InsertHeadList (&CcInUseCacheViewListHead, &Bcb->CacheView[Index]->ListEntry); + Status = MmMapViewInSystemCache (Bcb->CacheView[Index]); if (!NT_SUCCESS (Status)) Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/cc/pin.c URL: http://svn.reactos.ru/svn/reactos/branches/cache_manager_rewrite/reactos/nt… ============================================================================== --- branches/cache_manager_rewrite/reactos/ntoskrnl/cc/pin.c (original) +++ branches/cache_manager_rewrite/reactos/ntoskrnl/cc/pin.c Tue May 2 23:00:43 2006 @@ -132,6 +132,9 @@ Bcb->CacheView[Index]->SectionData.ViewOffset = Index * CACHE_VIEW_SIZE; Bcb->CacheView[Index]->SectionData.Section = Bcb->Section; Bcb->CacheView[Index]->SectionData.Segment = Bcb->Section->Segment; + + RemoveEntryList (&Bcb->CacheView[Index]->ListEntry); + InsertHeadList (&CcInUseCacheViewListHead, &Bcb->CacheView[Index]->ListEntry); Status = MmMapViewInSystemCache (Bcb->CacheView[Index]);

1 0

[mbosma] 21772: Free with MC_CACHE
by mbosma＠svn.reactos.org 02 May '06

02 May '06

Author: mbosma Date: Tue May 2 22:56:39 2006 New Revision: 21772 URL: http://svn.reactos.ru/svn/reactos?rev=21772&view=rev Log: Free with MC_CACHE Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/section.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.ru/svn/reactos/branches/cache_manager_rewrite/reactos/nt… ============================================================================== --- branches/cache_manager_rewrite/reactos/ntoskrnl/mm/section.c (original) +++ branches/cache_manager_rewrite/reactos/ntoskrnl/mm/section.c Tue May 2 22:56:39 2006 @@ -63,6 +63,7 @@ PSECTION_OBJECT Section; PMM_SECTION_SEGMENT Segment; ULONG Offset; + ULONG Consumer; BOOLEAN WasDirty; BOOLEAN Private; } @@ -754,13 +755,13 @@ } VOID -MmspReleasePages(ULONG PageCount, PPFN_TYPE Pfns) +MmspReleasePages(ULONG PageCount, PPFN_TYPE Pfns, ULONG Consumer) { ULONG i; for (i = 0; i < PageCount; i++) { - MmReleasePageMemoryConsumer(MC_USER, Pfns[i]); + MmReleasePageMemoryConsumer(Consumer, Pfns[i]); } } @@ -775,7 +776,7 @@ Status = MmRequestPageMemoryConsumer(Consumer, TRUE, &Pfns[i]); if (!NT_SUCCESS(Status)) { - MmspReleasePages(i, Pfns); + MmspReleasePages(i, Pfns, Consumer); return Status; } } @@ -959,7 +960,7 @@ } if (!NT_SUCCESS(Status)) { - MmspReleasePages(PageCount, Pages); + MmspReleasePages(PageCount, Pages, Consumer); } return Status; } @@ -2479,7 +2480,7 @@ if (PageOutContext->Private) { - MmReleasePageMemoryConsumer(MC_USER, Page); + MmReleasePageMemoryConsumer(PageOutContext->Consumer, Page); } DPRINT("PhysicalAddress %x, Address %x\n", Page << PAGE_SHIFT, Address); @@ -2508,6 +2509,8 @@ */ Context.Segment = MemoryArea->Data.SectionData.Segment; Context.Section = MemoryArea->Data.SectionData.Section; + + Context.Consumer = MemoryArea->Type == MEMORY_AREA_CACHE_SEGMENT ? MC_CACHE : MC_USER; Context.Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + MemoryArea->Data.SectionData.ViewOffset;

1 0

[mbosma] 21771: Better to wait a bit then bugcheck.
by mbosma＠svn.reactos.org 02 May '06

02 May '06

Author: mbosma Date: Tue May 2 22:49:27 2006 New Revision: 21771 URL: http://svn.reactos.ru/svn/reactos?rev=21771&view=rev Log: Better to wait a bit then bugcheck. Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/section.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.ru/svn/reactos/branches/cache_manager_rewrite/reactos/nt… ============================================================================== --- branches/cache_manager_rewrite/reactos/ntoskrnl/mm/section.c (original) +++ branches/cache_manager_rewrite/reactos/ntoskrnl/mm/section.c Tue May 2 22:49:27 2006 @@ -1270,7 +1270,7 @@ MmUnlockSectionSegment(Segment); MmUnlockAddressSpace(AddressSpace); Status = MmRequestPageMemoryConsumer(MemoryArea->Type == MEMORY_AREA_CACHE_SEGMENT - ? MC_CACHE : MC_USER, FALSE, &Pfn[0]); + ? MC_CACHE : MC_USER, TRUE, &Pfn[0]); if (!NT_SUCCESS(Status)) { KEBUGCHECK(0);

1 0

[greatlrd] 21770: remove unsuse files after some redesign of ddraw
by greatlrd＠svn.reactos.org 02 May '06

02 May '06

Author: greatlrd Date: Tue May 2 21:53:04 2006 New Revision: 21770 URL: http://svn.reactos.ru/svn/reactos?rev=21770&view=rev Log: remove unsuse files after some redesign of ddraw Removed: trunk/reactos/dll/directx/ddraw/main/color_main.c trunk/reactos/dll/directx/ddraw/main/gamma_main.c trunk/reactos/dll/directx/ddraw/main/kernel_main.c trunk/reactos/dll/directx/ddraw/main/palette_main.c trunk/reactos/dll/directx/ddraw/main/videoport_main.c Removed: trunk/reactos/dll/directx/ddraw/main/color_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/colo… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/color_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/color_main.c (removed) @@ -1,88 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/color.c - * PURPOSE: IDirectDrawColorControl Implementation - * PROGRAMMER: Maarten Bosma - * - */ - -#include "rosdraw.h" - -ULONG WINAPI -DirectDrawColorControl_AddRef( LPDIRECTDRAWCOLORCONTROL iface) -{ - DX_WINDBG_trace(); - - IDirectDrawColorImpl * This = (IDirectDrawColorImpl*)iface; - - ULONG ref=0; - - if (iface!=NULL) - { - ref = InterlockedIncrement( (PLONG) &This->ref); - } - return ref; -} - -ULONG WINAPI -DirectDrawColorControl_Release( LPDIRECTDRAWCOLORCONTROL iface) -{ - DX_WINDBG_trace(); - - IDirectDrawColorImpl* This = (IDirectDrawColorImpl*)iface; - ULONG ref=0; - - if (iface!=NULL) - { - ref = InterlockedDecrement( (PLONG) &This->ref); - - if (ref == 0) - { - /* Add here if we need releae some memory pointer before - * exists - */ - - if (This!=NULL) - { - HeapFree(GetProcessHeap(), 0, This); - } - } - } - return ref; -} - -HRESULT WINAPI -DirectDrawColorControl_QueryInterface( LPDIRECTDRAWCOLORCONTROL iface, - REFIID riid, - LPVOID* ppvObj) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawColorControl_GetColorControls( LPDIRECTDRAWCOLORCONTROL iface, - LPDDCOLORCONTROL lpColorControl) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawColorControl_SetColorControls( LPDIRECTDRAWCOLORCONTROL iface, - LPDDCOLORCONTROL lpColorControl) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -IDirectDrawColorControlVtbl DirectDrawColorControl_Vtable = -{ - DirectDrawColorControl_QueryInterface, - DirectDrawColorControl_AddRef, - DirectDrawColorControl_Release, - DirectDrawColorControl_GetColorControls, - DirectDrawColorControl_SetColorControls -}; Removed: trunk/reactos/dll/directx/ddraw/main/gamma_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/gamm… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/gamma_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/gamma_main.c (removed) @@ -1,51 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/gamma.c - * PURPOSE: IDirectDrawGamma Implementation - * PROGRAMMER: Maarten Bosma - * - */ - -#include "rosdraw.h" - -ULONG WINAPI -Main_DirectDrawGammaControl_AddRef(LPDIRECTDRAWGAMMACONTROL iface) -{ - return 1; -} - -ULONG WINAPI -Main_DirectDrawGammaControl_Release(LPDIRECTDRAWGAMMACONTROL iface) -{ - return 0; -} - -HRESULT WINAPI -Main_DirectDrawGammaControl_QueryInterface(LPDIRECTDRAWGAMMACONTROL iface, REFIID riid, - LPVOID *ppObj) -{ - return E_NOINTERFACE; -} - -HRESULT WINAPI -Main_DirectDrawGammaControl_GetGammaRamp(LPDIRECTDRAWGAMMACONTROL iface, DWORD dwFlags, LPDDGAMMARAMP lpGammaRamp) -{ - DX_STUB; -} - -HRESULT WINAPI -Main_DirectDrawGammaControl_SetGammaRamp(LPDIRECTDRAWGAMMACONTROL iface, DWORD dwFlags, LPDDGAMMARAMP lpGammaRamp) -{ - DX_STUB; -} - -IDirectDrawGammaControlVtbl DirectDrawGammaControl_Vtable = -{ - Main_DirectDrawGammaControl_QueryInterface, - Main_DirectDrawGammaControl_AddRef, - Main_DirectDrawGammaControl_Release, - Main_DirectDrawGammaControl_GetGammaRamp, - Main_DirectDrawGammaControl_SetGammaRamp -}; Removed: trunk/reactos/dll/directx/ddraw/main/kernel_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/kern… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/kernel_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/kernel_main.c (removed) @@ -1,86 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/kernel.c - * PURPOSE: IDirectDrawKernel and IDirectDrawSurfaceKernel Implementation - * PROGRAMMER: Maarten Bosma - * - */ - -#include "rosdraw.h" - - -/***** IDirectDrawKernel ****/ - -ULONG WINAPI Main_DirectDrawKernel_AddRef (LPDIRECTDRAWKERNEL iface) -{ - return 1; -} - -ULONG WINAPI Main_DirectDrawKernel_Release (LPDIRECTDRAWKERNEL iface) -{ - return 0; -} - -HRESULT WINAPI Main_DirectDrawKernel_QueryInterface (LPDIRECTDRAWKERNEL iface, REFIID riid, LPVOID* ppvObj) -{ - return E_NOINTERFACE; -} - -HRESULT WINAPI Main_DirectDrawKernel_GetKernelHandle (LPDIRECTDRAWKERNEL iface, ULONG* handle) -{ - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawKernel_ReleaseKernelHandle (LPDIRECTDRAWKERNEL iface) -{ - DX_STUB; -} - - -/***** IDirectDrawSurfaceKernel ****/ - -ULONG WINAPI Main_DDSurfaceKernel_AddRef (LPDIRECTDRAWSURFACEKERNEL iface) -{ - return 1; -} - -ULONG WINAPI Main_DDSurfaceKernel_Release (LPDIRECTDRAWSURFACEKERNEL iface) -{ - return 0; -} - -HRESULT WINAPI Main_DDSurfaceKernel_QueryInterface (LPDIRECTDRAWSURFACEKERNEL iface, REFIID riid, LPVOID* ppvObj) -{ - return E_NOINTERFACE; -} - -HRESULT WINAPI Main_DDSurfaceKernel_GetKernelHandle (LPDIRECTDRAWSURFACEKERNEL iface, ULONG* handle) -{ - DX_STUB; -} - -HRESULT WINAPI Main_DDSurfaceKernel_ReleaseKernelHandle (LPDIRECTDRAWSURFACEKERNEL iface) -{ - DX_STUB; -} - - -IDirectDrawKernelVtbl DirectDrawKernel_Vtable = -{ - Main_DirectDrawKernel_QueryInterface, - Main_DirectDrawKernel_AddRef, - Main_DirectDrawKernel_Release, - Main_DirectDrawKernel_GetKernelHandle, - Main_DirectDrawKernel_ReleaseKernelHandle -}; - -IDirectDrawSurfaceKernelVtbl DirectDrawSurfaceKernel_Vtable = -{ - Main_DDSurfaceKernel_QueryInterface, - Main_DDSurfaceKernel_AddRef, - Main_DDSurfaceKernel_Release, - Main_DDSurfaceKernel_GetKernelHandle, - Main_DDSurfaceKernel_ReleaseKernelHandle -}; Removed: trunk/reactos/dll/directx/ddraw/main/palette_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/pale… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/palette_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/palette_main.c (removed) @@ -1,69 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/palette.c - * PURPOSE: IDirectDrawPalette Implementation - * PROGRAMMER: Maarten Bosma - * - */ - -#include "rosdraw.h" - -ULONG WINAPI -Main_DirectDrawPalette_Release(LPDIRECTDRAWPALETTE iface) -{ - return 1; -} - -ULONG WINAPI Main_DirectDrawPalette_AddRef(LPDIRECTDRAWPALETTE iface) -{ - return 0; -} - -HRESULT WINAPI -Main_DirectDrawPalette_Initialize(LPDIRECTDRAWPALETTE iface, - LPDIRECTDRAW ddraw, DWORD dwFlags, - LPPALETTEENTRY palent) -{ - return DD_OK; -} - -HRESULT WINAPI -Main_DirectDrawPalette_GetEntries(LPDIRECTDRAWPALETTE iface, DWORD dwFlags, - DWORD dwStart, DWORD dwCount, - LPPALETTEENTRY palent) -{ - DX_STUB; -} - -HRESULT WINAPI -Main_DirectDrawPalette_SetEntries(LPDIRECTDRAWPALETTE iface, DWORD dwFlags, - DWORD dwStart, DWORD dwCount, - LPPALETTEENTRY palent) -{ - DX_STUB; -} -HRESULT WINAPI -Main_DirectDrawPalette_GetCaps(LPDIRECTDRAWPALETTE iface, LPDWORD lpdwCaps) -{ - DX_STUB; -} - -HRESULT WINAPI -Main_DirectDrawPalette_QueryInterface(LPDIRECTDRAWPALETTE iface, - REFIID refiid, LPVOID *obj) -{ - return E_NOINTERFACE; -} - -IDirectDrawPaletteVtbl DirectDrawPalette_Vtable = -{ - Main_DirectDrawPalette_QueryInterface, - Main_DirectDrawPalette_AddRef, - Main_DirectDrawPalette_Release, - Main_DirectDrawPalette_GetCaps, - Main_DirectDrawPalette_GetEntries, - Main_DirectDrawPalette_Initialize, - Main_DirectDrawPalette_SetEntries -}; Removed: trunk/reactos/dll/directx/ddraw/main/videoport_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/vide… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/videoport_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/videoport_main.c (removed) @@ -1,218 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/videoport.c - * PURPOSE: IDirectDrawVideoPort, DDVideoPortContainer and IDirectDrawVideoPortNotify Implementation - * PROGRAMMER: Maarten Bosma - * - */ - -#include "rosdraw.h" - - -/************* IDirectDrawVideoPort *************/ - -HRESULT WINAPI -Main_DirectDrawVideoPort_QueryInterface (LPDIRECTDRAWVIDEOPORT iface, REFIID riid, LPVOID* ppvObj) -{ - return E_NOINTERFACE; -} - -ULONG WINAPI -Main_DirectDrawVideoPort_AddRef (LPDIRECTDRAWVIDEOPORT iface) -{ - return 1; -} - -ULONG WINAPI -Main_DirectDrawVideoPort_Release (LPDIRECTDRAWVIDEOPORT iface) -{ - return 0; -} - -HRESULT WINAPI -Main_DirectDrawVideoPort_Flip (LPDIRECTDRAWVIDEOPORT iface, LPDIRECTDRAWSURFACE lpDDSurface, DWORD dwFlags) -{ - DX_STUB; -} - -HRESULT WINAPI -Main_DirectDrawVideoPort_GetBandwidthInfo (LPDIRECTDRAWVIDEOPORT iface, LPDDPIXELFORMAT lpddpfFormat, DWORD dwWidth, - DWORD dwHeight, DWORD dwFlags, LPDDVIDEOPORTBANDWIDTH lpBandwidth) -{ - DX_STUB; -} - -HRESULT WINAPI -Main_DirectDrawVideoPort_GetColorControls (LPDIRECTDRAWVIDEOPORT iface, LPDDCOLORCONTROL lpColorControl) -{ - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_GetInputFormats (LPDIRECTDRAWVIDEOPORT iface, LPDWORD lpNumFormats, - LPDDPIXELFORMAT lpFormats, DWORD dwFlags) -{ - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_GetOutputFormats (LPDIRECTDRAWVIDEOPORT iface, LPDDPIXELFORMAT lpInputFormat, - LPDWORD lpNumFormats, LPDDPIXELFORMAT lpFormats, DWORD dwFlags) -{ - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_GetFieldPolarity (LPDIRECTDRAWVIDEOPORT iface, LPBOOL lpbFieldPolarity) -{ - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_GetVideoLine (LPDIRECTDRAWVIDEOPORT This, LPDWORD lpdwLine) -{ - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_GetVideoSignalStatus (LPDIRECTDRAWVIDEOPORT iface, LPDWORD lpdwStatus) -{ - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_SetColorControls (LPDIRECTDRAWVIDEOPORT iface, LPDDCOLORCONTROL lpColorControl) -{ - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_SetTargetSurface (LPDIRECTDRAWVIDEOPORT iface, LPDIRECTDRAWSURFACE lpDDSurface, - DWORD dwFlags) -{ - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_StartVideo (LPDIRECTDRAWVIDEOPORT iface, LPDDVIDEOPORTINFO dwFlags) -{ - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_StopVideo (LPDIRECTDRAWVIDEOPORT iface) -{ - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_UpdateVideo (LPDIRECTDRAWVIDEOPORT iface, LPDDVIDEOPORTINFO dwFlags) -{ - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_WaitForSync (LPDIRECTDRAWVIDEOPORT iface, DWORD dwFlags, DWORD dwLine, - DWORD dwTimeout) -{ - DX_STUB; -} - -/************* IDDVideoPortContainer *************/ - -HRESULT WINAPI Main_DDVideoPortContainer_QueryInterface (LPDDVIDEOPORTCONTAINER iface, REFIID riid, LPVOID* ppvObj) -{ - return E_NOINTERFACE; -} - -ULONG WINAPI Main_DDVideoPortContainer_AddRef (LPDDVIDEOPORTCONTAINER iface) -{ - return 1; -} - -ULONG WINAPI Main_DDVideoPortContainer_Release (LPDDVIDEOPORTCONTAINER iface) -{ - return 0; -} - -HRESULT WINAPI Main_DDVideoPortContainer_CreateVideoPort (LPDDVIDEOPORTCONTAINER iface, DWORD dwFlags, LPDDVIDEOPORTDESC pPortDesc, - LPDIRECTDRAWVIDEOPORT* DDVideoPort, IUnknown* pUnkOuter) -{ - DX_STUB; -} - -HRESULT WINAPI Main_DDVideoPortContainer_EnumVideoPorts (LPDDVIDEOPORTCONTAINER iface, DWORD dwFlags, LPDDVIDEOPORTCAPS pCaps, LPVOID pContext, - LPDDENUMVIDEOCALLBACK pEnumVideoCallback) -{ - DX_STUB; -} - -HRESULT WINAPI Main_DDVideoPortContainer_GetVideoPortConnectInfo (LPDDVIDEOPORTCONTAINER iface, DWORD PortId, DWORD* pNumEntries, - LPDDVIDEOPORTCONNECT pConnectInfo) -{ - DX_STUB; -} - -HRESULT WINAPI Main_DDVideoPortContainer_QueryVideoPortStatus (LPDDVIDEOPORTCONTAINER iface, DWORD PortId, LPDDVIDEOPORTSTATUS pStatus) -{ - DX_STUB; -} - -/************* IDirectDrawVideoPortNotify *************/ - -HRESULT WINAPI Main_DDVideoPortNotify_QueryInterface (LPDIRECTDRAWVIDEOPORTNOTIFY iface, REFIID riid, LPVOID* ppvObj) -{ - return E_NOINTERFACE; -} - -ULONG WINAPI Main_DDVideoPortNotify_AddRef (LPDIRECTDRAWVIDEOPORTNOTIFY iface) -{ - return 1; -} - -ULONG WINAPI Main_DDVideoPortNotify_Release (LPDIRECTDRAWVIDEOPORTNOTIFY iface) -{ - return 0; -} - -HRESULT WINAPI Main_DDVideoPortNotify_AcquireNotification (LPDIRECTDRAWVIDEOPORTNOTIFY iface, HANDLE* h, LPDDVIDEOPORTNOTIFY pVideoPortNotify) -{ - DX_STUB; -} - -HRESULT WINAPI Main_DDVideoPortNotify_ReleaseNotification (LPDIRECTDRAWVIDEOPORTNOTIFY iface, HANDLE h) -{ - DX_STUB; -} - -IDirectDrawVideoPortVtbl DirectDrawVideoPort_Vtable = -{ - Main_DirectDrawVideoPort_QueryInterface, - Main_DirectDrawVideoPort_AddRef, - Main_DirectDrawVideoPort_Release, - Main_DirectDrawVideoPort_Flip, - Main_DirectDrawVideoPort_GetBandwidthInfo, - Main_DirectDrawVideoPort_GetColorControls, - Main_DirectDrawVideoPort_GetInputFormats, - Main_DirectDrawVideoPort_GetOutputFormats, - Main_DirectDrawVideoPort_GetFieldPolarity, - Main_DirectDrawVideoPort_GetVideoLine, - Main_DirectDrawVideoPort_GetVideoSignalStatus, - Main_DirectDrawVideoPort_SetColorControls, - Main_DirectDrawVideoPort_SetTargetSurface, - Main_DirectDrawVideoPort_StartVideo, - Main_DirectDrawVideoPort_StopVideo, - Main_DirectDrawVideoPort_UpdateVideo, - Main_DirectDrawVideoPort_WaitForSync -}; - -IDDVideoPortContainerVtbl DDVideoPortContainer_Vtable = -{ - Main_DDVideoPortContainer_QueryInterface, - Main_DDVideoPortContainer_AddRef, - Main_DDVideoPortContainer_Release, - Main_DDVideoPortContainer_CreateVideoPort, - Main_DDVideoPortContainer_EnumVideoPorts, - Main_DDVideoPortContainer_GetVideoPortConnectInfo, - Main_DDVideoPortContainer_QueryVideoPortStatus -}; - -IDirectDrawVideoPortNotifyVtbl DDVideoPortNotify_Vtable = -{ - Main_DDVideoPortNotify_QueryInterface, - Main_DDVideoPortNotify_AddRef, - Main_DDVideoPortNotify_Release, - Main_DDVideoPortNotify_AcquireNotification, - Main_DDVideoPortNotify_ReleaseNotification -};

1 0

[greatlrd] 21769: fix the build
by greatlrd＠svn.reactos.org 02 May '06

02 May '06

Author: greatlrd Date: Tue May 2 12:15:50 2006 New Revision: 21769 URL: http://svn.reactos.ru/svn/reactos?rev=21769&view=rev Log: fix the build Added: trunk/reactos/dll/directx/ddraw/color.c (with props) trunk/reactos/dll/directx/ddraw/gamma.c trunk/reactos/dll/directx/ddraw/kernel.c trunk/reactos/dll/directx/ddraw/palette.c trunk/reactos/dll/directx/ddraw/videoport.c Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild Added: trunk/reactos/dll/directx/ddraw/color.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/color.c?r… ============================================================================== --- trunk/reactos/dll/directx/ddraw/color.c (added) +++ trunk/reactos/dll/directx/ddraw/color.c Tue May 2 12:15:50 2006 @@ -1,0 +1,88 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * FILE: lib/ddraw/main/color.c + * PURPOSE: IDirectDrawColorControl Implementation + * PROGRAMMER: Maarten Bosma + * + */ + +#include "rosdraw.h" + +ULONG WINAPI +DirectDrawColorControl_AddRef( LPDIRECTDRAWCOLORCONTROL iface) +{ + DX_WINDBG_trace(); + + IDirectDrawColorImpl * This = (IDirectDrawColorImpl*)iface; + + ULONG ref=0; + + if (iface!=NULL) + { + ref = InterlockedIncrement( (PLONG) &This->ref); + } + return ref; +} + +ULONG WINAPI +DirectDrawColorControl_Release( LPDIRECTDRAWCOLORCONTROL iface) +{ + DX_WINDBG_trace(); + + IDirectDrawColorImpl* This = (IDirectDrawColorImpl*)iface; + ULONG ref=0; + + if (iface!=NULL) + { + ref = InterlockedDecrement( (PLONG) &This->ref); + + if (ref == 0) + { + /* Add here if we need releae some memory pointer before + * exists + */ + + if (This!=NULL) + { + HeapFree(GetProcessHeap(), 0, This); + } + } + } + return ref; +} + +HRESULT WINAPI +DirectDrawColorControl_QueryInterface( LPDIRECTDRAWCOLORCONTROL iface, + REFIID riid, + LPVOID* ppvObj) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +DirectDrawColorControl_GetColorControls( LPDIRECTDRAWCOLORCONTROL iface, + LPDDCOLORCONTROL lpColorControl) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +DirectDrawColorControl_SetColorControls( LPDIRECTDRAWCOLORCONTROL iface, + LPDDCOLORCONTROL lpColorControl) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +IDirectDrawColorControlVtbl DirectDrawColorControl_Vtable = +{ + DirectDrawColorControl_QueryInterface, + DirectDrawColorControl_AddRef, + DirectDrawColorControl_Release, + DirectDrawColorControl_GetColorControls, + DirectDrawColorControl_SetColorControls +}; Propchange: trunk/reactos/dll/directx/ddraw/color.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/directx/ddraw/color.c ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rbu… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Tue May 2 12:15:50 2006 @@ -19,6 +19,11 @@ <file>regsvr.c</file> <file>clipper.c</file> + <file>color.c</file> + <file>gamma.c</file> + <file>palette.c</file> + <file>videoport.c</file> + <file>kernel.c</file> <directory name="hal"> <file>ddraw_hal.c</file> @@ -27,12 +32,7 @@ <directory name="main"> <file>ddraw_main.c</file> - <file>surface_main.c</file> - <file>color_main.c</file> - <file>gamma_main.c</file> - <file>palette_main.c</file> - <file>videoport_main.c</file> - <file>kernel_main.c</file> + <file>surface_main.c</file> </directory> <directory name="soft"> Added: trunk/reactos/dll/directx/ddraw/gamma.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/gamma.c?r… ============================================================================== --- trunk/reactos/dll/directx/ddraw/gamma.c (added) +++ trunk/reactos/dll/directx/ddraw/gamma.c Tue May 2 12:15:50 2006 @@ -1,0 +1,90 @@ +/* $Id: gamma_main.c 21434 2006-04-01 19:12:56Z greatlrd $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * FILE: lib/ddraw/main/gamma.c + * PURPOSE: IDirectDrawGamma Implementation + * PROGRAMMER: Maarten Bosma + * + */ + +#include "rosdraw.h" + +ULONG WINAPI +DirectDrawGammaControl_AddRef( LPDIRECTDRAWGAMMACONTROL iface) +{ + DX_WINDBG_trace(); + + IDirectDrawGammaImpl * This = (IDirectDrawGammaImpl*)iface; + + ULONG ref=0; + + if (iface!=NULL) + { + ref = InterlockedIncrement( (PLONG) &This->ref); + } + return ref; +} + +ULONG WINAPI +DirectDrawGammaControl_Release( LPDIRECTDRAWGAMMACONTROL iface) +{ + DX_WINDBG_trace(); + + IDirectDrawGammaImpl* This = (IDirectDrawGammaImpl*)iface; + ULONG ref=0; + + if (iface!=NULL) + { + ref = InterlockedDecrement( (PLONG) &This->ref); + + if (ref == 0) + { + /* Add here if we need releae some memory pointer before + * exists + */ + + if (This!=NULL) + { + HeapFree(GetProcessHeap(), 0, This); + } + } + } + return ref; +} + +HRESULT WINAPI +DirectDrawGammaControl_QueryInterface( LPDIRECTDRAWGAMMACONTROL iface, + REFIID riid, + LPVOID *ppObj) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +DirectDrawGammaControl_GetGammaRamp( LPDIRECTDRAWGAMMACONTROL iface, + DWORD dwFlags, + LPDDGAMMARAMP lpGammaRamp) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +DirectDrawGammaControl_SetGammaRamp( LPDIRECTDRAWGAMMACONTROL iface, + DWORD dwFlags, + LPDDGAMMARAMP lpGammaRamp) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +IDirectDrawGammaControlVtbl DirectDrawGammaControl_Vtable = +{ + DirectDrawGammaControl_QueryInterface, + DirectDrawGammaControl_AddRef, + DirectDrawGammaControl_Release, + DirectDrawGammaControl_GetGammaRamp, + DirectDrawGammaControl_SetGammaRamp +}; Added: trunk/reactos/dll/directx/ddraw/kernel.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/kernel.c?… ============================================================================== --- trunk/reactos/dll/directx/ddraw/kernel.c (added) +++ trunk/reactos/dll/directx/ddraw/kernel.c Tue May 2 12:15:50 2006 @@ -1,0 +1,168 @@ +/* $Id: kernel_main.c 21434 2006-04-01 19:12:56Z greatlrd $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * FILE: lib/ddraw/main/kernel.c + * PURPOSE: IDirectDrawKernel and IDirectDrawSurfaceKernel Implementation + * PROGRAMMER: Maarten Bosma + * + */ + +#include "rosdraw.h" + + +/***** IDirectDrawKernel ****/ + +ULONG WINAPI +DirectDrawKernel_AddRef ( LPDIRECTDRAWKERNEL iface) +{ + DX_WINDBG_trace(); + + IDirectDrawKernelImpl * This = (IDirectDrawKernelImpl*)iface; + + ULONG ref=0; + + if (iface!=NULL) + { + ref = InterlockedIncrement( (PLONG) &This->ref); + } + return ref; +} + +ULONG WINAPI +DirectDrawKernel_Release ( LPDIRECTDRAWKERNEL iface) +{ + DX_WINDBG_trace(); + + IDirectDrawKernelImpl* This = (IDirectDrawKernelImpl*)iface; + ULONG ref=0; + + if (iface!=NULL) + { + ref = InterlockedDecrement( (PLONG) &This->ref); + + if (ref == 0) + { + /* Add here if we need releae some memory pointer before + * exists + */ + + if (This!=NULL) + { + HeapFree(GetProcessHeap(), 0, This); + } + } + } + return ref; +} + +HRESULT WINAPI +DirectDrawKernel_QueryInterface ( LPDIRECTDRAWKERNEL iface, + REFIID riid, + LPVOID* ppvObj) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +DirectDrawKernel_GetKernelHandle ( LPDIRECTDRAWKERNEL iface, + ULONG* handle) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +DirectDrawKernel_ReleaseKernelHandle ( LPDIRECTDRAWKERNEL iface) +{ + DX_WINDBG_trace(); + DX_STUB; +} + + +ULONG WINAPI +DDSurfaceKernel_AddRef ( LPDIRECTDRAWSURFACEKERNEL iface) +{ + DX_WINDBG_trace(); + + IDirectDrawSurfaceKernelImpl * This = (IDirectDrawSurfaceKernelImpl*)iface; + + ULONG ref=0; + + if (iface!=NULL) + { + ref = InterlockedIncrement( (PLONG) &This->ref); + } + return ref; +} + +ULONG WINAPI +DDSurfaceKernel_Release ( LPDIRECTDRAWSURFACEKERNEL iface) +{ + DX_WINDBG_trace(); + + IDirectDrawSurfaceKernelImpl* This = (IDirectDrawSurfaceKernelImpl*)iface; + ULONG ref=0; + + if (iface!=NULL) + { + ref = InterlockedDecrement( (PLONG) &This->ref); + + if (ref == 0) + { + /* Add here if we need releae some memory pointer before + * exists + */ + + if (This!=NULL) + { + HeapFree(GetProcessHeap(), 0, This); + } + } + } + return ref; +} + +HRESULT WINAPI +DDSurfaceKernel_QueryInterface ( LPDIRECTDRAWSURFACEKERNEL iface, + REFIID riid, + LPVOID* ppvObj) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +DDSurfaceKernel_GetKernelHandle ( LPDIRECTDRAWSURFACEKERNEL iface, + ULONG* handle) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +DDSurfaceKernel_ReleaseKernelHandle ( LPDIRECTDRAWSURFACEKERNEL iface) +{ + DX_WINDBG_trace(); + DX_STUB; +} + + +IDirectDrawKernelVtbl DirectDrawKernel_Vtable = +{ + DirectDrawKernel_QueryInterface, + DirectDrawKernel_AddRef, + DirectDrawKernel_Release, + DirectDrawKernel_GetKernelHandle, + DirectDrawKernel_ReleaseKernelHandle +}; + +IDirectDrawSurfaceKernelVtbl DirectDrawSurfaceKernel_Vtable = +{ + DDSurfaceKernel_QueryInterface, + DDSurfaceKernel_AddRef, + DDSurfaceKernel_Release, + DDSurfaceKernel_GetKernelHandle, + DDSurfaceKernel_ReleaseKernelHandle +}; Added: trunk/reactos/dll/directx/ddraw/palette.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/palette.c… ============================================================================== --- trunk/reactos/dll/directx/ddraw/palette.c (added) +++ trunk/reactos/dll/directx/ddraw/palette.c Tue May 2 12:15:50 2006 @@ -1,0 +1,112 @@ +/* $Id: palette_main.c 21434 2006-04-01 19:12:56Z greatlrd $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * FILE: lib/ddraw/main/palette.c + * PURPOSE: IDirectDrawPalette Implementation + * PROGRAMMER: Maarten Bosma + * + */ + +#include "rosdraw.h" + +ULONG WINAPI +DirectDrawPalette_Release( LPDIRECTDRAWPALETTE iface) +{ + DX_WINDBG_trace(); + + IDirectDrawPaletteImpl* This = (IDirectDrawPaletteImpl*)iface; + ULONG ref=0; + + if (iface!=NULL) + { + ref = InterlockedDecrement( (PLONG) &This->ref); + + if (ref == 0) + { + /* Add here if we need releae some memory pointer before + * exists + */ + + if (This!=NULL) + { + HeapFree(GetProcessHeap(), 0, This); + } + } + } + return ref; +} + +ULONG WINAPI +DirectDrawPalette_AddRef( LPDIRECTDRAWPALETTE iface) +{ + DX_WINDBG_trace(); + + IDirectDrawPaletteImpl * This = (IDirectDrawPaletteImpl*)iface; + + ULONG ref=0; + + if (iface!=NULL) + { + ref = InterlockedIncrement( (PLONG) &This->ref); + } + return ref; +} + +HRESULT WINAPI +DirectDrawPalette_Initialize( LPDIRECTDRAWPALETTE iface, + LPDIRECTDRAW ddraw, + DWORD dwFlags, + LPPALETTEENTRY palent) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +DirectDrawPalette_GetEntries( LPDIRECTDRAWPALETTE iface, + DWORD dwFlags, + DWORD dwStart, DWORD dwCount, + LPPALETTEENTRY palent) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +DirectDrawPalette_SetEntries( LPDIRECTDRAWPALETTE iface, + DWORD dwFlags, + DWORD dwStart, + DWORD dwCount, + LPPALETTEENTRY palent) +{ + DX_WINDBG_trace(); + DX_STUB; +} +HRESULT WINAPI +DirectDrawPalette_GetCaps( LPDIRECTDRAWPALETTE iface, + LPDWORD lpdwCaps) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +DirectDrawPalette_QueryInterface( LPDIRECTDRAWPALETTE iface, + REFIID refiid, + LPVOID *obj) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +IDirectDrawPaletteVtbl DirectDrawPalette_Vtable = +{ + DirectDrawPalette_QueryInterface, + DirectDrawPalette_AddRef, + DirectDrawPalette_Release, + DirectDrawPalette_GetCaps, + DirectDrawPalette_GetEntries, + DirectDrawPalette_Initialize, + DirectDrawPalette_SetEntries +}; Added: trunk/reactos/dll/directx/ddraw/videoport.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/videoport… ============================================================================== --- trunk/reactos/dll/directx/ddraw/videoport.c (added) +++ trunk/reactos/dll/directx/ddraw/videoport.c Tue May 2 12:15:50 2006 @@ -1,0 +1,260 @@ +/* $Id: videoport_main.c 21434 2006-04-01 19:12:56Z greatlrd $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * FILE: lib/ddraw/main/videoport.c + * PURPOSE: IDirectDrawVideoPort, DDVideoPortContainer and IDirectDrawVideoPortNotify Implementation + * PROGRAMMER: Maarten Bosma + * + */ + +#include "rosdraw.h" + + +/************* IDirectDrawVideoPort *************/ + +HRESULT WINAPI +Main_DirectDrawVideoPort_QueryInterface (LPDIRECTDRAWVIDEOPORT iface, REFIID riid, LPVOID* ppvObj) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +ULONG WINAPI +Main_DirectDrawVideoPort_AddRef (LPDIRECTDRAWVIDEOPORT iface) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +ULONG WINAPI +Main_DirectDrawVideoPort_Release (LPDIRECTDRAWVIDEOPORT iface) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +Main_DirectDrawVideoPort_Flip (LPDIRECTDRAWVIDEOPORT iface, LPDIRECTDRAWSURFACE lpDDSurface, DWORD dwFlags) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +Main_DirectDrawVideoPort_GetBandwidthInfo (LPDIRECTDRAWVIDEOPORT iface, LPDDPIXELFORMAT lpddpfFormat, DWORD dwWidth, + DWORD dwHeight, DWORD dwFlags, LPDDVIDEOPORTBANDWIDTH lpBandwidth) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +Main_DirectDrawVideoPort_GetColorControls (LPDIRECTDRAWVIDEOPORT iface, LPDDCOLORCONTROL lpColorControl) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawVideoPort_GetInputFormats (LPDIRECTDRAWVIDEOPORT iface, LPDWORD lpNumFormats, + LPDDPIXELFORMAT lpFormats, DWORD dwFlags) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawVideoPort_GetOutputFormats (LPDIRECTDRAWVIDEOPORT iface, LPDDPIXELFORMAT lpInputFormat, + LPDWORD lpNumFormats, LPDDPIXELFORMAT lpFormats, DWORD dwFlags) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawVideoPort_GetFieldPolarity (LPDIRECTDRAWVIDEOPORT iface, LPBOOL lpbFieldPolarity) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawVideoPort_GetVideoLine (LPDIRECTDRAWVIDEOPORT This, LPDWORD lpdwLine) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawVideoPort_GetVideoSignalStatus (LPDIRECTDRAWVIDEOPORT iface, LPDWORD lpdwStatus) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawVideoPort_SetColorControls (LPDIRECTDRAWVIDEOPORT iface, LPDDCOLORCONTROL lpColorControl) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawVideoPort_SetTargetSurface (LPDIRECTDRAWVIDEOPORT iface, LPDIRECTDRAWSURFACE lpDDSurface, + DWORD dwFlags) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawVideoPort_StartVideo (LPDIRECTDRAWVIDEOPORT iface, LPDDVIDEOPORTINFO dwFlags) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawVideoPort_StopVideo (LPDIRECTDRAWVIDEOPORT iface) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawVideoPort_UpdateVideo (LPDIRECTDRAWVIDEOPORT iface, LPDDVIDEOPORTINFO dwFlags) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawVideoPort_WaitForSync (LPDIRECTDRAWVIDEOPORT iface, DWORD dwFlags, DWORD dwLine, + DWORD dwTimeout) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +/************* IDDVideoPortContainer *************/ + +HRESULT WINAPI Main_DDVideoPortContainer_QueryInterface (LPDDVIDEOPORTCONTAINER iface, REFIID riid, LPVOID* ppvObj) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +ULONG WINAPI Main_DDVideoPortContainer_AddRef (LPDDVIDEOPORTCONTAINER iface) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +ULONG WINAPI Main_DDVideoPortContainer_Release (LPDDVIDEOPORTCONTAINER iface) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI Main_DDVideoPortContainer_CreateVideoPort (LPDDVIDEOPORTCONTAINER iface, DWORD dwFlags, LPDDVIDEOPORTDESC pPortDesc, + LPDIRECTDRAWVIDEOPORT* DDVideoPort, IUnknown* pUnkOuter) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +Main_DDVideoPortContainer_EnumVideoPorts (LPDDVIDEOPORTCONTAINER iface, + DWORD dwFlags, + LPDDVIDEOPORTCAPS pCaps, + LPVOID pContext, + LPDDENUMVIDEOCALLBACK pEnumVideoCallback) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +Main_DDVideoPortContainer_GetVideoPortConnectInfo (LPDDVIDEOPORTCONTAINER iface, + DWORD PortId, DWORD* pNumEntries, + LPDDVIDEOPORTCONNECT pConnectInfo) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +Main_DDVideoPortContainer_QueryVideoPortStatus (LPDDVIDEOPORTCONTAINER iface, + DWORD PortId, + LPDDVIDEOPORTSTATUS pStatus) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +/************* IDirectDrawVideoPortNotify *************/ + +HRESULT WINAPI +Main_DDVideoPortNotify_QueryInterface (LPDIRECTDRAWVIDEOPORTNOTIFY iface, REFIID + riid, LPVOID* ppvObj) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +ULONG WINAPI +Main_DDVideoPortNotify_AddRef (LPDIRECTDRAWVIDEOPORTNOTIFY iface) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +ULONG WINAPI +Main_DDVideoPortNotify_Release (LPDIRECTDRAWVIDEOPORTNOTIFY iface) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI Main_DDVideoPortNotify_AcquireNotification (LPDIRECTDRAWVIDEOPORTNOTIFY iface, HANDLE* h, LPDDVIDEOPORTNOTIFY pVideoPortNotify) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI Main_DDVideoPortNotify_ReleaseNotification (LPDIRECTDRAWVIDEOPORTNOTIFY iface, HANDLE h) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +IDirectDrawVideoPortVtbl DirectDrawVideoPort_Vtable = +{ + Main_DirectDrawVideoPort_QueryInterface, + Main_DirectDrawVideoPort_AddRef, + Main_DirectDrawVideoPort_Release, + Main_DirectDrawVideoPort_Flip, + Main_DirectDrawVideoPort_GetBandwidthInfo, + Main_DirectDrawVideoPort_GetColorControls, + Main_DirectDrawVideoPort_GetInputFormats, + Main_DirectDrawVideoPort_GetOutputFormats, + Main_DirectDrawVideoPort_GetFieldPolarity, + Main_DirectDrawVideoPort_GetVideoLine, + Main_DirectDrawVideoPort_GetVideoSignalStatus, + Main_DirectDrawVideoPort_SetColorControls, + Main_DirectDrawVideoPort_SetTargetSurface, + Main_DirectDrawVideoPort_StartVideo, + Main_DirectDrawVideoPort_StopVideo, + Main_DirectDrawVideoPort_UpdateVideo, + Main_DirectDrawVideoPort_WaitForSync +}; + +IDDVideoPortContainerVtbl DDVideoPortContainer_Vtable = +{ + Main_DDVideoPortContainer_QueryInterface, + Main_DDVideoPortContainer_AddRef, + Main_DDVideoPortContainer_Release, + Main_DDVideoPortContainer_CreateVideoPort, + Main_DDVideoPortContainer_EnumVideoPorts, + Main_DDVideoPortContainer_GetVideoPortConnectInfo, + Main_DDVideoPortContainer_QueryVideoPortStatus +}; + +IDirectDrawVideoPortNotifyVtbl DDVideoPortNotify_Vtable = +{ + Main_DDVideoPortNotify_QueryInterface, + Main_DDVideoPortNotify_AddRef, + Main_DDVideoPortNotify_Release, + Main_DDVideoPortNotify_AcquireNotification, + Main_DDVideoPortNotify_ReleaseNotification +};

1 0

[greatlrd] 21768: implement add and release ref
by greatlrd＠svn.reactos.org 02 May '06

02 May '06

Author: greatlrd Date: Tue May 2 12:09:47 2006 New Revision: 21768 URL: http://svn.reactos.ru/svn/reactos?rev=21768&view=rev Log: implement add and release ref Modified: trunk/reactos/dll/directx/ddraw/main/color_main.c Modified: trunk/reactos/dll/directx/ddraw/main/color_main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/directx/ddraw/main/colo… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/color_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/color_main.c Tue May 2 12:09:47 2006 @@ -11,41 +11,78 @@ #include "rosdraw.h" ULONG WINAPI -Main_DirectDrawColorControl_AddRef(LPDIRECTDRAWCOLORCONTROL iface) +DirectDrawColorControl_AddRef( LPDIRECTDRAWCOLORCONTROL iface) { - return 1; + DX_WINDBG_trace(); + + IDirectDrawColorImpl * This = (IDirectDrawColorImpl*)iface; + + ULONG ref=0; + + if (iface!=NULL) + { + ref = InterlockedIncrement( (PLONG) &This->ref); + } + return ref; } ULONG WINAPI -Main_DirectDrawColorControl_Release(LPDIRECTDRAWCOLORCONTROL iface) +DirectDrawColorControl_Release( LPDIRECTDRAWCOLORCONTROL iface) { - return 0; + DX_WINDBG_trace(); + + IDirectDrawColorImpl* This = (IDirectDrawColorImpl*)iface; + ULONG ref=0; + + if (iface!=NULL) + { + ref = InterlockedDecrement( (PLONG) &This->ref); + + if (ref == 0) + { + /* Add here if we need releae some memory pointer before + * exists + */ + + if (This!=NULL) + { + HeapFree(GetProcessHeap(), 0, This); + } + } + } + return ref; } HRESULT WINAPI -Main_DirectDrawColorControl_QueryInterface(LPDIRECTDRAWCOLORCONTROL iface, - REFIID riid, LPVOID* ppvObj) +DirectDrawColorControl_QueryInterface( LPDIRECTDRAWCOLORCONTROL iface, + REFIID riid, + LPVOID* ppvObj) { - return E_NOINTERFACE; + DX_WINDBG_trace(); + DX_STUB; } HRESULT WINAPI -Main_DirectDrawColorControl_GetColorControls(LPDIRECTDRAWCOLORCONTROL iface, LPDDCOLORCONTROL lpColorControl) +DirectDrawColorControl_GetColorControls( LPDIRECTDRAWCOLORCONTROL iface, + LPDDCOLORCONTROL lpColorControl) { - DX_STUB; + DX_WINDBG_trace(); + DX_STUB; } HRESULT WINAPI -Main_DirectDrawColorControl_SetColorControls(LPDIRECTDRAWCOLORCONTROL iface, LPDDCOLORCONTROL lpColorControl) +DirectDrawColorControl_SetColorControls( LPDIRECTDRAWCOLORCONTROL iface, + LPDDCOLORCONTROL lpColorControl) { - DX_STUB; + DX_WINDBG_trace(); + DX_STUB; } IDirectDrawColorControlVtbl DirectDrawColorControl_Vtable = { - Main_DirectDrawColorControl_QueryInterface, - Main_DirectDrawColorControl_AddRef, - Main_DirectDrawColorControl_Release, - Main_DirectDrawColorControl_GetColorControls, - Main_DirectDrawColorControl_SetColorControls + DirectDrawColorControl_QueryInterface, + DirectDrawColorControl_AddRef, + DirectDrawColorControl_Release, + DirectDrawColorControl_GetColorControls, + DirectDrawColorControl_SetColorControls };

1 0

[gvg] 21767: Default multisession to true
by gvg＠svn.reactos.org 02 May '06

02 May '06

Author: gvg Date: Tue May 2 11:27:17 2006 New Revision: 21767 URL: http://svn.reactos.ru/svn/reactos?rev=21767&view=rev Log: Default multisession to true Modified: trunk/web/reactos.org/htdocs/roscms/inc/user_register.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/user_register.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/u… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/user_register.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/user_register.php Tue May 2 11:27:17 2006 @@ -470,7 +470,7 @@ //echo "PWD::".$reg_randompwd; $reg_account_post="INSERT INTO `users` ( `user_id` , `user_name` , `user_roscms_password` , `user_timestamp_touch` , `user_timestamp_touch2` , `user_login_counter` , `user_account_enabled` , `user_account_hidden` , `user_register` , `user_fullname` , `user_email` , `user_website` , `user_language` , `user_country` , `user_timezone` , `user_occupation` , `user_description` , `user_setting_multisession` , `user_setting_browseragent` , `user_setting_ipaddress` , `user_setting_timeout` ) - VALUES ('', '". mysql_escape_string($reg_txtusername) ."', MD5( '". mysql_escape_string($reg_randompwd) ."' ) , '', NOW( ) , '0', 'yes', 'no', NOW( ) , '', '". mysql_escape_string($reg_txtemail) ."', '', 'en', '', '', '', '', 'false', 'true', 'true', 'true');"; + VALUES ('', '". mysql_escape_string($reg_txtusername) ."', MD5( '". mysql_escape_string($reg_randompwd) ."' ) , '', NOW( ) , '0', 'yes', 'no', NOW( ) , '', '". mysql_escape_string($reg_txtemail) ."', '', 'en', '', '', '', '', 'true', 'false', 'false', 'true');"; $reg_account_list=mysql_query($reg_account_post);

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 May 2006