Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[weiden] 16849: clear out the lower 2 bits of a pid before using it to calculate the hash as they may vary

by weiden＠svn.reactos.com

clear out the lower 2 bits of a pid before using it to calculate the hash as they may vary Modified: trunk/reactos/subsys/csrss/api/process.c _____ Modified: trunk/reactos/subsys/csrss/api/process.c --- trunk/reactos/subsys/csrss/api/process.c 2005-07-28 23:22:47 UTC (rev 16848) +++ trunk/reactos/subsys/csrss/api/process.c 2005-07-28 23:29:44 UTC (rev 16849) @@ -37,7 +37,7 @@ ULONG hash; PCSRSS_PROCESS_DATA pProcessData; - hash = (ULONG_PTR)ProcessId % (sizeof(ProcessData) / sizeof(*ProcessData)); + hash = ((ULONG_PTR)ProcessId & ~0x3) % (sizeof(ProcessData) / sizeof(*ProcessData)); LOCK; @@ -59,7 +59,7 @@ CLIENT_ID ClientId; NTSTATUS Status; - hash = (ULONG_PTR)ProcessId % (sizeof(ProcessData) / sizeof(*ProcessData)); + hash = ((ULONG_PTR)ProcessId & ~0x3) % (sizeof(ProcessData) / sizeof(*ProcessData)); LOCK; @@ -121,7 +121,7 @@ UINT c; PCSRSS_PROCESS_DATA pProcessData, pPrevProcessData = NULL; - hash = (ULONG_PTR)Pid % (sizeof(ProcessData) / sizeof(*ProcessData)); + hash = ((ULONG_PTR)Pid & ~0x3) % (sizeof(ProcessData) / sizeof(*ProcessData)); LOCK;

19 years, 6 months

[weiden] 16848: don't generate meaningless lvalue typecast

by weiden＠svn.reactos.com

don't generate meaningless lvalue typecast Modified: trunk/reactos/tools/widl/server.c _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2005-07-28 23:19:22 UTC (rev 16847) +++ trunk/reactos/tools/widl/server.c 2005-07-28 23:22:47 UTC (rev 16848) @@ -892,9 +892,9 @@ } else if (var->ptr_level == 1) { - print_server("("); + fprintf(server, "%s = (", var->name); write_type(server, var->type, NULL, var->tname); - fprintf(server, " __RPC_FAR *)%s = 0;\n", var->name); + print_server(" __RPC_FAR *)0;\n"); } else if (var->ptr_level > 1) {

19 years, 6 months

[weiden] 16847: discard explicitly returned value

by weiden＠svn.reactos.com

