Ros-diffs

ros-diffs@reactos.org

81390 discussions

[osiejka] 51844: [MSVC] Arch Blackmann should know not to remove empty lines at the end of resource/rsrc files in base\applications. Should fix MS Linker fatal error RC1004 for modules affected.
by osiejka＠svn.reactos.org 22 May '11

22 May '11

Author: osiejka Date: Sun May 22 11:57:27 2011 New Revision: 51844 URL: http://svn.reactos.org/svn/reactos?rev=51844&view=rev Log: [MSVC] Arch Blackmann should know not to remove empty lines at the end of resource/rsrc files in base\applications. Should fix MS Linker fatal error RC1004 for modules affected. Modified: trunk/reactos/base/applications/cacls/rsrc.rc trunk/reactos/base/applications/calc/resource.rc trunk/reactos/base/applications/charmap/rsrc.rc trunk/reactos/base/applications/cmdutils/find/rsrc.rc trunk/reactos/base/applications/cmdutils/more/rsrc.rc trunk/reactos/base/applications/dxdiag/rsrc.rc trunk/reactos/base/applications/findstr/rsrc.rc trunk/reactos/base/applications/games/solitaire/rsrc.rc trunk/reactos/base/applications/games/spider/rsrc.rc trunk/reactos/base/applications/games/winmine/rsrc.rc trunk/reactos/base/applications/kbswitch/rsrc.rc trunk/reactos/base/applications/logoff/rsrc.rc trunk/reactos/base/applications/magnify/rsrc.rc trunk/reactos/base/applications/mmc/rsrc.rc trunk/reactos/base/applications/mplay32/rsrc.rc trunk/reactos/base/applications/msconfig/rsrc.rc trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc trunk/reactos/base/applications/mscutils/servman/rsrc.rc trunk/reactos/base/applications/mspaint/rsrc.rc trunk/reactos/base/applications/mstsc/rsrc.rc trunk/reactos/base/applications/network/ipconfig/ipconfig.rc trunk/reactos/base/applications/notepad/rsrc.rc trunk/reactos/base/applications/rapps/rsrc.rc trunk/reactos/base/applications/regedit/rsrc.rc trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc trunk/reactos/base/applications/screensavers/logon/logon.rc trunk/reactos/base/applications/shutdown/rsrc.rc trunk/reactos/base/applications/sndrec32/rsrc.rc trunk/reactos/base/applications/sndvol32/rsrc.rc trunk/reactos/base/applications/taskmgr/rsrc.rc Modified: trunk/reactos/base/applications/cacls/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/rs… ============================================================================== --- trunk/reactos/base/applications/cacls/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cacls/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -23,4 +23,4 @@ // UTF-8 #pragma code_page(65001) -#include "lang/pl-PL.rc" +#include "lang/pl-PL.rc Modified: trunk/reactos/base/applications/calc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… ============================================================================== --- trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -66,4 +66,4 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" -#include "lang/ro-RO.rc" +#include "lang/ro-RO.rc" Modified: trunk/reactos/base/applications/charmap/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -23,4 +23,4 @@ // UTF-8 #pragma code_page(65001) -#include "lang/pl-PL.rc" +#include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/cmdutils/find/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/find/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -20,4 +20,4 @@ // UTF-8 #pragma code_page(65001) -#include "lang/pl-PL.rc" +#include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/cmdutils/more/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -16,4 +16,4 @@ // UTF-8 #pragma code_page(65001) -#include "lang/pl-PL.rc" +#include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/dxdiag/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/r… ============================================================================== --- trunk/reactos/base/applications/dxdiag/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -17,4 +17,4 @@ // UTF-8 #pragma code_page(65001) -#include "lang/pl-PL.rc" +#include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/findstr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… ============================================================================== --- trunk/reactos/base/applications/findstr/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/findstr/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -21,4 +21,4 @@ // UTF-8 #pragma code_page(65001) -#include "lang/pl-PL.rc" +#include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -31,4 +31,4 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" -#include "lang/ro-RO.rc" +#include "lang/ro-RO.rc" Modified: trunk/reactos/base/applications/games/spider/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -20,4 +20,4 @@ // UTF-8 #pragma code_page(65001) -#include "lang/pl-PL.rc" +#include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/games/winmine/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -67,4 +67,4 @@ #include "lang/sl-SI.rc" #include "lang/sv-SE.rc" #include "lang/uk-UA.rc" -#include "lang/zh-CN.rc" +#include "lang/zh-CN.rc" Modified: trunk/reactos/base/applications/kbswitch/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -17,4 +17,4 @@ // UTF-8 #pragma code_page(65001) -#include "lang/pl-PL.rc" +#include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/logoff/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/r… ============================================================================== --- trunk/reactos/base/applications/logoff/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/logoff/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -20,4 +20,4 @@ // UTF-8 #pragma code_page(65001) -#include "lang/pl-PL.rc" +#include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/magnify/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -19,4 +19,4 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" -#include "lang/ro-RO.rc" +#include "lang/ro-RO.rc" Modified: trunk/reactos/base/applications/mmc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/rsrc… ============================================================================== --- trunk/reactos/base/applications/mmc/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -23,4 +23,4 @@ // UTF-8 #pragma code_page(65001) -#include "lang/pl-PL.rc" +#include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/mplay32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -18,4 +18,4 @@ // UTF-8 #pragma code_page(65001) -#include "lang/pl-PL.rc" +#include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/msconfig/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -32,4 +32,4 @@ // UTF-8 #pragma code_page(65001) -#include "lang/pl-PL.rc" +#include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -32,4 +32,4 @@ // UTF-8 #pragma code_page(65001) -#include "lang/pl-PL.rc" +#include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -27,4 +27,4 @@ // UTF-8 #pragma code_page(65001) -#include "lang/pl-PL.rc" +#include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/mscutils/servman/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -40,4 +40,4 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" -#include "lang/ro-RO.rc" +#include "lang/ro-RO.rc" Modified: trunk/reactos/base/applications/mspaint/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -38,4 +38,4 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" -#include "lang/ro-RO.rc" +#include "lang/ro-RO.rc" Modified: trunk/reactos/base/applications/mstsc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rs… ============================================================================== --- trunk/reactos/base/applications/mstsc/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -31,4 +31,4 @@ // UTF-8 #pragma code_page(65001) -#include "lang/pl-PL.rc" +#include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/ipconfig.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ipconfig/ipconfig.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -23,4 +23,4 @@ // UTF-8 #pragma code_page(65001) -#include "lang/pl-PL.rc" +#include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/notepad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -65,4 +65,4 @@ #pragma code_page(65001) #include "lang/hy-AM.rc" #include "lang/pl-PL.rc" -#include "lang/ro-RO.rc" +#include "lang/ro-RO.rc" Modified: trunk/reactos/base/applications/rapps/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/rs… ============================================================================== --- trunk/reactos/base/applications/rapps/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -12,4 +12,4 @@ #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/sv-SE.rc" -#include "lang/uk-UA.rc" +#include "lang/uk-UA.rc Modified: trunk/reactos/base/applications/regedit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -54,4 +54,4 @@ // UTF-8 #pragma code_page(65001) -#include "lang/pl-PL.rc" +#include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -29,4 +29,4 @@ // UTF-8 #pragma code_page(65001) -#include "lang/pl-PL.rc" +#include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -33,4 +33,4 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" -#include "lang/ro-RO.rc" +#include "lang/ro-RO.rc" Modified: trunk/reactos/base/applications/shutdown/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/shutdown/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -20,4 +20,4 @@ // UTF-8 #pragma code_page(65001) -#include "lang/pl-PL.rc" +#include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/sndrec32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -29,4 +29,4 @@ // UTF-8 #pragma code_page(65001) -#include "lang/pl-PL.rc" +#include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/sndvol32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -29,4 +29,4 @@ // UTF-8 #pragma code_page(65001) -#include "lang/pl-PL.rc" +#include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/taskmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/rsrc.rc [iso-8859-1] Sun May 22 11:57:27 2011 @@ -24,4 +24,4 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" -#include "lang/ro-RO.rc" +#include "lang/ro-RO.rc"

1 0

[ekohl] 51843: [MSPORTS] Determine serial port names COM1-4 and parallel port names LPT1-2 from their resources. Other serial and parallel are still named COMx and LPTx.
by ekohl＠svn.reactos.org 22 May '11

22 May '11

