Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 16558: Implemented VkKeyScan, GetKeyboardTypeand GetKeyboardLayout.
by jimtabor＠svn.reactos.com 13 Jul '05

13 Jul '05

Implemented VkKeyScan, GetKeyboardTypeand GetKeyboardLayout. Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsys/win32k/ntuser/misc.c Modified: trunk/reactos/subsys/win32k/ntuser/stubs.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c --- trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-07-13 17:59:37 UTC (rev 16557) +++ trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-07-13 23:19:59 UTC (rev 16558) @@ -1050,4 +1050,126 @@ IntUnLockQueueState; } + +DWORD +STDCALL +NtUserGetKeyboardLayoutList( + DWORD Items, + DWORD pHklBuff) +{ + UNIMPLEMENTED + + return 0; +} + +DWORD +STDCALL +NtUserGetKeyboardLayoutName( + DWORD lpszName) +{ + UNIMPLEMENTED + + return 0; +} + +HKL +STDCALL +NtUserGetKeyboardLayout( + DWORD dwThreadId) +{ + NTSTATUS Status; + PETHREAD Thread; + PW32THREAD W32Thread; + PKBDTABLES layout; + + if (!dwThreadId) + W32Thread = PsGetWin32Thread(); + else + { + Status = PsLookupThreadByThreadId((HANDLE)dwThreadId, &Thread); + if(!NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return 0; + } + W32Thread = Thread->Tcb.Win32Thread; + } + layout = W32Thread->KeyboardLayout; + if(!layout) return 0; + return (HKL)layout; +} + + +DWORD +STDCALL +NtUserGetKeyboardType( + DWORD TypeFlag) +{ + switch(TypeFlag) + { + case 0: /* Keyboard type */ + return 4; /* AT-101 */ + case 1: /* Keyboard Subtype */ + return 0; /* There are no defined subtypes */ + case 2: /* Number of F-keys */ + return 12; /* We're doing an 101 for now, so return 12 F-keys */ + default: + DPRINT1("Unknown type!\n"); + return 0; /* The book says 0 here, so 0 */ + } +} + + +/* + Based on TryToTranslateChar, instead of processing VirtualKey match, + look for wChar match. + */ +DWORD +STDCALL +NtUserVkKeyScanEx( + DWORD wChar, + DWORD KeyboardLayout, + DWORD Unknown2) +{ + PKBDTABLES KeyLayout; + PVK_TO_WCHAR_TABLE vtwTbl; + PVK_TO_WCHARS10 vkPtr; + size_t size_this_entry; + int nMod; + DWORD CapsMod = 0, CapsState = 0; + + if(!KeyboardLayout) return -1; + KeyLayout = (PKBDTABLES) KeyboardLayout; + + for (nMod = 0; KeyLayout->pVkToWcharTable[nMod].nModifications; nMod++) + { + vtwTbl = &KeyLayout->pVkToWcharTable[nMod]; + size_this_entry = vtwTbl->cbSize; + vkPtr = (PVK_TO_WCHARS10)((BYTE *)vtwTbl->pVkToWchars); + + while(vkPtr->VirtualKey) + { + /* + 0x01 Shift key + 0x02 Ctrl key + 0x04 Alt key + Should have only 7 valid possibilities. + */ + for(CapsState = 0; CapsState < vtwTbl->nModifications; CapsState++) + { + if(vkPtr->wch[CapsState] == wChar) + { + CapsMod = KeyLayout->pCharModifiers->ModNumber[CapsState]; + DPRINT("nMod %d Vk %04x: CapsMod %08x CapsState %08x MaxModBits %08x\n", + nMod, wVirtKey, CapsMod, CapsState, KeyLayout->pCharModifiers->wMaxModBits); + return ((CapsMod << 8)|(vkPtr->VirtualKey & 0xff)); + } + } + vkPtr = (PVK_TO_WCHARS10)(((BYTE *)vkPtr) + size_this_entry); + } + } + return -1; +} + + /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/ntuser/misc.c --- trunk/reactos/subsys/win32k/ntuser/misc.c 2005-07-13 17:59:37 UTC (rev 16557) +++ trunk/reactos/subsys/win32k/ntuser/misc.c 2005-07-13 23:19:59 UTC (rev 16558) @@ -341,6 +341,12 @@ case ONEPARAM_ROUTINE_MSQSETWAKEMASK: return (DWORD)IntMsqSetWakeMask(Param); + + case ONEPARAM_ROUTINE_GETKEYBOARDTYPE: + return NtUserGetKeyboardType(Param); + + case ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT: + return (DWORD)NtUserGetKeyboardLayout(Param); } DPRINT1("Calling invalid routine number 0x%x in NtUserCallOneParam(), Param=0x%x\n", Routine, Param); _____ Modified: trunk/reactos/subsys/win32k/ntuser/stubs.c --- trunk/reactos/subsys/win32k/ntuser/stubs.c 2005-07-13 17:59:37 UTC (rev 16557) +++ trunk/reactos/subsys/win32k/ntuser/stubs.c 2005-07-13 23:19:59 UTC (rev 16558) @@ -344,29 +344,9 @@ return 0; } -DWORD -STDCALL -NtUserGetKeyboardLayoutList( - DWORD Unknown0, - DWORD Unknown1) -{ - UNIMPLEMENTED - return 0; -} - DWORD STDCALL -NtUserGetKeyboardLayoutName( - DWORD Unknown0) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL NtUserGetListBoxInfo( DWORD Unknown0) { @@ -703,18 +683,6 @@ DWORD STDCALL -NtUserVkKeyScanEx( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL NtUserWaitForInputIdle( DWORD Unknown0, DWORD Unknown1,

1 0

[hbirr] 16557: Fixed the allocation of the buffer for the environment variable in ProcessInput.
by hbirr＠svn.reactos.com 13 Jul '05

13 Jul '05

Fixed the allocation of the buffer for the environment variable in ProcessInput. Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-07-13 17:32:39 UTC (rev 16556) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-07-13 17:59:37 UTC (rev 16557) @@ -1061,18 +1061,19 @@ } else { - evar = malloc ( size * sizeof(TCHAR)); + evar = malloc ( 512 * sizeof(TCHAR)); if (evar==NULL) return 1; - size = GetEnvironmentVariable (ip, evar, size); - if (size!=0) + size = GetEnvironmentVariable (ip, evar, 512); + if (size > 512) { evar = realloc(evar,size * sizeof(TCHAR) ); - if (evar!=NULL) + if (evar==NULL) { - size = GetEnvironmentVariable (ip, evar, size); + return 1; } + size = GetEnvironmentVariable (ip, evar, size); } if (size)

1 0

[hbirr] 16556: Fixed a bug in IsConsoleHandle which was introduced by r16540.
by hbirr＠svn.reactos.com 13 Jul '05

13 Jul '05

Fixed a bug in IsConsoleHandle which was introduced by r16540. Modified: trunk/reactos/lib/kernel32/include/kernel32.h _____ Modified: trunk/reactos/lib/kernel32/include/kernel32.h --- trunk/reactos/lib/kernel32/include/kernel32.h 2005-07-13 16:36:24 UTC (rev 16555) +++ trunk/reactos/lib/kernel32/include/kernel32.h 2005-07-13 17:32:39 UTC (rev 16556) @@ -24,7 +24,7 @@ #endif #define IsConsoleHandle(h) \ - ((((ULONG)h) & 0x10000003) == 0x3) ? TRUE : FALSE + (((((ULONG)h) & 0x10000003) == 0x3) ? TRUE : FALSE) #define HANDLE_DETACHED_PROCESS (HANDLE)-1 #define HANDLE_CREATE_NEW_CONSOLE (HANDLE)-2

1 0

[weiden] 16555: only NULL-terminate the string in GetEnvironmentVariableW if the buffer size is greater than 0. Thanks to Joseph Galbraith for the hint
by weiden＠svn.reactos.com 13 Jul '05

13 Jul '05

only NULL-terminate the string in GetEnvironmentVariableW if the buffer size is greater than 0. Thanks to Joseph Galbraith for the hint Modified: trunk/reactos/lib/kernel32/misc/env.c _____ Modified: trunk/reactos/lib/kernel32/misc/env.c --- trunk/reactos/lib/kernel32/misc/env.c 2005-07-13 15:46:59 UTC (rev 16554) +++ trunk/reactos/lib/kernel32/misc/env.c 2005-07-13 16:36:24 UTC (rev 16555) @@ -158,9 +158,12 @@ } } - /* make sure the string is NULL-terminated! RtlQueryEnvironmentVariable_U - only terminates it if MaximumLength < Length */ - VarValue.Buffer[VarValue.Length / sizeof(WCHAR)] = L'\0'; + if (nSize != 0) + { + /* make sure the string is NULL-terminated! RtlQueryEnvironmentVariable_U + only terminates it if MaximumLength < Length */ + VarValue.Buffer[VarValue.Length / sizeof(WCHAR)] = L'\0'; + } return (VarValue.Length / sizeof(WCHAR)); }