discard explicitly returned value Modified: trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp Modified: trunk/reactos/subsys/system/explorer/explorer.cpp Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/favorites.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/traynotify.cpp Modified: trunk/reactos/subsys/system/ibrowser/favorites.cpp Modified: trunk/reactos/subsys/system/ibrowser/ibrowser.cpp Modified: trunk/reactos/subsys/system/ibrowser/mainframe.cpp _____ Modified: trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp --- trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp 2005-07-28 22:43:24 UTC (rev 16846) +++ trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp 2005-07-28 23:19:22 UTC (rev 16847) @@ -103,7 +103,7 @@ _haccel = LoadAccelerators(g_Globals._hInstance, MAKEINTRESOURCE(IDA_SEARCH_PROGRAM)); - ListView_SetImageList(_list_ctrl, g_Globals._icon_cache.get_sys_imagelist(), LVSIL_SMALL); + (void)ListView_SetImageList(_list_ctrl, g_Globals._icon_cache.get_sys_imagelist(), LVSIL_SMALL); LV_COLUMN column = {LVCF_FMT|LVCF_WIDTH|LVCF_TEXT, LVCFMT_LEFT, 250}; @@ -263,7 +263,7 @@ { switch(nmsg) { case WM_CLOSE: - ListView_SetImageList(_list_ctrl, 0, LVSIL_SMALL); // detach system image list + (void)ListView_SetImageList(_list_ctrl, 0, LVSIL_SMALL); // detach system image list goto def; case PM_TRANSLATE_MSG: { _____ Modified: trunk/reactos/subsys/system/explorer/explorer.cpp --- trunk/reactos/subsys/system/explorer/explorer.cpp 2005-07-28 22:43:24 UTC (rev 16846) +++ trunk/reactos/subsys/system/explorer/explorer.cpp 2005-07-28 23:19:22 UTC (rev 16847) @@ -519,10 +519,10 @@ void SetWindowIcon(HWND hwnd, UINT nid) { HICON hIcon = ResIcon(nid); - Window_SetIcon(hwnd, ICON_BIG, hIcon); + (void)Window_SetIcon(hwnd, ICON_BIG, hIcon); HICON hIconSmall = SmallIcon(nid); - Window_SetIcon(hwnd, ICON_SMALL, hIconSmall); + (void)Window_SetIcon(hwnd, ICON_SMALL, hIconSmall); } _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp --- trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-07-28 22:43:24 UTC (rev 16846) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-07-28 23:19:22 UTC (rev 16847) @@ -215,7 +215,7 @@ WS_CHILD|WS_TABSTOP|WS_BORDER|/*WS_VISIBLE|*/WS_CHILD|TVS_HASLINES|TVS_H ASBUTTONS|TVS_SHOWSELALWAYS|TVS_INFOTIP, -1, -1, 200, 0, _hwnd, (HMENU)IDW_SIDEBAR, g_Globals._hInstance, 0); - TreeView_SetImageList(_hsidebar, _himl, TVSIL_NORMAL); + (void)TreeView_SetImageList(_hsidebar, _himl, TVSIL_NORMAL); CheckMenuItem(_menu_info._hMenuView, ID_VIEW_SIDE_BAR, MF_BYCOMMAND|MF_UNCHECKED/*MF_CHECKED*/); _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp --- trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2005-07-28 22:43:24 UTC (rev 16846) +++ trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2005-07-28 23:19:22 UTC (rev 16847) @@ -50,7 +50,7 @@ ShellBrowser::~ShellBrowser() { - TreeView_SetImageList(_left_hwnd, 0, TVSIL_NORMAL); + (void)TreeView_SetImageList(_left_hwnd, 0, TVSIL_NORMAL); if (_pShellView) _pShellView->Release(); @@ -137,7 +137,7 @@ { CONTEXT("ShellBrowserChild::InitializeTree()"); - TreeView_SetImageList(_left_hwnd, himl, TVSIL_NORMAL); + (void)TreeView_SetImageList(_left_hwnd, himl, TVSIL_NORMAL); TreeView_SetScrollTime(_left_hwnd, 100); TV_INSERTSTRUCT tvInsert; @@ -199,7 +199,7 @@ ScreenToClient(_left_hwnd, &tvhti.pt); tvhti.flags = LVHT_NOWHERE; - TreeView_HitTest(_left_hwnd, &tvhti); + (void)TreeView_HitTest(_left_hwnd, &tvhti); if (TVHT_ONITEM & tvhti.flags) { LPARAM itemData = TreeView_GetItemData(_left_hwnd, tvhti.hItem); @@ -318,7 +318,7 @@ tvInsert.hInsertAfter = TVI_LAST; tvInsert.hParent = hParentItem; - TreeView_InsertItem(_left_hwnd, &tvInsert); + (void)TreeView_InsertItem(_left_hwnd, &tvInsert); } ++cnt; _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/favorites.cpp --- trunk/reactos/subsys/system/explorer/taskbar/favorites.cpp 2005-07-28 22:43:24 UTC (rev 16846) +++ trunk/reactos/subsys/system/explorer/taskbar/favorites.cpp 2005-07-28 23:19:22 UTC (rev 16847) @@ -362,7 +362,7 @@ tv.iImage = tv.iSelectedImage = icon.add_to_imagelist(himagelist, hdc_wnd); } - TreeView_InsertItem(hwnd, &tvi); + (void)TreeView_InsertItem(hwnd, &tvi); } } } _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/traynotify.cpp --- trunk/reactos/subsys/system/explorer/taskbar/traynotify.cpp 2005-07-28 22:43:24 UTC (rev 16846) +++ trunk/reactos/subsys/system/explorer/taskbar/traynotify.cpp 2005-07-28 23:19:22 UTC (rev 16847) @@ -918,7 +918,7 @@ ImageList_AddAlphaIcon(_himl, SmallIcon(IDI_DOT_RED), hbkgnd, canvas); } - TreeView_SetImageList(_tree_ctrl, _himl, TVSIL_NORMAL); + (void)TreeView_SetImageList(_tree_ctrl, _himl, TVSIL_NORMAL); _resize_mgr.Add(IDC_NOTIFY_ICONS, RESIZE); _resize_mgr.Add(IDC_LABEL1, MOVE_Y); @@ -1077,7 +1077,7 @@ tv.lParam = (LPARAM)idx; tv.pszText = (LPTSTR)txt.c_str(); tv.iSelectedImage = tv.iImage = ImageList_AddAlphaIcon(_himl, hicon, GetStockBrush(WHITE_BRUSH), hdc); - TreeView_InsertItem(_tree_ctrl, &tvi); + (void)TreeView_InsertItem(_tree_ctrl, &tvi); } LRESULT TrayNotifyDlg::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam) _____ Modified: trunk/reactos/subsys/system/ibrowser/favorites.cpp --- trunk/reactos/subsys/system/ibrowser/favorites.cpp 2005-07-28 22:43:24 UTC (rev 16846) +++ trunk/reactos/subsys/system/ibrowser/favorites.cpp 2005-07-28 23:19:22 UTC (rev 16847) @@ -360,7 +360,7 @@ tv.iImage = tv.iSelectedImage = icon.add_to_imagelist(himagelist, hdc_wnd); } - TreeView_InsertItem(hwnd, &tvi); + (void)TreeView_InsertItem(hwnd, &tvi); } } } _____ Modified: trunk/reactos/subsys/system/ibrowser/ibrowser.cpp --- trunk/reactos/subsys/system/ibrowser/ibrowser.cpp 2005-07-28 22:43:24 UTC (rev 16846) +++ trunk/reactos/subsys/system/ibrowser/ibrowser.cpp 2005-07-28 23:19:22 UTC (rev 16847) @@ -344,10 +344,10 @@ void SetWindowIcon(HWND hwnd, UINT nid) { HICON hIcon = ResIcon(nid); - Window_SetIcon(hwnd, ICON_BIG, hIcon); + (void)Window_SetIcon(hwnd, ICON_BIG, hIcon); HICON hIconSmall = SmallIcon(nid); - Window_SetIcon(hwnd, ICON_SMALL, hIconSmall); + (void)Window_SetIcon(hwnd, ICON_SMALL, hIconSmall); } _____ Modified: trunk/reactos/subsys/system/ibrowser/mainframe.cpp --- trunk/reactos/subsys/system/ibrowser/mainframe.cpp 2005-07-28 22:43:24 UTC (rev 16846) +++ trunk/reactos/subsys/system/ibrowser/mainframe.cpp 2005-07-28 23:19:22 UTC (rev 16847) @@ -119,7 +119,7 @@ WS_CHILD|WS_TABSTOP|WS_BORDER|/*WS_VISIBLE|*/WS_CHILD|TVS_HASLINES|TVS_H ASBUTTONS|TVS_SHOWSELALWAYS|TVS_INFOTIP, -1, -1, 200, 0, _hwnd, (HMENU)IDW_SIDEBAR, g_hInstance, 0); - TreeView_SetImageList(_hsidebar, _himl, TVSIL_NORMAL); + (void)TreeView_SetImageList(_hsidebar, _himl, TVSIL_NORMAL); CheckMenuItem(_menu_info._hMenuView, ID_VIEW_SIDE_BAR, MF_BYCOMMAND|MF_UNCHECKED/*MF_CHECKED*/);

19 years, 6 months

[ion] 16846: - Fix/update w32api PE headers

by ion＠svn.reactos.com

- Fix/update w32api PE headers - Implement proper PEB creation, set all necessary fields and read data from PE Header and Config Directory. Fixes "corruption" issue with console apps. Modified: trunk/reactos/lib/kernel32/process/create.c Modified: trunk/reactos/ntoskrnl/mm/process.c Modified: trunk/reactos/w32api/include/winnt.h _____ Modified: trunk/reactos/lib/kernel32/process/create.c --- trunk/reactos/lib/kernel32/process/create.c 2005-07-28 22:34:11 UTC (rev 16845) +++ trunk/reactos/lib/kernel32/process/create.c 2005-07-28 22:43:24 UTC (rev 16846) @@ -1380,7 +1380,7 @@ lpProcessInformation->hThread = hThread; DPRINT("hThread[%lx]: %lx inside hProcess[%lx]: %lx\n", hThread, ClientId.UniqueThread, ClientId.UniqueProcess, hProcess); - hProcess = hThread = NULL; + hProcess = hThread = NULL; /* De-allocate heap strings */ if (NameBuffer) RtlFreeHeap(GetProcessHeap(), 0, NameBuffer); _____ Modified: trunk/reactos/ntoskrnl/mm/process.c --- trunk/reactos/ntoskrnl/mm/process.c 2005-07-28 22:34:11 UTC (rev 16845) +++ trunk/reactos/ntoskrnl/mm/process.c 2005-07-28 22:43:24 UTC (rev 16846) @@ -16,6 +16,7 @@ extern ULONG NtMajorVersion; extern ULONG NtMinorVersion; extern ULONG NtOSCSDVersion; +extern ULONG NtGlobalFlag; /* FUNCTIONS *****************************************************************/ @@ -220,7 +221,10 @@ LARGE_INTEGER SectionOffset; ULONG ViewSize = 0; PVOID TableBase = NULL; + PIMAGE_NT_HEADERS NtHeaders; + PIMAGE_LOAD_CONFIG_DIRECTORY ImageConfigData; NTSTATUS Status; + KAFFINITY ProcessAffinityMask = 0; SectionOffset.QuadPart = (ULONGLONG)0; DPRINT("MmCreatePeb\n"); @@ -257,18 +261,88 @@ /* Set up data */ DPRINT("Setting up PEB\n"); Peb->ImageBaseAddress = Process->SectionBaseAddress; + Peb->InheritedAddressSpace = 0; + Peb->Mutant = NULL; + + /* NLS */ + Peb->AnsiCodePageData = (char*)TableBase + NlsAnsiTableOffset; + Peb->OemCodePageData = (char*)TableBase + NlsOemTableOffset; + Peb->UnicodeCaseTableData = (char*)TableBase + NlsUnicodeTableOffset; + + /* Default Version Data (could get changed below) */ Peb->OSMajorVersion = NtMajorVersion; Peb->OSMinorVersion = NtMinorVersion; Peb->OSBuildNumber = 2195; - Peb->OSPlatformId = 2; //VER_PLATFORM_WIN32_NT; + Peb->OSPlatformId = 2; /* VER_PLATFORM_WIN32_NT */ Peb->OSCSDVersion = NtOSCSDVersion; - Peb->AnsiCodePageData = (char*)TableBase + NlsAnsiTableOffset; - Peb->OemCodePageData = (char*)TableBase + NlsOemTableOffset; - Peb->UnicodeCaseTableData = (char*)TableBase + NlsUnicodeTableOffset; + + /* Heap and Debug Data */ Peb->NumberOfProcessors = KeNumberProcessors; Peb->BeingDebugged = (BOOLEAN)(Process->DebugPort != NULL ? TRUE : FALSE); + Peb->NtGlobalFlag = NtGlobalFlag; + /*Peb->HeapSegmentReserve = MmHeapSegmentReserve; + Peb->HeapSegmentCommit = MmHeapSegmentCommit; + Peb->HeapDeCommitTotalFreeThreshold = MmHeapDeCommitTotalFreeThreshold; + Peb->HeapDeCommitFreeBlockThreshold = MmHeapDeCommitFreeBlockThreshold;*/ + Peb->NumberOfHeaps = 0; + Peb->MaximumNumberOfHeaps = (PAGE_SIZE - sizeof(PEB)) / sizeof(PVOID); + Peb->ProcessHeaps = (PVOID*)Peb + 1; + /* Image Data */ + if ((NtHeaders = RtlImageNtHeader(Peb->ImageBaseAddress))) + { + /* Get the Image Config Data too */ + ImageConfigData = RtlImageDirectoryEntryToData(Peb->ImageBaseAddress, + TRUE, + IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, + &ViewSize); + + /* Write subsystem data */ + Peb->ImageSubSystem = NtHeaders->OptionalHeader.Subsystem; + Peb->ImageSubSystemMajorVersion = NtHeaders->OptionalHeader.MajorSubsystemVersion; + Peb->ImageSubSystemMinorVersion = NtHeaders->OptionalHeader.MinorSubsystemVersion; + + /* Write Version Data */ + if (NtHeaders->OptionalHeader.Win32VersionValue) + { + Peb->OSMajorVersion = NtHeaders->OptionalHeader.Win32VersionValue & 0xFF; + Peb->OSMinorVersion = (NtHeaders->OptionalHeader.Win32VersionValue >> 8) & 0xFF; + Peb->OSBuildNumber = (NtHeaders->OptionalHeader.Win32VersionValue >> 16) & 0x3FFF; + + /* Lie about the version if requested */ + if (ImageConfigData && ImageConfigData->CSDVersion) + { + Peb->OSCSDVersion = ImageConfigData->CSDVersion; + } + + /* Set the Platform ID */ + Peb->OSPlatformId = (NtHeaders->OptionalHeader.Win32VersionValue >> 30) ^ 2; + } + + /* Check for affinity override */ + if (ImageConfigData && ImageConfigData->ProcessAffinityMask) + { + ProcessAffinityMask = ImageConfigData->ProcessAffinityMask; + } + + /* Check if the image is not safe for SMP */ + if (NtHeaders->FileHeader.Characteristics & IMAGE_FILE_UP_SYSTEM_ONLY) + { + /* FIXME: Choose one randomly */ + Peb->ImageProcessAffinityMask = 1; + } + else + { + /* Use affinity from Image Header */ + Peb->ImageProcessAffinityMask = ProcessAffinityMask; + } + } + + /* Misc data */ + Peb->SessionId = Process->Session; Process->Peb = Peb; + + /* Detach from the Process */ KeDetachProcess(); DPRINT("MmCreatePeb: Peb created at %p\n", Peb); _____ Modified: trunk/reactos/w32api/include/winnt.h --- trunk/reactos/w32api/include/winnt.h 2005-07-28 22:34:11 UTC (rev 16845) +++ trunk/reactos/w32api/include/winnt.h 2005-07-28 22:43:24 UTC (rev 16846) @@ -2554,7 +2554,7 @@ WORD MinorImageVersion; WORD MajorSubsystemVersion; WORD MinorSubsystemVersion; - DWORD Reserved1; + DWORD Win32VersionValue; DWORD SizeOfImage; DWORD SizeOfHeaders; DWORD CheckSum; @@ -2900,20 +2900,26 @@ DWORD Reserved; } IMAGE_RESOURCE_DATA_ENTRY,*PIMAGE_RESOURCE_DATA_ENTRY; typedef struct _IMAGE_LOAD_CONFIG_DIRECTORY { - DWORD Characteristics; - DWORD TimeDateStamp; - WORD MajorVersion; - WORD MinorVersion; - DWORD GlobalFlagsClear; - DWORD GlobalFlagsSet; - DWORD CriticalSectionDefaultTimeout; - DWORD DeCommitFreeBlockThreshold; - DWORD DeCommitTotalFreeThreshold; - PVOID LockPrefixTable; - DWORD MaximumAllocationSize; - DWORD VirtualMemoryThreshold; - DWORD ProcessHeapFlags; - DWORD Reserved[4]; + DWORD Size; + DWORD TimeDateStamp; + WORD MajorVersion; + WORD MinorVersion; + DWORD GlobalFlagsClear; + DWORD GlobalFlagsSet; + DWORD CriticalSectionDefaultTimeout; + DWORD DeCommitFreeBlockThreshold; + DWORD DeCommitTotalFreeThreshold; + DWORD LockPrefixTable; + DWORD MaximumAllocationSize; + DWORD VirtualMemoryThreshold; + DWORD ProcessHeapFlags; + DWORD ProcessAffinityMask; + WORD CSDVersion; + WORD Reserved1; + DWORD EditList; + DWORD SecurityCookie; + DWORD SEHandlerTable; + DWORD SEHandlerCount; } IMAGE_LOAD_CONFIG_DIRECTORY,*PIMAGE_LOAD_CONFIG_DIRECTORY; typedef struct _IMAGE_RUNTIME_FUNCTION_ENTRY { DWORD BeginAddress;

19 years, 6 months

[greatlrd] 16845: Implement GdiEntry13, GdiEntry15, GdiEntry16 (all are party tested)

by greatlrd＠svn.reactos.com

Implement GdiEntry13, GdiEntry15, GdiEntry16 (all are party tested) Modified: trunk/reactos/lib/gdi32/misc/gdientry.c Modified: trunk/reactos/lib/gdi32/misc/stubs.c _____ Modified: trunk/reactos/lib/gdi32/misc/gdientry.c --- trunk/reactos/lib/gdi32/misc/gdientry.c 2005-07-28 22:08:29 UTC (rev 16844) +++ trunk/reactos/lib/gdi32/misc/gdientry.c 2005-07-28 22:34:11 UTC (rev 16845) @@ -28,6 +28,7 @@ #include "precomp.h" static LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobalInternal; +static ULONG RemberDdQueryDisplaySettingsUniquenessID = 0; /* @@ -197,10 +198,61 @@ * * GDIEntry 12 */ -VOID STDCALL DdUnattachSurface( -LPDDRAWI_DDRAWSURFACE_LCL pSurface, -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceAttached -) +VOID +STDCALL +DdUnattachSurface(LPDDRAWI_DDRAWSURFACE_LCL pSurface, + LPDDRAWI_DDRAWSURFACE_LCL pSurfaceAttached) { NtGdiDdUnattachSurface((HANDLE) pSurface->hDDSurface, (HANDLE) pSurfaceAttached->hDDSurface); } + +/* + * @implemented + * + * GDIEntry 13 + */ +ULONG +STDCALL +DdQueryDisplaySettingsUniqueness() +{ + return RemberDdQueryDisplaySettingsUniquenessID; +} + + +/* + * @implemented + * + * GDIEntry 15 + */ +BOOL STDCALL DdSetGammaRamp( +LPDDRAWI_DIRECTDRAW_LCL pDDraw, +HDC hdc, +LPVOID lpGammaRamp +) +{ + if (!pDDraw->lpGbl->hDD) + { + if (!pDirectDrawGlobalInternal->hDD) + { + return FALSE; + } + return NtGdiDdSetGammaRamp((HANDLE)pDirectDrawGlobalInternal->hDD,hdc,lpGammaRa mp); + } + + return NtGdiDdSetGammaRamp((HANDLE)pDDraw->lpGbl->hDD,hdc,lpGammaRamp); +} + +/* + * @implemented + * + * GDIEntry 16 + */ +DWORD STDCALL DdSwapTextureHandles( +LPDDRAWI_DIRECTDRAW_LCL pDDraw, +LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl1, +LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl2 +) +{ + return TRUE; +} + _____ Modified: trunk/reactos/lib/gdi32/misc/stubs.c --- trunk/reactos/lib/gdi32/misc/stubs.c 2005-07-28 22:08:29 UTC (rev 16844) +++ trunk/reactos/lib/gdi32/misc/stubs.c 2005-07-28 22:34:11 UTC (rev 16845) @@ -3938,20 +3938,9 @@ } - /* * @unimplemented */ -ULONG STDCALL DdQueryDisplaySettingsUniqueness(VOID) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ HANDLE STDCALL DdGetDxHandle( LPDDRAWI_DIRECTDRAW_LCL pDDraw, LPDDRAWI_DDRAWSURFACE_LCL pSurface, @@ -3963,34 +3952,10 @@ return 0; } -/* - * @unimplemented - */ -BOOL STDCALL DdSetGammaRamp( -LPDDRAWI_DIRECTDRAW_LCL pDDraw, -HDC hdc, -LPVOID lpGammaRamp -) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} -/* - * @unimplemented - */ -DWORD STDCALL DdSwapTextureHandles( -LPDDRAWI_DIRECTDRAW_LCL pDDraw, -LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl1, -LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl2 -) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} + + /* * @unimplemented */

19 years, 6 months

[greatlrd] 16844: Implement GdiEntry12 (8 of 16 are done and party tested)

by greatlrd＠svn.reactos.com

Implement GdiEntry12 (8 of 16 are done and party tested) Modified: trunk/reactos/lib/gdi32/misc/gdientry.c Modified: trunk/reactos/lib/gdi32/misc/stubs.c _____ Modified: trunk/reactos/lib/gdi32/misc/gdientry.c --- trunk/reactos/lib/gdi32/misc/gdientry.c 2005-07-28 21:55:51 UTC (rev 16843) +++ trunk/reactos/lib/gdi32/misc/gdientry.c 2005-07-28 22:08:29 UTC (rev 16844) @@ -191,3 +191,16 @@ return NtGdiDdReenableDirectDrawObject((HANDLE)pDirectDrawGlobal->hDD, pbNewMode); } + +/* + * @implemented + * + * GDIEntry 12 + */ +VOID STDCALL DdUnattachSurface( +LPDDRAWI_DDRAWSURFACE_LCL pSurface, +LPDDRAWI_DDRAWSURFACE_LCL pSurfaceAttached +) +{ + NtGdiDdUnattachSurface((HANDLE) pSurface->hDDSurface, (HANDLE) pSurfaceAttached->hDDSurface); +} _____ Modified: trunk/reactos/lib/gdi32/misc/stubs.c --- trunk/reactos/lib/gdi32/misc/stubs.c 2005-07-28 21:55:51 UTC (rev 16843) +++ trunk/reactos/lib/gdi32/misc/stubs.c 2005-07-28 22:08:29 UTC (rev 16844) @@ -3937,18 +3937,8 @@ return 0; } -/* - * @unimplemented - */ -VOID STDCALL DdUnattachSurface( -LPDDRAWI_DDRAWSURFACE_LCL pSurface, -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceAttached -) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -} + /* * @unimplemented */

