Ros-diffs

ros-diffs@reactos.org

81390 discussions

[peterw] 31092: - Bump the date in the changelog, RosBE 1.1 is released.
by peterw＠svn.reactos.org 08 Dec '07

08 Dec '07

Author: peterw Date: Sat Dec 8 23:11:45 2007 New Revision: 31092 URL: http://svn.reactos.org/svn/reactos?rev=31092&view=rev Log: - Bump the date in the changelog, RosBE 1.1 is released. Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Sat Dec 8 23:11:45 2007 @@ -1,4 +1,4 @@ -*** XXX XXth, 200X - RosBE 1.1 Released +*** December 8th, 2007 - RosBE 1.1 Released - Updated: NASM to 2.00 (Peter Ward) - Updated: GDB to 6.7.5.20071127 (Peter Ward)

1 0

[hpoussin] 31091: Fix some possible problems
by hpoussin＠svn.reactos.org 08 Dec '07

08 Dec '07

Author: hpoussin Date: Sat Dec 8 22:38:39 2007 New Revision: 31091 URL: http://svn.reactos.org/svn/reactos?rev=31091&view=rev Log: Fix some possible problems Modified: trunk/reactos/base/setup/usetup/interface/devinst.c Modified: trunk/reactos/base/setup/usetup/interface/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/devinst.c (original) +++ trunk/reactos/base/setup/usetup/interface/devinst.c Sat Dec 8 22:38:39 2007 @@ -222,7 +222,7 @@ NtClose(hDeviceKey); return; } - else + else if (pPartialInformation) { for (HardwareID = (LPCWSTR)pPartialInformation->Data; (PUCHAR)HardwareID < pPartialInformation->Data + pPartialInformation->DataLength @@ -277,7 +277,7 @@ DPRINT1("NtQueryValueKey() failed with status 0x%08x\n", Status); return; } - else + else if (pPartialInformation) { for (HardwareID = (LPCWSTR)pPartialInformation->Data; (PUCHAR)HardwareID < pPartialInformation->Data + pPartialInformation->DataLength @@ -347,7 +347,8 @@ if (Status == STATUS_BUFFER_TOO_SMALL) { PnpEventSize += 0x400; - PnpEvent = (PPLUGPLAY_EVENT_BLOCK)RtlReAllocateHeap(ProcessHeap, 0, PnpEvent, PnpEventSize); + RtlFreeHeap(ProcessHeap, 0, PnpEvent); + PnpEvent = (PPLUGPLAY_EVENT_BLOCK)RtlAllocateHeap(ProcessHeap, 0, PnpEventSize); if (PnpEvent == NULL) { NtClose(hEnum);

1 0

[cwittich] 31090: Dmitry Timoshkov : kernel32: Fix the size of ThreadAffinityMask to match PSDK. <dmitry at codeweavers.com> Dmitry Timoshkov : winternl.h: Make the fields of the PROCESS_BASIC_INFORMATION structure use same type width as a PSDK one .
by cwittich＠svn.reactos.org 08 Dec '07

08 Dec '07