Author: ekohl Date: Sun May 22 08:57:33 2011 New Revision: 51843 URL: http://svn.reactos.org/svn/reactos?rev=51843&view=rev Log: [MSPORTS] Determine serial port names COM1-4 and parallel port names LPT1-2 from their resources. Other serial and parallel are still named COMx and LPTx. Modified: trunk/reactos/dll/win32/msports/classinst.c Modified: trunk/reactos/dll/win32/msports/classinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/classins… ============================================================================== --- trunk/reactos/dll/win32/msports/classinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/classinst.c [iso-8859-1] Sun May 22 08:57:33 2011 @@ -6,7 +6,10 @@ * PROGRAMMERS: Copyright 2011 Eric Kohl */ +#define WIN32_NO_STATUS #include <windows.h> +#include <cmtypes.h> +#include <stdio.h> #include <setupapi.h> #include <wine/debug.h> @@ -21,28 +24,275 @@ } PORT_TYPE; +BOOL +GetBootResourceList(HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + PCM_RESOURCE_LIST *ppResourceList) +{ + HKEY hDeviceKey = NULL; + HKEY hConfigKey = NULL; + LPBYTE lpBuffer = NULL; + DWORD dwDataSize; + LONG lError; + BOOL ret = FALSE; + + *ppResourceList = NULL; + + hDeviceKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, + DeviceInfoData, + DICS_FLAG_GLOBAL, + 0, + DIREG_DEV, + NULL, + NULL); + if (!hDeviceKey) + return FALSE; + + lError = RegOpenKeyExW(hDeviceKey, + L"LogConf", + 0, + KEY_QUERY_VALUE, + &hConfigKey); + if (lError != ERROR_SUCCESS) + goto done; + + /* Get the configuration data size */ + lError = RegQueryValueExW(hConfigKey, + L"BootConfig", + NULL, + NULL, + NULL, + &dwDataSize); + if (lError != ERROR_SUCCESS) + goto done; + + /* Allocate the buffer */ + lpBuffer = HeapAlloc(GetProcessHeap(), 0, dwDataSize); + if (lpBuffer == NULL) + goto done; + + /* Retrieve the configuration data */ + lError = RegQueryValueExW(hConfigKey, + L"BootConfig", + NULL, + NULL, + (LPBYTE)lpBuffer, + &dwDataSize); + if (lError == ERROR_SUCCESS) + ret = TRUE; + +done: + if (ret == FALSE && lpBuffer != NULL) + HeapFree(GetProcessHeap(), 0, lpBuffer); + + if (hConfigKey) + RegCloseKey(hConfigKey); + + if (hDeviceKey) + RegCloseKey(hDeviceKey); + + if (ret == TRUE) + *ppResourceList = (PCM_RESOURCE_LIST)lpBuffer; + + return ret; +} + + +DWORD +GetSerialPortNumber(IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData) +{ + PCM_RESOURCE_LIST lpResourceList = NULL; + PCM_PARTIAL_RESOURCE_DESCRIPTOR lpResDes; + ULONG i; + DWORD dwBaseAddress = 0; + DWORD dwPortNumber = 0; + + TRACE("GetSerialPortNumber(%p, %p)\n", + DeviceInfoSet, DeviceInfoData); + + if (GetBootResourceList(DeviceInfoSet, + DeviceInfoData, + &lpResourceList)) + { + TRACE("Full resource descriptors: %ul\n", lpResourceList->Count); + if (lpResourceList->Count > 0) + { + TRACE("Partial resource descriptors: %ul\n", lpResourceList->List[0].PartialResourceList.Count); + + for (i = 0; i < lpResourceList->List[0].PartialResourceList.Count; i++) + { + lpResDes = &lpResourceList->List[0].PartialResourceList.PartialDescriptors[i]; + TRACE("Type: %u\n", lpResDes->Type); + + switch (lpResDes->Type) + { + case CmResourceTypePort: + TRACE("Port: Start: %I64x Length: %lu\n", + lpResDes->u.Port.Start.QuadPart, + lpResDes->u.Port.Length); + if (lpResDes->u.Port.Start.HighPart == 0) + dwBaseAddress = (DWORD)lpResDes->u.Port.Start.LowPart; + break; + + case CmResourceTypeInterrupt: + TRACE("Interrupt: Level: %lu Vector: %lu\n", + lpResDes->u.Interrupt.Level, + lpResDes->u.Interrupt.Vector); + break; + } + } + } + + HeapFree(GetProcessHeap(), 0, lpResourceList); + } + + switch (dwBaseAddress) + { + case 0x3f8: + dwPortNumber = 1; + break; + + case 0x2f8: + dwPortNumber = 2; + break; + + case 0x3e8: + dwPortNumber = 3; + break; + + case 0x2e8: + dwPortNumber = 4; + break; + } + + return dwPortNumber; +} + + +DWORD +GetParallelPortNumber(IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData) +{ + PCM_RESOURCE_LIST lpResourceList = NULL; + PCM_PARTIAL_RESOURCE_DESCRIPTOR lpResDes; + ULONG i; + DWORD dwBaseAddress = 0; + DWORD dwPortNumber = 0; + + TRACE("GetParallelPortNumber(%p, %p)\n", + DeviceInfoSet, DeviceInfoData); + + if (GetBootResourceList(DeviceInfoSet, + DeviceInfoData, + &lpResourceList)) + { + TRACE("Full resource descriptors: %ul\n", lpResourceList->Count); + if (lpResourceList->Count > 0) + { + TRACE("Partial resource descriptors: %ul\n", lpResourceList->List[0].PartialResourceList.Count); + + for (i = 0; i < lpResourceList->List[0].PartialResourceList.Count; i++) + { + lpResDes = &lpResourceList->List[0].PartialResourceList.PartialDescriptors[i]; + TRACE("Type: %u\n", lpResDes->Type); + + switch (lpResDes->Type) + { + case CmResourceTypePort: + TRACE("Port: Start: %I64x Length: %lu\n", + lpResDes->u.Port.Start.QuadPart, + lpResDes->u.Port.Length); + if (lpResDes->u.Port.Start.HighPart == 0) + dwBaseAddress = (DWORD)lpResDes->u.Port.Start.LowPart; + break; + + case CmResourceTypeInterrupt: + TRACE("Interrupt: Level: %lu Vector: %lu\n", + lpResDes->u.Interrupt.Level, + lpResDes->u.Interrupt.Vector); + break; + } + + } + + } + + HeapFree(GetProcessHeap(), 0, lpResourceList); + } + + switch (dwBaseAddress) + { + case 0x378: + dwPortNumber = 1; + break; + + case 0x278: + dwPortNumber = 2; + break; + } + + return dwPortNumber; +} + + static DWORD InstallSerialPort(IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData) { - LPWSTR pszFriendlyName = L"Serial Port (COMx)"; + WCHAR szDeviceDescription[256]; + WCHAR szFriendlyName[256]; + WCHAR szPortName[5]; + DWORD dwPortNumber; TRACE("InstallSerialPort(%p, %p)\n", DeviceInfoSet, DeviceInfoData); + + dwPortNumber = GetSerialPortNumber(DeviceInfoSet, + DeviceInfoData); + if (dwPortNumber != 0) + { + swprintf(szPortName, L"COM%u", dwPortNumber); + } + else + { + wcscpy(szPortName, L"COMx"); + } + /* Install the device */ if (!SetupDiInstallDevice(DeviceInfoSet, DeviceInfoData)) { return GetLastError(); + } + + if (SetupDiGetDeviceRegistryPropertyW(DeviceInfoSet, + DeviceInfoData, + SPDRP_DEVICEDESC, + NULL, + (LPBYTE)szDeviceDescription, + 256 * sizeof(WCHAR), + NULL)) + { + swprintf(szFriendlyName, + L"%s (%s)", + szDeviceDescription, + szPortName); + } + else + { + swprintf(szFriendlyName, + L"Serial Port (%s)", + szPortName); } /* Set the friendly name for the device */ SetupDiSetDeviceRegistryPropertyW(DeviceInfoSet, DeviceInfoData, SPDRP_FRIENDLYNAME, - (LPBYTE)pszFriendlyName, - (wcslen(pszFriendlyName) + 1) * sizeof(WCHAR)); + (LPBYTE)szFriendlyName, + (wcslen(szFriendlyName) + 1) * sizeof(WCHAR)); return ERROR_SUCCESS; } @@ -52,9 +302,61 @@ InstallParallelPort(IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData) { - FIXME("InstallParallelPort(%p, %p)\n", - DeviceInfoSet, DeviceInfoData); - return ERROR_DI_DO_DEFAULT; + WCHAR szDeviceDescription[256]; + WCHAR szFriendlyName[256]; + WCHAR szPortName[5]; + DWORD dwPortNumber; + + TRACE("InstallParallelPort(%p, %p)\n", + DeviceInfoSet, DeviceInfoData); + + dwPortNumber = GetParallelPortNumber(DeviceInfoSet, + DeviceInfoData); + if (dwPortNumber != 0) + { + swprintf(szPortName, L"LPT%u", dwPortNumber); + } + else + { + wcscpy(szPortName, L"LPTx"); + } + + + /* Install the device */ + if (!SetupDiInstallDevice(DeviceInfoSet, + DeviceInfoData)) + { + return GetLastError(); + } + + if (SetupDiGetDeviceRegistryPropertyW(DeviceInfoSet, + DeviceInfoData, + SPDRP_DEVICEDESC, + NULL, + (LPBYTE)szDeviceDescription, + 256 * sizeof(WCHAR), + NULL)) + { + swprintf(szFriendlyName, + L"%s (%s)", + szDeviceDescription, + szPortName); + } + else + { + swprintf(szFriendlyName, + L"Serial Port (%s)", + szPortName); + } + + /* Set the friendly name for the device */ + SetupDiSetDeviceRegistryPropertyW(DeviceInfoSet, + DeviceInfoData, + SPDRP_FRIENDLYNAME, + (LPBYTE)szFriendlyName, + (wcslen(szFriendlyName) + 1) * sizeof(WCHAR)); + + return ERROR_SUCCESS; }

1 0

[akhaldi] 51842: [CMAKE/IDL] * Make sure to declare all the output files, so that the cleanup step could take care of them.
by akhaldi＠svn.reactos.org 21 May '11

21 May '11

Author: akhaldi Date: Sat May 21 17:44:39 2011 New Revision: 51842 URL: http://svn.reactos.org/svn/reactos?rev=51842&view=rev Log: [CMAKE/IDL] * Make sure to declare all the output files, so that the cleanup step could take care of them. Modified: trunk/reactos/cmake/idl-support.cmake Modified: trunk/reactos/cmake/idl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/idl-support.cmake?re… ============================================================================== --- trunk/reactos/cmake/idl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/idl-support.cmake [iso-8859-1] Sat May 21 17:44:39 2011 @@ -93,7 +93,7 @@ list(APPEND IDLS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) endif() add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c ${NAME}_p.h COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_PROXY_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_p.c ${IDL_HEADER_ARG2} ${NAME}_p.h ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${DLLDATA_ARG} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) endforeach() @@ -116,18 +116,18 @@ foreach(FILE ${ARGN}) get_filename_component(NAME ${FILE} NAME_WE) add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.c + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.c ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.h COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG2} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.h ${IDL_SERVER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) list(APPEND server_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_s.c) add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.c + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.c ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.h COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG2} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.h ${IDL_CLIENT_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}) list(APPEND client_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}_c.c) endforeach() - add_library(${TARGET} ${server_SOURCES} ${client_SOURCES}) + add_library(${TARGET} ${client_SOURCES} ${server_SOURCES}) add_dependencies(${TARGET} psdk) endmacro()

1 0

[osiejka] 51841: Converting POLISH localisation strings to UTF-8. Part 1/x - - base/applications. pl-PL.rc conversion; - add PRAGMA, required by MSVC to rsrc/modulename/resource.rc, instead of indi...
by osiejka＠svn.reactos.org 21 May '11

21 May '11

