Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 26601: fix timezone cities
by gedmurphy＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: gedmurphy Date: Tue May 1 02:25:56 2007 New Revision: 26601 URL: http://svn.reactos.org/svn/reactos?rev=26601&view=rev Log: fix timezone cities Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf (original) +++ trunk/reactos/boot/bootdata/hivesft.inf Tue May 1 02:25:56 2007 @@ -374,7 +374,7 @@ 0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central European Standard Time","Display",0x00000000,"(GMT+01:00) Sarajevo, Skopje, Sofija, Warsaw, Zagreb" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central European Standard Time","Display",0x00000000,"(GMT+01:00) Sarajevo, Skopje, Warsaw, Zagreb" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central European Standard Time","Dlt",0x00000000,"Central European Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central European Standard Time","Std",0x00000000,"Central European Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central European Standard Time","Index",0x00010001,100 @@ -419,7 +419,7 @@ 0x00,0x00,0x09,0x00,0x03,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x05,0x00,0x05,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\FLE Standard Time","Display",0x00000000,"(GMT+02:00) Helsinki, Riga, Tallinn" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\FLE Standard Time","Display",0x00000000,"(GMT+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\FLE Standard Time","Dlt",0x00000000,"FLE Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\FLE Standard Time","Std",0x00000000,"FLE Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\FLE Standard Time","Index",0x00010001,125

1 0

[gedmurphy] 26600: don't risk a leak. precompify header
by gedmurphy＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: gedmurphy Date: Tue May 1 02:25:26 2007 New Revision: 26600 URL: http://svn.reactos.org/svn/reactos?rev=26600&view=rev Log: don't risk a leak. precompify header Modified: trunk/reactos/dll/cpl/timedate/ntpclient.c Modified: trunk/reactos/dll/cpl/timedate/ntpclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/ntpclient… ============================================================================== --- trunk/reactos/dll/cpl/timedate/ntpclient.c (original) +++ trunk/reactos/dll/cpl/timedate/ntpclient.c Tue May 1 02:25:26 2007 @@ -7,7 +7,7 @@ * */ -#include "timedate.h" +#include <timedate.h> #define TIMEOUT 4000 /* 4 second timeout */ @@ -171,10 +171,12 @@ DestroyConnection(); } + } + if (pInfo) HeapFree(GetProcessHeap(), 0, pInfo); + if (lpAddr) HeapFree(GetProcessHeap(), 0, lpAddr); - } return ulTime;

1 0

[jimtabor] 26599: Fix build. Sdk reports something about; needed for win95 functionality
by jimtabor＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: jimtabor Date: Mon Apr 30 23:24:46 2007 New Revision: 26599 URL: http://svn.reactos.org/svn/reactos?rev=26599&view=rev Log: Fix build. Sdk reports something about; needed for win95 functionality Modified: trunk/reactos/subsystems/win32/win32k/objects/paintobj.c trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/paintobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/paintobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/paintobj.c Mon Apr 30 23:24:46 2007 @@ -23,12 +23,11 @@ #define NDEBUG #include <debug.h> -BOOL -STDCALL +VOID +APIENTRY NtGdiFlush(VOID) { UNIMPLEMENTED; - return FALSE; } DWORD Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Mon Apr 30 23:24:46 2007 @@ -3162,7 +3162,6 @@ } DWORD -STDCALL NtGdiGetCharSet(HDC hDC) { UNIMPLEMENTED;

1 0