Author: cwittich Date: Sat Dec 8 21:58:42 2007 New Revision: 31090 URL: http://svn.reactos.org/svn/reactos?rev=31090&view=rev Log: Dmitry Timoshkov : kernel32: Fix the size of ThreadAffinityMask to match PSDK. <dmitry at codeweavers.com> Dmitry Timoshkov : winternl.h: Make the fields of the PROCESS_BASIC_INFORMATION structure use same type width as a PSDK one . Modified: trunk/reactos/dll/win32/kernel32/thread/thread.c trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/winternl.h Modified: trunk/reactos/dll/win32/kernel32/thread/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/thread.c (original) +++ trunk/reactos/dll/win32/kernel32/thread/thread.c Sat Dec 8 21:58:42 2007 @@ -489,10 +489,10 @@ /* * @implemented */ -DWORD +DWORD_PTR WINAPI SetThreadAffinityMask(HANDLE hThread, - DWORD dwThreadAffinityMask) + DWORD_PTR dwThreadAffinityMask) { THREAD_BASIC_INFORMATION ThreadBasic; KAFFINITY AffinityMask; Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h (original) +++ trunk/reactos/include/psdk/winbase.h Sat Dec 8 21:58:42 2007 @@ -1998,7 +1998,7 @@ BOOL WINAPI SetSystemTimeAdjustment(DWORD,BOOL); DWORD WINAPI SetTapeParameters(HANDLE,DWORD,PVOID); DWORD WINAPI SetTapePosition(HANDLE,DWORD,DWORD,DWORD,DWORD,BOOL); -DWORD WINAPI SetThreadAffinityMask(HANDLE,DWORD); +DWORD_PTR WINAPI SetThreadAffinityMask(HANDLE,DWORD_PTR); BOOL WINAPI SetThreadContext(HANDLE,const CONTEXT*); DWORD WINAPI SetThreadIdealProcessor(HANDLE,DWORD); BOOL WINAPI SetThreadPriority(HANDLE,int); Modified: trunk/reactos/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winternl.h (original) +++ trunk/reactos/include/psdk/winternl.h Sat Dec 8 21:58:42 2007 @@ -708,7 +708,7 @@ NTSTATUS ExitStatus; PVOID TebBaseAddress; CLIENT_ID ClientId; - ULONG AffinityMask; + ULONG_PTR AffinityMask; LONG Priority; LONG BasePriority; } THREAD_BASIC_INFORMATION, *PTHREAD_BASIC_INFORMATION; @@ -914,12 +914,12 @@ typedef struct _PROCESS_BASIC_INFORMATION { #ifdef __WINESRC__ - DWORD ExitStatus; - DWORD PebBaseAddress; - DWORD AffinityMask; - DWORD BasePriority; - ULONG UniqueProcessId; - ULONG InheritedFromUniqueProcessId; + DWORD_PTR ExitStatus; + PPEB PebBaseAddress; + DWORD_PTR AffinityMask; + DWORD_PTR BasePriority; + ULONG_PTR UniqueProcessId; + ULONG_PTR InheritedFromUniqueProcessId; #else PVOID Reserved1; PPEB PebBaseAddress;

1 0

[cwittich] 31089: -UniqueProcessId is ULONG_PTR not ULONG -some formatting fixes
by cwittich＠svn.reactos.org 08 Dec '07

08 Dec '07

Author: cwittich Date: Sat Dec 8 21:42:10 2007 New Revision: 31089 URL: http://svn.reactos.org/svn/reactos?rev=31089&view=rev Log: -UniqueProcessId is ULONG_PTR not ULONG -some formatting fixes Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=31… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Sat Dec 8 21:42:10 2007 @@ -120,11 +120,11 @@ /* Set return length */ Length = sizeof(PROCESS_BASIC_INFORMATION); - if ( ProcessInformationLength != Length ) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } + if ( ProcessInformationLength != Length ) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } /* Protect writes with SEH */ _SEH_TRY { @@ -132,7 +132,7 @@ ProcessBasicInfo->ExitStatus = Process->ExitStatus; ProcessBasicInfo->PebBaseAddress = Process->Peb; ProcessBasicInfo->AffinityMask = Process->Pcb.Affinity; - ProcessBasicInfo->UniqueProcessId = (ULONG)Process-> + ProcessBasicInfo->UniqueProcessId = (ULONG_PTR)Process-> UniqueProcessId; ProcessBasicInfo->InheritedFromUniqueProcessId = (ULONG)Process->InheritedFromUniqueProcessId; @@ -151,12 +151,12 @@ case ProcessQuotaLimits: case ProcessIoCounters: - Length = sizeof(IO_COUNTERS); - if ( ProcessInformationLength != Length ) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } + Length = sizeof(IO_COUNTERS); + if ( ProcessInformationLength != Length ) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } Status = STATUS_NOT_IMPLEMENTED; break; @@ -167,11 +167,11 @@ /* Set the return length */ Length = sizeof(KERNEL_USER_TIMES); - if ( ProcessInformationLength != Length ) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } + if ( ProcessInformationLength != Length ) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } /* Protect writes with SEH */ _SEH_TRY @@ -225,11 +225,11 @@ /* Set the return length*/ Length = sizeof(ULONG); - if ( ProcessInformationLength != Length ) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } + if ( ProcessInformationLength != Length ) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } /* Count the number of handles this process has */ HandleCount = ObpGetHandleCountByHandleTable(Process->ObjectTable); @@ -279,11 +279,11 @@ /* Set the return length */ Length = sizeof(VM_COUNTERS); - if ( ProcessInformationLength != Length ) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } + if ( ProcessInformationLength != Length ) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } /* Enter SEH for write safety */ _SEH_TRY

1 0

[jimtabor] 31088: Louis Lenders : gdi32: Add check for null pointer in SetDIBitsToDevice.
by jimtabor＠svn.reactos.org 08 Dec '07

