Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 40513: - Use rundll32.exe and CreateProcessAsUserW to call ClientSideInstallW for installing new devices and supply all required information over a named pipe. The named pipe communication was monitored under Windows XP SP2, so that the protocol under ReactOS is compatible (except for one data field, see code) - Implement ClientSideInstallW in newdev.dll - Give umpnpmgr the SE_ASSIGNPRIMARYTOKEN privilege to use CreateProcessAsUserW - Open the token of the userinit process with TOKEN_AS
by cfinck＠svn.reactos.org 14 Apr '09

14 Apr '09

Author: cfinck Date: Wed Apr 15 02:31:36 2009 New Revision: 40513 URL: http://svn.reactos.org/svn/reactos?rev=40513&view=rev Log: - Use rundll32.exe and CreateProcessAsUserW to call ClientSideInstallW for installing new devices and supply all required information over a named pipe. The named pipe communication was monitored under Windows XP SP2, so that the protocol under ReactOS is compatible (except for one data field, see code) - Implement ClientSideInstallW in newdev.dll - Give umpnpmgr the SE_ASSIGNPRIMARYTOKEN privilege to use CreateProcessAsUserW - Open the token of the userinit process with TOKEN_ASSIGN_PRIMARY | TOKEN_DUPLICATE | TOKEN_QUERY, we don't get TOKEN_ALL_ACCESS and used to fail here without noticing it - Return CR_FAILURE in case of problems inside PNP_ReportLogOn This stuff by the way fixes the "Browse" button in a "New hardware device" dialog See issue #4363 for more details. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/base/services/umpnpmgr/umpnpmgr.rbuild trunk/reactos/dll/win32/newdev/newdev.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Wed Apr 15 02:31:36 2009 @@ -23,19 +23,23 @@ * PURPOSE: User-mode Plug and Play manager * PROGRAMMER: Eric Kohl * Hervé Poussineau (hpoussin(a)reactos.org) + * Colin Finck (colin(a)reactos.org) */ /* INCLUDES *****************************************************************/ //#define HAVE_SLIST_ENTRY_IMPLEMENTED #define WIN32_NO_STATUS #include <windows.h> +#include <stdio.h> #include <cmtypes.h> #include <cmfuncs.h> #include <rtlfuncs.h> +#include <setypes.h> #include <umpnpmgr/sysguid.h> #include <wdmguid.h> #include <cfgmgr32.h> #include <regstr.h> +#include <userenv.h> #include <rpc.h> #include <rpcdce.h> @@ -222,6 +226,7 @@ BOOL Admin, DWORD ProcessId) { + DWORD ReturnValue = CR_FAILURE; HANDLE hProcess; UNREFERENCED_PARAMETER(hBinding); @@ -233,28 +238,37 @@ SetEvent(hInstallEvent); /* Get the users token */ - hProcess = OpenProcess(PROCESS_ALL_ACCESS, - TRUE, - ProcessId); - if (hProcess != NULL) - { - if (hUserToken != NULL) - { - CloseHandle(hUserToken); - hUserToken = NULL; - } - - OpenProcessToken(hProcess, - TOKEN_ALL_ACCESS, - &hUserToken); - CloseHandle(hProcess); + hProcess = OpenProcess(PROCESS_ALL_ACCESS, TRUE, ProcessId); + + if(!hProcess) + { + DPRINT1("OpenProcess failed with error %u\n", GetLastError()); + goto cleanup; + } + + if (hUserToken) + { + CloseHandle(hUserToken); + hUserToken = NULL; + } + + if(!OpenProcessToken(hProcess, TOKEN_ASSIGN_PRIMARY | TOKEN_DUPLICATE | TOKEN_QUERY, &hUserToken)) + { + DPRINT1("OpenProcessToken failed with error %u\n", GetLastError()); + goto cleanup; } /* Trigger the installer thread */ /*if (hInstallEvent != NULL) SetEvent(hInstallEvent);*/ - return CR_SUCCESS; + ReturnValue = CR_SUCCESS; + +cleanup: + if(hProcess) + CloseHandle(hProcess); + + return ReturnValue; } @@ -1900,18 +1914,29 @@ } -typedef BOOL (WINAPI *PDEV_INSTALL_W)(HWND, HINSTANCE, LPCWSTR, INT); - static BOOL InstallDevice(PCWSTR DeviceInstance, BOOL ShowWizard) { PLUGPLAY_CONTROL_STATUS_DATA PlugPlayData; - HMODULE hNewDev = NULL; - PDEV_INSTALL_W DevInstallW; NTSTATUS Status; BOOL DeviceInstalled = FALSE; + DWORD BytesWritten; + DWORD Value; + HANDLE hPipe = INVALID_HANDLE_VALUE; + LPVOID Environment = NULL; + PROCESS_INFORMATION ProcessInfo; + STARTUPINFOW StartupInfo; + UUID RandomUuid; + + /* The following lengths are constant (see below), they cannot overflow */ + WCHAR CommandLine[116]; + WCHAR InstallEventName[73]; + WCHAR PipeName[74]; + WCHAR UuidString[39]; DPRINT("InstallDevice(%S, %d)\n", DeviceInstance, ShowWizard); + + ZeroMemory(&ProcessInfo, sizeof(ProcessInfo)); RtlInitUnicodeString(&PlugPlayData.DeviceInstance, DeviceInstance); @@ -1934,34 +1959,109 @@ return TRUE; } - /* Install device */ - SetEnvironmentVariableW(L"USERPROFILE", L"."); /* FIXME: why is it needed? */ - - hNewDev = LoadLibraryW(L"newdev.dll"); - if (!hNewDev) - { - DPRINT1("Unable to load newdev.dll\n"); + /* Create a random UUID for the named pipe */ + UuidCreate(&RandomUuid); + swprintf(UuidString, L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + RandomUuid.Data1, RandomUuid.Data2, RandomUuid.Data3, + RandomUuid.Data4[0], RandomUuid.Data4[1], RandomUuid.Data4[2], + RandomUuid.Data4[3], RandomUuid.Data4[4], RandomUuid.Data4[5], + RandomUuid.Data4[6], RandomUuid.Data4[7]); + + /* Create the named pipe */ + wcscpy(PipeName, L"\\\\.\\pipe\\PNP_Device_Install_Pipe_0."); + wcscat(PipeName, UuidString); + hPipe = CreateNamedPipeW(PipeName, PIPE_ACCESS_OUTBOUND, PIPE_TYPE_BYTE, 1, 512, 512, 0, NULL); + + if(hPipe == INVALID_HANDLE_VALUE) + { + DPRINT1("CreateNamedPipeW failed with error %u\n", GetLastError()); goto cleanup; } - DevInstallW = (PDEV_INSTALL_W)GetProcAddress(hNewDev, (LPCSTR)"DevInstallW"); - if (!DevInstallW) - { - DPRINT1("'DevInstallW' not found in newdev.dll\n"); + /* Launch rundll32 to call ClientSideInstallW */ + wcscpy(CommandLine, L"rundll32.exe newdev.dll,ClientSideInstall "); + wcscat(CommandLine, PipeName); + + ZeroMemory(&StartupInfo, sizeof(StartupInfo)); + StartupInfo.cb = sizeof(StartupInfo); + + if(hUserToken) + { + /* newdev has to run under the environment of the current user */ + if(!CreateEnvironmentBlock(&Environment, hUserToken, FALSE)) + { + DPRINT1("CreateEnvironmentBlock failed with error %d\n", GetLastError()); + goto cleanup; + } + + if(!CreateProcessAsUserW(hUserToken, NULL, CommandLine, NULL, NULL, FALSE, CREATE_UNICODE_ENVIRONMENT, Environment, NULL, &StartupInfo, &ProcessInfo)) + { + DPRINT1("CreateProcessAsUserW failed with error %u\n", GetLastError()); + goto cleanup; + } + } + else + { + /* FIXME: This is probably not correct, I guess newdev should never be run with SYSTEM privileges. + + Still, we currently do that in 2nd stage setup and probably Console mode as well, so allow it here. + (ShowWizard is only set to FALSE for these two modes) */ + ASSERT(!ShowWizard); + + if(!CreateProcessW(NULL, CommandLine, NULL, NULL, FALSE, 0, NULL, NULL, &StartupInfo, &ProcessInfo)) + { + DPRINT1("CreateProcessW failed with error %u\n", GetLastError()); + goto cleanup; + } + } + + /* Wait for the function to connect to our pipe */ + if(!ConnectNamedPipe(hPipe, NULL)) + { + DPRINT1("ConnectNamedPipe failed with error %u\n", GetLastError()); goto cleanup; } - if (!DevInstallW(NULL, NULL, DeviceInstance, ShowWizard ? SW_SHOWNOACTIVATE : SW_HIDE)) - { - DPRINT1("DevInstallW('%S') failed\n", DeviceInstance); + /* Pass the data. The following output is partly compatible to Windows XP SP2 (researched using a modified newdev.dll to log this stuff) */ + wcscpy(InstallEventName, L"Global\\PNP_Device_Install_Event_0."); + wcscat(InstallEventName, UuidString); + + Value = sizeof(InstallEventName); + WriteFile(hPipe, &Value, sizeof(Value), &BytesWritten, NULL); + WriteFile(hPipe, InstallEventName, Value, &BytesWritten, NULL); + + /* I couldn't figure out what the following value means under WinXP. It's usually 0 in my tests, but was also 5 once. + Therefore the following line is entirely ReactOS-specific. We use the value here to pass the ShowWizard variable. */ + WriteFile(hPipe, &ShowWizard, sizeof(ShowWizard), &BytesWritten, NULL); + + Value = (wcslen(DeviceInstance) + 1) * sizeof(WCHAR); + WriteFile(hPipe, &Value, sizeof(Value), &BytesWritten, NULL); + WriteFile(hPipe, DeviceInstance, Value, &BytesWritten, NULL); + + /* Wait for newdev.dll to finish processing */ + WaitForSingleObject(ProcessInfo.hProcess, INFINITE); + + /* The following check for success is probably not compatible to Windows, but should do its job */ + if(!GetExitCodeProcess(ProcessInfo.hProcess, &Value)) + { + DPRINT1("GetExitCodeProcess failed with error %u\n", GetLastError()); goto cleanup; } - DeviceInstalled = TRUE; + DeviceInstalled = Value; cleanup: - if (hNewDev != NULL) - FreeLibrary(hNewDev); + if(hPipe != INVALID_HANDLE_VALUE) + CloseHandle(hPipe); + + if(Environment) + DestroyEnvironmentBlock(Environment); + + if(ProcessInfo.hProcess) + CloseHandle(ProcessInfo.hProcess); + + if(ProcessInfo.hThread) + CloseHandle(ProcessInfo.hThread); return DeviceInstalled; } @@ -2255,12 +2355,16 @@ int wmain(int argc, WCHAR *argv[]) { + BOOLEAN OldValue; DWORD dwError; UNREFERENCED_PARAMETER(argc); UNREFERENCED_PARAMETER(argv); DPRINT("Umpnpmgr: main() started\n"); + + /* We need this privilege for using CreateProcessAsUserW */ + RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, TRUE, FALSE, &OldValue); hInstallEvent = CreateEvent(NULL, TRUE, SetupIsActive()/*FALSE*/, NULL); if (hInstallEvent == NULL) Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.rbuild [iso-8859-1] Wed Apr 15 02:31:36 2009 @@ -11,6 +11,7 @@ <library>rpcrt4</library> <library>pseh</library> <library>wdmguid</library> + <library>userenv</library> <file>umpnpmgr.c</file> <file>umpnpmgr.rc</file> </module> Modified: trunk/reactos/dll/win32/newdev/newdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/newdev.c [iso-8859-1] Wed Apr 15 02:31:36 2009 @@ -3,6 +3,7 @@ * * Copyright 2005-2006 Hervé Poussineau (hpoussin(a)reactos.org) * 2005 Christoph von Wittich (Christoph(a)ActiveVB.de) + * 2009 Colin Finck (colin(a)reactos.org) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -803,7 +804,7 @@ } /* -* @unimplemented +* @implemented */ BOOL WINAPI ClientSideInstallW( @@ -811,11 +812,75 @@ IN DWORD dwUnknownFlags, IN LPWSTR lpNamedPipeName) { - /* NOTE: pNamedPipeName is in the format: - * "\\.\pipe\PNP_Device_Install_Pipe_0.{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}" - */ - FIXME("Stub\n"); - return FALSE; + BOOL ReturnValue = FALSE; + BOOL ShowWizard; + DWORD BytesRead; + DWORD Value; + HANDLE hPipe = INVALID_HANDLE_VALUE; + PWSTR DeviceInstance = NULL; + PWSTR InstallEventName = NULL; + + /* Open the pipe */ + hPipe = CreateFileW(lpNamedPipeName, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + + if(hPipe == INVALID_HANDLE_VALUE) + { + ERR("CreateFileW failed with error %u\n", GetLastError()); + goto cleanup; + } + + /* Read the data. Some is just included for compatibility with Windows right now and not yet used by ReactOS. + See umpnpmgr for more details. */ + if(!ReadFile(hPipe, &Value, sizeof(Value), &BytesRead, NULL)) + { + ERR("ReadFile failed with error %u\n", GetLastError()); + goto cleanup; + } + + InstallEventName = (PWSTR)HeapAlloc(GetProcessHeap(), 0, Value); + + if(!ReadFile(hPipe, InstallEventName, Value, &BytesRead, NULL)) + { + ERR("ReadFile failed with error %u\n", GetLastError()); + goto cleanup; + } + + /* I couldn't figure out what the following value means under Windows XP. + Therefore I used it in umpnpmgr to pass the ShowWizard variable. */ + if(!ReadFile(hPipe, &ShowWizard, sizeof(ShowWizard), &BytesRead, NULL)) + { + ERR("ReadFile failed with error %u\n", GetLastError()); + goto cleanup; + } + + /* Next one is again size in bytes of the following string */ + if(!ReadFile(hPipe, &Value, sizeof(Value), &BytesRead, NULL)) + { + ERR("ReadFile failed with error %u\n", GetLastError()); + goto cleanup; + } + + DeviceInstance = (PWSTR)HeapAlloc(GetProcessHeap(), 0, Value); + + if(!ReadFile(hPipe, DeviceInstance, Value, &BytesRead, NULL)) + { + ERR("ReadFile failed with error %u\n", GetLastError()); + goto cleanup; + } + + ReturnValue = DevInstallW(NULL, NULL, DeviceInstance, ShowWizard ? SW_SHOWNOACTIVATE : SW_HIDE); + +cleanup: + if(hPipe != INVALID_HANDLE_VALUE) + CloseHandle(hPipe); + + if(InstallEventName) + HeapFree(GetProcessHeap(), 0, InstallEventName); + + if(DeviceInstance) + HeapFree(GetProcessHeap(), 0, DeviceInstance); + + return ReturnValue; } BOOL WINAPI