19 years, 6 months

[greatlrd] 16843: implement GdiEntry 8, Implement GdiEntry 10

by greatlrd＠svn.reactos.com

implement GdiEntry 8, Implement GdiEntry 10 Modified: trunk/reactos/lib/gdi32/misc/gdientry.c Modified: trunk/reactos/lib/gdi32/misc/stubs.c _____ Modified: trunk/reactos/lib/gdi32/misc/gdientry.c --- trunk/reactos/lib/gdi32/misc/gdientry.c 2005-07-28 21:34:00 UTC (rev 16842) +++ trunk/reactos/lib/gdi32/misc/gdientry.c 2005-07-28 21:55:51 UTC (rev 16843) @@ -64,7 +64,7 @@ { /* we have create a directdraw handler already */ - pDirectDrawGlobal->hDD = pDirectDrawGlobalInternal->hDD; + pDirectDrawGlobal->hDD = pDirectDrawGlobalInternal->hDD; return TRUE; } @@ -78,7 +78,8 @@ NtGdiDeleteDC(newHdc); } - pDirectDrawGlobal->hDD = pDirectDrawGlobalInternal->hDD; + /* pDirectDrawGlobal->hDD = pDirectDrawGlobalInternal->hDD; ? */ + pDirectDrawGlobal->hDD = 0; /* ? */ /* test see if we got a handler */ if (!pDirectDrawGlobalInternal->hDD) @@ -156,3 +157,37 @@ { return NtGdiDdGetDC(pColorTable, (HANDLE) pSurfaceLocal->hDDSurface); } + +/* + * @implemented + * + * GDIEntry 8 + */ +BOOL STDCALL DdReleaseDC( +LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal +) +{ + return NtGdiDdReleaseDC((HANDLE) pSurfaceLocal->hDDSurface); +} + +/* + * @implemented + * + * GDIEntry 10 + */ +BOOL +STDCALL +DdReenableDirectDrawObject(LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, + BOOL *pbNewMode) +{ + if (!pDirectDrawGlobal->hDD) + { + if (!pDirectDrawGlobalInternal->hDD) + { + return FALSE; + } + return NtGdiDdReenableDirectDrawObject((HANDLE)pDirectDrawGlobalInternal->hDD, pbNewMode); + } + + return NtGdiDdReenableDirectDrawObject((HANDLE)pDirectDrawGlobal->hDD, pbNewMode); +} _____ Modified: trunk/reactos/lib/gdi32/misc/stubs.c --- trunk/reactos/lib/gdi32/misc/stubs.c 2005-07-28 21:34:00 UTC (rev 16842) +++ trunk/reactos/lib/gdi32/misc/stubs.c 2005-07-28 21:55:51 UTC (rev 16843) @@ -3903,18 +3903,8 @@ -/* - * @unimplemented - */ -BOOL STDCALL DdReleaseDC( -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal -) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} + /* * @unimplemented */ @@ -3932,19 +3922,8 @@ return 0; } -/* - * @unimplemented - */ -BOOL STDCALL DdReenableDirectDrawObject( -LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, -BOOL *pbNewMode -) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} + /* * @unimplemented */