08 Dec '07

Author: jimtabor Date: Sat Dec 8 21:32:22 2007 New Revision: 31088 URL: http://svn.reactos.org/svn/reactos?rev=31088&view=rev Log: Louis Lenders : gdi32: Add check for null pointer in SetDIBitsToDevice. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Sat Dec 8 21:32:22 2007 @@ -342,6 +342,8 @@ INT DIBWidth; SIZEL SourceSize; XLATEOBJ *XlateObj = NULL; + + if (!Bits) return 0; pDC = DC_LockDc(hDC); if (!pDC)

1 0

[cwittich] 31087: Dmitry Timoshkov : Windows doesn' t send the initialization messages to a dialog if a passed in dlgProc is NULL . <dmitry at codeweavers.com>
by cwittich＠svn.reactos.org 08 Dec '07

08 Dec '07

Author: cwittich Date: Sat Dec 8 21:11:28 2007 New Revision: 31087 URL: http://svn.reactos.org/svn/reactos?rev=31087&view=rev Log: Dmitry Timoshkov : Windows doesn' t send the initialization messages to a dialog if a passed in dlgProc is NULL . <dmitry at codeweavers.com> Modified: trunk/reactos/dll/win32/user32/windows/dialog.c Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c Sat Dec 8 21:11:28 2007 @@ -798,7 +798,7 @@ if (unicode) SetWindowLongPtrW( hwnd, DWLP_DLGPROC, (ULONG_PTR)dlgProc ); else SetWindowLongPtrA( hwnd, DWLP_DLGPROC, (ULONG_PTR)dlgProc ); - if (dlgInfo->hUserFont) + if (dlgProc && dlgInfo->hUserFont) SendMessageW( hwnd, WM_SETFONT, (WPARAM)dlgInfo->hUserFont, 0 ); /* Create controls */ @@ -806,16 +806,17 @@ if (DIALOG_CreateControls32( hwnd, dlgTemplate, &template, hInst, unicode )) { /* Send initialisation messages and set focus */ - - if (SendMessageW( hwnd, WM_INITDIALOG, (WPARAM)dlgInfo->hwndFocus, param ) && - ((~template.style & DS_CONTROL) || (template.style & WS_VISIBLE))) - { - /* By returning TRUE, app has requested a default focus assignment */ - dlgInfo->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE); - if( dlgInfo->hwndFocus ) - SetFocus( dlgInfo->hwndFocus ); - } - + if (dlgProc) + { + if (SendMessageW( hwnd, WM_INITDIALOG, (WPARAM)dlgInfo->hwndFocus, param ) && + ((~template.style & DS_CONTROL) || (template.style & WS_VISIBLE))) + { + /* By returning TRUE, app has requested a default focus assignment */ + dlgInfo->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE); + if( dlgInfo->hwndFocus ) + SetFocus( dlgInfo->hwndFocus ); + } + } if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD)) SendMessageW( hwnd, WM_CHANGEUISTATE, MAKEWPARAM(UIS_INITIALIZE, 0), 0);

1 0

[cwittich] 31086: use REFGUID instead of UUID* to be compatible with MS PSDK
by cwittich＠svn.reactos.org 08 Dec '07

08 Dec '07

Author: cwittich Date: Sat Dec 8 20:37:25 2007 New Revision: 31086 URL: http://svn.reactos.org/svn/reactos?rev=31086&view=rev Log: use REFGUID instead of UUID* to be compatible with MS PSDK Modified: trunk/reactos/base/setup/usetup/interface/devinst.c Modified: trunk/reactos/base/setup/usetup/interface/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/devinst.c (original) +++ trunk/reactos/base/setup/usetup/interface/devinst.c Sat Dec 8 20:37:25 2007 @@ -365,7 +365,7 @@ /* Process the pnp event */ DPRINT("Received PnP Event\n"); - if (IsEqualIID(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ARRIVAL)) + if (IsEqualIID(&PnpEvent->EventGuid, (REFGUID)&GUID_DEVICE_ARRIVAL)) { DPRINT1("Device arrival event: %S\n", PnpEvent->TargetDevice.DeviceIds); InstallDevice(hInf, hEnum, hServices, PnpEvent->TargetDevice.DeviceIds);

1 0

[cwittich] 31085: revert 31080 and apply the patch from Francois Gouget to delete_registry_key (Modify getRegClass() to avoid dubious comparisons and casts between HKEYs and error codes.)
by cwittich＠svn.reactos.org 08 Dec '07