[gedmurphy] 26598: - correctly get local NTP server info - fix some bugs in the socket code
by gedmurphy＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: gedmurphy Date: Mon Apr 30 23:05:04 2007 New Revision: 26598 URL: http://svn.reactos.org/svn/reactos?rev=26598&view=rev Log: - correctly get local NTP server info - fix some bugs in the socket code Modified: trunk/reactos/dll/cpl/timedate/dateandtime.c trunk/reactos/dll/cpl/timedate/internettime.c trunk/reactos/dll/cpl/timedate/monthcal.c trunk/reactos/dll/cpl/timedate/ntpclient.c trunk/reactos/dll/cpl/timedate/timedate.h Modified: trunk/reactos/dll/cpl/timedate/dateandtime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/dateandti… ============================================================================== --- trunk/reactos/dll/cpl/timedate/dateandtime.c (original) +++ trunk/reactos/dll/cpl/timedate/dateandtime.c Mon Apr 30 23:05:04 2007 @@ -13,7 +13,7 @@ static WNDPROC pOldWndProc = NULL; -static BOOL +BOOL SystemSetLocalTime(LPSYSTEMTIME lpSystemTime) { HANDLE hToken; Modified: trunk/reactos/dll/cpl/timedate/internettime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/internett… ============================================================================== --- trunk/reactos/dll/cpl/timedate/internettime.c (original) +++ trunk/reactos/dll/cpl/timedate/internettime.c Mon Apr 30 23:05:04 2007 @@ -136,15 +136,13 @@ /* get the domain name from the registry */ static BOOL -GetNTPServerAddress(LPSTR* lpAddress) +GetNTPServerAddress(LPWSTR* lpAddress) { HKEY hKey; WCHAR szSel[4]; - LPWSTR buf = NULL; DWORD dwSize; LONG Ret; - *lpAddress = NULL; Ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\DateTime\\Servers", 0, @@ -172,14 +170,14 @@ szSel, NULL, NULL, - NULL, //(LPBYTE)buf + NULL, &dwSize); - if (Ret == ERROR_MORE_DATA) - { - buf = (LPWSTR) HeapAlloc(GetProcessHeap(), - 0, - dwSize); - if (buf == NULL) + if (Ret == ERROR_SUCCESS) + { + (*lpAddress) = (LPWSTR) HeapAlloc(GetProcessHeap(), + 0, + dwSize); + if ((*lpAddress) == NULL) { Ret = ERROR_NOT_ENOUGH_MEMORY; goto fail; @@ -189,7 +187,7 @@ szSel, NULL, NULL, - (LPBYTE)buf, + (LPBYTE)*lpAddress, &dwSize); if (Ret != ERROR_SUCCESS) goto fail; @@ -198,38 +196,13 @@ else goto fail; - /* We still allocate same amount of space for ASCII storage, - * as some chars may use several bytes */ - *lpAddress = (LPSTR) HeapAlloc(GetProcessHeap(), - 0, - sizeof(dwSize)); - if (*lpAddress == NULL) - goto fail; - - if (! WideCharToMultiByte(CP_ACP, - 0, - buf, - sizeof(dwSize), - *lpAddress, - sizeof(dwSize), - NULL, - NULL)) - { - Ret = GetLastError(); - goto fail; - } - RegCloseKey(hKey); - HeapFree(GetProcessHeap(), - 0, - buf); return TRUE; fail: DisplayWin32Error(Ret); if (hKey) RegCloseKey(hKey); - HeapFree(GetProcessHeap(), 0, buf); HeapFree(GetProcessHeap(), 0, *lpAddress); return FALSE; @@ -240,25 +213,17 @@ static ULONG GetTimeFromServer(VOID) { - LPSTR lpAddress = NULL; + LPWSTR lpAddress = NULL; ULONG ulTime = 0; - if (! GetNTPServerAddress(&lpAddress)) - return 0; - - if (InitializeConnection(lpAddress)) - { - if (SendData()) - { - ulTime = RecieveData(); - } - } - - DestroyConnection(); - - HeapFree(GetProcessHeap(), - 0, - lpAddress); + if (GetNTPServerAddress(&lpAddress)) + { + ulTime = GetServerTime(lpAddress); + + HeapFree(GetProcessHeap(), + 0, + lpAddress); + } return ulTime; } @@ -303,11 +268,7 @@ return; } - /*FIXME: Should we be calling SystemSetLocalTime - in order to maintain system privldges? - I thought SetSystemTime already dealt - with this */ - if (! SetSystemTime(&stNew)) + if (!SystemSetLocalTime(&stNew)) DisplayWin32Error(GetLastError()); } @@ -364,7 +325,7 @@ static VOID -InitializeDialog(HWND hwnd) +OnInitDialog(HWND hwnd) { GetSyncSetting(hwnd); @@ -385,7 +346,7 @@ { case WM_INITDIALOG: { - InitializeDialog(hwndDlg); + OnInitDialog(hwndDlg); } break; Modified: trunk/reactos/dll/cpl/timedate/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/monthcal.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/monthcal.c (original) +++ trunk/reactos/dll/cpl/timedate/monthcal.c Mon Apr 30 23:05:04 2007 @@ -176,7 +176,7 @@ pDayEnd = pDay + MonthLength; while (pDay != pDayEnd) { - *(pDay++) = ++d; + *(pDay++) = (BYTE)++d; } /* repaint the control */ Modified: trunk/reactos/dll/cpl/timedate/ntpclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/ntpclient… ============================================================================== --- trunk/reactos/dll/cpl/timedate/ntpclient.c (original) +++ trunk/reactos/dll/cpl/timedate/ntpclient.c Mon Apr 30 23:05:04 2007 @@ -7,15 +7,23 @@ * */ -#include <timedate.h> +#include "timedate.h" #define TIMEOUT 4000 /* 4 second timeout */ -SOCKET Sock; -SOCKADDR_IN myAddr, ntpAddr; +typedef struct _INFO +{ + SOCKET Sock; + SOCKADDR_IN myAddr; + SOCKADDR_IN ntpAddr; + NTPPACKET SendPacket; + NTPPACKET RecvPacket; +} INFO, *PINFO; -BOOL -InitializeConnection(LPSTR lpAddress) + +static BOOL +InitConnection(PINFO pInfo, + LPSTR lpAddress) { WSADATA wsaData; HOSTENT *he; @@ -26,10 +34,10 @@ if (Ret != 0) return FALSE; - Sock = socket(AF_INET, - SOCK_DGRAM, - 0); - if (Sock == INVALID_SOCKET) + pInfo->Sock = socket(AF_INET, + SOCK_DGRAM, + 0); + if (pInfo->Sock == INVALID_SOCKET) return FALSE; /* setup server info */ @@ -37,10 +45,10 @@ if (he != NULL) { /* setup server socket info */ - ZeroMemory(&ntpAddr, sizeof(SOCKADDR_IN)); - ntpAddr.sin_family = AF_INET; //he->h_addrtype; - ntpAddr.sin_port = htons(NTPPORT); - ntpAddr.sin_addr = *((struct in_addr *)he->h_addr); + ZeroMemory(&pInfo->ntpAddr, sizeof(SOCKADDR_IN)); + pInfo->ntpAddr.sin_family = AF_INET; //he->h_addrtype; + pInfo->ntpAddr.sin_port = htons(NTPPORT); + pInfo->ntpAddr.sin_addr = *((struct in_addr *)he->h_addr); } else return FALSE; @@ -48,24 +56,40 @@ return TRUE; } -VOID + +static VOID DestroyConnection() { WSACleanup(); } + +static BOOL +GetTransmitTime(PTIMEPACKET ptp) +{ + + return TRUE; +} + + /* send some data to wake the server up */ -BOOL -SendData() +static BOOL +SendData(PINFO pInfo) { - CHAR Packet[] = ""; + TIMEPACKET tp = {0,}; INT Ret; - Ret = sendto(Sock, - Packet, - sizeof(Packet), + ZeroMemory(&pInfo->SendPacket, sizeof(pInfo->SendPacket)); + pInfo->SendPacket.LiVnMode = 27; + if (!GetTransmitTime(&tp)) + return FALSE; + pInfo->SendPacket.TransmitTimestamp = tp; + + Ret = sendto(pInfo->Sock, + (char *)&pInfo->SendPacket, + sizeof(pInfo->SendPacket), 0, - (SOCKADDR *)&ntpAddr, + (SOCKADDR *)&pInfo->ntpAddr, sizeof(SOCKADDR_IN)); if (Ret == SOCKET_ERROR) @@ -75,8 +99,8 @@ } -ULONG -RecieveData(VOID) +static ULONG +RecieveData(PINFO pInfo) { TIMEVAL timeVal; FD_SET readFDS; @@ -85,7 +109,7 @@ /* monitor socket for incomming connections */ FD_ZERO(&readFDS); - FD_SET(Sock, &readFDS); + FD_SET(pInfo->Sock, &readFDS); /* set timeout values */ timeVal.tv_sec = TIMEOUT / 1000; @@ -96,9 +120,10 @@ if ((Ret != SOCKET_ERROR) && (Ret != 0)) { - Ret = recvfrom(Sock, - (char *)&ulTime, - 4, + + Ret = recvfrom(pInfo->Sock, + (char *)&pInfo->RecvPacket, + sizeof(pInfo->RecvPacket), 0, NULL, NULL); @@ -108,3 +133,49 @@ return ulTime; } + + +ULONG +GetServerTime(LPWSTR lpAddress) +{ + PINFO pInfo; + LPSTR lpAddr; + DWORD dwSize = wcslen(lpAddress) + 1; + ULONG ulTime = 0; + + pInfo = (PINFO)HeapAlloc(GetProcessHeap(), + 0, + sizeof(INFO)); + lpAddr = (LPSTR)HeapAlloc(GetProcessHeap(), + 0, + dwSize); + + if (pInfo && lpAddr) + { + if (WideCharToMultiByte(CP_ACP, + 0, + lpAddress, + -1, + lpAddr, + dwSize, + NULL, + NULL)) + { + if (InitConnection(pInfo, lpAddr)) + { + if (SendData(pInfo)) + { + ulTime = RecieveData(pInfo); + } + } + + DestroyConnection(); + } + + HeapFree(GetProcessHeap(), 0, pInfo); + HeapFree(GetProcessHeap(), 0, lpAddr); + } + + return ulTime; + +} Modified: trunk/reactos/dll/cpl/timedate/timedate.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.h (original) +++ trunk/reactos/dll/cpl/timedate/timedate.h Mon Apr 30 23:05:04 2007 @@ -31,6 +31,7 @@ /* dateandtime.c */ INT_PTR CALLBACK DateTimePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +BOOL SystemSetLocalTime(LPSYSTEMTIME lpSystemTime); /* timezone.c */ @@ -56,10 +57,30 @@ /* ntpclient.c */ -BOOL InitializeConnection(CHAR *szIpAddr); -VOID DestroyConnection(VOID); -BOOL SendData(VOID); -ULONG RecieveData(VOID); +// NTP timestamp +typedef struct _TIMEPACKET +{ + DWORD dwInteger; + DWORD dwFractional; +} TIMEPACKET, *PTIMEPACKET; + +// NTP packet +typedef struct _NTPPACKET +{ + BYTE LiVnMode; + BYTE Stratum; + char Poll; + char Precision; + long RootDelay; + long RootDispersion; + char ReferenceID[4]; + TIMEPACKET ReferenceTimestamp; + TIMEPACKET OriginateTimestamp; + TIMEPACKET ReceiveTimestamp; + TIMEPACKET TransmitTimestamp; +}NTPPACKET, *PNTPPACKET; + +ULONG GetServerTime(LPWSTR lpAddress); /* monthcal.c */