1 0

[weiden] 16553: handle memory allocation errors in GetEnvironmentVariable() and ensure the string is always null-terminated
by weiden＠svn.reactos.com 13 Jul '05

13 Jul '05

handle memory allocation errors in GetEnvironmentVariable() and ensure the string is always null-terminated Modified: trunk/reactos/lib/kernel32/misc/env.c _____ Modified: trunk/reactos/lib/kernel32/misc/env.c --- trunk/reactos/lib/kernel32/misc/env.c 2005-07-13 08:48:49 UTC (rev 16552) +++ trunk/reactos/lib/kernel32/misc/env.c 2005-07-13 15:09:52 UTC (rev 16553) @@ -48,17 +48,33 @@ /* initialize unicode variable value string and allocate buffer */ VarValueU.Length = 0; - VarValueU.MaximumLength = nSize * sizeof(WCHAR); - VarValueU.Buffer = RtlAllocateHeap (RtlGetProcessHeap (), - 0, - VarValueU.MaximumLength); + if (nSize != 0) + { + VarValueU.MaximumLength = (nSize - 1) * sizeof(WCHAR); + VarValueU.Buffer = RtlAllocateHeap (RtlGetProcessHeap (), + 0, + nSize * sizeof(WCHAR)); + if (VarValueU.Buffer != NULL) + { + /* NULL-terminate the buffer in any case! RtlQueryEnvironmentVariable_U + only terminates it if MaximumLength < Length! */ + VarValueU.Buffer[nSize - 1] = L'\0'; + } + } + else + { + VarValueU.MaximumLength = 0; + VarValueU.Buffer = NULL; + } - /* get unicode environment variable */ - Status = RtlQueryEnvironmentVariable_U (NULL, - &VarNameU, - &VarValueU); - if (!NT_SUCCESS(Status)) - { + if (VarValueU.Buffer != NULL || nSize == 0) + { + /* get unicode environment variable */ + Status = RtlQueryEnvironmentVariable_U (NULL, + &VarNameU, + &VarValueU); + if (!NT_SUCCESS(Status)) + { /* free unicode buffer */ RtlFreeHeap (RtlGetProcessHeap (), 0, @@ -70,28 +86,37 @@ SetLastErrorByStatus (Status); if (Status == STATUS_BUFFER_TOO_SMALL) { - return VarValueU.Length / sizeof(WCHAR) + 1; + return (VarValueU.Length / sizeof(WCHAR)) + 1; } else { return 0; } - } + } - /* convert unicode value string to ansi */ - RtlUnicodeStringToAnsiString (&VarValue, - &VarValueU, - FALSE); + /* convert unicode value string to ansi */ + RtlUnicodeStringToAnsiString (&VarValue, + &VarValueU, + FALSE); - /* free unicode buffer */ - RtlFreeHeap (RtlGetProcessHeap (), - 0, - VarValueU.Buffer); + if (VarValueU.Buffer != NULL) + { + /* free unicode buffer */ + RtlFreeHeap (RtlGetProcessHeap (), + 0, + VarValueU.Buffer); + } - /* free unicode variable name string */ - RtlFreeUnicodeString (&VarNameU); + /* free unicode variable name string */ + RtlFreeUnicodeString (&VarNameU); - return (VarValueU.Length / sizeof(WCHAR)); + return (VarValueU.Length / sizeof(WCHAR)); + } + else + { + SetLastError (ERROR_NOT_ENOUGH_MEMORY); + return 0; + } } @@ -114,7 +139,7 @@ lpName); VarValue.Length = 0; - VarValue.MaximumLength = nSize * sizeof(WCHAR); + VarValue.MaximumLength = (nSize != 0 ? (nSize - 1) * sizeof(WCHAR) : 0); VarValue.Buffer = lpBuffer; Status = RtlQueryEnvironmentVariable_U (NULL, @@ -125,13 +150,17 @@ SetLastErrorByStatus (Status); if (Status == STATUS_BUFFER_TOO_SMALL) { - return (VarValue.Length / sizeof(WCHAR)) + 1; + return (VarValue.Length / sizeof(WCHAR)) + 1; } else { return 0; } } + + /* make sure the string is NULL-terminated! RtlQueryEnvironmentVariable_U + only terminates it if MaximumLength < Length */ + VarValue.Buffer[VarValue.Length / sizeof(WCHAR)] = L'\0'; return (VarValue.Length / sizeof(WCHAR)); }