08 Dec '07

Author: cwittich Date: Sat Dec 8 19:48:36 2007 New Revision: 31085 URL: http://svn.reactos.org/svn/reactos?rev=31085&view=rev Log: revert 31080 and apply the patch from Francois Gouget to delete_registry_key (Modify getRegClass() to avoid dubious comparisons and casts between HKEYs and error codes.) Modified: trunk/reactos/base/applications/regedit/regproc.c Modified: trunk/reactos/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regproc.c (original) +++ trunk/reactos/base/applications/regedit/regproc.c Sat Dec 8 19:48:36 2007 @@ -362,45 +362,6 @@ } } str[val_idx] = '\0'; -} - -/****************************************************************************** - * Parses HKEY_SOME_ROOT\some\key\path to get the root key handle and - * extract the key path (what comes after the first '\'). - */ -static BOOL parseKeyName(LPSTR lpKeyName, HKEY *hKey, LPSTR *lpKeyPath) -{ - LPSTR lpSlash; - unsigned int i, len; - - if (lpKeyName == NULL) - return FALSE; - - lpSlash = strchr(lpKeyName, '\\'); - if (lpSlash) - { - len = lpSlash-lpKeyName; - } - else - { - len = strlen(lpKeyName); - lpSlash = lpKeyName+len; - } - *hKey = NULL; - for (i = 0; i < REG_CLASS_NUMBER; i++) { - if (strncmp(lpKeyName, reg_class_names[i], len) == 0 && - len == strlen(reg_class_names[i])) { - *hKey = reg_class_keys[i]; - break; - } - } - if (*hKey == NULL) - return FALSE; - - if (*lpSlash != '\0') - lpSlash++; - *lpKeyPath = lpSlash; - return TRUE; } /****************************************************************************** @@ -1457,7 +1418,53 @@ } /****************************************************************************** - + * Recursive function which removes the registry key with all subkeys. + */ +static void delete_branch(HKEY key, + CHAR **reg_key_name_buf, DWORD *reg_key_name_len) +{ + HKEY branch_key; + DWORD max_sub_key_len; + DWORD subkeys; + DWORD curr_len; + LONG ret; + long int i; + + if (RegOpenKeyA(key, *reg_key_name_buf, &branch_key) != ERROR_SUCCESS) { + REGPROC_print_error(); + } + + /* get size information and resize the buffers if necessary */ + if (RegQueryInfoKey(branch_key, NULL, NULL, NULL, + &subkeys, &max_sub_key_len, + NULL, NULL, NULL, NULL, NULL, NULL + ) != ERROR_SUCCESS) { + REGPROC_print_error(); + } + curr_len = (DWORD) strlen(*reg_key_name_buf); + REGPROC_resize_char_buffer(reg_key_name_buf, reg_key_name_len, + max_sub_key_len + curr_len + 1); + + (*reg_key_name_buf)[curr_len] = '\\'; + for (i = subkeys - 1; i >= 0; i--) { + DWORD buf_len = *reg_key_name_len - curr_len; + + ret = RegEnumKeyExA(branch_key, i, *reg_key_name_buf + curr_len + 1, + &buf_len, NULL, NULL, NULL, NULL); + if (ret != ERROR_SUCCESS && + ret != ERROR_MORE_DATA && + ret != ERROR_NO_MORE_ITEMS) { + REGPROC_print_error(); + } else { + delete_branch(key, reg_key_name_buf, reg_key_name_len); + } + } + (*reg_key_name_buf)[curr_len] = '\0'; + RegCloseKey(branch_key); + RegDeleteKeyA(key, *reg_key_name_buf); +} + +/****************************************************************************** * Removes the registry key with all subkeys. Parses full key name. * * Parameters: @@ -1466,24 +1473,33 @@ */ void delete_registry_key(CHAR *reg_key_name) { - CHAR *key_name; - HKEY key_class; + CHAR *branch_name; + DWORD branch_name_len; + HKEY reg_key_class; + HKEY branch_key; if (!reg_key_name || !reg_key_name[0]) return; - - if (!parseKeyName(reg_key_name, &key_class, &key_name)) { + /* open the specified key */ + if (!getRegClass(reg_key_name, &reg_key_class)) { fprintf(stderr,"%s: Incorrect registry class specification in '%s'\n", getAppName(), reg_key_name); exit(1); } - if (!*key_name) { + branch_name = getRegKeyName(reg_key_name); + CHECK_ENOUGH_MEMORY(branch_name); + branch_name_len = (DWORD) strlen(branch_name); + if (!branch_name[0]) { fprintf(stderr,"%s: Can't delete registry class '%s'\n", getAppName(), reg_key_name); exit(1); } - - RegDeleteTreeA(key_class, key_name); + if (RegOpenKeyA(reg_key_class, branch_name, &branch_key) == ERROR_SUCCESS) { + /* check whether the key exists */ + RegCloseKey(branch_key); + delete_branch(reg_key_class, &branch_name, &branch_name_len); + } + HeapFree(GetProcessHeap(), 0, branch_name); } /******************************************************************************