1 0

[jimtabor] 26597: Moved NtGdiGetTextCharset to NtGdiGetCharSet.
by jimtabor＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: jimtabor Date: Mon Apr 30 22:58:22 2007 New Revision: 26597 URL: http://svn.reactos.org/svn/reactos?rev=26597&view=rev Log: Moved NtGdiGetTextCharset to NtGdiGetCharSet. Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c trunk/reactos/tools/nci/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Mon Apr 30 22:58:22 2007 @@ -3161,15 +3161,9 @@ return FALSE; } - -/* - Based on "Undocumented W2k Secrets", Table B-2, page 473. - This function does not exist. See note in gdi32/objects/text.c - GetTextCharset. This should be moved to include/win32k/ntgdibad.h. -*/ -UINT +DWORD STDCALL -NtGdiGetTextCharset(HDC hDC) +NtGdiGetCharSet(HDC hDC) { UNIMPLEMENTED; return 0; Modified: trunk/reactos/tools/nci/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=2… ============================================================================== --- trunk/reactos/tools/nci/w32ksvc.db (original) +++ trunk/reactos/tools/nci/w32ksvc.db Mon Apr 30 22:58:22 2007 @@ -98,6 +98,7 @@ NtGdiGetCharABCWidths 4 NtGdiGetCharABCWidthsFloat 4 NtGdiGetCharacterPlacement 6 +NtGdiGetCharSet 1 NtGdiGetCharWidth32 4 NtGdiGetCharWidthFloat 4 NtGdiGetClipBox 2 @@ -152,7 +153,6 @@ NtGdiGetSystemPaletteEntries 4 NtGdiGetSystemPaletteUse 1 NtGdiGetTextAlign 1 -NtGdiGetTextCharset 1 NtGdiGetTextCharsetInfo 3 NtGdiGetTextColor 1 NtGdiGetTextExtentExPoint 7