2 2

[ion] 16554: Fix macro to be optimized out, thanks to Filip
by ion＠svn.reactos.com 13 Jul '05

13 Jul '05

Fix macro to be optimized out, thanks to Filip Modified: trunk/reactos/include/wine/debug.h _____ Modified: trunk/reactos/include/wine/debug.h --- trunk/reactos/include/wine/debug.h 2005-07-13 15:09:52 UTC (rev 16553) +++ trunk/reactos/include/wine/debug.h 2005-07-13 15:46:59 UTC (rev 16554) @@ -20,7 +20,7 @@ #endif #if !defined(DBG) || !defined(YDEBUG) -#define DPRINT(...) do { DbgPrint(__VA_ARGS__); } while(0) +#define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #else #define DPRINT DbgPrint("(%s:%d:%s) ",__FILE__,__LINE__,__FUNCTION__), DbgPrint #endif

1 0

[arty] 16552: stop exporting MmCopyFromCaller and kin and make a local version in the
by arty＠svn.reactos.com 13 Jul '05

13 Jul '05

stop exporting MmCopyFromCaller and kin and make a local version in the last place we use it, now based on SEH. we'll remove the copy from caller hack from ntoskrnl soon. Modified: trunk/reactos/ntoskrnl/ntoskrnl.def Added: trunk/reactos/subsys/win32k/include/mmcopy.h Modified: trunk/reactos/subsys/win32k/include/win32k.h Added: trunk/reactos/subsys/win32k/misc/copy.c Modified: trunk/reactos/subsys/win32k/w32k.h Modified: trunk/reactos/subsys/win32k/win32k.xml _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.def --- trunk/reactos/ntoskrnl/ntoskrnl.def 2005-07-13 02:45:53 UTC (rev 16551) +++ trunk/reactos/ntoskrnl/ntoskrnl.def 2005-07-13 08:48:49 UTC (rev 16552) @@ -690,8 +690,8 @@ MmAllocatePagesForMdl@28 MmBuildMdlForNonPagedPool@4 MmCanFileBeTruncated@8 -MmCopyFromCaller@12 -MmCopyToCaller@12 +;MmCopyFromCaller@12 +;MmCopyToCaller@12 MmCreateMdl@12 MmCreateSection@32 MmDbgTranslatePhysicalAddress@8 _____ Added: trunk/reactos/subsys/win32k/include/mmcopy.h --- trunk/reactos/subsys/win32k/include/mmcopy.h 2005-07-13 02:45:53 UTC (rev 16551) +++ trunk/reactos/subsys/win32k/include/mmcopy.h 2005-07-13 08:48:49 UTC (rev 16552) @@ -0,0 +1,11 @@ +#ifndef NDK_MMCOPY_H +#define NDK_MMCOPY_H + +#include <pseh/pseh.h> + +NTSTATUS _MmCopyFromCaller( PVOID Target, PVOID Source, UINT Bytes ); + +#define MmCopyFromCaller(x,y,z) _MmCopyFromCaller((PCHAR)(x),(PCHAR)(y),(UINT)(z)) +#define MmCopyToCaller(x,y,z) MmCopyFromCaller(x,y,z) + +#endif/*NDK_MMCOPY_H*/ _____ Modified: trunk/reactos/subsys/win32k/include/win32k.h --- trunk/reactos/subsys/win32k/include/win32k.h 2005-07-13 02:45:53 UTC (rev 16551) +++ trunk/reactos/subsys/win32k/include/win32k.h 2005-07-13 08:48:49 UTC (rev 16552) @@ -54,8 +54,8 @@ #include <include/window.h> #include <include/winpos.h> #include <include/winsta.h> +#include <include/mmcopy.h> #include <eng/objects.h> #include <eng/misc.h> #include <dib/dib.h> - /* EOF */ _____ Added: trunk/reactos/subsys/win32k/misc/copy.c --- trunk/reactos/subsys/win32k/misc/copy.c 2005-07-13 02:45:53 UTC (rev 16551) +++ trunk/reactos/subsys/win32k/misc/copy.c 2005-07-13 08:48:49 UTC (rev 16552) @@ -0,0 +1,13 @@ +#include "w32k.h" + +NTSTATUS _MmCopyFromCaller( PVOID Target, PVOID Source, UINT Bytes ) { + NTSTATUS Status = STATUS_SUCCESS; + + _SEH_TRY { + RtlCopyMemory(Target,Source,Bytes); + } _SEH_HANDLE { + Status = _SEH_GetExceptionCode(); + } _SEH_END; + + return Status; +} _____ Modified: trunk/reactos/subsys/win32k/w32k.h --- trunk/reactos/subsys/win32k/w32k.h 2005-07-13 02:45:53 UTC (rev 16551) +++ trunk/reactos/subsys/win32k/w32k.h 2005-07-13 08:48:49 UTC (rev 16552) @@ -19,14 +19,6 @@ #include <windows.h> #include <ndk/ntndk.h> -/* FIXME: ReactOS will be R-Rated if I really write what I'm about to */ -NTSTATUS -STDCALL -MmCopyFromCaller(PVOID Dest, const VOID *Src, ULONG NumberOfBytes); -NTSTATUS -STDCALL -MmCopyToCaller(PVOID Dest, const VOID *Src, ULONG NumberOfBytes); - /* SEH Support with PSEH */ #include <pseh/pseh.h> _____ Modified: trunk/reactos/subsys/win32k/win32k.xml --- trunk/reactos/subsys/win32k/win32k.xml 2005-07-13 02:45:53 UTC (rev 16551) +++ trunk/reactos/subsys/win32k/win32k.xml 2005-07-13 08:48:49 UTC (rev 16552) @@ -58,6 +58,7 @@ <file>math.c</file> <file>object.c</file> <file>ssec.c</file> + <file>copy.c</file> </directory> <directory name="ntddraw"> <file>ddraw.c</file>

