Ros-diffs October 2010

ros-diffs@reactos.org

20 participants
435 discussions

[jgardou] 49285: [CMAKE] - redefine _WIN32_WINNT too for building pnp rpc client and server libs
by jgardou＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: jgardou Date: Tue Oct 26 17:06:39 2010 New Revision: 49285 URL: http://svn.reactos.org/svn/reactos?rev=49285&view=rev Log: [CMAKE] - redefine _WIN32_WINNT too for building pnp rpc client and server libs Modified: branches/cmake-bringup/include/reactos/idl/CMakeLists.txt Modified: branches/cmake-bringup/include/reactos/idl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/i… ============================================================================== --- branches/cmake-bringup/include/reactos/idl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/idl/CMakeLists.txt [iso-8859-1] Tue Oct 26 17:06:39 2010 @@ -10,4 +10,6 @@ MACRO_IDL_FILES(${SOURCE}) remove_definitions(-DWINNT=0x502) add_definitions(-DWINNT=0x600) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) MACRO_IDL_FILES(pnp.idl)

1 0

[jgardou] 49284: [LSARPC] - define right interface in lsa.acf
by jgardou＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: jgardou Date: Tue Oct 26 16:55:46 2010 New Revision: 49284 URL: http://svn.reactos.org/svn/reactos?rev=49284&view=rev Log: [LSARPC] - define right interface in lsa.acf Modified: branches/cmake-bringup/include/reactos/idl/lsa.acf Modified: branches/cmake-bringup/include/reactos/idl/lsa.acf URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/i… ============================================================================== --- branches/cmake-bringup/include/reactos/idl/lsa.acf [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/idl/lsa.acf [iso-8859-1] Tue Oct 26 16:55:46 2010 @@ -1,6 +1,6 @@ [ explicit_handle ] -interface svcctl +interface lsarpc { }

1 0

[jgardou] 49283: [EVENTLOG] - Correct definition of midl_user_allocate
by jgardou＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: jgardou Date: Tue Oct 26 16:36:25 2010 New Revision: 49283 URL: http://svn.reactos.org/svn/reactos?rev=49283&view=rev Log: [EVENTLOG] - Correct definition of midl_user_allocate Modified: branches/cmake-bringup/base/services/eventlog/rpc.c Modified: branches/cmake-bringup/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/eve… ============================================================================== --- branches/cmake-bringup/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/eventlog/rpc.c [iso-8859-1] Tue Oct 26 16:36:25 2010 @@ -694,7 +694,7 @@ } -void __RPC_FAR *__RPC_USER midl_user_allocate(SIZE_T len) +void __RPC_FAR *__RPC_USER midl_user_allocate(size_t len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); }

1 0

[jgardou] 49282: [WIDL] - Do not define MIDL_user_allocate and MIDL_user_free as it's already in the psdk. This and the previous one should be sent to wine. Anyone with a working copy of their git, ...
by jgardou＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: jgardou Date: Tue Oct 26 16:33:29 2010 New Revision: 49282 URL: http://svn.reactos.org/svn/reactos?rev=49282&view=rev Log: [WIDL] - Do not define MIDL_user_allocate and MIDL_user_free as it's already in the psdk. This and the previous one should be sent to wine. Anyone with a working copy of their git, feel free to do so. Modified: branches/cmake-bringup/tools/widl/header.c branches/cmake-bringup/tools/widl/widl_ros.diff Modified: branches/cmake-bringup/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/widl/header… ============================================================================== --- branches/cmake-bringup/tools/widl/header.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/widl/header.c [iso-8859-1] Tue Oct 26 16:33:29 2010 @@ -1081,14 +1081,6 @@ { unsigned int ver = get_attrv(iface->attrs, ATTR_VERSION); const char *var = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); - static int allocate_written = 0; - - if (!allocate_written) - { - allocate_written = 1; - fprintf(header, "void * __RPC_USER MIDL_user_allocate(SIZE_T);\n"); - fprintf(header, "void __RPC_USER MIDL_user_free(void *);\n\n"); - } fprintf(header, "/*****************************************************************************\n"); fprintf(header, " * %s interface (v%d.%d)\n", iface->name, MAJORVERSION(ver), MINORVERSION(ver)); Modified: branches/cmake-bringup/tools/widl/widl_ros.diff URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/widl/widl_r… ============================================================================== --- branches/cmake-bringup/tools/widl/widl_ros.diff [iso-8859-1] (original) +++ branches/cmake-bringup/tools/widl/widl_ros.diff [iso-8859-1] Tue Oct 26 16:33:29 2010 @@ -12,6 +12,25 @@ #include "widltypes.h" #include "hash.h" +diff -u wine-1.3.4/tools/widl/header.c tools/widl/header.c +--- wine-1.3.4/tools/widl/header.c 2010-09-19 17:48:47.640625000 +0200 ++++ tools/widl/header.c 2010-10-26 18:30:19.000000000 +0200 +@@ -1081,15 +1081,7 @@ + { + unsigned int ver = get_attrv(iface->attrs, ATTR_VERSION); + const char *var = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); +- static int allocate_written = 0; + +- if (!allocate_written) +- { +- allocate_written = 1; +- fprintf(header, "void * __RPC_USER MIDL_user_allocate(SIZE_T);\n"); +- fprintf(header, "void __RPC_USER MIDL_user_free(void *);\n\n"); +- } +- + fprintf(header, "/*****************************************************************************\n"); + fprintf(header, " * %s interface (v%d.%d)\n", iface->name, MAJORVERSION(ver), MINORVERSION(ver)); + fprintf(header, " */\n"); diff -u wine-1.3.4/tools/widl/parser.y tools/widl/parser.y --- wine-1.3.4/tools/widl/parser.y 2010-09-19 17:49:40.578125000 +0200 +++ tools/widl/parser.y 2010-10-03 16:44:18.781250000 +0200