1 0

[cfinck] 40512: Fix and slightly optimize _SHGetUserShellFolderPath Note to Wine guys: Registry functions take and give everything in bytes!
by cfinck＠svn.reactos.org 14 Apr '09

14 Apr '09

Author: cfinck Date: Wed Apr 15 02:13:20 2009 New Revision: 40512 URL: http://svn.reactos.org/svn/reactos?rev=40512&view=rev Log: Fix and slightly optimize _SHGetUserShellFolderPath Note to Wine guys: Registry functions take and give everything in bytes! Modified: trunk/reactos/dll/win32/shell32/shellpath.c Modified: trunk/reactos/dll/win32/shell32/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellpat… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellpath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellpath.c [iso-8859-1] Wed Apr 15 02:13:20 2009 @@ -924,7 +924,7 @@ HRESULT hr; WCHAR shellFolderPath[MAX_PATH], userShellFolderPath[MAX_PATH]; LPCWSTR pShellFolderPath, pUserShellFolderPath; - DWORD dwDisp, dwType, dwPathLen = MAX_PATH; + DWORD dwDisp, dwType, dwPathLen; HKEY userShellFolderKey, shellFolderKey; TRACE("%p,%s,%s,%p\n",rootKey, debugstr_w(userPrefix), debugstr_w(value), @@ -962,21 +962,25 @@ return E_FAIL; } + dwPathLen = MAX_PATH * sizeof(WCHAR); + if (!RegQueryValueExW(userShellFolderKey, value, NULL, &dwType, (LPBYTE)path, &dwPathLen) && (dwType == REG_EXPAND_SZ || dwType == REG_SZ)) { LONG ret; - path[dwPathLen / sizeof(WCHAR)] = '\0'; + dwPathLen /= sizeof(WCHAR); + + path[dwPathLen] = '\0'; if (dwType == REG_EXPAND_SZ && path[0] == '%') { WCHAR szTemp[MAX_PATH]; - ExpandEnvironmentStringsW(path, szTemp, MAX_PATH); - lstrcpynW(path, szTemp, MAX_PATH); - } - ret = RegSetValueExW(shellFolderKey, value, 0, REG_SZ, (LPBYTE)path, - (wcslen(path) + 1) * sizeof(WCHAR)); + dwPathLen = ExpandEnvironmentStringsW(path, szTemp, MAX_PATH); + lstrcpynW(path, szTemp, dwPathLen); + } + + ret = RegSetValueExW(shellFolderKey, value, 0, REG_SZ, (LPBYTE)path, dwPathLen * sizeof(WCHAR)); if (ret != ERROR_SUCCESS) hr = HRESULT_FROM_WIN32(ret); else @@ -984,6 +988,7 @@ } else hr = E_FAIL; + RegCloseKey(shellFolderKey); RegCloseKey(userShellFolderKey); TRACE("returning 0x%08x\n", hr);