1 0

[ion] 16551: fix bizarre build error
by ion＠svn.reactos.com 13 Jul '05

13 Jul '05

fix bizarre build error Modified: trunk/reactos/lib/comctl32/listview.c _____ Modified: trunk/reactos/lib/comctl32/listview.c --- trunk/reactos/lib/comctl32/listview.c 2005-07-13 02:02:08 UTC (rev 16550) +++ trunk/reactos/lib/comctl32/listview.c 2005-07-13 02:45:53 UTC (rev 16551) @@ -6928,7 +6928,7 @@ return oldspacing; } -static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL small) +static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL _small) { INT cx, cy; @@ -6939,8 +6939,8 @@ } else { - size->cx = GetSystemMetrics(small ? SM_CXSMICON : SM_CXICON); - size->cy = GetSystemMetrics(small ? SM_CYSMICON : SM_CYICON); + size->cx = GetSystemMetrics(_small ? SM_CXSMICON : SM_CXICON); + size->cy = GetSystemMetrics(_small ? SM_CYSMICON : SM_CYICON); } }

1 0

[ion] 16550: Silence more warnings. Patch by Waxdragon.
by ion＠svn.reactos.com 13 Jul '05

13 Jul '05

Silence more warnings. Patch by Waxdragon. Modified: trunk/reactos/drivers/bus/acpi/ospm/fdo.c Modified: trunk/reactos/lib/dinput/keyboard.c Modified: trunk/reactos/lib/dinput/mouse.c Modified: trunk/reactos/lib/iphlpapi/ifenum_reactos.c Modified: trunk/reactos/lib/iphlpapi/resinfo_reactos.c Modified: trunk/reactos/lib/shell32/shellpath.c Modified: trunk/reactos/lib/wininet/dialogs.c Modified: trunk/reactos/lib/winmm/lolvldrv.c Modified: trunk/reactos/subsys/system/calc/winecalc.c _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/fdo.c --- trunk/reactos/drivers/bus/acpi/ospm/fdo.c 2005-07-13 01:41:13 UTC (rev 16549) +++ trunk/reactos/drivers/bus/acpi/ospm/fdo.c 2005-07-13 02:02:08 UTC (rev 16550) @@ -320,7 +320,6 @@ PFDO_DEVICE_EXTENSION DeviceExtension; PDEVICE_RELATIONS Relations; PLIST_ENTRY CurrentEntry; - ANSI_STRING AnsiString; ACPI_STATUS AcpiStatus; PACPI_DEVICE Device; NTSTATUS Status = STATUS_SUCCESS; _____ Modified: trunk/reactos/lib/dinput/keyboard.c --- trunk/reactos/lib/dinput/keyboard.c 2005-07-13 01:41:13 UTC (rev 16549) +++ trunk/reactos/lib/dinput/keyboard.c 2005-07-13 02:02:08 UTC (rev 16550) @@ -99,10 +99,7 @@ void reactos_input_keyboard() { - MSG msg; - BOOL fDone; int disk_code = -1; - BOOL down; BYTE oldDInputKeyState[256]; int t; _____ Modified: trunk/reactos/lib/dinput/mouse.c --- trunk/reactos/lib/dinput/mouse.c 2005-07-13 01:41:13 UTC (rev 16549) +++ trunk/reactos/lib/dinput/mouse.c 2005-07-13 02:02:08 UTC (rev 16550) @@ -712,8 +712,6 @@ int filp=0; void getmousesvalue(LPDIRECTINPUTDEVICE8A iface) { - static long last_event = 0; - POINT point; SysMouseImpl *This = (SysMouseImpl *)iface; @@ -761,7 +759,6 @@ { int retValue = DI_OK; -SysMouseImpl *This = (SysMouseImpl *)iface; if (poll_mouse==0) { retValue=SysMouseAImpl_Acquire(iface); poll_mouse=1; @@ -783,7 +780,6 @@ LPDIRECTINPUTDEVICE8A iface,DWORD len,LPVOID ptr ) { SysMouseImpl *This = (SysMouseImpl *)iface; - POINT point; #ifndef __REACTOS__ EnterCriticalSection(&(This->crit)); _____ Modified: trunk/reactos/lib/iphlpapi/ifenum_reactos.c --- trunk/reactos/lib/iphlpapi/ifenum_reactos.c 2005-07-13 01:41:13 UTC (rev 16549) +++ trunk/reactos/lib/iphlpapi/ifenum_reactos.c 2005-07-13 02:02:08 UTC (rev 16550) @@ -367,20 +367,20 @@ DWORD numAddrs; IPAddrEntry *addrs; TDIEntityID ip_ent; - int j,k; + int j; interfaceInfoComplete = FALSE; status = getNthIpEntity( tcpFile, 0, &ip_ent ); if( NT_SUCCESS(status) ) status = tdiGetIpAddrsForIpEntity ( tcpFile, &ip_ent, &addrs, &numAddrs ); - for( k = 0; k < numAddrs && NT_SUCCESS(status); k++ ) { - DPRINT("ADDR %d: index %d (target %d)\n", k, addrs[k].iae_index, infoSetInt[curInterf].if_info.ent.if_index); - if( addrs[k].iae_index == + for( j = 0; j < numAddrs && NT_SUCCESS(status); j++ ) { + DPRINT("ADDR %d: index %d (target %d)\n", j, addrs[j].iae_index, infoSetInt[curInterf].if_info.ent.if_index); + if( addrs[j].iae_index == infoSetInt[curInterf].if_info.ent.if_index ) { memcpy( &infoSetInt[curInterf].ip_addr, - &addrs[k], - sizeof( addrs[k] ) ); + &addrs[j], + sizeof( addrs[j] ) ); curInterf++; break; } @@ -847,7 +847,6 @@ { HANDLE tcpFile; NTSTATUS status = openTcpFile( &tcpFile ); - USHORT TheNteContext = NteContext; IO_STATUS_BLOCK Iosb; DPRINT("Called.\n"); _____ Modified: trunk/reactos/lib/iphlpapi/resinfo_reactos.c --- trunk/reactos/lib/iphlpapi/resinfo_reactos.c 2005-07-13 01:41:13 UTC (rev 16549) +++ trunk/reactos/lib/iphlpapi/resinfo_reactos.c 2005-07-13 02:02:08 UTC (rev 16550) @@ -92,12 +92,10 @@ */ static void EnumInterfaces( PVOID Data, EnumInterfacesFunc cb ) { - HKEY RegHandle, TcpipHandle; + HKEY RegHandle; HKEY ChildKeyHandle = 0; PWCHAR RegKeyToEnumerate = L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces"; - PWCHAR RegKeyForTcpip = - L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters"; PWCHAR ChildKeyName = 0; DWORD CurrentInterface; @@ -202,7 +200,7 @@ } PIPHLP_RES_INFO getResInfo() { - DWORD result = ERROR_SUCCESS, dwSize, i, ServerCount, ExtraServer; + DWORD i, ServerCount, ExtraServer; HKEY hKey; LONG errCode; PWCHAR Str; _____ Modified: trunk/reactos/lib/shell32/shellpath.c --- trunk/reactos/lib/shell32/shellpath.c 2005-07-13 01:41:13 UTC (rev 16549) +++ trunk/reactos/lib/shell32/shellpath.c 2005-07-13 02:02:08 UTC (rev 16550) @@ -1529,7 +1529,7 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) { HRESULT hr = S_OK; - WCHAR szTemp[MAX_PATH], szProfilesPrefix[MAX_PATH] = { 0 }; + WCHAR szTemp[MAX_PATH]; TRACE("%s, %p\n", debugstr_w(szSrc), szDest); _____ Modified: trunk/reactos/lib/wininet/dialogs.c --- trunk/reactos/lib/wininet/dialogs.c 2005-07-13 01:41:13 UTC (rev 16549) +++ trunk/reactos/lib/wininet/dialogs.c 2005-07-13 02:02:08 UTC (rev 16550) @@ -135,10 +135,8 @@ WCHAR szResource[0x80], szUserPass[0x40]; LPWSTR p; HWND hUserItem, hPassItem; - DWORD r, dwMagic = 19; - UINT r_len, u_len; + UINT r_len; WORD sz; - static const WCHAR szColon[] = { ':',0 }; static const WCHAR szbs[] = { '/', 0 }; hUserItem = GetDlgItem( hdlg, IDC_USERNAME ); @@ -158,6 +156,11 @@ if( bSet ) { #ifndef __REACTOS__ + + DWORD r, dwMagic = 19; + UNIT u_len; + static const WCHAR szColon[] = { ':',0 }; + szUserPass[0] = 0; GetWindowTextW( hUserItem, szUserPass, (sizeof szUserPass-1)/sizeof(WCHAR) ); _____ Modified: trunk/reactos/lib/winmm/lolvldrv.c --- trunk/reactos/lib/winmm/lolvldrv.c 2005-07-13 01:41:13 UTC (rev 16549) +++ trunk/reactos/lib/winmm/lolvldrv.c 2005-07-13 02:02:08 UTC (rev 16550) @@ -723,8 +723,6 @@ char driver_buffer[256]; char mapper_buffer[256]; char midi_buffer[256]; - char* p1; - char* p2; DWORD type, size; BOOL ret = FALSE; TRACE("()\n"); @@ -751,6 +749,9 @@ } #ifndef __REACTOS__ + char* p1; + char* p2; + p1 = driver_buffer; while (p1) { p2 = strchr(p1, ';'); _____ Modified: trunk/reactos/subsys/system/calc/winecalc.c --- trunk/reactos/subsys/system/calc/winecalc.c 2005-07-13 01:41:13 UTC (rev 16549) +++ trunk/reactos/subsys/system/calc/winecalc.c 2005-07-13 02:02:08 UTC (rev 16550) @@ -639,7 +639,7 @@ break; default: { - int ret = parse(wParam, lParam); + parse(wParam, lParam); } } // switch WM_CHAR

1 0

[ion] 16549: Expand the wine debug macros in all cases. the actual code will get optimized away, but the variables will appear in use. removes about 100-150 warnings. also fix hidden build breakages when the macros are actually used. thanks to art
by ion＠svn.reactos.com 13 Jul '05

13 Jul '05

Expand the wine debug macros in all cases. the actual code will get optimized away, but the variables will appear in use. removes about 100-150 warnings. also fix hidden build breakages when the macros are actually used. thanks to art Modified: trunk/reactos/include/wine/debug.h Modified: trunk/reactos/lib/dbghelp/stack.c Modified: trunk/reactos/lib/kernel32/misc/lcformat.c Modified: trunk/reactos/lib/msvideo/msvfw32.xml Modified: trunk/reactos/lib/shell32/shellord.c Modified: trunk/reactos/lib/user32/controls/combo.c Modified: trunk/reactos/lib/user32/controls/edit.c Modified: trunk/reactos/lib/user32/controls/listbox.c _____ Modified: trunk/reactos/include/wine/debug.h --- trunk/reactos/include/wine/debug.h 2005-07-13 00:11:11 UTC (rev 16548) +++ trunk/reactos/include/wine/debug.h 2005-07-13 01:41:13 UTC (rev 16549) @@ -3,6 +3,7 @@ #include "../roscfg.h" #include <stdarg.h> +#include <windows.h> #include <wchar.h> #ifndef __GNUC__ @@ -19,12 +20,8 @@ #endif #if !defined(DBG) || !defined(YDEBUG) -#ifdef __GNUC__ -#define DPRINT(args...) +#define DPRINT(...) do { DbgPrint(__VA_ARGS__); } while(0) #else -#define DPRINT -#endif -#else #define DPRINT DbgPrint("(%s:%d:%s) ",__FILE__,__LINE__,__FUNCTION__), DbgPrint #endif @@ -52,6 +49,24 @@ inline static const char *debugres_a( const char *s ) { return wine_dbgstr_an( s, 80 ); } inline static const char *debugres_w( const wchar_t *s ) { return wine_dbgstr_wn( s, 80 ); } +static inline const char *wine_dbgstr_point( const POINT *pt ) +{ + if (!pt) return "(null)"; + return wine_dbg_sprintf( "(%ld,%ld)", pt->x, pt->y ); +} + +static inline const char *wine_dbgstr_size( const SIZE *size ) +{ + if (!size) return "(null)"; + return wine_dbg_sprintf( "(%ld,%ld)", size->cx, size->cy ); +} + +static inline const char *wine_dbgstr_rect( const RECT *rect ) +{ + if (!rect) return "(null)"; + return wine_dbg_sprintf( "(%ld,%ld)-(%ld,%ld)", rect->left, rect->top, rect->right, rect->bottom ); +} + #define TRACE DPRINT #define TRACE_(ch) DPRINT #ifdef NDEBUG _____ Modified: trunk/reactos/lib/dbghelp/stack.c --- trunk/reactos/lib/dbghelp/stack.c 2005-07-13 00:11:11 UTC (rev 16548) +++ trunk/reactos/lib/dbghelp/stack.c 2005-07-13 01:41:13 UTC (rev 16549) @@ -39,7 +39,6 @@ enum st_mode {stm_start, stm_32bit, stm_16bit, stm_done}; -#if 0 static const char* wine_dbgstr_addr(const ADDRESS* addr) { if (!addr) return "(null)"; @@ -57,7 +56,6 @@ return "unknown"; } } -#endif /* indexes in Reserved array */ #define __CurrentMode 0 _____ Modified: trunk/reactos/lib/kernel32/misc/lcformat.c --- trunk/reactos/lib/kernel32/misc/lcformat.c 2005-07-13 00:11:11 UTC (rev 16548) +++ trunk/reactos/lib/kernel32/misc/lcformat.c 2005-07-13 01:41:13 UTC (rev 16549) @@ -33,9 +33,8 @@ #include <k32.h> #include "wine/config.h" -//#include "wine/port.h" -#include "wine/debug.h" #include "wine/unicode.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(nls); @@ -140,7 +139,7 @@ TRACE( #type ": %ld (%08lx)\n", (DWORD)num, (DWORD)num) #define GET_LOCALE_STRING(str, type) str = NLS_GetLocaleString(lcid, type|dwFlags); \ - TRACE( #type ": '%s'\n", debugstr_w(str)) + TRACE( #type ": '%S'\n", (str)) /*********************************************************************** *** * NLS_GetFormats <internal> @@ -654,7 +653,7 @@ } cchWritten++; /* Include terminating NUL */ - TRACE("returning length=%d, ouput='%s'\n", cchWritten, debugstr_w(lpStr)); + TRACE("returning length=%d, ouput='%S'\n", cchWritten, lpStr); return cchWritten; NLS_GetDateTimeFormatW_Overrun: @@ -677,7 +676,7 @@ INT iRet; TRACE("(0x%04lx,0x%08lx,%p,%s,%p,%d)\n", lcid, dwFlags, lpTime, - debugstr_a(lpFormat), lpStr, cchOut); + lpFormat, lpStr, cchOut); if (NLS_IsUnicodeOnlyLcid(lcid)) { @@ -762,7 +761,7 @@ LPCSTR lpFormat, LPSTR lpDateStr, INT cchOut) { TRACE("(0x%04lx,0x%08lx,%p,%s,%p,%d)\n",lcid, dwFlags, lpTime, - debugstr_a(lpFormat), lpDateStr, cchOut); + lpFormat, lpDateStr, cchOut); return NLS_GetDateTimeFormatA(lcid, dwFlags | DATE_DATEVARSONLY, lpTime, lpFormat, lpDateStr, cchOut); @@ -777,8 +776,8 @@ INT WINAPI GetDateFormatW(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime, LPCWSTR lpFormat, LPWSTR lpDateStr, INT cchOut) { - TRACE("(0x%04lx,0x%08lx,%p,%s,%p,%d)\n", lcid, dwFlags, lpTime, - debugstr_w(lpFormat), lpDateStr, cchOut); + TRACE("(0x%04lx,0x%08lx,%p,%S,%p,%d)\n", lcid, dwFlags, lpTime, + lpFormat, lpDateStr, cchOut); return NLS_GetDateTimeFormatW(lcid, dwFlags|DATE_DATEVARSONLY, lpTime, lpFormat, lpDateStr, cchOut); @@ -829,7 +828,7 @@ LPCSTR lpFormat, LPSTR lpTimeStr, INT cchOut) { TRACE("(0x%04lx,0x%08lx,%p,%s,%p,%d)\n",lcid, dwFlags, lpTime, - debugstr_a(lpFormat), lpTimeStr, cchOut); + lpFormat, lpTimeStr, cchOut); return NLS_GetDateTimeFormatA(lcid, dwFlags|TIME_TIMEVARSONLY, lpTime, lpFormat, lpTimeStr, cchOut); @@ -843,8 +842,8 @@ INT WINAPI GetTimeFormatW(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime, LPCWSTR lpFormat, LPWSTR lpTimeStr, INT cchOut) { - TRACE("(0x%04lx,0x%08lx,%p,%s,%p,%d)\n",lcid, dwFlags, lpTime, - debugstr_w(lpFormat), lpTimeStr, cchOut); + TRACE("(0x%04lx,0x%08lx,%p,%S,%p,%d)\n",lcid, dwFlags, lpTime, + lpFormat, lpTimeStr, cchOut); return NLS_GetDateTimeFormatW(lcid, dwFlags|TIME_TIMEVARSONLY, lpTime, lpFormat, lpTimeStr, cchOut); @@ -887,7 +886,7 @@ const NUMBERFMTW *pfmt = NULL; INT iRet; - TRACE("(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_a(lpszValue), + TRACE("(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, dwFlags, lpszValue, lpFormat, lpNumberStr, cchOut); if (NLS_IsUnicodeOnlyLcid(lcid)) @@ -966,7 +965,7 @@ DWORD dwState = 0, dwDecimals = 0, dwGroupCount = 0, dwCurrentGroupCount = 0; INT iRet; - TRACE("(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_w(lpszValue), + TRACE("(0x%04lx,0x%08lx,%S,%p,%p,%d)\n", lcid, dwFlags, lpszValue, lpFormat, lpNumberStr, cchOut); if (!lpszValue || cchOut < 0 || (cchOut > 0 && !lpNumberStr) || @@ -1227,7 +1226,7 @@ const CURRENCYFMTW *pfmt = NULL; INT iRet; - TRACE("(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_a(lpszValue), + TRACE("(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, dwFlags, lpszValue, lpFormat, lpCurrencyStr, cchOut); if (NLS_IsUnicodeOnlyLcid(lcid)) @@ -1332,7 +1331,7 @@ DWORD dwState = 0, dwDecimals = 0, dwGroupCount = 0, dwCurrentGroupCount = 0, dwFmt; INT iRet; - TRACE("(0x%04lx,0x%08lx,%s,%p,%p,%d)\n", lcid, dwFlags, debugstr_w(lpszValue), + TRACE("(0x%04lx,0x%08lx,%S,%p,%p,%d)\n", lcid, dwFlags, lpszValue, lpFormat, lpCurrencyStr, cchOut); if (!lpszValue || cchOut < 0 || (cchOut > 0 && !lpCurrencyStr) || _____ Modified: trunk/reactos/lib/msvideo/msvfw32.xml --- trunk/reactos/lib/msvideo/msvfw32.xml 2005-07-13 00:11:11 UTC (rev 16548) +++ trunk/reactos/lib/msvideo/msvfw32.xml 2005-07-13 01:41:13 UTC (rev 16549) @@ -13,6 +13,7 @@ <library>comctl32</library> <library>kernel32</library> <library>ntdll</library> + <library>wine</library> <file>drawdib.c</file> <file>mciwnd.c</file> <file>msvfw32.rc</file> _____ Modified: trunk/reactos/lib/shell32/shellord.c --- trunk/reactos/lib/shell32/shellord.c 2005-07-13 00:11:11 UTC (rev 16548) +++ trunk/reactos/lib/shell32/shellord.c 2005-07-13 01:41:13 UTC (rev 16549) @@ -965,8 +965,8 @@ IShellView * psf; HRESULT hRes; - TRACE("sf=%p pidl=%p cb=%p mode=0x%08x parm=%p\n", - psvcbi->pshf, psvcbi->pidl, psvcbi->pfnCallback, + TRACE("sf=%p cb=%p mode=0x%08x parm=%p\n", + psvcbi->pshf, psvcbi->pfnCallback, psvcbi->fvm, psvcbi->psvOuter); psf = IShellView_Constructor(psvcbi->pshf); _____ Modified: trunk/reactos/lib/user32/controls/combo.c --- trunk/reactos/lib/user32/controls/combo.c 2005-07-13 00:11:11 UTC (rev 16548) +++ trunk/reactos/lib/user32/controls/combo.c 2005-07-13 01:41:13 UTC (rev 16549) @@ -1829,8 +1829,8 @@ { LPHEADCOMBO lphc = (LPHEADCOMBO)GetWindowLongA( hwnd, 0 ); - TRACE("[%p]: msg %s wp %08x lp %08lx\n", - hwnd, SPY_GetMsgName(message, hwnd), wParam, lParam ); + //TRACE("[%p]: msg %s wp %08x lp %08lx\n", + // hwnd, SPY_GetMsgName(message, hwnd), wParam, lParam ); if( lphc || message == WM_NCCREATE ) switch(message) _____ Modified: trunk/reactos/lib/user32/controls/edit.c --- trunk/reactos/lib/user32/controls/edit.c 2005-07-13 00:11:11 UTC (rev 16548) +++ trunk/reactos/lib/user32/controls/edit.c 2005-07-13 01:41:13 UTC (rev 16549) @@ -433,7 +433,7 @@ EDITSTATE *es = (EDITSTATE *)GetWindowLongW( hwnd, 0 ); LRESULT result = 0; - TRACE("hwnd=%p msg=%x (%s) wparam=%x lparam=%lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), wParam, lParam); + //TRACE("hwnd=%p msg=%x (%s) wparam=%x lparam=%lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), wParam, lParam); if (!es && msg != WM_NCCREATE) return DefWindowProcT(hwnd, msg, wParam, lParam, unicode); _____ Modified: trunk/reactos/lib/user32/controls/listbox.c --- trunk/reactos/lib/user32/controls/listbox.c 2005-07-13 00:11:11 UTC (rev 16548) +++ trunk/reactos/lib/user32/controls/listbox.c 2005-07-13 01:41:13 UTC (rev 16549) @@ -2565,8 +2565,8 @@ DefWindowProcA( hwnd, msg, wParam, lParam ); } - TRACE("[%p]: msg %s wp %08x lp %08lx\n", - hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam ); + //TRACE("[%p]: msg %s wp %08x lp %08lx\n", + // hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam ); switch(msg) { #ifndef __REACTOS__ @@ -3206,8 +3206,8 @@ DefWindowProcA( hwnd, msg, wParam, lParam ); } - TRACE_(combo)("[%p]: msg %s wp %08x lp %08lx\n", - hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam ); + //TRACE_(combo)("[%p]: msg %s wp %08x lp %08lx\n", + // hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam ); if ((lphc = descr->lphc) != NULL) {

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