Author: osiejka Date: Sat May 21 16:24:21 2011 New Revision: 51841 URL: http://svn.reactos.org/svn/reactos?rev=51841&view=rev Log: Converting POLISH localisation strings to UTF-8. Part 1/x - - base/applications. pl-PL.rc conversion; - add PRAGMA, required by MSVC to rsrc/modulename/resource.rc, instead of individual localisation files. Localisation files already converted to UTF-8 will be placed at the end, after PRAGMA. Tested on rbuild/cmake/nmake Modified: trunk/reactos/base/applications/cacls/lang/pl-PL.rc trunk/reactos/base/applications/cacls/rsrc.rc trunk/reactos/base/applications/calc/lang/pl-PL.rc trunk/reactos/base/applications/calc/lang/ro-RO.rc trunk/reactos/base/applications/calc/resource.rc trunk/reactos/base/applications/charmap/charmap.rc trunk/reactos/base/applications/charmap/lang/pl-PL.rc trunk/reactos/base/applications/charmap/rsrc.rc trunk/reactos/base/applications/cmdutils/doskey/doskey.rc trunk/reactos/base/applications/cmdutils/doskey/lang/pl-PL.rc trunk/reactos/base/applications/cmdutils/find/find.rc trunk/reactos/base/applications/cmdutils/find/lang/pl-PL.rc trunk/reactos/base/applications/cmdutils/find/rsrc.rc trunk/reactos/base/applications/cmdutils/more/lang/pl-PL.rc trunk/reactos/base/applications/cmdutils/more/more.rc trunk/reactos/base/applications/cmdutils/more/rsrc.rc trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc trunk/reactos/base/applications/dxdiag/rsrc.rc trunk/reactos/base/applications/findstr/lang/pl-PL.rc trunk/reactos/base/applications/findstr/rsrc.rc trunk/reactos/base/applications/fontview/fontview.rc trunk/reactos/base/applications/fontview/lang/pl-PL.rc trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc trunk/reactos/base/applications/games/solitaire/rsrc.rc trunk/reactos/base/applications/games/spider/lang/pl-PL.rc trunk/reactos/base/applications/games/spider/rsrc.rc trunk/reactos/base/applications/games/winmine/lang/bg-BG.rc trunk/reactos/base/applications/games/winmine/lang/cs-CZ.rc trunk/reactos/base/applications/games/winmine/lang/da-DK.rc trunk/reactos/base/applications/games/winmine/lang/de-DE.rc trunk/reactos/base/applications/games/winmine/lang/en-US.rc trunk/reactos/base/applications/games/winmine/lang/es-ES.rc trunk/reactos/base/applications/games/winmine/lang/fi-FI.rc trunk/reactos/base/applications/games/winmine/lang/fr-FR.rc trunk/reactos/base/applications/games/winmine/lang/it-IT.rc trunk/reactos/base/applications/games/winmine/lang/ja-JP.rc trunk/reactos/base/applications/games/winmine/lang/ko-KR.rc trunk/reactos/base/applications/games/winmine/lang/lt-LT.rc trunk/reactos/base/applications/games/winmine/lang/nl-NL.rc trunk/reactos/base/applications/games/winmine/lang/no-NO.rc trunk/reactos/base/applications/games/winmine/lang/pl-PL.rc trunk/reactos/base/applications/games/winmine/lang/pt-PT.rc trunk/reactos/base/applications/games/winmine/lang/ro-RO.rc trunk/reactos/base/applications/games/winmine/lang/ru-RU.rc trunk/reactos/base/applications/games/winmine/lang/sl-SI.rc trunk/reactos/base/applications/games/winmine/lang/sv-SE.rc trunk/reactos/base/applications/games/winmine/lang/tr-TR.rc trunk/reactos/base/applications/games/winmine/lang/uk-UA.rc trunk/reactos/base/applications/games/winmine/lang/zh-CN.rc trunk/reactos/base/applications/games/winmine/rsrc.rc trunk/reactos/base/applications/kbswitch/lang/pl-PL.rc trunk/reactos/base/applications/kbswitch/rsrc.rc trunk/reactos/base/applications/logoff/lang/pl-PL.rc trunk/reactos/base/applications/logoff/rsrc.rc trunk/reactos/base/applications/magnify/lang/pl-PL.rc trunk/reactos/base/applications/magnify/lang/ro-RO.rc trunk/reactos/base/applications/magnify/rsrc.rc trunk/reactos/base/applications/mmc/lang/pl-PL.rc trunk/reactos/base/applications/mmc/rsrc.rc trunk/reactos/base/applications/mplay32/lang/pl-PL.rc trunk/reactos/base/applications/mplay32/rsrc.rc trunk/reactos/base/applications/msconfig/lang/pl-PL.rc trunk/reactos/base/applications/msconfig/rsrc.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/servman/rsrc.rc trunk/reactos/base/applications/mspaint/lang/pl-PL.rc trunk/reactos/base/applications/mspaint/lang/ro-RO.rc trunk/reactos/base/applications/mspaint/rsrc.rc trunk/reactos/base/applications/mstsc/lang/pl-PL.rc trunk/reactos/base/applications/mstsc/rsrc.rc trunk/reactos/base/applications/network/ipconfig/ipconfig.rc trunk/reactos/base/applications/network/ipconfig/lang/pl-PL.rc trunk/reactos/base/applications/network/ping/lang/pl-PL.rc trunk/reactos/base/applications/network/ping/ping.rc trunk/reactos/base/applications/notepad/lang/hy-AM.rc trunk/reactos/base/applications/notepad/lang/pl-PL.rc trunk/reactos/base/applications/notepad/lang/ro-RO.rc trunk/reactos/base/applications/notepad/rsrc.rc trunk/reactos/base/applications/rapps/lang/bg-BG.rc trunk/reactos/base/applications/rapps/lang/cs-CZ.rc trunk/reactos/base/applications/rapps/lang/de-DE.rc trunk/reactos/base/applications/rapps/lang/en-US.rc trunk/reactos/base/applications/rapps/lang/es-ES.rc trunk/reactos/base/applications/rapps/lang/fr-FR.rc trunk/reactos/base/applications/rapps/lang/it-IT.rc trunk/reactos/base/applications/rapps/lang/ja-JP.rc trunk/reactos/base/applications/rapps/lang/no-NO.rc trunk/reactos/base/applications/rapps/lang/pl-PL.rc trunk/reactos/base/applications/rapps/lang/ru-RU.rc trunk/reactos/base/applications/rapps/lang/sk-SK.rc trunk/reactos/base/applications/rapps/lang/sv-SE.rc trunk/reactos/base/applications/rapps/lang/uk-UA.rc trunk/reactos/base/applications/rapps/rsrc.rc trunk/reactos/base/applications/regedit/lang/pl-PL.rc trunk/reactos/base/applications/regedit/rsrc.rc trunk/reactos/base/applications/screensavers/3dtext/lang/pl-PL.rc trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc trunk/reactos/base/applications/screensavers/logon/lang/pl-PL.rc trunk/reactos/base/applications/screensavers/logon/lang/ro-RO.rc trunk/reactos/base/applications/screensavers/logon/logon.rc trunk/reactos/base/applications/shutdown/lang/pl-PL.rc trunk/reactos/base/applications/shutdown/rsrc.rc trunk/reactos/base/applications/sndrec32/lang/pl-PL.rc trunk/reactos/base/applications/sndrec32/rsrc.rc trunk/reactos/base/applications/sndvol32/lang/pl-PL.rc trunk/reactos/base/applications/sndvol32/rsrc.rc trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc trunk/reactos/base/applications/taskmgr/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/cacls/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… Modified: trunk/reactos/base/applications/cacls/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/rs… Modified: trunk/reactos/base/applications/calc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… Modified: trunk/reactos/base/applications/charmap/charmap.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/charmap/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/charmap/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/doskey/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/find.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/more/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/more/more.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/more/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/r… Modified: trunk/reactos/base/applications/findstr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/fontview/fontview.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… Modified: trunk/reactos/base/applications/fontview/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… Modified: trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/spider/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/spider/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/winmine/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winmine/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/kbswitch/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… Modified: trunk/reactos/base/applications/kbswitch/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… Modified: trunk/reactos/base/applications/logoff/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… Modified: trunk/reactos/base/applications/logoff/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/r… Modified: trunk/reactos/base/applications/magnify/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… Modified: trunk/reactos/base/applications/magnify/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… Modified: trunk/reactos/base/applications/magnify/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… Modified: trunk/reactos/base/applications/mmc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… Modified: trunk/reactos/base/applications/mmc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/rsrc… Modified: trunk/reactos/base/applications/mplay32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Modified: trunk/reactos/base/applications/mplay32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Modified: trunk/reactos/base/applications/msconfig/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mspaint/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mspaint/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mstsc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… Modified: trunk/reactos/base/applications/mstsc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rs… Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ipconfig/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/ping.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/notepad/lang/hy-AM.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/rapps/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/rs… Modified: trunk/reactos/base/applications/regedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/screensavers/3dtext/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/screensavers/logon/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/screensavers/logon/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/shutdown/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… Modified: trunk/reactos/base/applications/shutdown/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… Modified: trunk/reactos/base/applications/sndrec32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndvol32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…

1 0

[akhaldi] 51840: [FREELDR] * Make KeBugCheckEx definition consistent with the declaration. Fixes an msvc error.
by akhaldi＠svn.reactos.org 21 May '11

21 May '11

Author: akhaldi Date: Sat May 21 15:27:24 2011 New Revision: 51840 URL: http://svn.reactos.org/svn/reactos?rev=51840&view=rev Log: [FREELDR] * Make KeBugCheckEx definition consistent with the declaration. Fixes an msvc error. Modified: trunk/reactos/boot/freeldr/freeldr/debug.c Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Sat May 21 15:27:24 2011 @@ -341,7 +341,6 @@ } NTKERNELAPI -DECLSPEC_NORETURN VOID NTAPI KeBugCheckEx(

1 0

[tkreuzer] 51839: [GDI FONT DRIVER] - Implement support for different source and destination bit depth, which is neccessary for fonts that provide bitmaps for individual glyphs. These can be in 1bp...
by tkreuzer＠svn.reactos.org 21 May '11

21 May '11