1 0

[cfinck] 40511: Don't miss the last byte when we have nothing more to read
by cfinck＠svn.reactos.org 14 Apr '09

14 Apr '09

Author: cfinck Date: Wed Apr 15 01:53:25 2009 New Revision: 40511 URL: http://svn.reactos.org/svn/reactos?rev=40511&view=rev Log: Don't miss the last byte when we have nothing more to read Modified: trunk/tools/sysreg2/console.c Modified: trunk/tools/sysreg2/console.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/console.c?rev=40511&… ============================================================================== --- trunk/tools/sysreg2/console.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/console.c [iso-8859-1] Wed Apr 15 01:53:25 2009 @@ -72,8 +72,8 @@ bp = buf; - /* Read one line or a maximum of 512 bytes into a buffer */ - while (bp - buf < sizeof(buf)) + /* Read one line or a maximum of 511 bytes into a buffer (leave space for the null character) */ + while (bp - buf < sizeof(buf) - 1) { got = read(fds[i].fd, bp, 1); @@ -89,8 +89,10 @@ } /* Also break on newlines */ - if(*bp++ == '\n') + if(*bp == '\n') break; + + ++bp; } if (bp == buf) @@ -99,8 +101,8 @@ Ret = EXIT_SHUTDOWN; goto cleanup; } - - *bp = 0; + + *(++bp) = 0; /* Now check the output */ if (fds[i].fd == STDIN_FILENO)

1 0

[gschneider] 40510: - ICON_CreateCursorFromData should pass a header that fits to the bitmap data to SetDIBits to allow color conversion if necessary; create the color cursor if requested in the same function - Winamp 2.95 now shows a custom cursor, but it's still surrounded by blackness, bug #4370 - Misc typo fixes, cleanup
by gschneider＠svn.reactos.org 14 Apr '09

14 Apr '09

Author: gschneider Date: Wed Apr 15 01:30:03 2009 New Revision: 40510 URL: http://svn.reactos.org/svn/reactos?rev=40510&view=rev Log: - ICON_CreateCursorFromData should pass a header that fits to the bitmap data to SetDIBits to allow color conversion if necessary; create the color cursor if requested in the same function - Winamp 2.95 now shows a custom cursor, but it's still surrounded by blackness, bug #4370 - Misc typo fixes, cleanup Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c trunk/reactos/dll/win32/user32/windows/icon.c Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/b… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/bitmap.c [iso-8859-1] Wed Apr 15 01:30:03 2009 @@ -56,8 +56,7 @@ #include "poppack.h" -/*forward declerations... actualy in user32\windows\icon.c but usful here****/ -HICON ICON_CreateCursorFromData(HDC hDC, PVOID ImageData, ICONIMAGE* IconImage, int cxDesired, int cyDesired, int xHotspot, int yHotspot); +/* forward declerations... actually in user32\windows\icon.c but usful here */ HICON ICON_CreateIconFromData(HDC hDC, PVOID ImageData, ICONIMAGE* IconImage, int cxDesired, int cyDesired, int xHotspot, int yHotspot); CURSORICONDIRENTRY *CURSORICON_FindBestIcon( CURSORICONDIR *dir, int width, int height, int colors); CURSORICONDIRENTRY *CURSORICON_FindBestCursor( CURSORICONDIR *dir, int width, int height, int colors); Modified: trunk/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] Wed Apr 15 01:30:03 2009 @@ -94,9 +94,9 @@ HICON ICON_CreateCursorFromData(HDC hDC, PVOID ImageData, ICONIMAGE* IconImage, int cxDesired, int cyDesired, int xHotspot, int yHotspot) { - /* FIXME - color cursors */ BYTE BitmapInfoBuffer[sizeof(BITMAPINFOHEADER) + 2 * sizeof(RGBQUAD)]; BITMAPINFO *bwBIH = (BITMAPINFO *)BitmapInfoBuffer; + BITMAPINFO *orgBIH = (BITMAPINFO *)IconImage; ICONINFO IconInfo; PVOID XORImageData = ImageData; @@ -104,7 +104,7 @@ IconInfo.xHotspot = xHotspot; IconInfo.yHotspot = yHotspot; - /* Create a BITMAPINFO header for the monocrome part of the icon */ + /* Create a BITMAPINFO header for the monochrome part of the icon */ bwBIH->bmiHeader.biBitCount = 1; bwBIH->bmiHeader.biWidth = IconImage->icHeader.biWidth; bwBIH->bmiHeader.biHeight = IconImage->icHeader.biHeight; @@ -133,10 +133,24 @@ if (IconInfo.hbmMask) { SetDIBits(hDC, IconInfo.hbmMask, 0, IconImage->icHeader.biHeight, - XORImageData, bwBIH, DIB_RGB_COLORS); + XORImageData, orgBIH, DIB_RGB_COLORS); } - IconInfo.hbmColor = (HBITMAP)0; + if (IconImage->icHeader.biBitCount == 1) + { + IconInfo.hbmColor = (HBITMAP)0; + } + else + { + /* Create the color part of the icon */ + IconInfo.hbmColor = CreateDIBitmap(hDC, &IconImage->icHeader, 0, + XORImageData, orgBIH, DIB_RGB_COLORS); + if (IconInfo.hbmColor) + { + SetDIBits(hDC, IconInfo.hbmColor, 0, IconImage->icHeader.biHeight, + XORImageData, orgBIH, DIB_RGB_COLORS); + } + } /* Create the icon based on everything we have so far */ return NtUserCreateCursorIconHandle(&IconInfo, FALSE);

1 0

[tkreuzer] 40509: Remove hBitmap from DC.rosdc and use DC.dclevel.pSurface instead.
by tkreuzer＠svn.reactos.org 14 Apr '09

14 Apr '09