19 years, 6 months

[greatlrd] 16842: thx irc : unC0Rr did sport typo fault in GdiEntry3

by greatlrd＠svn.reactos.com

thx irc : unC0Rr did sport typo fault in GdiEntry3 Modified: trunk/reactos/lib/gdi32/misc/gdientry.c _____ Modified: trunk/reactos/lib/gdi32/misc/gdientry.c --- trunk/reactos/lib/gdi32/misc/gdientry.c 2005-07-28 21:08:55 UTC (rev 16841) +++ trunk/reactos/lib/gdi32/misc/gdientry.c 2005-07-28 21:34:00 UTC (rev 16842) @@ -107,7 +107,7 @@ { return FALSE; } - return NtGdiDdDeleteDirectDrawObject((HANDLE)pDirectDrawGlobal->hDD); + return NtGdiDdDeleteDirectDrawObject((HANDLE)pDirectDrawGlobalInternal->hDD); } return NtGdiDdDeleteDirectDrawObject((HANDLE)pDirectDrawGlobal->hDD);

19 years, 6 months

[greatlrd] 16841: implement GdiEntry7 (some part is untested)

by greatlrd＠svn.reactos.com

implement GdiEntry7 (some part is untested) Modified: trunk/reactos/lib/gdi32/misc/gdientry.c Modified: trunk/reactos/lib/gdi32/misc/stubs.c _____ Modified: trunk/reactos/lib/gdi32/misc/gdientry.c --- trunk/reactos/lib/gdi32/misc/gdientry.c 2005-07-28 21:00:24 UTC (rev 16840) +++ trunk/reactos/lib/gdi32/misc/gdientry.c 2005-07-28 21:08:55 UTC (rev 16841) @@ -144,3 +144,15 @@ return NtGdiDdResetVisrgn((HANDLE) pSurfaceLocal->hDDSurface, hWnd); } +/* + * @implemented + * + * GDIEntry 7 + */ +HDC STDCALL DdGetDC( +LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, +LPPALETTEENTRY pColorTable +) +{ + return NtGdiDdGetDC(pColorTable, (HANDLE) pSurfaceLocal->hDDSurface); +} _____ Modified: trunk/reactos/lib/gdi32/misc/stubs.c --- trunk/reactos/lib/gdi32/misc/stubs.c 2005-07-28 21:00:24 UTC (rev 16840) +++ trunk/reactos/lib/gdi32/misc/stubs.c 2005-07-28 21:08:55 UTC (rev 16841) @@ -3902,18 +3902,6 @@ -/* - * @unimplemented - */ -HDC STDCALL DdGetDC( -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, -LPPALETTEENTRY pColorTable -) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} /* * @unimplemented

19 years, 6 months

[greatlrd] 16840: implement GdiEntry6 (party untested)

by greatlrd＠svn.reactos.com

implement GdiEntry6 (party untested) Modified: trunk/reactos/lib/gdi32/misc/gdientry.c Modified: trunk/reactos/lib/gdi32/misc/stubs.c _____ Modified: trunk/reactos/lib/gdi32/misc/gdientry.c --- trunk/reactos/lib/gdi32/misc/gdientry.c 2005-07-28 20:35:53 UTC (rev 16839) +++ trunk/reactos/lib/gdi32/misc/gdientry.c 2005-07-28 21:00:24 UTC (rev 16840) @@ -131,4 +131,16 @@ return NtGdiDdDeleteSurfaceObject((HANDLE)pSurfaceLocal->hDDSurface); } +/* + * @implemented + * + * GDIEntry 6 + */ +BOOL +STDCALL +DdResetVisrgn(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, + HWND hWnd) +{ + return NtGdiDdResetVisrgn((HANDLE) pSurfaceLocal->hDDSurface, hWnd); +} _____ Modified: trunk/reactos/lib/gdi32/misc/stubs.c --- trunk/reactos/lib/gdi32/misc/stubs.c 2005-07-28 20:35:53 UTC (rev 16839) +++ trunk/reactos/lib/gdi32/misc/stubs.c 2005-07-28 21:00:24 UTC (rev 16840) @@ -3905,19 +3905,6 @@ /* * @unimplemented */ -BOOL STDCALL DdResetVisrgn( -LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, -HWND hWnd -) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ HDC STDCALL DdGetDC( LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, LPPALETTEENTRY pColorTable

19 years, 6 months

← Newer
1
...
6
7
8
9
10
11
12
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2005