1 0

[jgardou] 49281: [PSDK] - Add MIDL_user_allocate and MIDL_user_free definitions - #ifdef a GCC hack
by jgardou＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: jgardou Date: Tue Oct 26 16:01:08 2010 New Revision: 49281 URL: http://svn.reactos.org/svn/reactos?rev=49281&view=rev Log: [PSDK] - Add MIDL_user_allocate and MIDL_user_free definitions - #ifdef a GCC hack Modified: branches/cmake-bringup/include/psdk/rpcndr.h Modified: branches/cmake-bringup/include/psdk/rpcndr.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/rpcn… ============================================================================== --- branches/cmake-bringup/include/psdk/rpcndr.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/rpcndr.h [iso-8859-1] Tue Oct 26 16:01:08 2010 @@ -117,6 +117,9 @@ #define MIDL_memset(d,v,n) memset(d,v,n) #define midl_user_free MIDL_user_free #define midl_user_allocate MIDL_user_allocate + +void * __RPC_USER MIDL_user_allocate(size_t size); +void __RPC_USER MIDL_user_free( void * ); #define NdrFcShort(s) (unsigned char)(s & 0xff), (unsigned char)(s >> 8) #define NdrFcLong(s) (unsigned char)(s & 0xff), (unsigned char)((s & 0x0000ff00) >> 8), \ @@ -649,6 +652,7 @@ RPCRTAPI unsigned char* RPC_ENTRY NdrUserMarshalSimpleTypeConvert( ULONG *pFlags, unsigned char *pBuffer, unsigned char FormatChar ); +#ifdef __GCC__ /* Note: this should return a CLIENT_CALL_RETURN, but calling convention for * returning structures/unions is different between Windows and gcc on i386. */ LONG_PTR RPC_VAR_ENTRY @@ -659,6 +663,13 @@ NdrAsyncClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); LONG_PTR RPC_VAR_ENTRY NdrDcomAsyncClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); +#else +CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrClientCall2( + PMIDL_STUB_DESC pStubDescriptor, + PFORMAT_STRING pFormat, + ... +); +#endif RPCRTAPI void RPC_ENTRY NdrServerCall2( PRPC_MESSAGE pRpcMsg );

1 0

[janderwald] 49280: [PORTCLS] - Disable driver specific filter / pin / node property handlers until bug leading to crashes has been found
by janderwald＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: janderwald Date: Tue Oct 26 15:19:14 2010 New Revision: 49280 URL: http://svn.reactos.org/svn/reactos?rev=49280&view=rev Log: [PORTCLS] - Disable driver specific filter / pin / node property handlers until bug leading to crashes has been found Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] Tue Oct 26 15:19:14 2010 @@ -278,8 +278,11 @@ DPRINT1("Calling Node %lu MajorTarget %p MinorTarget %p PropertySet %S PropertyId %lu PropertyFlags %lx InstanceSize %lu ValueSize %lu Handler %p PropertyRequest %p\n", PropertyRequest->Node, PropertyRequest->MajorTarget, PropertyRequest->MinorTarget, GuidBuffer.Buffer, Property->Id, Property->Flags, PropertyRequest->InstanceSize, PropertyRequest->ValueSize, PropertyRequest->PropertyItem->Handler, PropertyRequest); +#if 0 Status = PropertyRequest->PropertyItem->Handler(PropertyRequest); - +#else + Status = STATUS_NOT_FOUND; +#endif Irp->IoStatus.Information = PropertyRequest->ValueSize; if (Status != STATUS_PENDING)