Author: tkreuzer Date: Sat May 21 15:05:20 2011 New Revision: 51839 URL: http://svn.reactos.org/svn/reactos?rev=51839&view=rev Log: [GDI FONT DRIVER] - Implement support for different source and destination bit depth, which is neccessary for fonts that provide bitmaps for individual glyphs. These can be in 1bpp, while we still need to provide 4bpp. (In theory we could use a callback for the rasterizer to directly draw on the output bitmap, but its support in freetype doesn't yet cover all cases) Added: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/copybits.c (with props) Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/CMakeLists.txt branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/CMakeLists.txt [iso-8859-1] Sat May 21 15:05:20 2011 @@ -5,6 +5,7 @@ add_library(ftfd SHARED enable.c + copybits.c font.c glyph.c tttables.c Added: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/copybits.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/copybits.c (added) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/copybits.c [iso-8859-1] Sat May 21 15:05:20 2011 @@ -1,0 +1,188 @@ +/* + * PROJECT: ReactOS win32 subsystem + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: GDI font driver based on freetype + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#include "ftfd.h" + + +static +VOID +FtfdCopyBits_S1D1( + BYTE *pjDest, + FT_Bitmap *ftbitmap) +{ + ULONG ulRows, ulDstDelta, ulSrcDelta; + PBYTE pjDstLine, pjSrcLine; + + pjDstLine = pjDest; + ulDstDelta = (ftbitmap->width + 7) / 8; + + pjSrcLine = ftbitmap->buffer; + ulSrcDelta = abs(ftbitmap->pitch); + + ulRows = ftbitmap->rows; + while (ulRows--) + { + /* Copy one line */ + memcpy(pjDstLine, pjSrcLine, ulDstDelta); + + /* Next ros */ + pjDstLine += ulDstDelta; + pjSrcLine += ulSrcDelta; + } +} + +static +VOID +FtfdCopyBits_S8D1( + BYTE *pjDest, + FT_Bitmap *ftbitmap) +{ + __debugbreak(); +} + + +static +VOID +FtfdCopyBits_S1D4( + BYTE *pjDest, + FT_Bitmap *ftbitmap) +{ + ULONG ulRows, ulSrcDelta; + PBYTE pjDstLine, pjSrcLine; + +//__debugbreak(); + + pjDstLine = pjDest; + + pjSrcLine = ftbitmap->buffer; + ulSrcDelta = abs(ftbitmap->pitch); + + ulRows = ftbitmap->rows; + while (ulRows--) + { + ULONG ulWidth = ftbitmap->width; + BYTE j, *pjSrc; + static USHORT ausExpand[] = + {0x0000, 0x000f, 0x00f0, 0x00ff, 0x0f00, 0x0f0f, 0x0ff0, 0x0fff, + 0xf000, 0xf00f, 0xf0f0, 0xf0ff, 0xff00, 0xff0f, 0xfff0, 0xffff}; + + pjSrc = pjSrcLine; + + /* Get 8 pixels */ + j = (*pjSrc++); + + while (ulWidth >= 8) + { + /* Set 8 pixels / 4 bytes */ + *pjDstLine++ = (BYTE)(ausExpand[j >> 4] >> 8); + *pjDstLine++ = (BYTE)ausExpand[j >> 4]; + *pjDstLine++ = (BYTE)(ausExpand[j & 0xf] >> 8); + *pjDstLine++ = (BYTE)ausExpand[j & 0xf]; + + /* Next 8 pixels */ + j = (*pjSrc++); + ulWidth -= 8; + } + + /* Set remaining pixels (max 7) */ + if (ulWidth > 0) *pjDstLine++ = (BYTE)(ausExpand[j >> 4] >> 8); + if (ulWidth > 2) *pjDstLine++ = (BYTE)ausExpand[j >> 4]; + if (ulWidth > 4) *pjDstLine++ = (BYTE)(ausExpand[j & 0xf] >> 8); + if (ulWidth > 6) *pjDstLine++ = (BYTE)ausExpand[j & 0xf]; + + /* Go to the next source line */ + pjSrcLine += ulSrcDelta; + } +} + +static +VOID +FtfdCopyBits_S8D4( + BYTE *pjDest, + FT_Bitmap *ftbitmap) +{ + ULONG ulRows, ulDstDelta, ulSrcDelta; + PBYTE pjDstLine, pjSrcLine; + + pjDstLine = pjDest; + ulDstDelta = (ftbitmap->width*4 + 7) / 8; + + pjSrcLine = ftbitmap->buffer; + ulSrcDelta = abs(ftbitmap->pitch); + + ulRows = ftbitmap->rows; + while (ulRows--) + { + ULONG ulWidth = ulDstDelta; + BYTE j, *pjSrc; + + pjSrc = pjSrcLine; + while (ulWidth--) + { + /* Get the 1st pixel */ + j = (*pjSrc++) & 0xf0; + + /* Get the 2nd pixel */ + if (ulWidth > 0 || !(ftbitmap->width & 1)) + j |= (*pjSrc++) >> 4; + *pjDstLine++ = j; + } + + /* Go to the next source line */ + pjSrcLine += ulSrcDelta; + } +} + +void +NTAPI +FtfdCopyBits( + BYTE jBppDst, + BYTE *pjDest, + FT_Bitmap *ftbitmap) +{ + + if (jBppDst == 1) + { + if (ftbitmap->pixel_mode == FT_PIXEL_MODE_MONO) + { + FtfdCopyBits_S1D1(pjDest, ftbitmap); + } + else if (ftbitmap->pixel_mode == FT_PIXEL_MODE_GRAY && + ftbitmap->num_grays == 256) + { + FtfdCopyBits_S8D1(pjDest, ftbitmap); + } + else + { + WARN("Unsupported pixel format\n"); + __debugbreak(); + } + + } + else if (jBppDst == 4) + { + if (ftbitmap->pixel_mode == FT_PIXEL_MODE_MONO) + { + FtfdCopyBits_S1D4(pjDest, ftbitmap); + } + else if (ftbitmap->pixel_mode == FT_PIXEL_MODE_GRAY && + ftbitmap->num_grays == 256) + { + FtfdCopyBits_S8D4(pjDest, ftbitmap); + } + else + { + WARN("Unsupported pixel format\n"); + __debugbreak(); + } + } + else + { + WARN("Bit depth %ld not implemented\n", jBppDst); + __debugbreak(); + } +} Propchange: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/copybits.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] Sat May 21 15:05:20 2011 @@ -148,7 +148,6 @@ POINTEF ptefSide; SIZEL sizlScale; HGLYPH hgSelected; - ULONG cjSelected; UCHAR jBpp; } FTFD_FONT, *PFTFD_FONT; @@ -340,3 +339,10 @@ NTAPI FtfdInitKerningPairs( PFTFD_FACE pface); + +VOID +NTAPI +FtfdCopyBits( + BYTE jBppDst, + BYTE *pjDest, + FT_Bitmap *ftbitmap); Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] Sat May 21 15:05:20 2011 @@ -97,6 +97,7 @@ pfont->iFace = pfo->iFace; pfont->pface = pface; pfont->hgSelected = -1; + /* Create a freetype face */ fterror = FT_New_Memory_Face(gftlibrary, @@ -429,72 +430,6 @@ //__debugbreak(); } -static -VOID -FtfdCopyBitmap1Bpp( - BYTE *pjDest, - FT_Bitmap *ftbitmap) -{ - ULONG ulRows, ulDstDelta, ulSrcDelta; - PBYTE pjDstLine, pjSrcLine; - - pjDstLine = pjDest; - ulDstDelta = (ftbitmap->width + 7) / 8; - - pjSrcLine = ftbitmap->buffer; - ulSrcDelta = abs(ftbitmap->pitch); - - ulRows = ftbitmap->rows; - while (ulRows--) - { - /* Copy one line */ - memcpy(pjDstLine, pjSrcLine, ulDstDelta); - - /* Next ros */ - pjDstLine += ulDstDelta; - pjSrcLine += ulSrcDelta; - } -} - -static -VOID -FtfdCopyBitmap4Bpp( - BYTE *pjDest, - FT_Bitmap *ftbitmap) -{ - ULONG ulRows, ulDstDelta, ulSrcDelta; - PBYTE pjDstLine, pjSrcLine; - - pjDstLine = pjDest; - ulDstDelta = (ftbitmap->width*4 + 7) / 8; - - pjSrcLine = ftbitmap->buffer; - ulSrcDelta = abs(ftbitmap->pitch); - - ulRows = ftbitmap->rows; - while (ulRows--) - { - ULONG ulWidth = ulDstDelta; - BYTE j, *pjSrc; - - pjSrc = pjSrcLine; - while (ulWidth--) - { - /* Get the 1st pixel */ - j = (*pjSrc++) & 0xf0; - - /* Get the 2nd pixel */ - if (ulWidth > 0 || !(ftbitmap->width & 1)) - j |= (*pjSrc++) >> 4; - *pjDstLine++ = j; - } - - /* Go to the next line */ - //pjDstLine += ulDstDelta; - pjSrcLine += ulSrcDelta; - } -} - VOID FtfdQueryGlyphBits( FONTOBJ *pfo, @@ -523,15 +458,11 @@ } /* Copy the bitmap */ - if (pfont->jBpp == 4) - FtfdCopyBitmap4Bpp(pgb->aj, &ftglyph->bitmap); - else - FtfdCopyBitmap1Bpp(pgb->aj, &ftglyph->bitmap); + FtfdCopyBits(pfont->jBpp, pgb->aj, &ftglyph->bitmap); //TRACE("QueryGlyphBits hg=%lx, (%ld,%ld) cjSize=%ld, need %ld\n", // hg, pgb->sizlBitmap.cx, pgb->sizlBitmap.cy, cjSize, // GLYPHBITS_SIZE(pgb->sizlBitmap.cx, pgb->sizlBitmap.cy, pfont->jBpp)); - } VOID

1 0

[akhaldi] 51838: [CMAKE] * Merge more msvc fixes from the cmake branch.
by akhaldi＠svn.reactos.org 21 May '11

21 May '11