1 0

[cwittich] 31084: Michael Stefaniuc : kernel32: Pass HEAP_ZERO_MEMORY to HeapAlloc() instead of clearing the memory with a separate memset() call. <mstefani at redhat.de>
by cwittich＠svn.reactos.org 08 Dec '07

08 Dec '07

Author: cwittich Date: Sat Dec 8 19:33:05 2007 New Revision: 31084 URL: http://svn.reactos.org/svn/reactos?rev=31084&view=rev Log: Michael Stefaniuc : kernel32: Pass HEAP_ZERO_MEMORY to HeapAlloc() instead of clearing the memory with a separate memset() call. <mstefani at redhat.de> Modified: trunk/reactos/dll/win32/kernel32/misc/lzexpand_main.c Modified: trunk/reactos/dll/win32/kernel32/misc/lzexpand_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/lz… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lzexpand_main.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/lzexpand_main.c Sat Dec 8 19:33:05 2007 @@ -168,10 +168,9 @@ } for (i = 0; i < MAX_LZSTATES; i++) if (!lzstates[i]) break; if (i == MAX_LZSTATES) return LZERROR_GLOBALLOC; - lzstates[i] = lzs = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(struct lzstate) ); + lzstates[i] = lzs = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct lzstate) ); if(lzs == NULL) return LZERROR_GLOBALLOC; - memset(lzs,'\0',sizeof(*lzs)); lzs->realfd = hfSrc; lzs->lastchar = head.lastchar; lzs->reallength = head.reallength;

1 0

[cwittich] 31083: move GetTextExtentExPointI and GetTextExtentPointI from stubs.c to text.c
by cwittich＠svn.reactos.org 08 Dec '07

08 Dec '07

Author: cwittich Date: Sat Dec 8 19:26:40 2007 New Revision: 31083 URL: http://svn.reactos.org/svn/reactos?rev=31083&view=rev Log: move GetTextExtentExPointI and GetTextExtentPointI from stubs.c to text.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/text.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sat Dec 8 19:26:40 2007 @@ -1568,39 +1568,6 @@ UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); } - -/* - * @implemented - */ -BOOL -STDCALL -GetTextExtentExPointI(HDC hdc, - LPWORD pgiIn, - int cgi, - int nMaxExtent, - LPINT lpnFit, - LPINT alpDx, - LPSIZE lpSize) -{ - return NtGdiGetTextExtentExW(hdc,pgiIn,cgi,nMaxExtent,(ULONG *)lpnFit, (PULONG) alpDx,lpSize,1); -} - -/* - * @implemented - */ -BOOL -STDCALL -GetTextExtentPointI(HDC hdc, - LPWORD pgiIn, - int cgi, - LPSIZE lpSize) -{ - return NtGdiGetTextExtent(hdc,pgiIn,cgi,lpSize,2); -} - - - - /* * @unimplemented Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c Sat Dec 8 19:26:40 2007 @@ -274,6 +274,34 @@ return NtGdiGetTextExtentPoint32(hdc, lpString, cbString, lpSize); } +/* + * @implemented + */ +BOOL +STDCALL +GetTextExtentExPointI(HDC hdc, + LPWORD pgiIn, + int cgi, + int nMaxExtent, + LPINT lpnFit, + LPINT alpDx, + LPSIZE lpSize) +{ + return NtGdiGetTextExtentExW(hdc,pgiIn,cgi,nMaxExtent,(ULONG *)lpnFit, (PULONG) alpDx,lpSize,1); +} + +/* + * @implemented + */ +BOOL +STDCALL +GetTextExtentPointI(HDC hdc, + LPWORD pgiIn, + int cgi, + LPSIZE lpSize) +{ + return NtGdiGetTextExtent(hdc,pgiIn,cgi,lpSize,2); +} /* * @implemented

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