Author: tkreuzer Date: Wed Apr 15 00:50:02 2009 New Revision: 40509 URL: http://svn.reactos.org/svn/reactos?rev=40509&view=rev Log: Remove hBitmap from DC.rosdc and use DC.dclevel.pSurface instead. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/objects/arc.c trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/dclife.c trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c trunk/reactos/subsystems/win32/win32k/objects/dcstate.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/drawing.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c trunk/reactos/subsystems/win32/win32k/objects/line.c trunk/reactos/subsystems/win32/win32k/objects/print.c trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -17,7 +17,6 @@ HRGN hClipRgn; /* Clip region (may be 0) */ HRGN hVisRgn; /* Should me to DC. Visible region (must never be 0) */ HRGN hGCClipRgn; /* GC clip region (ClipRgn AND VisRgn) */ - HBITMAP hBitmap; BYTE bitsPerPixel; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -89,7 +89,6 @@ PSYSTEM_CURSORINFO CurInfo; PCURICON_OBJECT OldCursor; HCURSOR Ret = (HCURSOR)0; - HBITMAP dcbmp; HBITMAP hMask = 0; SURFOBJ *soMask = NULL, *soColor = NULL; XLATEOBJ *XlateObj = NULL; @@ -120,13 +119,14 @@ { return Ret; } - dcbmp = dc->rosdc.hBitmap; DevInfo = (PDEVINFO)&dc->ppdev->DevInfo; - DC_UnlockDc(dc); - - psurf = SURFACE_LockSurface(dcbmp); + + psurf = dc->dclevel.pSurface; if (!psurf) + { + DC_UnlockDc(dc); return (HCURSOR)0; + } pso = &psurf->SurfObj; if (!NewCursor) @@ -148,7 +148,7 @@ CurInfo->ShowingCursor = 0; } - SURFACE_UnlockSurface(psurf); + DC_UnlockDc(dc); return Ret; } @@ -162,7 +162,7 @@ if (maskBpp != 1) { DPRINT1("SetCursor: The Mask bitmap must have 1BPP!\n"); - SURFACE_UnlockSurface(psurf); + DC_UnlockDc(dc); return Ret; } @@ -207,7 +207,7 @@ if ( !hMask ) { SURFACE_UnlockSurface(MaskBmpObj); - SURFACE_UnlockSurface(psurf); + DC_UnlockDc(dc); return (HCURSOR)0; } soMask = EngLockSurface((HSURF)hMask); @@ -249,7 +249,6 @@ DPRINT1("IntEngSetPointerShape returned %lx\n", Status); } - SURFACE_UnlockSurface(psurf); if(hMask) { EngUnlockSurface(soMask); @@ -260,6 +259,7 @@ EngDeleteXlate(XlateObj); } + DC_UnlockDc(dc); return Ret; } @@ -1724,7 +1724,6 @@ HDC Screen; PDC dc; - HBITMAP hbmpDc; SURFOBJ *SurfObj; SURFACE *psurfDc; PDEVOBJ *ppdev; @@ -1743,19 +1742,18 @@ return showpointer; /* No mouse */ } - hbmpDc = dc->rosdc.hBitmap; - DC_UnlockDc(dc); - - psurfDc = SURFACE_LockSurface(hbmpDc); + psurfDc = dc->dclevel.pSurface; + if ( !psurfDc ) { + DC_UnlockDc(dc); return showpointer; /* No Mouse */ } SurfObj = &psurfDc->SurfObj; if (SurfObj == NULL) { - SURFACE_UnlockSurface(psurfDc); + DC_UnlockDc(dc); return showpointer; /* No mouse */ } @@ -1763,7 +1761,7 @@ if(ppdev == NULL) { - SURFACE_UnlockSurface(psurfDc); + DC_UnlockDc(dc); return showpointer; /* No mouse */ } @@ -1800,6 +1798,6 @@ } } - SURFACE_UnlockSurface(psurfDc); + DC_UnlockDc(dc); return showpointer; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -432,12 +432,11 @@ SURFACE *psurf; dc = DC_LockDc(ScreenDeviceContext); /* FIXME - Handle dc == NULL!!!! */ - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); - if(psurf) + psurf = dc->dclevel.pSurface; + if (psurf) { Ret->right = psurf->SurfObj.sizlBitmap.cx; Ret->bottom = psurf->SurfObj.sizlBitmap.cy; - SURFACE_UnlockSurface(psurf); } DC_UnlockDc(dc); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -1072,7 +1072,6 @@ PWINSTATION_OBJECT WinSta; BOOL DoMove, SwapButtons; MSG Msg; - HBITMAP hBitmap; SURFACE *psurf; SURFOBJ *pso; PDC dc; @@ -1169,10 +1168,7 @@ dc = DC_LockDc(hDC); if (dc) { - hBitmap = dc->rosdc.hBitmap; - DC_UnlockDc(dc); - - psurf = SURFACE_LockSurface(hBitmap); + psurf = dc->dclevel.pSurface; if (psurf) { pso = &psurf->SurfObj; @@ -1185,9 +1181,9 @@ * use the old values to move the pointer image */ gpsi->ptCursor.x = MousePos.x; gpsi->ptCursor.y = MousePos.y; - - SURFACE_UnlockSurface(psurf); - } + } + + DC_UnlockDc(dc); } } Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -156,7 +156,7 @@ arctype, pbrushPen); - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + psurf = dc->dclevel.pSurface; if (NULL == psurf) { DPRINT1("Arc Fail 2\n"); @@ -174,7 +174,6 @@ PUTLINE(EfCx + CenterX, EfCy + CenterY, SfCx + CenterX, SfCy + CenterY, dc->eboLine); pbrushPen->ptPenWidth.x = PenOrigWidth; - SURFACE_UnlockSurface(psurf); PEN_UnlockPen(pbrushPen); DPRINT("IntArc Exit.\n"); return ret; Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -120,7 +120,7 @@ } /* Determine surfaces to be used in the bitblt */ - BitmapDest = SURFACE_LockSurface(DCDest->rosdc.hBitmap); + BitmapDest = DCDest->dclevel.pSurface; if (!BitmapDest) { if (hDCSrc != hDCDest) @@ -128,14 +128,11 @@ DC_UnlockDc(DCDest); return FALSE; } - if (DCSrc->rosdc.hBitmap == DCDest->rosdc.hBitmap) - BitmapSrc = BitmapDest; - else - { - BitmapSrc = SURFACE_LockSurface(DCSrc->rosdc.hBitmap); + + { + BitmapSrc = DCSrc->dclevel.pSurface; if (!BitmapSrc) { - SURFACE_UnlockSurface(BitmapDest); if (hDCSrc != hDCDest) DC_UnlockDc(DCSrc); DC_UnlockDc(DCDest); @@ -164,9 +161,6 @@ if (XlateObj != NULL) EngDeleteXlate(XlateObj); - SURFACE_UnlockSurface(BitmapDest); - if (BitmapSrc != BitmapDest) - SURFACE_UnlockSurface(BitmapSrc); DC_UnlockDc(DCDest); if (hDCSrc != hDCDest) DC_UnlockDc(DCSrc); @@ -264,17 +258,14 @@ } /* Determine surfaces to be used in the bitblt */ - BitmapDest = SURFACE_LockSurface(DCDest->rosdc.hBitmap); + BitmapDest = DCDest->dclevel.pSurface; if (!BitmapDest) goto cleanup; if (UsesSource) { - if (DCSrc->rosdc.hBitmap == DCDest->rosdc.hBitmap) - BitmapSrc = BitmapDest; - else - { - BitmapSrc = SURFACE_LockSurface(DCSrc->rosdc.hBitmap); + { + BitmapSrc = DCSrc->dclevel.pSurface; if (!BitmapSrc) goto cleanup; } @@ -311,14 +302,6 @@ if (UsesSource && XlateObj != NULL) EngDeleteXlate(XlateObj); - if(BitmapDest != NULL) - { - SURFACE_UnlockSurface(BitmapDest); - } - if (BitmapSrc != NULL && BitmapSrc != BitmapDest) - { - SURFACE_UnlockSurface(BitmapSrc); - } if (UsesSource && hDCSrc != hDCDest) { DC_UnlockDc(DCSrc); @@ -387,13 +370,13 @@ return TRUE; } - BitmapDest = SURFACE_LockSurface(DCDest->rosdc.hBitmap); + BitmapDest = DCDest->dclevel.pSurface; if (!BitmapDest) { goto done; } - BitmapSrc = SURFACE_LockSurface(DCSrc->rosdc.hBitmap); + BitmapSrc = DCSrc->dclevel.pSurface; if (!BitmapSrc) { goto done; @@ -466,14 +449,6 @@ done: DC_UnlockDc(DCSrc); - if (BitmapDest) - { - SURFACE_UnlockSurface(BitmapDest); - } - if (BitmapSrc) - { - SURFACE_UnlockSurface(BitmapSrc); - } if(hdcDst != hdcSrc) { DC_UnlockDc(DCDest); @@ -826,18 +801,13 @@ BrushOrigin.y = 0; /* Determine surfaces to be used in the bitblt */ - BitmapDest = SURFACE_LockSurface(DCDest->rosdc.hBitmap); + BitmapDest = DCDest->dclevel.pSurface; if (BitmapDest == NULL) goto failed; if (UsesSource) { - if (DCSrc->rosdc.hBitmap == DCDest->rosdc.hBitmap) - { - BitmapSrc = BitmapDest; - } - else - { - BitmapSrc = SURFACE_LockSurface(DCSrc->rosdc.hBitmap); + { + BitmapSrc = DCSrc->dclevel.pSurface; if (BitmapSrc == NULL) goto failed; } @@ -862,7 +832,7 @@ DCMask = DC_LockDc(hDCMask); if (DCMask) { - BitmapMask = SURFACE_LockSurface(DCMask->rosdc.hBitmap); + BitmapMask = DCMask->dclevel.pSurface; if (BitmapMask && (BitmapMask->SurfObj.sizlBitmap.cx != WidthSrc || BitmapMask->SurfObj.sizlBitmap.cy != HeightSrc)) @@ -890,18 +860,6 @@ if (XlateObj) { EngDeleteXlate(XlateObj); - } - if (BitmapSrc && DCSrc->rosdc.hBitmap != DCDest->rosdc.hBitmap) - { - SURFACE_UnlockSurface(BitmapSrc); - } - if (BitmapDest) - { - SURFACE_UnlockSurface(BitmapDest); - } - if (BitmapMask) - { - SURFACE_UnlockSurface(BitmapMask); } if (UsesSource && hDCSrc != hDCDest) { @@ -967,7 +925,7 @@ ASSERT(BrushObj); - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + psurf = dc->dclevel.pSurface; if (psurf == NULL) { SetLastWin32Error(ERROR_INVALID_HANDLE); @@ -1023,8 +981,6 @@ &BrushOrigin, ROP3_TO_ROP4(ROP)); } - - SURFACE_UnlockSurface(psurf); return ret; } Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -154,7 +154,7 @@ { DIBSECTION dibs; INT Count; - PSURFACE psurf = SURFACE_LockSurface(Dc->rosdc.hBitmap); + PSURFACE psurf = Dc->dclevel.pSurface; Count = BITMAP_GetObject(psurf, sizeof(dibs), &dibs); if (Count) @@ -223,7 +223,6 @@ if (!PalGDI) { ExFreePoolWithTag(bi, TAG_TEMP); - SURFACE_UnlockSurface(psurf); SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; } @@ -239,7 +238,6 @@ } PALETTE_UnlockPalette(PalGDI); } - SURFACE_UnlockSurface(psurf); Bmp = DIB_CreateDIBSection(Dc, bi, @@ -254,7 +252,6 @@ } } } - SURFACE_UnlockSurface(psurf); } } return Bmp; @@ -361,7 +358,7 @@ if (RECTL_bPointInRect(&dc->rosdc.CombinedClip->rclBounds, XPos, YPos)) { bInRect = TRUE; - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + psurf = dc->dclevel.pSurface; pso = &psurf->SurfObj; if (psurf) { @@ -381,7 +378,6 @@ } EngDeleteXlate(XlateObj); } - SURFACE_UnlockSurface(psurf); } } DC_UnlockDc(dc); Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -212,6 +212,7 @@ HRGN hVisRgn; UNICODE_STRING StdDriver; BOOL calledFromUser; + HSURF hsurf; RtlInitUnicodeString(&StdDriver, L"DISPLAY"); @@ -284,7 +285,9 @@ pdc->dhpdev = PrimarySurface.hPDev; if (pUMdhpdev) pUMdhpdev = pdc->dhpdev; // set DHPDEV for device. pdc->ppdev = (PVOID)&PrimarySurface; - pdc->rosdc.hBitmap = (HBITMAP)PrimarySurface.pSurface; // <- what kind of haxx0ry is that? + hsurf = (HBITMAP)PrimarySurface.pSurface; // <- what kind of haxx0ry is that? + pdc->dclevel.pSurface = SURFACE_ShareLockSurface(hsurf); + // ATM we only have one display. pdcattr->ulDirty_ |= DC_PRIMARY_DISPLAY; @@ -574,6 +577,7 @@ HRGN hVisRgn; UNICODE_STRING DriverName; DWORD Layout = 0; + HSURF hsurf; if (hDC == NULL) { @@ -628,7 +632,8 @@ pdcattrNew->szlViewportExt = pdcattrOld->szlViewportExt; pdcNew->dctype = DC_TYPE_MEMORY; // Always! - pdcNew->rosdc.hBitmap = NtGdiGetStockObject(DEFAULT_BITMAP); + hsurf = NtGdiGetStockObject(DEFAULT_BITMAP); + pdcNew->dclevel.pSurface = SURFACE_ShareLockSurface(hsurf); pdcNew->ppdev = pdcOld->ppdev; pdcNew->dclevel.hpal = pdcOld->dclevel.hpal; Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -20,11 +20,10 @@ XLATEOBJ *pxlo = NULL; HPALETTE hPalette = NULL; - psurf = SURFACE_LockSurface(pdc->rosdc.hBitmap); + psurf = pdc->dclevel.pSurface; if (psurf) { hPalette = psurf->hDIBPalette; - SURFACE_UnlockSurface(psurf); } if (!hPalette) hPalette = pPrimarySurface->DevInfo.hpalDefault; @@ -185,14 +184,12 @@ SURFACE *psurf; HPALETTE hpal; -// psurf = pdc->dclevel.pSurface; - psurf = SURFACE_LockSurface(pdc->rosdc.hBitmap); + psurf = pdc->dclevel.pSurface; if (psurf) { hpal = psurf->hDIBPalette; if (!hpal) hpal = pPrimarySurface->DevInfo.hpalDefault; pxlo = IntEngCreateXlate(0, PAL_RGB, hpal, NULL); - SURFACE_UnlockSurface(psurf); } /* Update the eboText's solid color */ @@ -216,14 +213,12 @@ SURFACE *psurf; HPALETTE hpal; -// psurf = pdc->dclevel.pSurface; - psurf = SURFACE_LockSurface(pdc->rosdc.hBitmap); + psurf = pdc->dclevel.pSurface; if (psurf) { hpal = psurf->hDIBPalette; if (!hpal) hpal = pPrimarySurface->DevInfo.hpalDefault; pxlo = IntEngCreateXlate(0, PAL_RGB, hpal, NULL); - SURFACE_UnlockSurface(psurf); } /* Update the eboBackground's solid color */ @@ -386,11 +381,6 @@ psurfOld = pDC->dclevel.pSurface; hOrgBmp = psurfOld ? psurfOld->BaseObject.hHmgr : NULL; - /* FIXME: ros hack */ - hOrgBmp = pDC->rosdc.hBitmap; - - pDC->rosdc.hBitmap = hBmp; - /* Release the old bitmap, reference the new */ DC_vSelectSurface(pDC, psurfBmp); @@ -530,8 +520,11 @@ break; case GDI_OBJECT_TYPE_BITMAP: - SelObject = pdc->rosdc.hBitmap; - break; + { + SURFACE *psurf = pdc->dclevel.pSurface; + SelObject = psurf ? psurf->BaseObject.hHmgr : NULL; + break; + } case GDI_OBJECT_TYPE_COLORSPACE: DPRINT1("FIXME: NtGdiGetCurrentObject() ObjectType OBJ_COLORSPACE not supported yet!\n"); Modified: trunk/reactos/subsystems/win32/win32k/objects/dcstate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcstate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcstate.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -48,8 +48,6 @@ pdcDst->dclevel.plfnt = pdcSrc->dclevel.plfnt; /* ROS hacks */ - pdcDst->rosdc.hBitmap = pdcSrc->rosdc.hBitmap; - if (pdcDst->dctype != DC_TYPE_MEMORY) { pdcDst->rosdc.bitsPerPixel = pdcSrc->rosdc.bitsPerPixel; Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -85,7 +85,7 @@ return 0; } - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + psurf = dc->dclevel.pSurface; if (psurf == NULL) { DC_UnlockDc(dc); @@ -95,7 +95,6 @@ if (psurf->hSecure == NULL) { - SURFACE_UnlockSurface(psurf); DC_UnlockDc(dc); SetLastWin32Error(ERROR_INVALID_PARAMETER); return 0; @@ -110,7 +109,6 @@ PalGDI = PALETTE_LockPalette(psurf->hDIBPalette); if (PalGDI == NULL) { - SURFACE_UnlockSurface(psurf); DC_UnlockDc(dc); SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; @@ -132,7 +130,6 @@ /* Mark the brushes invalid */ dc->pdcattr->ulDirty_ |= DIRTY_FILL|DIRTY_LINE|DIRTY_BACKGROUND|DIRTY_TEXT; - SURFACE_UnlockSurface(psurf); DC_UnlockDc(dc); return Entries; @@ -154,7 +151,7 @@ return 0; } - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + psurf = dc->dclevel.pSurface; if (psurf == NULL) { DC_UnlockDc(dc); @@ -164,7 +161,6 @@ if (psurf->hSecure == NULL) { - SURFACE_UnlockSurface(psurf); DC_UnlockDc(dc); SetLastWin32Error(ERROR_INVALID_PARAMETER); return 0; @@ -180,7 +176,6 @@ PalGDI = PALETTE_LockPalette(psurf->hDIBPalette); if (PalGDI == NULL) { - SURFACE_UnlockSurface(psurf); DC_UnlockDc(dc); SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; @@ -200,7 +195,6 @@ else Entries = 0; - SURFACE_UnlockSurface(psurf); DC_UnlockDc(dc); return Entries; @@ -484,14 +478,13 @@ DDBPalette = pDC->ppdev->DevInfo.hpalDefault; /* Try to use hDIBPalette if it exists */ - pSurf = SURFACE_LockSurface(pDC->rosdc.hBitmap); + pSurf = pDC->dclevel.pSurface; if (pSurf && pSurf->hDIBPalette) { DDBPalette = pSurf->hDIBPalette; - SURFACE_UnlockSurface(pSurf); - } - - pDestSurf = EngLockSurface((HSURF)pDC->rosdc.hBitmap); + } + + pDestSurf = pSurf ? &pSurf->SurfObj : NULL; rcDest.left = XDest; rcDest.top = YDest; @@ -582,7 +575,6 @@ if (hSourceBitmap) EngDeleteSurface((HSURF)hSourceBitmap); if (XlateObj) EngDeleteXlate(XlateObj); if (DIBPalette) PALETTE_FreePaletteByHandle(DIBPalette); - EngUnlockSurface(pDestSurf); DC_UnlockDc(pDC); return ret; @@ -1257,7 +1249,7 @@ { DIBSECTION dibs; INT Count; - SURFACE *psurf = SURFACE_LockSurface(Dc->rosdc.hBitmap); + SURFACE *psurf = Dc->dclevel.pSurface; Count = BITMAP_GetObject(psurf, sizeof(dibs), &dibs); if (!Count) bpp = 1; @@ -1270,7 +1262,6 @@ /* A DIB section is selected in the DC */ bpp = dibs.dsBmih.biBitCount; } - SURFACE_UnlockSurface(psurf); } } Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi, iUsage); Modified: trunk/reactos/subsystems/win32/win32k/objects/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -1198,7 +1198,7 @@ ASSERT(pbrush); - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + psurf = dc->dclevel.pSurface; if (psurf == NULL) { SetLastWin32Error(ERROR_INVALID_HANDLE); @@ -1249,7 +1249,6 @@ ROP3_TO_ROP4(ROP)); } - SURFACE_UnlockSurface(psurf); return (int)Ret; } Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -96,7 +96,7 @@ /* Special locking order to avoid lock-ups */ pbrFill = dc->dclevel.pbrFill; pbrLine = dc->dclevel.pbrLine; - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + psurf = dc->dclevel.pSurface; /* FIXME - psurf can be NULL!!!! don't assert but handle this case gracefully! */ ASSERT(psurf); @@ -153,7 +153,6 @@ } } } - SURFACE_UnlockSurface(psurf); return ret; } @@ -581,7 +580,7 @@ ret = FALSE; goto cleanup; } - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + psurf = dc->dclevel.pSurface; if (!psurf) { ret = FALSE; @@ -646,9 +645,6 @@ } cleanup: - if (psurf) - SURFACE_UnlockSurface(psurf); - /* Move current position in DC? MSDN: The current position is neither used nor updated by Rectangle. */ @@ -917,7 +913,7 @@ DitherOrg.x += dc->ptlDCOrig.x; DitherOrg.y += dc->ptlDCOrig.y; - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + psurf = dc->dclevel.pSurface; /* FIXME - psurf can be NULL!!! Don't assert but handle this case gracefully! */ ASSERT(psurf); @@ -947,7 +943,6 @@ &DitherOrg, ulMode); - SURFACE_UnlockSurface(psurf); EngDeleteXlate(XlateObj); return Ret; @@ -1121,7 +1116,7 @@ Ret = FALSE; goto cleanup; } - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + psurf = dc->dclevel.pSurface; if (!psurf) { Ret = FALSE; @@ -1129,9 +1124,6 @@ } cleanup: - if (psurf) - SURFACE_UnlockSurface(psurf); - DC_UnlockDc(dc); return Ret; } Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -3171,7 +3171,7 @@ IntLPtoDP(dc, (POINT *)lprc, 2); } - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + psurf = dc->dclevel.pSurface; if (!psurf) { goto fail; @@ -3579,7 +3579,6 @@ EngDeleteXlate(XlateObj); EngDeleteXlate(XlateObj2); - SURFACE_UnlockSurface(psurf); if (TextObj != NULL) TEXTOBJ_UnlockText(TextObj); good: @@ -3594,8 +3593,6 @@ EngDeleteXlate(XlateObj); if (TextObj != NULL) TEXTOBJ_UnlockText(TextObj); - if (psurf != NULL) - SURFACE_UnlockSurface(psurf); DC_UnlockDc(dc); return FALSE; Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -113,7 +113,7 @@ if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY)) DC_vUpdateLineBrush(dc); - psurf = SURFACE_LockSurface( dc->rosdc.hBitmap ); + psurf = dc->dclevel.pSurface; if (NULL == psurf) { SetLastWin32Error(ERROR_INVALID_HANDLE); @@ -153,7 +153,6 @@ ROP2_TO_MIX(pdcattr->jROP2)); } - SURFACE_UnlockSurface(psurf); } if (Ret) @@ -263,7 +262,7 @@ Points = EngAllocMem(0, Count * sizeof(POINT), TAG_COORD); if (Points != NULL) { - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + psurf = dc->dclevel.pSurface; /* FIXME - psurf can be NULL!!!! Don't assert but handle this case gracefully! */ ASSERT(psurf); @@ -285,7 +284,6 @@ Count, ROP2_TO_MIX(pdcattr->jROP2)); - SURFACE_UnlockSurface(psurf); EngFreeMem(Points); } else Modified: trunk/reactos/subsystems/win32/win32k/objects/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/print.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/print.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -114,7 +114,7 @@ INT OutSize, LPSTR OutData) { - SURFACE *psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + SURFACE *psurf = dc->dclevel.pSurface; INT Result; /* FIXME - Handle psurf == NULL !!!!!! */ @@ -139,7 +139,6 @@ OutSize, (PVOID)OutData ); } - SURFACE_UnlockSurface(psurf); return Result; } Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Wed Apr 15 00:50:02 2009 @@ -2936,7 +2936,7 @@ BrushOrigin.x = pdcattr->ptlBrushOrigin.x; BrushOrigin.y = pdcattr->ptlBrushOrigin.y; - psurf = SURFACE_LockSurface(dc->rosdc.hBitmap); + psurf = dc->dclevel.pSurface; /* FIXME - Handle psurf == NULL !!!! */ bRet = IntEngPaint(&psurf->SurfObj, @@ -2945,7 +2945,6 @@ &BrushOrigin, 0xFFFF);//FIXME:don't know what to put here - SURFACE_UnlockSurface(psurf); REGION_UnlockRgn(visrgn); GreDeleteObject(tmpVisRgn);