Author: akhaldi Date: Sat May 21 12:39:48 2011 New Revision: 51838 URL: http://svn.reactos.org/svn/reactos?rev=51838&view=rev Log: [CMAKE] * Merge more msvc fixes from the cmake branch. Modified: trunk/reactos/include/dxsdk/amvideo.idl trunk/reactos/include/dxsdk/bdatif.idl trunk/reactos/include/dxsdk/qedit.idl trunk/reactos/include/dxsdk/videoacc.idl trunk/reactos/include/reactos/idl/eventlogrpc.acf trunk/reactos/include/reactos/idl/lsa.acf trunk/reactos/include/reactos/wine/irot.idl trunk/reactos/include/reactos/wine/wined3d.idl Modified: trunk/reactos/include/dxsdk/amvideo.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/amvideo.idl?… ============================================================================== --- trunk/reactos/include/dxsdk/amvideo.idl [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/amvideo.idl [iso-8859-1] Sat May 21 12:39:48 2011 @@ -61,7 +61,7 @@ [ object, - /* uuid(36d39eb0-dd75-11ce-bf0e-00aa0055595a) conflicts with uuids.h */ + uuid(36d39eb0-dd75-11ce-bf0e-00aa0055595a), pointer_default(unique), local ] @@ -87,7 +87,7 @@ [ object, - /* uuid(1bd0ecb0-f8e2-11ce-aac6-0020af0b99a3) conflicts with uuids.h */ + uuid(1bd0ecb0-f8e2-11ce-aac6-0020af0b99a3), pointer_default(unique), local ] @@ -103,7 +103,7 @@ [ object, - /* uuid(dd1d7110-7836-11cf-bf47-00aa0055595a) conflicts with uuids.h */ + uuid(dd1d7110-7836-11cf-bf47-00aa0055595a), pointer_default(unique) ] interface IFullScreenVideo : IUnknown @@ -129,7 +129,7 @@ [ object, - /* uuid(53479470-f1dd-11cf-bc42-00aa00ac74f6) conflicts with uuids.h */ + uuid(53479470-f1dd-11cf-bc42-00aa00ac74f6), pointer_default(unique), local ] @@ -144,7 +144,7 @@ [ object, - /* uuid(61ded640-e912-11ce-a099-00aa00479a58) conflicts with uuids.h */ + uuid(61ded640-e912-11ce-a099-00aa00479a58), pointer_default(unique), local ] Modified: trunk/reactos/include/dxsdk/bdatif.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/bdatif.idl?r… ============================================================================== --- trunk/reactos/include/dxsdk/bdatif.idl [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/bdatif.idl [iso-8859-1] Sat May 21 12:39:48 2011 @@ -254,7 +254,9 @@ ] library PSISLOADLib { +#ifndef __midl importlib("stdole32.tlb"); +#endif importlib("stdole2.tlb"); [ Modified: trunk/reactos/include/dxsdk/qedit.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/qedit.idl?re… ============================================================================== --- trunk/reactos/include/dxsdk/qedit.idl [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/qedit.idl [iso-8859-1] Sat May 21 12:39:48 2011 @@ -160,9 +160,16 @@ }; [ - uuid(65BD0711-24D2-4ff7-9324-ED2E5D3ABAFA), + uuid(78530B68-61F9-11D2-8CAD-00A024580902), + version(1.0), ] -coclass MediaDet +library DexterLib { - [default] interface IMediaDet; + [ + uuid(65BD0711-24D2-4ff7-9324-ED2E5D3ABAFA), + ] + coclass MediaDet + { + [default] interface IMediaDet; + }; }; Modified: trunk/reactos/include/dxsdk/videoacc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/videoacc.idl… ============================================================================== --- trunk/reactos/include/dxsdk/videoacc.idl [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/videoacc.idl [iso-8859-1] Sat May 21 12:39:48 2011 @@ -53,4 +53,4 @@ HRESULT GetUncompSurfacesInfo([in] const GUID *pGuid, [in] [out] LPAMVAUncompBufferInfo pUncompBufferInfo); HRESULT SetUncompSurfacesInfo([in] DWORD dwActualUncompSurfacesAllocated); HRESULT GetCreateVideoAcceleratorData([in] const GUID *pGuid, [out] LPDWORD pdwSizeMiscData, [out] LPVOID *ppMiscData); -}; +}; Modified: trunk/reactos/include/reactos/idl/eventlogrpc.acf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/eventl… ============================================================================== --- trunk/reactos/include/reactos/idl/eventlogrpc.acf [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/eventlogrpc.acf [iso-8859-1] Sat May 21 12:39:48 2011 @@ -3,4 +3,4 @@ ] interface eventlog { -} +} Modified: trunk/reactos/include/reactos/idl/lsa.acf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/lsa.ac… ============================================================================== --- trunk/reactos/include/reactos/idl/lsa.acf [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/lsa.acf [iso-8859-1] Sat May 21 12:39:48 2011 @@ -1,6 +1,6 @@ [ explicit_handle ] -interface svcctl +interface lsarpc { } Modified: trunk/reactos/include/reactos/wine/irot.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/irot.… ============================================================================== --- trunk/reactos/include/reactos/wine/irot.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/irot.idl [iso-8859-1] Sat May 21 12:39:48 2011 @@ -29,7 +29,9 @@ [ uuid(7a98c254-6808-11cf-b73b-00aa00b677a8), version(0.2), +#ifndef _MSC_VER strict_context_handle +#endif ] interface Irot { Modified: trunk/reactos/include/reactos/wine/wined3d.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… ============================================================================== --- trunk/reactos/include/reactos/wine/wined3d.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/wined3d.idl [iso-8859-1] Sat May 21 12:39:48 2011 @@ -3374,7 +3374,15 @@ ); } +#ifdef __midl +IWineD3D * __stdcall WineDirect3DCreate(UINT dxVersion, void *parent); +IWineD3DClipper * __stdcall WineDirect3DCreateClipper(void); +void __stdcall wined3d_mutex_lock(void); +void __stdcall wined3d_mutex_unlock(void); +#else IWineD3D *WineDirect3DCreate(UINT dxVersion, void *parent); IWineD3DClipper *WineDirect3DCreateClipper(void); void wined3d_mutex_lock(void); void wined3d_mutex_unlock(void); +#endif +

1 0

[akhaldi] 51837: [CMAKE] * Merge some msvc fixes from the cmake branch.
by akhaldi＠svn.reactos.org 21 May '11

21 May '11