1 0

[jgardou] 49279: [CMAKE - MSC] - Add set_image_base macro - add psdk and buildno dependencies to modules
by jgardou＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: jgardou Date: Tue Oct 26 07:31:04 2010 New Revision: 49279 URL: http://svn.reactos.org/svn/reactos?rev=49279&view=rev Log: [CMAKE - MSC] - Add set_image_base macro - add psdk and buildno dependencies to modules Modified: branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=492… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Tue Oct 26 07:31:04 2010 @@ -39,6 +39,15 @@ set_target_properties(${MODULE} PROPERTIES LINK_FLAGS ${NEW_LINKER_FLAGS}) endmacro() +macro(set_image_base MODULE IMAGE_BASE) + set(NEW_LINKER_FLAGS "/BASE:${IMAGE_BASE}") + get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS) + if(LINKER_FLAGS) + set(NEW_LINKER_FLAGS "${LINKER_FLAGS} ${NEW_LINKER_FLAGS}") + endif() + set_target_properties(${MODULE} PROPERTIES LINK_FLAGS ${NEW_LINKER_FLAGS}) +endmacro() + macro(add_importlibs MODULE) foreach(LIB ${ARGN}) target_link_libraries(${MODULE} ${LIB}.LIB) @@ -46,6 +55,7 @@ endmacro() macro(set_module_type MODULE TYPE) + add_dependencies(${MODULE} psdk buildno_header) if(${TYPE} MATCHES nativecui) set_subsystem(${MODULE} native) add_importlibs(${MODULE} ntdll)

1 0

[jimtabor] 49278: [Win32k|User32] - Add fix for KsStudio for Olaf Siejka and debug prints for WH_KEYBOARD_LL. See bug 5670 for more details.
by jimtabor＠svn.reactos.org 26 Oct '10

26 Oct '10