1 0

[tkreuzer] 40508: Revert 40507, it breaks VBox.
by tkreuzer＠svn.reactos.org 14 Apr '09

14 Apr '09

Author: tkreuzer Date: Tue Apr 14 22:14:18 2009 New Revision: 40508 URL: http://svn.reactos.org/svn/reactos?rev=40508&view=rev Log: Revert 40507, it breaks VBox. Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/media/inf/hdc.inf Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Tue Apr 14 22:14:18 2009 @@ -809,13 +809,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Type",0x00010001,0x00000001 -; UniATA/Atapi miniport driver -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Group",0x00000000,"System Bus Extender" -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ImagePath",0x00020000,"system32\drivers\uniata.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Tag",0x00010001,0x00000010 +; Atapi miniport driver +HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Group",0x00000000,"SCSI Miniport" +HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","ImagePath",0x00020000,"system32\drivers\atapi.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Tag",0x00010001,0x00000010 ; Audio Service HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","DisplayName",0x00000000,"Audio Service" Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Tue Apr 14 22:14:18 2009 @@ -13,7 +13,7 @@ [SourceDisksFiles] acpi.sys=,,,,,,,,,,,,4 -uniata.sys=,,,,,,x,,,,,,4 +atapi.sys=,,,,,,x,,,,,,4 buslogic.sys=,,,,,,x,,,,,,4 blue.sys=,,,,,,x,,,,,,4 bootvid.dll=,,,,,,,,,,,,4 @@ -31,6 +31,7 @@ ntfs.sys=,,,,,,,,,,,,4 pci.sys=,,,,,,,,,,,,4 scsiport.sys=,,,,,,x,,,,,,4 +uniata.sys=,,,,,,,,,,,,4 fastfat.sys=,,,,,,x,,,,,,4 ramdisk.sys=,,,,,,x,,,,,,4 ext2.sys=,,,,,,x,,,,,,4 Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=4050… ============================================================================== Binary files - no diff available.