Author: akhaldi Date: Sat May 21 12:30:26 2011 New Revision: 51837 URL: http://svn.reactos.org/svn/reactos?rev=51837&view=rev Log: [CMAKE] * Merge some msvc fixes from the cmake branch. Modified: trunk/reactos/include/psdk/activdbg.idl trunk/reactos/include/psdk/asptlb.idl trunk/reactos/include/psdk/ctfutb.idl trunk/reactos/include/psdk/dimm.idl trunk/reactos/include/psdk/dispex.idl trunk/reactos/include/psdk/ksproxy.h trunk/reactos/include/psdk/mlang.idl trunk/reactos/include/psdk/msctf.idl trunk/reactos/include/psdk/mshtml.idl trunk/reactos/include/psdk/mstask.idl trunk/reactos/include/psdk/richole.idl trunk/reactos/include/psdk/shobjidl.idl trunk/reactos/include/psdk/stdole2.idl trunk/reactos/include/reactos/idl/svcctl.idl trunk/reactos/include/reactos/idl/wlansvc.idl Modified: trunk/reactos/include/psdk/activdbg.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/activdbg.idl?… ============================================================================== --- trunk/reactos/include/psdk/activdbg.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/activdbg.idl [iso-8859-1] Sat May 21 12:30:26 2011 @@ -553,6 +553,140 @@ [out] BOOL *pfCallOnScriptErrorWhenContinuing); } +[ + object, + uuid(51973C17-CB0C-11d0-B5C9-00A0244A0E7A), + pointer_default(unique) +] +interface IDebugStackFrame : IUnknown +{ + /* FIXME: fill me! */ +} + +[ + object, + uuid(51973C1e-CB0C-11d0-B5C9-00A0244A0E7A), + pointer_default(unique) +] +interface IEnumDebugStackFrames : IUnknown +{ + /* FIXME: fill me! */ +} + +[ + object, + uuid(51973C2a-CB0C-11d0-B5C9-00A0244A0E7A), + pointer_default(unique) +] +interface IApplicationDebugger : IUnknown +{ + /* FIXME: fill me! */ +}; + +[ + object, + uuid(51973C3c-CB0C-11d0-B5C9-00A0244A0E7A), + pointer_default(unique) +] +interface IEnumRemoteDebugApplicationThreads : IUnknown +{ + /* FIXME: fill me! */ +} + +[ + object, + uuid(51973C34-CB0C-11d0-B5C9-00A0244A0E7A), + pointer_default(unique) +] +interface IDebugApplicationNode : IUnknown +{ + /* FIXME: fill me! */ +} + +[ + object, + uuid(51973C40-CB0C-11d0-B5C9-00A0244A0E7A), + pointer_default(unique) +] +interface IEnumDebugExpressionContexts : IUnknown +{ + /* FIXME: fill me! */ +} + +[ + object, + uuid(51973c38-cb0c-11d0-b5c9-00a0244a0e7a), + pointer_default(unique), + local +] +interface IDebugApplicationThread : IRemoteDebugApplicationThread +{ + /* FIXME: fill me! */ +} + +[ + object, + uuid(51973C1a-cb0c-11d0-b5c9-00a0244a0e7a), + pointer_default(unique), + local +] +interface IDebugSyncOperation : IUnknown +{ + /* FIXME: fill me! */ +} + +[ + object, + uuid(51973c1b-cb0c-11d0-b5c9-00a0244a0e7a), + pointer_default(unique), + local +] +interface IDebugAsyncOperation : IUnknown +{ + /* FIXME: fill me! */ +} + +[ + object, + uuid(51973c18-cb0c-11d0-b5c9-00a0244a0e7a), + pointer_default(unique) +] +interface IDebugStackFrameSniffer : IUnknown +{ + /* FIXME: fill me! */ +} + +[ + object, + uuid(51973C36-CB0C-11d0-B5C9-00A0244A0E7A), + pointer_default(unique), + local +] +interface IDebugThreadCall32 : IUnknown +{ + /* FIXME: fill me! */ +} + +[ + object, + uuid(51973C12-CB0C-11d0-B5C9-00A0244A0E7A), + pointer_default(unique) +] +interface IActiveScriptErrorDebug : IActiveScriptError +{ + /* FIXME: fill me! */ +} + +[ + object, + uuid(51973C41-CB0C-11d0-B5C9-00A0244A0E7A), + pointer_default(unique) +] +interface IProvideExpressionContexts : IUnknown +{ + /* FIXME: fill me! */ +} + cpp_quote("#ifndef DISABLE_ACTIVDBG_INTERFACE_WRAPPERS") cpp_quote("#ifdef _WIN64") Modified: trunk/reactos/include/psdk/asptlb.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/asptlb.idl?re… ============================================================================== --- trunk/reactos/include/psdk/asptlb.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/asptlb.idl [iso-8859-1] Sat May 21 12:30:26 2011 @@ -23,7 +23,7 @@ [ object, dual, - uuid(D97A6DA0-A864-11cf-83BE-00A0C90C2BD8) + uuid(D97A6DA0-A85F-11df-83AE-00A0C90C2BD8) ] interface IRequestDictionary : IDispatch { Modified: trunk/reactos/include/psdk/ctfutb.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ctfutb.idl?re… ============================================================================== --- trunk/reactos/include/psdk/ctfutb.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ctfutb.idl [iso-8859-1] Sat May 21 12:30:26 2011 @@ -18,11 +18,17 @@ #ifndef DO_NO_IMPORTS import "oaidl.idl"; +#ifdef __midl +import "msctf.idl"; +#endif #endif interface ITfLangBarEventSink; interface ITfLangBarItemMgr; interface ITfInputProcessorProfiles; +interface IEnumTfLangBarItems; +interface ITfLangBarItem; +interface ITfLangBarItemSink; [ object, @@ -71,3 +77,156 @@ HRESULT GetShowFloatingStatus( [out] DWORD *pdwFlags); }; + +[ + object, + uuid(18a4e900-e0ae-11d2-afdd-00105a2799b5), + pointer_default(unique) +] +interface ITfLangBarEventSink: IUnknown +{ + HRESULT OnSetFocus( + [in] DWORD dwThreadId); + + HRESULT OnThreadTerminate( + [in] DWORD dwThreadId); + + HRESULT OnThreadItemChange( + [in] DWORD dwThreadId); + + HRESULT OnModalInput( + [in] DWORD dwThreadId, + [in] UINT uMsg, + [in] WPARAM wParam, + [in] LPARAM lParam); + + HRESULT ShowFloating( + [in] DWORD dwFlags); + + HRESULT GetItemFloatingRect( + [in] DWORD dwThreadId, + [in] REFGUID rguid, + [out] RECT *prc); +} + +const ULONG TF_LBI_DESC_MAXLEN = 32; + +typedef [uuid(12a1d29f-a065-440c-9746-eb2002c8bd19)] struct TF_LANGBARITEMINFO +{ + CLSID clsidService; + GUID guidItem; + DWORD dwStyle; + ULONG ulSort; + WCHAR szDescription[TF_LBI_DESC_MAXLEN]; +} TF_LANGBARITEMINFO; + +[ + object, + uuid(ba468c55-9956-4fb1-a59d-52a7dd7cc6aa), + pointer_default(unique), +] +interface ITfLangBarItemMgr : IUnknown +{ + HRESULT EnumItems( + [out] IEnumTfLangBarItems **ppEnum); + + HRESULT GetItem( + [in] REFGUID rguid, + [out] ITfLangBarItem **ppItem); + + HRESULT AddItem( + [in] ITfLangBarItem *punk); + + HRESULT RemoveItem( + [in] ITfLangBarItem *punk); + + HRESULT AdviseItemSink( + [in] ITfLangBarItemSink *punk, + [out] DWORD *pdwCookie, + [in] REFGUID rguidItem); + + HRESULT UnadviseItemSink( + [in] DWORD dwCookie); + + HRESULT GetItemFloatingRect( + [in] DWORD dwThreadId, + [in] REFGUID rguid, + [out] RECT *prc); + + HRESULT GetItemsStatus( + [in] ULONG ulCount, + [in, size_is(ulCount)] const GUID *prgguid, + [out, size_is(ulCount)] DWORD *pdwStatus); + + HRESULT GetItemNum( + [out] ULONG *pulCount); + + HRESULT GetItems( + [in] ULONG ulCount, + [out, size_is(ulCount), length_is(*pcFetched)] ITfLangBarItem **ppItem, + [out, size_is(ulCount), length_is(*pcFetched)] TF_LANGBARITEMINFO *pInfo, + [out, size_is(ulCount), length_is(*pcFetched)] DWORD *pdwStatus, + [in, out, unique] ULONG *pcFetched); + + HRESULT AdviseItemsSink( + [in] ULONG ulCount, + [in, size_is(ulCount)] ITfLangBarItemSink **ppunk, + [in, size_is(ulCount)] const GUID *pguidItem, + [out, size_is(ulCount)] DWORD *pdwCookie); + + HRESULT UnadviseItemsSink( + [in] ULONG ulCount, + [in, size_is(ulCount)] DWORD *pdwCookie); +}; + +[ + object, + uuid(583f34d0-de25-11d2-afdd-00105a2799b5), + pointer_default(unique), +] +interface IEnumTfLangBarItems : IUnknown +{ + HRESULT Clone( + [out] IEnumTfLangBarItems **ppEnum); + + HRESULT Next( + [in] ULONG ulCount, + [out, size_is(ulCount)] ITfLangBarItem **ppItem, + [in, out, unique] ULONG *pcFetched); + + HRESULT Reset(); + + HRESULT Skip( + [in] ULONG ulCount); +} + +[ + object, + uuid(73540d69-edeb-4ee9-96c9-23aa30b25916), + pointer_default(unique), +] +interface ITfLangBarItem : IUnknown +{ + HRESULT GetInfo( + [out] TF_LANGBARITEMINFO *pInfo); + + HRESULT GetStatus( + [out] DWORD *pdwStatus); + + HRESULT Show( + [in] BOOL fShow); + + HRESULT GetTooltipString( + [out] BSTR *pbstrToolTip); +} + +[ + object, + uuid(57dbe1a0-de25-11d2-afdd-00105a2799b5), + pointer_default(unique), +] +interface ITfLangBarItemSink : IUnknown +{ + HRESULT OnUpdate( + [in] DWORD dwFlags); +} Modified: trunk/reactos/include/psdk/dimm.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dimm.idl?rev=… ============================================================================== --- trunk/reactos/include/psdk/dimm.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dimm.idl [iso-8859-1] Sat May 21 12:30:26 2011 @@ -21,7 +21,9 @@ #endif cpp_quote("#include <imm.h>") - +#ifdef _MSC_VER +cpp_quote("DEFINE_GUID(CLSID_CActiveIMM, 0x4955dd33, 0xb159, 0x11d0, 0x8f,0xcf, 0x00,0xaa,0x00,0x6b,0xcc,0x59);") +#endif cpp_quote("#if 0") typedef struct { @@ -588,3 +590,4 @@ /* interface IActiveIMMRegistrar; */ /* interface IActiveIMMMessagePumpOwner; */ } + Modified: trunk/reactos/include/psdk/dispex.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dispex.idl?re… ============================================================================== --- trunk/reactos/include/psdk/dispex.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dispex.idl [iso-8859-1] Sat May 21 12:30:26 2011 @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +// HACK +#define annotation(x) #ifndef DO_NO_IMPORTS import "ocidl.idl"; Modified: trunk/reactos/include/psdk/ksproxy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksproxy.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ksproxy.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ksproxy.h [iso-8859-1] Sat May 21 12:30:26 2011 @@ -772,7 +772,7 @@ #ifndef _IKsTopology_ #define _IKsTopology_ -DEFINE_GUID(IID_IKsAggregateControl, 0x28F54683, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00, 0A0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(IID_IKsTopology, 0x28F54683, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00, 0A0, 0xC9, 0x22, 0x31, 0x96); #undef INTERFACE #define INTERFACE IKsTopology Modified: trunk/reactos/include/psdk/mlang.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mlang.idl?rev… ============================================================================== --- trunk/reactos/include/psdk/mlang.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mlang.idl [iso-8859-1] Sat May 21 12:30:26 2011 @@ -24,6 +24,15 @@ cpp_quote("#define CPIOD_PEEK 0x40000000") cpp_quote("#define CPIOD_FORCE_PROMPT 0x80000000") + +[ + uuid(275c23e0-3747-11d0-9fea-00aa003f8646), + lcid(0x0000), + version(0.2) +] +library MultiLanguage +{ + importlib("stdole2.tlb"); [ object, @@ -308,17 +317,17 @@ } [ - object, - uuid(275c23e3-3747-11d0-9fea-00aa003f8646), - pointer_default(unique) + object, + uuid(275c23e3-3747-11d0-9fea-00aa003f8646), + pointer_default(unique) ] interface IEnumCodePage : IUnknown { const USHORT MAX_MIMECP_NAME = 64; const USHORT MAX_MIMECSET_NAME = 50; - typedef enum tagMIMECONTF - { + typedef enum tagMIMECONTF + { MIMECONTF_MAILNEWS = 0x00000001, MIMECONTF_BROWSER = 0x00000002, MIMECONTF_MINIMAL = 0x00000004, @@ -332,7 +341,7 @@ MIMECONTF_MIME_IE4 = 0x10000000, MIMECONTF_MIME_LATEST = 0x20000000, MIMECONTF_MIME_REGISTRY = 0x40000000 - } MIMECONTF; + } MIMECONTF; typedef struct tagMIMECPINFO { DWORD dwFlags; @@ -347,12 +356,12 @@ BYTE bGDICharset; } MIMECPINFO, *PMIMECPINFO; - typedef struct tagMIMECSETINFO - { + typedef struct tagMIMECSETINFO + { UINT uiCodePage; UINT uiInternetEncoding; WCHAR wszCharset[MAX_MIMECSET_NAME]; - } MIMECSETINFO, *PMIMECSETINFO; + } MIMECSETINFO, *PMIMECSETINFO; HRESULT Clone( [out] IEnumCodePage **ppEnum); @@ -362,16 +371,16 @@ [out] PMIMECPINFO rgelt, [out] ULONG *pceltFetched); - HRESULT Reset(); + HRESULT Reset(); HRESULT Skip( [in] ULONG celt); } [ - object, - uuid(d66d6f98-cdaa-11d0-b822-00c04fc9b31f), - pointer_default(unique) + object, + uuid(d66d6f98-cdaa-11d0-b822-00c04fc9b31f), + pointer_default(unique) ] interface IMLangConvertCharset : IUnknown { @@ -417,21 +426,21 @@ }; [ - object, - uuid(3dc39d1d-c030-11d0-b81b-00c04fc9b31f), - pointer_default(unique) + object, + uuid(3dc39d1d-c030-11d0-b81b-00c04fc9b31f), + pointer_default(unique) ] interface IEnumRfc1766 : IUnknown { const USHORT MAX_RFC1766_NAME = 6; const USHORT MAX_LOCALE_NAME = 32; - typedef struct tagRFC1766INFO - { + typedef struct tagRFC1766INFO + { LCID lcid; WCHAR wszRfc1766[MAX_RFC1766_NAME]; WCHAR wszLocaleName[MAX_LOCALE_NAME]; - } RFC1766INFO, *PRFC1766INFO; + } RFC1766INFO, *PRFC1766INFO; HRESULT Clone( [out] IEnumRfc1766 **ppEnum); @@ -448,9 +457,9 @@ } [ - object, - uuid(275c23e1-3747-11d0-9fea-00aa003f8646), - pointer_default(unique) + object, + uuid(275c23e1-3747-11d0-9fea-00aa003f8646), + pointer_default(unique) ] interface IMultiLanguage : IUnknown { @@ -528,19 +537,19 @@ } [ - object, + object, uuid(dccfc164-2b38-11d2-b7ec-00c04f8f5d9a), pointer_default(unique) ] interface IMultiLanguage2 : IUnknown { - typedef struct tagDetectEncodingInfo - { + typedef struct tagDetectEncodingInfo + { UINT nLangID; UINT nCodePage; INT nDocPercent; INT nConfidence; - } DetectEncodingInfo, *pDetectEncodingInfo; + } DetectEncodingInfo, *pDetectEncodingInfo; HRESULT GetNumberOfCodePageInfo( [out] UINT *pcCodePage); @@ -692,14 +701,14 @@ } [ - object, - uuid(4e5868ab-b157-4623-9acc-6a1d9caebe04), - pointer_default(unique) + object, + uuid(4e5868ab-b157-4623-9acc-6a1d9caebe04), + pointer_default(unique) ] interface IMultiLanguage3 : IMultiLanguage2 { - typedef [unique] IMultiLanguage3 *LPMULTILANGUAGE3; - HRESULT DetectOutboundCodePage( + typedef [unique] IMultiLanguage3 *LPMULTILANGUAGE3; + HRESULT DetectOutboundCodePage( [in] DWORD dwFlags, [in] LPCWSTR lpWideCharStr, [in] UINT cchWideChar, @@ -709,7 +718,7 @@ [in, out] UINT *pnDetectedCodePages, [in] WCHAR *lpSpecialChar); - HRESULT DetectOutboundCodePageInIStream( + HRESULT DetectOutboundCodePageInIStream( [in] DWORD dwFlags, [in] IStream *pStrIn, [in] UINT *puiPreferredCodePages, @@ -724,12 +733,14 @@ ] coclass CMultiLanguage { - [default] interface IMultiLanguage; - interface IMLangCodePages; - interface IMLangFontLink; + [default] interface IMultiLanguage; + interface IMLangCodePages; + interface IMLangFontLink; /* interface IMLangLineBreakConsole; */ - interface IMLangFontLink2; -} + interface IMLangFontLink2; +}; + +} // library MultiLanguage cpp_quote("STDAPI LcidToRfc1766A(LCID, LPSTR, INT);") cpp_quote("STDAPI LcidToRfc1766W(LCID, LPWSTR, INT);") Modified: trunk/reactos/include/psdk/msctf.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msctf.idl?rev… ============================================================================== --- trunk/reactos/include/psdk/msctf.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msctf.idl [iso-8859-1] Sat May 21 12:30:26 2011 @@ -1359,3 +1359,142 @@ HRESULT OnKillThreadFocus(); }; + +[ + object, + uuid(101d6610-0990-11d3-8df0-00105a2799b5), + pointer_default(unique) +] +interface ITfFunctionProvider : IUnknown +{ + HRESULT GetType( + [out] GUID *pguid); + + HRESULT GetDescription( + [out] BSTR *pbstrDesc); + + HRESULT GetFunction( + [in] REFGUID rguid, + [in] REFIID riid, + [out, iid_is(riid)] IUnknown **ppunk); +} + +[ + object, + uuid(e4b24db0-0990-11d3-8df0-00105a2799b5), + pointer_default(unique) +] +interface IEnumTfFunctionProviders : IUnknown +{ + HRESULT Clone( + [out] IEnumTfFunctionProviders **ppEnum); + + HRESULT Next( + [in] ULONG ulCount, + [out, size_is(ulCount), length_is(*pcFetch)] ITfFunctionProvider **ppCmdobj, + [out] ULONG *pcFetch); + + HRESULT Reset(); + + HRESULT Skip( + [in] ULONG ulCount); +}; + +[ + object, + uuid(2433bf8e-0f9b-435c-ba2c-180611978c30), + pointer_default(unique) +] +interface ITfContextView : IUnknown +{ + HRESULT GetRangeFromPoint( + [in] TfEditCookie ec, + [in] const POINT *ppt, + [in] DWORD dwFlags, + [out] ITfRange **ppRange); + + HRESULT GetTextExt( + [in] TfEditCookie ec, + [in] ITfRange *pRange, + [out] RECT *prc, + [out] BOOL *pfClipped); + + HRESULT GetScreenExt( + [out] RECT *prc); + + HRESULT GetWnd( + [out] HWND *phwnd); +}; + +[ + object, + uuid(f0c0f8dd-cf38-44e1-bb0f-68cf0d551c78), + pointer_default(unique) +] +interface IEnumTfContextViews : IUnknown +{ + HRESULT Clone( + [out] IEnumTfContextViews **ppEnum); + + HRESULT Next( + [in] ULONG ulCount, + [out, size_is(ulCount), length_is(*pcFetched)] ITfContextView **rgViews, + [out] ULONG *pcFetched); + + HRESULT Reset(); + + HRESULT Skip( + [in] ULONG ulCount); +}; + +[ + object, + uuid(19188cb0-aca9-11d2-afc5-00105a2799b5), + pointer_default(unique) +] +interface IEnumTfProperties : IUnknown +{ + HRESULT Clone( + [out] IEnumTfProperties **ppEnum); + + HRESULT Next( + [in] ULONG ulCount, + [out, size_is(ulCount), length_is(*pcFetched)] ITfProperty **ppProp, + [out] ULONG *pcFetched); + + HRESULT Reset(); + + HRESULT Skip( + [in] ULONG ulCount); +} + +[ + object, + uuid(463a506d-6992-49d2-9b88-93d55e70bb16), + pointer_default(unique) +] +interface ITfRangeBackup : IUnknown +{ + HRESULT Restore( + [in] TfEditCookie ec, + [in] ITfRange *pRange); +}; + +[ + object, + uuid(42d4d099-7c1a-4a89-b836-6c6f22160df0), + pointer_default(unique) +] +interface ITfEditRecord : IUnknown +{ + const DWORD TF_GTP_INCL_TEXT = 0x1; + + HRESULT GetSelectionStatus( + [out] BOOL *pfChanged); + + HRESULT GetTextAndPropertyUpdates( + [in] DWORD dwFlags, + [in, size_is(cProperties)] const GUID **prgProperties, + [in] ULONG cProperties, + [out] IEnumTfRanges **ppEnum); +}; Modified: trunk/reactos/include/psdk/mshtml.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mshtml.idl?re… ============================================================================== --- trunk/reactos/include/psdk/mshtml.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mshtml.idl [iso-8859-1] Sat May 21 12:30:26 2011 @@ -20,6 +20,10 @@ #include <mshtmdid.h> #include <mshtmcid.h> #include <olectl.h> + +#if defined(_MSC_VER) && (__midl >= 501) +midl_pragma warning(disable: 2362) +#endif import "ocidl.idl"; import "dimm.idl"; @@ -6933,7 +6937,7 @@ [ noncreatable, - uuid(3050F24D-98B5-11CF-BB82-00AA00BDCE0B) + uuid(3050F251-98B5-11CF-BB82-00AA00BDCE0B) ] coclass HTMLFormElement { @@ -12497,13 +12501,13 @@ HRESULT onstorage([in] VARIANT v); [propget, id(DISPID_IHTMLDOCUMENT6_ONSTORAGE), displaybind, bindable] - HRESULT onstorage([out] VARIANT *p); + HRESULT onstorage([retval, out] VARIANT *p); [propput, id(DISPID_IHTMLDOCUMENT6_ONSTORAGECOMMIT), displaybind, bindable] HRESULT onstoragecommit([in] VARIANT v); [propget, id(DISPID_IHTMLDOCUMENT6_ONSTORAGECOMMIT), displaybind, bindable] - HRESULT onstoragecommit([out] VARIANT *p); + HRESULT onstoragecommit([retval, out] VARIANT *p); [id(DISPID_IHTMLDOCUMENT6_IE8_GETELEMENTBYID)] HRESULT getElementById( Modified: trunk/reactos/include/psdk/mstask.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mstask.idl?re… ============================================================================== --- trunk/reactos/include/psdk/mstask.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mstask.idl [iso-8859-1] Sat May 21 12:30:26 2011 @@ -58,6 +58,11 @@ cpp_quote("#define TASK_TRIGGER_FLAG_HAS_END_DATE 0x1") cpp_quote("#define TASK_TRIGGER_FLAG_KILL_AT_DURATION_END 0x2") cpp_quote("#define TASK_TRIGGER_FLAG_DISABLED 0x4") + +#ifdef _MSC_VER +cpp_quote("DEFINE_GUID(CLSID_CTaskScheduler, 0x148bd52a, 0xa2ab, 0x11ce, 0xb1,0x1f, 0x00,0xaa,0x00,0x53,0x05,0x03);") +cpp_quote("DEFINE_GUID(CLSID_CTask, 0x148bd520, 0xa2ab, 0x11ce, 0xb1,0x1f, 0x00,0xaa,0x00,0x53,0x05,0x03);") +#endif [ local, Modified: trunk/reactos/include/psdk/richole.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/richole.idl?r… ============================================================================== --- trunk/reactos/include/psdk/richole.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/richole.idl [iso-8859-1] Sat May 21 12:30:26 2011 @@ -131,3 +131,8 @@ HRESULT GetDragDropEffect(BOOL fDrag, DWORD grfKeyState, LPDWORD pdwEffect); HRESULT GetContextMenu(WORD seltype, LPOLEOBJECT lpoleobj, CHARRANGE *lpchrg, HMENU *lphmenu); } + +#ifndef __WIDL__ +cpp_quote("DEFINE_GUID(IID_IRichEditOle, 0x00020D00, 0, 0, 0xC0,0,0,0,0,0,0,0x46);") +cpp_quote("DEFINE_GUID(IID_IRichEditOleCallback, 0x00020D03, 0, 0, 0xC0,0,0,0,0,0,0,0x46);") +#endif Modified: trunk/reactos/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shobjidl.idl?… ============================================================================== --- trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] Sat May 21 12:30:26 2011 @@ -2224,7 +2224,7 @@ * ITravelLog interface */ [ - uuid(02BA3B52-0547-11D1-B833-00C04FC9B31F), + uuid(66A9CB08-4802-11d2-A561-00A0C92DBFE8), object, pointer_default(unique), local Modified: trunk/reactos/include/psdk/stdole2.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/stdole2.idl?r… ============================================================================== --- trunk/reactos/include/psdk/stdole2.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/stdole2.idl [iso-8859-1] Sat May 21 12:30:26 2011 @@ -61,7 +61,7 @@ void *pfnDeferredFillIn; SCODE scode; } EXCEPINFO; - +#ifndef __midl [ odl, uuid(00000000-0000-0000-C000-000000000046), @@ -139,7 +139,7 @@ HRESULT Clone( [out] IEnumVARIANT **ppenum); } - +#endif /* !__midl */ typedef [uuid(66504301-BE0F-101A-8BBB-00AA00300CAB), public] unsigned long OLE_COLOR; Modified: trunk/reactos/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl… ============================================================================== --- trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] Sat May 21 12:30:26 2011 @@ -434,7 +434,7 @@ /* Function 17 */ DWORD RQueryServiceConfigW( [in] SC_RPC_HANDLE hService, - [out, unique, size_is(cbBufSize)] LPBYTE lpServiceConfig, + [out, size_is(cbBufSize)] LPBYTE lpServiceConfig, /* FIXME: should be [out] LPQUERY_SERVICE_CONFIGW lpServiceConfig, */ [in, range(0, 1024*8)] DWORD cbBufSize, [out] LPBOUNDED_DWORD_8K pcbBytesNeeded); @@ -546,7 +546,7 @@ /* Function 29 */ DWORD RQueryServiceConfigA( [in] SC_RPC_HANDLE hService, - [out, unique, size_is(cbBufSize)] LPBYTE lpServiceConfig, + [out, size_is(cbBufSize)] LPBYTE lpServiceConfig, /* FIXME: should be [out] LPQUERY_SERVICE_CONFIGA lpServiceConfig, */ [in, range(0, 1024*8)] DWORD cbBufSize, [out] LPBOUNDED_DWORD_8K pcbBytesNeeded); Modified: trunk/reactos/include/reactos/idl/wlansvc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/wlansv… ============================================================================== --- trunk/reactos/include/reactos/idl/wlansvc.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/wlansvc.idl [iso-8859-1] Sat May 21 12:30:26 2011 @@ -72,7 +72,7 @@ DWORD _RpcQueryAutoConfigParameter( [in] WLANSVC_RPC_HANDLE hClientHandle, [in] /* enum32 */ DWORD OpCode, - [out] LPDWORD pdwDataSize, + [in, out] LPDWORD pdwDataSize, [out][ref][size_is(*pdwDataSize)] char ** ppData, [out] /* enum32 */ DWORD * pWlanOpcodeValueType); @@ -95,7 +95,7 @@ [in] WLANSVC_RPC_HANDLE hClientHandle, [in] GUID* pInterfaceGuid, [in] /* enum32 */ long OpCode, - [out] LPDWORD pdwDataSize, + [in, out] LPDWORD pdwDataSize, [out][ref][size_is(*pdwDataSize)] LPBYTE* ppData, [out] /* enum32 */ LPDWORD pWlanOpcodeValueType); @@ -131,7 +131,7 @@ [in][unique] PDOT11_SSID pDot11Ssid, [in] /* enum16 */ short dot11BssType, [in] DWORD bSecurityEnabled, - [out] LPDWORD dwBssListSize, + [in, out] LPDWORD dwBssListSize, [out][ref][size_is(*dwBssListSize)] LPBYTE *ppWlanBssList); /* Function: 0x0C */ @@ -231,7 +231,7 @@ [in] WLANSVC_RPC_HANDLE hClientHandle, [in] GUID* pInterfaceGuid, [in][string] wchar_t * strProfileName, - [out] LPDWORD dwDataSize, + [in, out] LPDWORD dwDataSize, [out][ref][size_is(*dwDataSize)] LPBYTE *pData); /* Function: 0x1A */ @@ -325,7 +325,7 @@ /* Function: 0x26 */ DWORD _RpcQueryPlapCredentials( [in] wchar_t * arg_1, - [out] LPDWORD dwSize, + [in, out] LPDWORD dwSize, [out][ref][size_is(*dwSize)] struct_E ** arg_3, [out][ref][string] wchar_t ** arg_4, [out] GUID* pInterfaceGuid, @@ -353,4 +353,4 @@ [out][ref][string] wchar_t ** pstrCurrentSDDL, [out] LPDWORD pdwGrantedAccess); -} +}