Author: jimtabor Date: Tue Oct 26 06:24:50 2010 New Revision: 49278 URL: http://svn.reactos.org/svn/reactos?rev=49278&view=rev Log: [Win32k|User32] - Add fix for KsStudio for Olaf Siejka and debug prints for WH_KEYBOARD_LL. See bug 5670 for more details. Modified: trunk/reactos/dll/win32/user32/windows/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/h… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] Tue Oct 26 06:24:50 2010 @@ -452,8 +452,6 @@ LRESULT Result; CREATESTRUCTW Csw; CBT_CREATEWNDW CbtCreatewndw; - CREATESTRUCTA Csa; - CBT_CREATEWNDA CbtCreatewnda; PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS CbtCreatewndExtra = NULL; WPARAM wParam = 0; LPARAM lParam = 0; @@ -479,30 +477,12 @@ CbtCreatewndExtra = (PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS) ((PCHAR) Common + Common->lParam); Csw = CbtCreatewndExtra->Cs; - if (NULL != CbtCreatewndExtra->Cs.lpszName) - { - Csw.lpszName = (LPCWSTR)((PCHAR) CbtCreatewndExtra - + (ULONG_PTR) CbtCreatewndExtra->Cs.lpszName); - } - if (0 != HIWORD(CbtCreatewndExtra->Cs.lpszClass)) - { - Csw.lpszClass = (LPCWSTR)((PCHAR) CbtCreatewndExtra - + LOWORD((ULONG_PTR) CbtCreatewndExtra->Cs.lpszClass)); - } + Csw.lpszName = CbtCreatewndExtra->Cs.lpszName; + Csw.lpszClass = CbtCreatewndExtra->Cs.lpszClass; wParam = Common->wParam; - if (Common->Ansi) - { - memcpy(&Csa, &Csw, sizeof(CREATESTRUCTW)); - CbtCreatewnda.lpcs = &Csa; - CbtCreatewnda.hwndInsertAfter = CbtCreatewndExtra->WndInsertAfter; - lParam = (LPARAM) &CbtCreatewnda; - } - else - { - CbtCreatewndw.lpcs = &Csw; - CbtCreatewndw.hwndInsertAfter = CbtCreatewndExtra->WndInsertAfter; - lParam = (LPARAM) &CbtCreatewndw; - } + CbtCreatewndw.lpcs = &Csw; + CbtCreatewndw.hwndInsertAfter = CbtCreatewndExtra->WndInsertAfter; + lParam = (LPARAM) &CbtCreatewndw; break; case HCBT_CLICKSKIPPED: pMHook = (PMOUSEHOOKSTRUCT)((PCHAR) Common + Common->lParam); @@ -555,6 +535,7 @@ break; } case WH_KEYBOARD_LL: + ERR("WH_KEYBOARD_LL: Code %d, wParam %d\n",Common->Code,Common->wParam); pKeyboardLlData = (PKBDLLHOOKSTRUCT)((PCHAR) Common + Common->lParam); Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) pKeyboardLlData); break; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Tue Oct 26 06:24:50 2010 @@ -333,8 +333,6 @@ CBT_CREATEWNDW *CbtCreateWnd = NULL; PCHAR Extra; PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS CbtCreatewndExtra = NULL; - UNICODE_STRING WindowName, ClassName; - ANSI_STRING asWindowName, asClassName; PTHREADINFO pti; PWND pWnd; BOOL Hit = FALSE; @@ -362,64 +360,11 @@ DPRINT1("WH_CBT HCBT_CREATEWND wParam bad hWnd!\n"); goto Fault_Exit; } - + // Due to KsStudio.exe, just pass the callers original pointers + // except class which point to kernel space if not an atom. + // Found by, Olaf Siejka CbtCreateWnd = (CBT_CREATEWNDW *) lParam; ArgumentLength += sizeof(HOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS); - - if (Ansi) - { - RtlInitAnsiString(&asWindowName, NULL); - _SEH2_TRY - { - ProbeForRead(CbtCreateWnd->lpcs->lpszName, sizeof(CHAR), 1); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Hit = TRUE; - } - _SEH2_END; - if (Hit) // Client is at deaths door. - goto Fault_Exit; - if (CbtCreateWnd->lpcs->lpszName) - RtlInitAnsiString(&asWindowName, (PCSZ)CbtCreateWnd->lpcs->lpszName); - ArgumentLength += asWindowName.Length + sizeof(CHAR); - } - else - { - RtlInitUnicodeString(&WindowName, NULL); - _SEH2_TRY - { - ProbeForRead(CbtCreateWnd->lpcs->lpszName, sizeof(WCHAR), 1); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Hit = TRUE; - } - _SEH2_END; - if (Hit) - goto Fault_Exit; - if (CbtCreateWnd->lpcs->lpszName) - RtlInitUnicodeString(&WindowName, CbtCreateWnd->lpcs->lpszName); - ArgumentLength += WindowName.Length + sizeof(WCHAR); - } - - if (!IS_ATOM(CbtCreateWnd->lpcs->lpszClass)) - { - if (Ansi) - { - RtlInitAnsiString(&asClassName, NULL); - if (CbtCreateWnd->lpcs->lpszClass) - RtlInitAnsiString(&asClassName, (PCSZ)CbtCreateWnd->lpcs->lpszClass); - ArgumentLength += asClassName.Length + sizeof(CHAR); - } - else - { - RtlInitUnicodeString(&ClassName, NULL); - if (CbtCreateWnd->lpcs->lpszClass) - RtlInitUnicodeString(&ClassName, CbtCreateWnd->lpcs->lpszClass); - ArgumentLength += ClassName.Length + sizeof(WCHAR); - } - } break; case HCBT_MOVESIZE: @@ -502,55 +447,9 @@ CbtCreatewndExtra = (PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS) Extra; RtlCopyMemory( &CbtCreatewndExtra->Cs, CbtCreateWnd->lpcs, sizeof(CREATESTRUCTW) ); CbtCreatewndExtra->WndInsertAfter = CbtCreateWnd->hwndInsertAfter; + CbtCreatewndExtra->Cs.lpszClass = CbtCreateWnd->lpcs->lpszClass; // if Atom + CbtCreatewndExtra->Cs.lpszName = CbtCreateWnd->lpcs->lpszName; Extra = (PCHAR) (CbtCreatewndExtra + 1); - CbtCreatewndExtra->Cs.lpszClass = CbtCreateWnd->lpcs->lpszClass; // if Atom - - if (Ansi) - { - if (asWindowName.Buffer) - RtlCopyMemory(Extra, asWindowName.Buffer, asWindowName.Length); - CbtCreatewndExtra->Cs.lpszName = (LPCWSTR) (Extra - (PCHAR) CbtCreatewndExtra); - Extra += asWindowName.Length; - - *((CHAR *) Extra) = '\0'; - Extra += sizeof(CHAR); - } - else - { - if (WindowName.Buffer) - RtlCopyMemory(Extra, WindowName.Buffer, WindowName.Length); - CbtCreatewndExtra->Cs.lpszName = (LPCWSTR) (Extra - (PCHAR) CbtCreatewndExtra); - Extra += WindowName.Length; - - *((WCHAR *) Extra) = L'\0'; - Extra += sizeof(WCHAR); - } - - if (!IS_ATOM(CbtCreateWnd->lpcs->lpszClass)) - { - if (Ansi) - { - if (asClassName.Buffer) - RtlCopyMemory(Extra, asClassName.Buffer, asClassName.Length); - CbtCreatewndExtra->Cs.lpszClass = - (LPCWSTR)(ULONG_PTR) MAKELONG(Extra - (PCHAR) CbtCreatewndExtra, 1); - Extra += asClassName.Length; - - *((CHAR *) Extra) = '\0'; - Extra += sizeof(CHAR); - } - else - { - if (ClassName.Buffer) - RtlCopyMemory(Extra, ClassName.Buffer, ClassName.Length); - CbtCreatewndExtra->Cs.lpszClass = - (LPCWSTR)(ULONG_PTR) MAKELONG(Extra - (PCHAR) CbtCreatewndExtra, 1); - Extra += ClassName.Length; - - *((WCHAR *) Extra) = L'\0'; - Extra += sizeof(WCHAR); - } - } break; case HCBT_CLICKSKIPPED: RtlCopyMemory(Extra, (PVOID) lParam, sizeof(MOUSEHOOKSTRUCT)); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Tue Oct 26 06:24:50 2010 @@ -987,11 +987,14 @@ ObReferenceObject(ptiHook->pEThread); if (ptiHook != pti ) { - DPRINT("\nGlobal Hook posting to another Thread! %d\n",HookId ); + if (HookId == WH_KEYBOARD_LL){ + DPRINT1("\nGlobal Hook posting to another Thread! %d\n",HookId );} Result = IntCallLowLevelHook(Hook, Code, wParam, lParam); } else { /* Make the direct call. */ + if (HookId == WH_KEYBOARD_LL){ + DPRINT1("\nLocal Hook calling to Thread! %d\n",HookId );} Result = co_IntCallHookProc( HookId, Code, wParam, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Tue Oct 26 06:24:50 2010 @@ -1347,7 +1347,7 @@ KbdHookData.dwExtraInfo = ki->dwExtraInfo; if (co_HOOK_CallHooks(WH_KEYBOARD_LL, HC_ACTION, Msg.message, (LPARAM) &KbdHookData)) { - DPRINT("Kbd msg %d wParam %d lParam 0x%08x dropped by WH_KEYBOARD_LL hook\n", + DPRINT1("Kbd msg %d wParam %d lParam 0x%08x dropped by WH_KEYBOARD_LL hook\n", Msg.message, vk_hook, Msg.lParam); if (Entered) UserLeave(); return FALSE;