1 0

[dreimer] 40507: Enable uniata.sys as default Storage driver. Approved by Fireball. Complaints go to reimer.daniel@freenet.de I skipped removing atapi.sys from build. first test it. if it works we do this then.
by dreimer＠svn.reactos.org 14 Apr '09

14 Apr '09

Author: dreimer Date: Tue Apr 14 21:24:04 2009 New Revision: 40507 URL: http://svn.reactos.org/svn/reactos?rev=40507&view=rev Log: Enable uniata.sys as default Storage driver. Approved by Fireball. Complaints go to reimer.daniel(a)freenet.de I skipped removing atapi.sys from build. first test it. if it works we do this then. Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/media/inf/hdc.inf Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Tue Apr 14 21:24:04 2009 @@ -809,13 +809,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Type",0x00010001,0x00000001 -; Atapi miniport driver -HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Group",0x00000000,"SCSI Miniport" -HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","ImagePath",0x00020000,"system32\drivers\atapi.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Tag",0x00010001,0x00000010 +; UniATA/Atapi miniport driver +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Group",0x00000000,"System Bus Extender" +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ImagePath",0x00020000,"system32\drivers\uniata.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Tag",0x00010001,0x00000010 ; Audio Service HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","DisplayName",0x00000000,"Audio Service" Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Tue Apr 14 21:24:04 2009 @@ -13,7 +13,7 @@ [SourceDisksFiles] acpi.sys=,,,,,,,,,,,,4 -atapi.sys=,,,,,,x,,,,,,4 +uniata.sys=,,,,,,x,,,,,,4 buslogic.sys=,,,,,,x,,,,,,4 blue.sys=,,,,,,x,,,,,,4 bootvid.dll=,,,,,,,,,,,,4 @@ -31,7 +31,6 @@ ntfs.sys=,,,,,,,,,,,,4 pci.sys=,,,,,,,,,,,,4 scsiport.sys=,,,,,,x,,,,,,4 -uniata.sys=,,,,,,,,,,,,4 fastfat.sys=,,,,,,x,,,,,,4 ramdisk.sys=,,,,,,x,,,,,,4 ext2.sys=,,,,,,x,,,,,,4 Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=4050… ============================================================================== Binary files - no diff available.