1 0

[jimtabor] 26596: Fix build.
by jimtabor＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: jimtabor Date: Mon Apr 30 21:31:55 2007 New Revision: 26596 URL: http://svn.reactos.org/svn/reactos?rev=26596&view=rev Log: Fix build. Modified: trunk/reactos/tools/nci/w32ksvc.db Modified: trunk/reactos/tools/nci/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=2… ============================================================================== --- trunk/reactos/tools/nci/w32ksvc.db (original) +++ trunk/reactos/tools/nci/w32ksvc.db Mon Apr 30 21:31:55 2007 @@ -80,7 +80,7 @@ NtGdiFloodFill 4 NtGdiFrameRgn 5 NtGdiGdiComment 3 -NtGdiGdiFlush 0 +NtGdiFlush 0 NtGdiGdiGetBatchLimit 0 #NtGdiGdiPlayDCScript ? #NtGdiGdiPlayJournal ?

1 0

[jimtabor] 26595: Fix name for GdiFlush.
by jimtabor＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: jimtabor Date: Mon Apr 30 21:20:56 2007 New Revision: 26595 URL: http://svn.reactos.org/svn/reactos?rev=26595&view=rev Log: Fix name for GdiFlush. Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/paintobj.c Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Mon Apr 30 21:20:56 2007 @@ -378,9 +378,6 @@ CONST LPBYTE Data ); -/* Should be NtGdiFlush. */ -BOOL STDCALL NtGdiGdiFlush (VOID); - /* Should be done in user-mode. */ DWORD STDCALL NtGdiGdiGetBatchLimit (VOID); Modified: trunk/reactos/subsystems/win32/win32k/objects/paintobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/paintobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/paintobj.c Mon Apr 30 21:20:56 2007 @@ -25,7 +25,7 @@ BOOL STDCALL -NtGdiGdiFlush(VOID) +NtGdiFlush(VOID) { UNIMPLEMENTED; return FALSE;