1 0

[fireball] 49277: [NTOS/MM] - Handle various special cases in NtQueryVirtualMemory (e.g. querying illegal virtual addresses, shared memory area, etc). Example of an app doing this - OllyDbg.
by fireball＠svn.reactos.org 25 Oct '10

25 Oct '10

Author: fireball Date: Mon Oct 25 20:50:45 2010 New Revision: 49277 URL: http://svn.reactos.org/svn/reactos?rev=49277&view=rev Log: [NTOS/MM] - Handle various special cases in NtQueryVirtualMemory (e.g. querying illegal virtual addresses, shared memory area, etc). Example of an app doing this - OllyDbg. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Mon Oct 25 20:50:45 2010 @@ -2329,9 +2329,34 @@ if ((BaseAddress > MM_HIGHEST_VAD_ADDRESS) || (PAGE_ALIGN(BaseAddress) == (PVOID)USER_SHARED_DATA)) { - /* FIXME: We should return some bogus info structure */ - UNIMPLEMENTED; - while (TRUE); + Address = PAGE_ALIGN(BaseAddress); + + /* Make up an info structure describing this range */ + MemoryInfo.BaseAddress = Address; + MemoryInfo.AllocationProtect = PAGE_READONLY; + MemoryInfo.Type = MEM_PRIVATE; + + /* Special case for shared data */ + if (Address == (PVOID)USER_SHARED_DATA) + { + MemoryInfo.AllocationBase = (PVOID)USER_SHARED_DATA; + MemoryInfo.State = MEM_COMMIT; + MemoryInfo.Protect = PAGE_READONLY; + MemoryInfo.RegionSize = PAGE_SIZE; + } + else + { + MemoryInfo.AllocationBase = (PCHAR)MM_HIGHEST_VAD_ADDRESS + 1; + MemoryInfo.State = MEM_RESERVE; + MemoryInfo.Protect = PAGE_NOACCESS; + MemoryInfo.RegionSize = (ULONG_PTR)MemoryInfo.AllocationBase - (ULONG_PTR)Address; + } + + /* Return the data (FIXME: Use SEH) */ + *(PMEMORY_BASIC_INFORMATION)MemoryInformation = MemoryInfo; + if (ReturnLength) *ReturnLength = sizeof(MEMORY_BASIC_INFORMATION); + + return STATUS_SUCCESS; } /* Check if this is for a local or remote process */ @@ -2395,9 +2420,26 @@ /* Calculate region size */ if (Vad) { - /* We don't handle this yet */ - UNIMPLEMENTED; - while (TRUE); + if (Vad->StartingVpn >= BaseVpn) + { + /* Region size is the free space till the start of that VAD */ + MemoryInfo.RegionSize = (ULONG_PTR)(Vad->StartingVpn << PAGE_SHIFT) - (ULONG_PTR)Address; + } + else + { + /* Get the next VAD */ + Vad = (PMMVAD)MiGetNextNode((PMMADDRESS_NODE)Vad); + if (Vad) + { + /* Region size is the free space till the start of that VAD */ + MemoryInfo.RegionSize = (ULONG_PTR)(Vad->StartingVpn << PAGE_SHIFT) - (ULONG_PTR)Address; + } + else + { + /* Maximum possible region size with that base address */ + MemoryInfo.RegionSize = (PCHAR)MM_HIGHEST_VAD_ADDRESS + 1 - (PCHAR)Address; + } + } } else {