1 0

[akhaldi] 51836: [CMAKE] * Fix cmake build. Now both rbuild and cmaked based builds compile and boot to shell.
by akhaldi＠svn.reactos.org 21 May '11

21 May '11

Author: akhaldi Date: Sat May 21 09:38:52 2011 New Revision: 51836 URL: http://svn.reactos.org/svn/reactos?rev=51836&view=rev Log: [CMAKE] * Fix cmake build. Now both rbuild and cmaked based builds compile and boot to shell. Modified: trunk/reactos/ntoskrnl/cache/section/io.c trunk/reactos/ntoskrnl/cache/section/newmm.h Modified: trunk/reactos/ntoskrnl/cache/section/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/io.… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/io.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/io.c [iso-8859-1] Sat May 21 09:38:52 2011 @@ -99,6 +99,9 @@ PLARGE_INTEGER FileOffset, PVOID Buffer, ULONG Length, +#ifdef __ROS_CMAKE__ + BOOLEAN Paging, +#endif PIO_STATUS_BLOCK ReadStatus) { NTSTATUS Status; @@ -140,9 +143,13 @@ { return STATUS_NO_MEMORY; } - + +#ifndef __ROS_CMAKE__ Irp->Flags |= IRP_PAGING_IO | IRP_SYNCHRONOUS_PAGING_IO | IRP_NOCACHE | IRP_SYNCHRONOUS_API; - +#else + Irp->Flags |= (Paging ? IRP_PAGING_IO | IRP_SYNCHRONOUS_PAGING_IO | IRP_NOCACHE : 0) | IRP_SYNCHRONOUS_API; +#endif + Irp->UserEvent = &ReadWait; Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); @@ -150,7 +157,11 @@ IrpSp->Control |= SL_INVOKE_ON_SUCCESS | SL_INVOKE_ON_ERROR; IrpSp->FileObject = FileObject; IrpSp->CompletionRoutine = MiSimpleReadComplete; - + +#ifdef __ROS_CMAKE__ + ObReferenceObject(FileObject); +#endif + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { Modified: trunk/reactos/ntoskrnl/cache/section/newmm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/new… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/newmm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/newmm.h [iso-8859-1] Sat May 21 09:38:52 2011 @@ -181,6 +181,9 @@ PLARGE_INTEGER FileOffset, PVOID Buffer, ULONG Length, +#ifdef __ROS_CMAKE__ + BOOLEAN Paging, +#endif PIO_STATUS_BLOCK ReadStatus); NTSTATUS @@ -404,40 +407,6 @@ ULONG AllocationAttributes, PFILE_OBJECT FileObject); -NTSTATUS -NTAPI -MiSimpleRead -(PFILE_OBJECT FileObject, - PLARGE_INTEGER FileOffset, - PVOID Buffer, - ULONG Length, - PIO_STATUS_BLOCK ReadStatus); - -NTSTATUS -NTAPI -_MiSimpleWrite -(PFILE_OBJECT FileObject, - PLARGE_INTEGER FileOffset, - PVOID Buffer, - ULONG Length, - PIO_STATUS_BLOCK ReadStatus, - const char *file, - int line); - -#define MiSimpleWrite(F,O,B,L,R) _MiSimpleWrite(F,O,B,L,R,__FILE__,__LINE__) - -NTSTATUS -NTAPI -_MiWriteBackPage -(PFILE_OBJECT FileObject, - PLARGE_INTEGER Offset, - ULONG Length, - PFN_NUMBER Page, - const char *File, - int Line); - -#define MiWriteBackPage(F,O,L,P) _MiWriteBackPage(F,O,L,P,__FILE__,__LINE__) - PVOID NTAPI MmGetSegmentRmap(PFN_NUMBER Page, PULONG RawOffset);