1 0

[fireball] 40506: - Display unpartitioned and unformatted entries in a partition table. Fixes problems when installing on an absolutely clean harddisk.
by fireball＠svn.reactos.org 14 Apr '09

14 Apr '09

Author: fireball Date: Tue Apr 14 20:53:22 2009 New Revision: 40506 URL: http://svn.reactos.org/svn/reactos?rev=40506&view=rev Log: - Display unpartitioned and unformatted entries in a partition table. Fixes problems when installing on an absolutely clean harddisk. Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Tue Apr 14 20:53:22 2009 @@ -1362,7 +1362,8 @@ /* Print disk entry */ for (i=0; i<4; i++) { - if (PartEntry->PartInfo[i].PartitionType != PARTITION_ENTRY_UNUSED) + if (PartEntry->PartInfo[i].PartitionType != PARTITION_ENTRY_UNUSED || + PartEntry->PartInfo[i].PartitionLength.QuadPart != 0ULL) { PrintPartitionData (List, DiskEntry, @@ -1370,6 +1371,16 @@ i); } } + + /* Print unpartitioned entry */ + if (PartEntry->Unpartitioned || PartEntry->New) + { + PrintPartitionData (List, + DiskEntry, + PartEntry, + 0); + } + } /* Print separator line */

1 0

[janderwald] 40505: - Implement Channel de-muxing - WIP, bugs expected
by janderwald＠svn.reactos.org 14 Apr '09

14 Apr '09