1 0

[jimtabor] 26594: Plug in locale GetStockObject.
by jimtabor＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: jimtabor Date: Mon Apr 30 20:15:13 2007 New Revision: 26594 URL: http://svn.reactos.org/svn/reactos?rev=26594&view=rev Log: Plug in locale GetStockObject. Modified: trunk/reactos/dll/win32/gdi32/gdi32.def Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Mon Apr 30 20:15:13 2007 @@ -429,7 +429,7 @@ GetRegionData@12=NtGdiGetRegionData@12 GetRelAbs@8 GetRgnBox@8=NtGdiGetRgnBox@8 -GetStockObject@4=NtGdiGetStockObject@4 +GetStockObject@4 GetStretchBltMode@4=NtGdiGetStretchBltMode@4 GetStringBitmapA@20 GetStringBitmapW@20

1 0

[jimtabor] 26593: Win32k/Gdi32 - Remove NtGdiCreateFont/Indirect, and NtGdiGetOutlineTextMetrics.
by jimtabor＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: jimtabor Date: Mon Apr 30 19:33:35 2007 New Revision: 26593 URL: http://svn.reactos.org/svn/reactos?rev=26593&view=rev Log: Win32k/Gdi32 - Remove NtGdiCreateFont/Indirect, and NtGdiGetOutlineTextMetrics. Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Mon Apr 30 19:33:35 2007 @@ -49,31 +49,6 @@ DWORD FontType; } FONTFAMILYINFO, *PFONTFAMILYINFO; -/* Should be using NtGdiHfontCreate with an ENUMLOGFONT */ -HFONT -NTAPI -NtGdiCreateFontIndirect(CONST LPLOGFONTW lf); - -/* Should be using NtGdiHfontCreate with an ENUMLOGFONT */ -HFONT -NTAPI -NtGdiCreateFont( - int Height, - int Width, - int Escapement, - int Orientation, - int Weight, - DWORD Italic, - DWORD Underline, - DWORD StrikeOut, - DWORD CharSet, - DWORD OutputPrecision, - DWORD ClipPrecision, - DWORD Quality, - DWORD PitchAndFamily, - LPCWSTR Face -); - /* Should be using NtGdiEnumFontChunk */ INT NTAPI @@ -620,13 +595,6 @@ HDC hDC, HRGN hrgn ); - -/* Use NtGdiGetOutlineTextMetricsInternalW. */ -UINT -STDCALL -NtGdiGetOutlineTextMetrics(HDC hDC, - UINT Data, - LPOUTLINETEXTMETRICW otm); /* Use NtGdiDoPalette with GdiPalGetEntries. */ UINT Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Mon Apr 30 19:33:35 2007 @@ -522,86 +522,6 @@ return Status; } - -HFONT -STDCALL -NtGdiCreateFont(int Height, - int Width, - int Escapement, - int Orientation, - int Weight, - DWORD Italic, - DWORD Underline, - DWORD StrikeOut, - DWORD CharSet, - DWORD OutputPrecision, - DWORD ClipPrecision, - DWORD Quality, - DWORD PitchAndFamily, - LPCWSTR Face) -{ - LOGFONTW logfont; - HFONT NewFont; - NTSTATUS Status = STATUS_SUCCESS; - - logfont.lfHeight = Height; - logfont.lfWidth = Width; - logfont.lfEscapement = Escapement; - logfont.lfOrientation = Orientation; - logfont.lfWeight = Weight; - logfont.lfItalic = Italic; - logfont.lfUnderline = Underline; - logfont.lfStrikeOut = StrikeOut; - logfont.lfCharSet = CharSet; - logfont.lfOutPrecision = OutputPrecision; - logfont.lfClipPrecision = ClipPrecision; - logfont.lfQuality = Quality; - logfont.lfPitchAndFamily = PitchAndFamily; - - if (NULL != Face) - { - int Size = sizeof(logfont.lfFaceName) / sizeof(WCHAR); - wcsncpy((wchar_t *)logfont.lfFaceName, Face, Size - 1); - /* Be 101% sure to have '\0' at end of string */ - logfont.lfFaceName[Size - 1] = '\0'; - } - else - { - logfont.lfFaceName[0] = L'\0'; - } - - if (NT_SUCCESS(Status)) - { - Status = TextIntCreateFontIndirect(&logfont, &NewFont); - } - - return NT_SUCCESS(Status) ? NewFont : NULL; -} - -HFONT -STDCALL -NtGdiCreateFontIndirect(CONST LPLOGFONTW lf) -{ - LOGFONTW SafeLogfont; - HFONT NewFont; - NTSTATUS Status = STATUS_SUCCESS; - - if (NULL != lf) - { - Status = MmCopyFromCaller(&SafeLogfont, lf, sizeof(LOGFONTW)); - if (NT_SUCCESS(Status)) - { - Status = TextIntCreateFontIndirect(&SafeLogfont, &NewFont); - } - } - else - { - Status = STATUS_INVALID_PARAMETER; - } - - return NT_SUCCESS(Status) ? NewFont : NULL; -} - HFONT STDCALL