1 0

[jimtabor] 51835: [Win32k|User32] - Move creation of the scrollbar Gray brush from user32 to win32k. - Noticed a color and pattern (patchy white pattern) difference when using GreCreateBitmap and i...
by jimtabor＠svn.reactos.org 21 May '11

21 May '11

Author: jimtabor Date: Sat May 21 06:34:02 2011 New Revision: 51835 URL: http://svn.reactos.org/svn/reactos?rev=51835&view=rev Log: [Win32k|User32] - Move creation of the scrollbar Gray brush from user32 to win32k. - Noticed a color and pattern (patchy white pattern) difference when using GreCreateBitmap and it did not work the same as the main function. Correcting this fixed the Gray brush. Someone from YAROTOWS needs to look into this. Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/subsystems/win32/win32k/include/brush.h trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/brush.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sat May 21 06:34:02 2011 @@ -927,8 +927,8 @@ HBRUSH DefWndControlColor(HDC hDC, UINT ctlType) { - if (CTLCOLOR_SCROLLBAR == ctlType) - { + if (ctlType == CTLCOLOR_SCROLLBAR) + { HBRUSH hb = GetSysColorBrush(COLOR_SCROLLBAR); COLORREF bk = GetSysColor(COLOR_3DHILIGHT); SetTextColor(hDC, GetSysColor(COLOR_3DFACE)); @@ -938,37 +938,24 @@ * we better use 0x55aa bitmap brush to make scrollbar's background * look different from the window background. */ - if (bk == GetSysColor(COLOR_WINDOW)) - { - static const WORD wPattern55AA[] = - { - 0x5555, 0xaaaa, 0x5555, 0xaaaa, - 0x5555, 0xaaaa, 0x5555, 0xaaaa - }; - static HBITMAP hPattern55AABitmap = NULL; - static HBRUSH hPattern55AABrush = NULL; - if (hPattern55AABrush == NULL) - { - hPattern55AABitmap = CreateBitmap(8, 8, 1, 1, wPattern55AA); - hPattern55AABrush = CreatePatternBrush(hPattern55AABitmap); - } - return hPattern55AABrush; - } - UnrealizeObject(hb); + if ( bk == GetSysColor(COLOR_WINDOW)) + return gpsi->hbrGray; + + UnrealizeObject( hb ); return hb; - } + } SetTextColor(hDC, GetSysColor(COLOR_WINDOWTEXT)); - if ((CTLCOLOR_EDIT == ctlType) || (CTLCOLOR_LISTBOX == ctlType)) - { + if ((ctlType == CTLCOLOR_EDIT) || (ctlType == CTLCOLOR_LISTBOX)) + { SetBkColor(hDC, GetSysColor(COLOR_WINDOW)); - } + } else - { + { SetBkColor(hDC, GetSysColor(COLOR_3DFACE)); return GetSysColorBrush(COLOR_3DFACE); - } + } return GetSysColorBrush(COLOR_WINDOW); } Modified: trunk/reactos/subsystems/win32/win32k/include/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/brush.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/brush.h [iso-8859-1] Sat May 21 06:34:02 2011 @@ -129,3 +129,5 @@ VOID FASTCALL FreeObjectAttr(PVOID); BOOL FASTCALL IntGdiSetBrushOwner(PBRUSH,DWORD); +BOOL FASTCALL GreSetBrushOwner(HBRUSH,DWORD); + Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Sat May 21 06:34:02 2011 @@ -92,6 +92,8 @@ HANDLE hPowerRequestEvent, HANDLE hMediaRequestEvent) { + static const WORD wPattern55AA[] = { 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa }; + HBITMAP hPattern55AABitmap = NULL; NTSTATUS Status; // Set W32PF_Flags |= (W32PF_READSCREENACCESSGRANTED | W32PF_IOWINSTA) @@ -125,6 +127,14 @@ CsrInit(); + if (gpsi->hbrGray == NULL) + { + hPattern55AABitmap = GreCreateBitmap(8, 8, 1, 1, (LPBYTE)wPattern55AA); + gpsi->hbrGray = IntGdiCreatePatternBrush(hPattern55AABitmap); + GreDeleteObject(hPattern55AABitmap); + GreSetBrushOwner(gpsi->hbrGray, GDI_OBJ_HMGR_PUBLIC); + } + return STATUS_SUCCESS; } 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] Sat May 21 06:34:02 2011 @@ -154,15 +154,23 @@ IN UINT cBitsPixel, IN OPTIONAL PVOID pvBits) { + HBITMAP hbmp; /* Call the extended function */ - return GreCreateBitmapEx(nWidth, + hbmp = GreCreateBitmapEx(nWidth, nHeight, 0, /* auto width */ BitmapFormat(cBitsPixel * cPlanes, BI_RGB), 0, /* no bitmap flags */ 0, /* auto size */ - pvBits, - DDB_SURFACE /* DDB */); + NULL, + DDB_SURFACE /* DDB */); + if (pvBits && hbmp) + { + PSURFACE psurf = SURFACE_ShareLockSurface(hbmp); + UnsafeSetBitmapBits(psurf, 0, pvBits); + SURFACE_ShareUnlockSurface(psurf); + } + return hbmp; } HBITMAP Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] Sat May 21 06:34:02 2011 @@ -59,6 +59,19 @@ GDIOBJ_vSetObjectOwner(&pbr->BaseObject, ulOwner); return TRUE; +} + +BOOL +FASTCALL +GreSetBrushOwner(HBRUSH hBrush, ULONG ulOwner) +{ + BOOL Ret; + PBRUSH pbrush; + + pbrush = BRUSH_ShareLockBrush(hBrush); + Ret = IntGdiSetBrushOwner(pbrush, ulOwner); + BRUSH_ShareUnlockBrush(pbrush); + return Ret; } BOOL

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