Author: janderwald Date: Tue Apr 14 20:43:17 2009 New Revision: 40505 URL: http://svn.reactos.org/svn/reactos?rev=40505&view=rev Log: - Implement Channel de-muxing - WIP, bugs expected Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] Tue Apr 14 20:43:17 2009 @@ -9,6 +9,127 @@ #include "kmixer.h" const GUID KSPROPSETID_Connection = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; + +NTSTATUS +PerformChannelConversion( + PUCHAR Buffer, + ULONG BufferLength, + ULONG OldChannels, + ULONG NewChannels, + ULONG BitsPerSample, + PVOID * Result, + PULONG ResultLength) +{ + ULONG Samples; + ULONG NewIndex, OldIndex; + + Samples = BufferLength / (BitsPerSample / 8) / OldChannels; + + if (NewChannels > OldChannels) + { + if (BitsPerSample == 8) + { + PUCHAR BufferOut = ExAllocatePool(NonPagedPool, Samples * NewChannels); + if (!BufferOut) + return STATUS_INSUFFICIENT_RESOURCES; + + for(NewIndex = 0, OldIndex = 0; OldIndex < Samples * OldChannels; NewIndex += NewChannels, OldIndex += OldChannels) + { + ULONG SubIndex = 0; + + RtlMoveMemory(&BufferOut[NewIndex], &Buffer[OldIndex], OldChannels * sizeof(UCHAR)); + + do + { + /* 2 channel stretched to 4 looks like LRLR */ + BufferOut[NewIndex+OldChannels + SubIndex] = Buffer[OldIndex + (SubIndex % OldChannels)]; + }while(SubIndex++ < NewChannels - OldChannels); + } + *Result = BufferOut; + *ResultLength = Samples * NewChannels; + } + else if (BitsPerSample == 16) + { + PUSHORT BufferOut = ExAllocatePool(NonPagedPool, Samples * NewChannels); + if (!BufferOut) + return STATUS_INSUFFICIENT_RESOURCES; + + for(NewIndex = 0, OldIndex = 0; OldIndex < Samples * OldChannels; NewIndex += NewChannels, OldIndex += OldChannels) + { + ULONG SubIndex = 0; + + RtlMoveMemory(&BufferOut[NewIndex], &Buffer[OldIndex], OldChannels * sizeof(USHORT)); + + do + { + BufferOut[NewIndex+OldChannels + SubIndex] = Buffer[OldIndex + (SubIndex % OldChannels)]; + }while(SubIndex++ < NewChannels - OldChannels); + } + *Result = BufferOut; + *ResultLength = Samples * NewChannels; + } + else if (BitsPerSample == 24) + { + PUCHAR BufferOut = ExAllocatePool(NonPagedPool, Samples * NewChannels); + if (!BufferOut) + return STATUS_INSUFFICIENT_RESOURCES; + + for(NewIndex = 0, OldIndex = 0; OldIndex < Samples * OldChannels; NewIndex += NewChannels, OldIndex += OldChannels) + { + ULONG SubIndex = 0; + + RtlMoveMemory(&BufferOut[NewIndex], &Buffer[OldIndex], OldChannels * 3); + + do + { + RtlMoveMemory(&BufferOut[(NewIndex+OldChannels + SubIndex) * 3], &Buffer[(OldIndex + (SubIndex % OldChannels)) * 3], 3); + }while(SubIndex++ < NewChannels - OldChannels); + } + *Result = BufferOut; + *ResultLength = Samples * NewChannels; + } + else if (BitsPerSample == 32) + { + PULONG BufferOut = ExAllocatePool(NonPagedPool, Samples * NewChannels); + if (!BufferOut) + return STATUS_INSUFFICIENT_RESOURCES; + + for(NewIndex = 0, OldIndex = 0; OldIndex < Samples * OldChannels; NewIndex += NewChannels, OldIndex += OldChannels) + { + ULONG SubIndex = 0; + + RtlMoveMemory(&BufferOut[NewIndex], &Buffer[OldIndex], OldChannels * sizeof(ULONG)); + + do + { + BufferOut[NewIndex+OldChannels + SubIndex] = Buffer[OldIndex + (SubIndex % OldChannels)]; + }while(SubIndex++ < NewChannels - OldChannels); + } + *Result = BufferOut; + *ResultLength = Samples * NewChannels; + } + + } + else + { + PUSHORT BufferOut = ExAllocatePool(NonPagedPool, Samples * NewChannels); + if (!BufferOut) + return STATUS_INSUFFICIENT_RESOURCES; + + for(NewIndex = 0, OldIndex = 0; OldIndex < Samples * OldChannels; NewIndex += NewChannels, OldIndex += OldChannels) + { + /* TODO + * mix stream instead of just dumping part of it ;) + */ + RtlMoveMemory(&BufferOut[NewIndex], &Buffer[OldIndex], NewChannels * (BitsPerSample/8)); + } + + *Result = BufferOut; + *ResultLength = Samples * NewChannels; + } + return STATUS_SUCCESS; +} + NTSTATUS PerformQualityConversion( @@ -359,7 +480,6 @@ InputFormat->WaveFormatEx.nSamplesPerSec, OutputFormat->WaveFormatEx.nSamplesPerSec, InputFormat->WaveFormatEx.wBitsPerSample, OutputFormat->WaveFormatEx.wBitsPerSample); - if (InputFormat->WaveFormatEx.wBitsPerSample != OutputFormat->WaveFormatEx.wBitsPerSample) { Status = PerformQualityConversion(StreamHeader->Data, @@ -370,7 +490,24 @@ &BufferLength); if (NT_SUCCESS(Status)) { - //DPRINT1("Old BufferSize %u NewBufferSize %u\n", StreamHeader->DataUsed, BufferLength); + ExFreePool(StreamHeader->Data); + StreamHeader->Data = BufferOut; + StreamHeader->DataUsed = BufferLength; + } + } + + if (InputFormat->WaveFormatEx.nChannels != OutputFormat->WaveFormatEx.nChannels) + { + Status = PerformChannelConversion(StreamHeader->Data, + StreamHeader->DataUsed, + InputFormat->WaveFormatEx.nChannels, + OutputFormat->WaveFormatEx.nChannels, + InputFormat->WaveFormatEx.wBitsPerSample, + &BufferOut, + &BufferLength); + + if (NT_SUCCESS(Status)) + { ExFreePool(StreamHeader->Data); StreamHeader->Data = BufferOut; StreamHeader->DataUsed = BufferLength;

1 0

[tkreuzer] 40504: Make the SURFACE structure more like the one from Windows
by tkreuzer＠svn.reactos.org 14 Apr '09

14 Apr '09

Author: tkreuzer Date: Tue Apr 14 20:41:48 2009 New Revision: 40504 URL: http://svn.reactos.org/svn/reactos?rev=40504&view=rev Log: Make the SURFACE structure more like the one from Windows Modified: trunk/reactos/subsystems/win32/win32k/include/surface.h Modified: trunk/reactos/subsystems/win32/win32k/include/surface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/surface.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/surface.h [iso-8859-1] Tue Apr 14 20:41:48 2009 @@ -12,20 +12,33 @@ SURFOBJ SurfObj; FLONG flHooks; FLONG flFlags; - SIZE dimension; /* For SetBitmapDimension(), do NOT use + struct _PALETTE *ppal; + + union + { + HANDLE hSecureUMPD; // if UMPD_SURFACE set + HANDLE hMirrorParent;// if MIRROR_SURFACE set + HANDLE hDDSurface; // if DIRECTDRAW_SURFACE set + }; + + SIZEL dimension; /* For SetBitmapDimension(), do NOT use to get width/height of bitmap, use bitmap.bmWidth/bitmap.bmHeight for that */ - PFAST_MUTEX BitsLock; /* You need to hold this lock before you touch - the actual bits in the bitmap */ + + HDC hDC; // Doc in "Undocumented Windows", page 546, seems to be supported with XP. + ULONG cRef; // 0x064 + HPALETTE hpalHint; /* For device-independent bitmaps: */ HANDLE hDIBSection; HANDLE hSecure; DWORD dwOffset; + /* reactos specific */ + PFAST_MUTEX BitsLock; /* You need to hold this lock before you touch + the actual bits in the bitmap */ HPALETTE hDIBPalette; - HDC hDC; // Doc in "Undocumented Windows", page 546, seems to be supported with XP. DWORD dsBitfields[3]; // hack, should probably use palette instead DWORD biClrUsed; DWORD biClrImportant;

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