1 0

[dreimer] 49276: Update rapps database.
by dreimer＠svn.reactos.org 25 Oct '10

25 Oct '10

Author: dreimer Date: Mon Oct 25 20:08:50 2010 New Revision: 49276 URL: http://svn.reactos.org/svn/reactos?rev=49276&view=rev Log: Update rapps database. Modified: trunk/reactos/base/applications/rapps/rapps/firefox36.txt trunk/reactos/base/applications/rapps/rapps/libreoffice.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/mirc.txt trunk/reactos/base/applications/rapps/rapps/opera.txt trunk/reactos/base/applications/rapps/rapps/scummvm.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/thunderbird.txt Modified: trunk/reactos/base/applications/rapps/rapps/firefox36.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox36.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox36.txt [iso-8859-1] Mon Oct 25 20:08:50 2010 @@ -2,47 +2,47 @@ [Section] Name = Mozilla Firefox 3.6 -Version = 3.6.10 +Version = 3.6.11 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. Size = 8.1M Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.10/win32/e… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.11/win32/e… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. Size = 8.0M URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.10/win32/d… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.11/win32/d… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. Size = 8.0M URLSite = http://www.mozilla-europe.org/es/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.10/win32/e… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.11/win32/e… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. Size = 8.0M URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.10/win32/n… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.11/win32/n… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. Size = 8.8M URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.10/win32/p… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.11/win32/p… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². Size = 8.4M URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.10/win32/r… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.11/win32/r… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². Size = 8.4M URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.10/win32/u… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.11/win32/u… Modified: trunk/reactos/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] Mon Oct 25 20:08:50 2010 @@ -2,13 +2,13 @@ [Section] Name = LibreOffice -Version = 3.3.0 Beta 1 +Version = 3.3.0 Beta 2 Licence = LGPL Description = Former called OpenOffice. Open Source Office Suite. -Size = 138.0MB +Size = 318.0MB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/testing/LO_3.3.0-beta1_W… +URLDownload = http://download.documentfoundation.org/libreoffice/testing/3.3.0-beta2/win/… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] Mon Oct 25 20:08:50 2010 @@ -2,13 +2,13 @@ [Section] Name = Miranda IM -Version = 0.9.5 +Version = 0.9.8 Licence = GPL Description = Open source multiprotocol instant messaging application - May not work completely. -Size = 2.2MB +Size = 3.0MB Category = 5 URLSite = http://www.miranda-im.org/ -URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.9.5-unicode.exe +URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.9.8-unicode.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirc.txt [iso-8859-1] Mon Oct 25 20:08:50 2010 @@ -2,13 +2,13 @@ [Section] Name = mIRC -Version = 7.1 +Version = 7.14 Licence = Shareware Description = The most popular client for the Internet Relay Chat (IRC). -Size = 1.8M +Size = 2.0M Category = 5 URLSite = http://www.mirc.com/ -URLDownload = http://download.mirc.com/mirc71.exe +URLDownload = http://download.mirc.com/mirc714.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/opera.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/opera.txt [iso-8859-1] Mon Oct 25 20:08:50 2010 @@ -2,13 +2,13 @@ [Section] Name = Opera -Version = 10.62 +Version = 10.63 Licence = Freeware Description = The popular Opera Browser with many advanced features and including a Mail and BitTorrent client. Size = 12.7M Category = 5 URLSite = http://www.opera.com/ -URLDownload = http://get4.opera.com/pub/opera/win/1062/int/Opera_1062_int_Setup.exe +URLDownload = http://get4.opera.com/pub/opera/win/1063/int/Opera_1063_int_Setup.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scummvm.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/scummvm.txt [iso-8859-1] Mon Oct 25 20:08:50 2010 @@ -2,13 +2,13 @@ [Section] Name = ScummVM -Version = 1.1.1 +Version = 1.2.0 Licence = GPL Description = Sam and Max, Day of the Tentacle, etc on ReactOS. -Size = 3.3MB +Size = 3.5MB Category = 4 URLSite = http://scummvm.org/ -URLDownload = http://dfn.dl.sourceforge.net/project/scummvm/scummvm/1.1.1/scummvm-1.1.1-w… +URLDownload = http://dfn.dl.sourceforge.net/project/scummvm/scummvm/1.2.0/scummvm-1.2.0-w… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] Mon Oct 25 20:08:50 2010 @@ -2,31 +2,31 @@ [Section] Name = Mozilla SeaMonkey -Version = 2.0.8 +Version = 2.0.9 Licence = MPL/GPL/LGPL Description = Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need. Size = 10.1MB Category = 5 URLSite = http://www.seamonkey-project.org/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.8/win32/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.9/win32/… CDPath = none [Section.0407] Description = Mozilla Suite lebt. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benÃ¶tigen. Size = 10.0MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.8/win32/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.9/win32/… [Section.040a] Description = La suite de Mozilla estÃ¡ viva. Es el primero y Ãºnico navegador web, gestor de correo, lector de noticias, Chat y editor HTML que necesitarÃ¡s. Size = 10.0MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.8/win32/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.9/win32/… [Section.0415] Description = Pakiet Mozilla Å¼yje. W zestawie: przeglÄdarka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz. Size = 10.8MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.8/win32/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.9/win32/… [Section.0419] Description = ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Mozilla Suite. ÐÐºÐ»ÑÑÐ°ÐµÑ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ, IRC-ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸ HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Size = 10.4MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.8/win32/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.9/win32/… Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] Mon Oct 25 20:08:50 2010 @@ -2,41 +2,41 @@ [Section] Name = Mozilla Thunderbird -Version = 3.1.4 +Version = 3.1.5 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. Size = 9.0M Category = 5 URLSite = http://www.mozilla-europe.org/en/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.4/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.5/win3… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. Size = 8.8M URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.4/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.5/win3… [Section.040a] Description = El mÃ¡s popular y uno de los mejores clientes mail que hay. Size = 8.8M URLSite = http://www.mozilla-europe.org/es/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.4/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.5/win3… [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. Size = 9.7M URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.4/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.5/win3… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². Size = 9.2M URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.4/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.5/win3… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ñ ÐºÐ»ÑÑÐ½ÑÑÐ². Size = 9.2M URLSite = http://www.mozillamessaging.com/uk/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.4/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.5/win3…

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2010