1 0

[hpoussin] 26592: Rename msacm directory to msacm32
by hpoussin＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: hpoussin Date: Mon Apr 30 19:25:51 2007 New Revision: 26592 URL: http://svn.reactos.org/svn/reactos?rev=26592&view=rev Log: Rename msacm directory to msacm32 Added: trunk/reactos/dll/win32/msacm32/ - copied from r26534, trunk/reactos/dll/win32/msacm/ Removed: trunk/reactos/dll/win32/msacm/ Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/ole32/ (props changed) trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Mon Apr 30 19:25:51 2007 @@ -176,7 +176,7 @@ dll\win32\winmm\midimap\midimap.dll 1 dll\win32\mmdrv\mmdrv.dll 1 dll\win32\mpr\mpr.dll 1 -dll\win32\msacm\msacm32.dll 1 +dll\win32\msacm32\msacm32.dll 1 dll\win32\msafd\msafd.dll 1 dll\win32\msgina\msgina.dll 1 dll\win32\msi\msi.dll 1 Propchange: trunk/reactos/dll/win32/ole32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon Apr 30 19:25:51 2007 @@ -12,3 +12,4 @@ GNUmakefile *.vcproj *.user +dcom.h Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Mon Apr 30 19:25:51 2007 @@ -118,8 +118,8 @@ <directory name="mpr"> <xi:include href="mpr/mpr.rbuild" /> </directory> -<directory name="msacm"> - <xi:include href="msacm/msacm32.rbuild" /> +<directory name="msacm32"> + <xi:include href="msacm32/msacm32.rbuild" /> </directory> <directory name="msafd"> <xi:include href="msafd/msafd.rbuild" />

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