Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 71441: [SHELL32]: Always paint the desktop listview transparent. This allows explorer to display the default desktop background color set by win32k as well as the ReactOS version on the ...
by hbelusca＠svn.reactos.org 28 May '16

28 May '16

Author: hbelusca Date: Sat May 28 16:59:55 2016 New Revision: 71441 URL: http://svn.reactos.org/svn/reactos?rev=71441&view=rev Log: [SHELL32]: Always paint the desktop listview transparent. This allows explorer to display the default desktop background color set by win32k as well as the ReactOS version on the desktop. See also r66271 and r66752. Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Sat May 28 16:59:55 2016 @@ -582,20 +582,27 @@ DWORD cbDropShadow = sizeof(bDropShadow); WCHAR wszBuf[16] = L""; + /* + * The desktop ListView always take the default desktop colours, by + * remaining transparent and letting user32/win32k paint itself the + * desktop background color, if any. + */ + m_ListView.SetBkColor(CLR_NONE); + RegGetValueW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", L"ListviewShadow", RRF_RT_DWORD, NULL, &bDropShadow, &cbDropShadow); if (bDropShadow && SystemParametersInfoW(SPI_GETDESKWALLPAPER, _countof(wszBuf), wszBuf, 0) && wszBuf[0]) { + /* Set the icon background transparent */ m_ListView.SetTextBkColor(CLR_NONE); - m_ListView.SetBkColor(CLR_NONE); m_ListView.SetTextColor(RGB(255, 255, 255)); m_ListView.SetExtendedListViewStyle(LVS_EX_TRANSPARENTSHADOWTEXT, LVS_EX_TRANSPARENTSHADOWTEXT); } else { + /* Set the icon background as the same colour as the desktop */ COLORREF crDesktop = GetSysColor(COLOR_DESKTOP); m_ListView.SetTextBkColor(crDesktop); - m_ListView.SetBkColor(crDesktop); if (GetRValue(crDesktop) + GetGValue(crDesktop) + GetBValue(crDesktop) > 128 * 3) m_ListView.SetTextColor(RGB(0, 0, 0)); else

1 0

[mjansen] 71440: [APPHELP] Register AppPatch directory with cmake, import SdbGetAppPatchDir implementation from Mislav Blažević CORE-10369
by mjansen＠svn.reactos.org 28 May '16

28 May '16

Author: mjansen Date: Sat May 28 16:47:39 2016 New Revision: 71440 URL: http://svn.reactos.org/svn/reactos?rev=71440&view=rev Log: [APPHELP] Register AppPatch directory with cmake, import SdbGetAppPatchDir implementation from Mislav Blažević CORE-10369 Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in trunk/reactos/dll/appcompat/apphelp/apphelp.h trunk/reactos/dll/appcompat/apphelp/apphelp.spec trunk/reactos/dll/appcompat/apphelp/sdbapi.c trunk/reactos/sdk/cmake/CMakeMacros.cmake Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] Sat May 28 16:47:39 2016 @@ -69,6 +69,7 @@ 50 = security\templates 51 = system32\CatRoot 52 = system32\CatRoot2 +53 = AppPatch .InfEnd Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] Sat May 28 16:47:39 2016 @@ -49,6 +49,11 @@ #define SDB_DATABASE_MAIN_MSI 0x80020000 #define SDB_DATABASE_MAIN_SHIM 0x80030000 #define SDB_DATABASE_MAIN_DRIVERS 0x80040000 + +typedef struct _SDB { + PDB db; + BOOL auto_loaded; +} SDB, *HSDB; typedef struct tagATTRINFO { TAG type; Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] Sat May 28 16:47:39 2016 @@ -52,7 +52,7 @@ @ stub SdbFreeFileInfo @ stub SdbFreeFlagInfo @ stub SdbGetAppCompatDataSize -@ stub SdbGetAppPatchDir +@ stdcall SdbGetAppPatchDir(ptr wstr long) @ stdcall SdbGetBinaryTagData(ptr long) @ stdcall SdbGetDatabaseID(ptr ptr) @ stub SdbGetDatabaseInformation Modified: trunk/reactos/dll/appcompat/apphelp/sdbapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdba… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] Sat May 28 16:47:39 2016 @@ -431,6 +431,53 @@ NtClose(db->file); SdbFree(db->data); SdbFree(db); +} + +/** + * Retrieves AppPatch directory. + * + * @param [in] db Handle to the shim database. + * @param [out] path Pointer to memory in which path shall be written. + * @param [in] size Size of the buffer in characters. + */ +BOOL WINAPI SdbGetAppPatchDir(HSDB db, LPWSTR path, DWORD size) +{ + static WCHAR* default_dir = NULL; + + if(!default_dir) + { + WCHAR* tmp = NULL; + UINT len = GetSystemWindowsDirectoryW(NULL, 0) + lstrlenW((CONST WCHAR[]){'\\','A','p','p','P','a','t','c','h',0}); + tmp = SdbAlloc((len + 1)* sizeof(WCHAR)); + if(tmp) + { + UINT r = GetSystemWindowsDirectoryW(tmp, len+1); + if (r && r < len) + { + if (SUCCEEDED(StringCchCatW(tmp, len+1, (CONST WCHAR[]){'\\','A','p','p','P','a','t','c','h',0}))) + { + if(InterlockedCompareExchangePointer((void**)&default_dir, tmp, NULL) == NULL) + tmp = NULL; + } + } + if (tmp) + SdbFree(tmp); + } + } + + /* In case function fails, path holds empty string */ + if (size > 0) + *path = 0; + + if (!db) + { + return SUCCEEDED(StringCchCopyW(path, size, default_dir)); + } + else + { + /* fixme */ + return FALSE; + } } /** Modified: trunk/reactos/sdk/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/CMakeMacros.cmak… ============================================================================== --- trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] Sat May 28 16:47:39 2016 @@ -261,6 +261,8 @@ set(${var} 51) elseif(${dir} STREQUAL reactos/system32/CatRoot2) set(${var} 52) + elseif(${dir} STREQUAL reactos/AppPatch) + set(${var} 53) else() message(FATAL_ERROR "Wrong destination: ${dir}") endif()

1 0

[mjansen] 71439: [APPHELP] Begin shimlib implementation. CORE-11329 Implement some macro's and functions that help when registering shims. These are all written in C, so that wine can use the shim ...
by mjansen＠svn.reactos.org 28 May '16

28 May '16

Author: mjansen Date: Sat May 28 16:42:57 2016 New Revision: 71439 URL: http://svn.reactos.org/svn/reactos?rev=71439&view=rev Log: [APPHELP] Begin shimlib implementation. CORE-11329 Implement some macro's and functions that help when registering shims. These are all written in C, so that wine can use the shim libraries as well. Added: trunk/reactos/dll/appcompat/shims/ trunk/reactos/dll/appcompat/shims/CMakeLists.txt (with props) trunk/reactos/dll/appcompat/shims/shimlib/ trunk/reactos/dll/appcompat/shims/shimlib/CMakeLists.txt (with props) trunk/reactos/dll/appcompat/shims/shimlib/implement_shim.inl (with props) trunk/reactos/dll/appcompat/shims/shimlib/setup_shim.inl (with props) trunk/reactos/dll/appcompat/shims/shimlib/shimlib.c (with props) trunk/reactos/dll/appcompat/shims/shimlib/shimlib.h (with props) Modified: trunk/reactos/dll/appcompat/CMakeLists.txt Modified: trunk/reactos/dll/appcompat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/appcompat/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/CMakeLists.txt [iso-8859-1] Sat May 28 16:42:57 2016 @@ -1,2 +1,5 @@ +project(appcompat) +set(SHIMLIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/shims/shimlib) add_subdirectory(apphelp) +add_subdirectory(shims) Added: trunk/reactos/dll/appcompat/shims/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/CMakeL… ============================================================================== --- trunk/reactos/dll/appcompat/shims/CMakeLists.txt (added) +++ trunk/reactos/dll/appcompat/shims/CMakeLists.txt [iso-8859-1] Sat May 28 16:42:57 2016 @@ -0,0 +1,3 @@ + +add_subdirectory(shimlib) + Propchange: trunk/reactos/dll/appcompat/shims/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/appcompat/shims/shimlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/shimli… ============================================================================== --- trunk/reactos/dll/appcompat/shims/shimlib/CMakeLists.txt (added) +++ trunk/reactos/dll/appcompat/shims/shimlib/CMakeLists.txt [iso-8859-1] Sat May 28 16:42:57 2016 @@ -0,0 +1,7 @@ + +list(APPEND SOURCE + shimlib.c + shimlib.h) + +add_library(shimlib ${SOURCE}) +add_dependencies(shimlib xdk) Propchange: trunk/reactos/dll/appcompat/shims/shimlib/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/appcompat/shims/shimlib/implement_shim.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/shimli… ============================================================================== --- trunk/reactos/dll/appcompat/shims/shimlib/implement_shim.inl (added) +++ trunk/reactos/dll/appcompat/shims/shimlib/implement_shim.inl [iso-8859-1] Sat May 28 16:42:57 2016 @@ -0,0 +1,76 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Shim library + * FILE: dll/appcompat/shims/shimlib/implement_shim.inl + * PURPOSE: Shimlib helper file, used to register shims using the earlier prepared macro's + * PROGRAMMER: Mark Jansen + */ + +#ifndef SHIM_NS +#error "A namespace should be provided in SHIM_NS before including this file!" +#endif + +#ifndef SHIM_NUM_HOOKS +#error "The number of hooks should be provided in SHIM_NUM_HOOKS before including this file!" +#endif + +#ifndef SHIM_OBJ_NAME +#error "setup_shim.inl should be included before this file!" +#endif + +#ifndef SHIM_SETUP_HOOKS +#error "Please define a hook: #define SHIM_SETUP_HOOKS SHIM_HOOK(num, dll_name, function_name, your_function)" +#endif + +PHOOKAPI WINAPI SHIM_OBJ_NAME(InitializeHooksMulti)(DWORD fdwReason, PCSTR pszCmdLine, PDWORD pdwHookCount) +{ + if (fdwReason == SHIM_REASON_ATTACH) + { + if (pszCmdLine) + { + SHIM_OBJ_NAME(g_szCommandLine) = ShimLib_StringDuplicateA(pszCmdLine); + } + else + { + SHIM_OBJ_NAME(g_szCommandLine) = ""; + } + SHIM_OBJ_NAME(g_pAPIHooks) = ShimLib_ShimMalloc(sizeof(HOOKAPI) * SHIM_NUM_HOOKS); + ZeroMemory(SHIM_OBJ_NAME(g_pAPIHooks), sizeof(HOOKAPI) * SHIM_NUM_HOOKS); + *pdwHookCount = SHIM_NUM_HOOKS; + } + +#ifdef SHIM_NOTIFY_FN + if (!SHIM_NOTIFY_FN(fdwReason) && fdwReason == SHIM_REASON_ATTACH) + return NULL; +#endif + + if (fdwReason == SHIM_REASON_ATTACH) + { + SHIM_SETUP_HOOKS + } + return SHIM_OBJ_NAME(g_pAPIHooks); +} + + +PVOID SHIM_OBJ_NAME(FindShim)(PCWSTR wszString) +{ + PCSTR szString = SHIM_OBJ_NAME(g_szModuleName); + while (*szString == *wszString) + { + if (!*szString) + return SHIM_OBJ_NAME(InitializeHooksMulti); + szString++; wszString++; + } + return NULL; +} + +#if defined(_MSC_VER) +#pragma section(".shm$BBB",long,read) +#endif + +_SHMALLOC(".shm$BBB") _PVSHIM SHIM_OBJ_NAME(_shim_fn) = SHIM_OBJ_NAME(FindShim); + +#undef SHIM_SETUP_HOOKS +#undef SHIM_NOTIFY_FN +#undef SHIM_NUM_HOOKS +#undef SHIM_NS Propchange: trunk/reactos/dll/appcompat/shims/shimlib/implement_shim.inl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/appcompat/shims/shimlib/setup_shim.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/shimli… ============================================================================== --- trunk/reactos/dll/appcompat/shims/shimlib/setup_shim.inl (added) +++ trunk/reactos/dll/appcompat/shims/shimlib/setup_shim.inl [iso-8859-1] Sat May 28 16:42:57 2016 @@ -0,0 +1,39 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Shim library + * FILE: dll/appcompat/shims/shimlib/setup_shim.inl + * PURPOSE: Shimlib helper file, used for setting up the macro's used when registering a shim. + * PROGRAMMER: Mark Jansen + */ + + +#ifndef SHIM_NS +#error "A namespace should be provided in SHIM_NS before including this file!" +#endif + +#ifndef SHIM_OBJ_NAME +#define SHIM_OBJ_NAME3(ns, name) ns ## _ ## name +#define SHIM_OBJ_NAME2(ns, name) SHIM_OBJ_NAME3(ns, name) +#define SHIM_OBJ_NAME(name) SHIM_OBJ_NAME2(SHIM_NS, name) + +#define SHIM_STRINGIFY2(X_) # X_ +#define SHIM_STRINGIFY(X_) SHIM_STRINGIFY2(X_) + +#define SHIM_HOOK(num, dll, function, target) \ + SHIM_OBJ_NAME(g_pAPIHooks)[num].LibraryName = dll; \ + SHIM_OBJ_NAME(g_pAPIHooks)[num].FunctionName = function; \ + SHIM_OBJ_NAME(g_pAPIHooks)[num].ReplacementFunction = target; \ + SHIM_OBJ_NAME(g_pAPIHooks)[num].OriginalFunction = NULL; \ + SHIM_OBJ_NAME(g_pAPIHooks)[num].Unk1 = NULL; \ + SHIM_OBJ_NAME(g_pAPIHooks)[num].Unk2 = NULL; + +#define CALL_SHIM(SHIM_NUM, SHIM_CALLCONV) \ + ((SHIM_CALLCONV)(SHIM_OBJ_NAME(g_pAPIHooks)[SHIM_NUM].OriginalFunction)) + +#endif + + +PCSTR SHIM_OBJ_NAME(g_szModuleName) = SHIM_STRINGIFY(SHIM_NS); +PCSTR SHIM_OBJ_NAME(g_szCommandLine); +PHOOKAPI SHIM_OBJ_NAME(g_pAPIHooks); + Propchange: trunk/reactos/dll/appcompat/shims/shimlib/setup_shim.inl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/appcompat/shims/shimlib/shimlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/shimli… ============================================================================== --- trunk/reactos/dll/appcompat/shims/shimlib/shimlib.c (added) +++ trunk/reactos/dll/appcompat/shims/shimlib/shimlib.c [iso-8859-1] Sat May 28 16:42:57 2016 @@ -0,0 +1,91 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Shim library + * FILE: dll/appcompat/shims/shimlib/shimlib.c + * PURPOSE: Shim helper functions + * PROGRAMMER: Mark Jansen + */ + +#include <windows.h> +#include <shimlib.h> +#include <strsafe.h> + +HINSTANCE g_hinstDll; +static HANDLE g_ShimLib_Heap; + +void ShimLib_Init(HINSTANCE hInstance) +{ + g_hinstDll = hInstance; + g_ShimLib_Heap = HeapCreate(0, 0x10000, 0); +} + +void ShimLib_Deinit() +{ + // Is this a good idea? + HeapDestroy(g_ShimLib_Heap); +} + +PVOID ShimLib_ShimMalloc(SIZE_T dwSize) +{ + return HeapAlloc(g_ShimLib_Heap, 0, dwSize); +} + +void ShimLib_ShimFree(PVOID pData) +{ + HeapFree(g_ShimLib_Heap, 0, pData); +} + +PCSTR ShimLib_StringDuplicateA(PCSTR szString) +{ + SIZE_T Length = lstrlenA(szString); + PSTR NewString = ShimLib_ShimMalloc(Length+1); + return lstrcpyA(NewString, szString); +} + +#if defined(_MSC_VER) + +#if defined(_M_IA64) || defined(_M_AMD64) +#define _ATTRIBUTES read +#else +#define _ATTRIBUTES read +#endif + + +#pragma section(".shm",long,read) +#pragma section(".shm$AAA",long,read) +#pragma section(".shm$ZZZ",long,read) +#endif + +#ifdef _MSC_VER +#pragma comment(linker, "/merge:.shm=.rdata") +#endif + + +_SHMALLOC(".shm") _PVSHIM _shim_start = 0; +_SHMALLOC(".shm$ZZZ") _PVSHIM _shim_end = 0; + + +/* Generic GetHookAPIs function. + The macro's from <setup_shim.inl> and <implement_shim.inl> will register a list of all apis that should be hooked + for a specific shim + This helper function will return the correct shim, and call the init function */ +PHOOKAPI WINAPI ShimLib_GetHookAPIs(IN LPCSTR szCommandLine, IN LPCWSTR wszShimName, OUT PDWORD pdwHookCount) +{ + uintptr_t ps = (uintptr_t)&_shim_start; + ps += sizeof(uintptr_t); + for (; ps != (uintptr_t)&_shim_end; ps += sizeof(uintptr_t)) + { + _PVSHIM* pfunc = (_PVSHIM *)ps; + if (*pfunc != NULL) + { + PVOID res = (*pfunc)(wszShimName); + if (res) + { + PHOOKAPI (WINAPI* PFN)(DWORD, PCSTR, PDWORD) = res; + return (*PFN)(SHIM_REASON_ATTACH, szCommandLine, pdwHookCount); + } + } + } + return NULL; +} + Propchange: trunk/reactos/dll/appcompat/shims/shimlib/shimlib.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/appcompat/shims/shimlib/shimlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/shimli… ============================================================================== --- trunk/reactos/dll/appcompat/shims/shimlib/shimlib.h (added) +++ trunk/reactos/dll/appcompat/shims/shimlib/shimlib.h [iso-8859-1] Sat May 28 16:42:57 2016 @@ -0,0 +1,45 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Shim Engine + * FILE: dll/appcompat/shims/shimlib/shimlib.h + * PURPOSE: ReactOS Shim Engine + * PROGRAMMER: Mark Jansen + */ + +#pragma once + +typedef struct tagHOOKAPI { + PCSTR LibraryName; + PCSTR FunctionName; + PVOID ReplacementFunction; + PVOID OriginalFunction; + PVOID Unk1; + PVOID Unk2; +} HOOKAPI, *PHOOKAPI; + +extern HINSTANCE g_hinstDll; + +void ShimLib_Init(HINSTANCE); +void ShimLib_Deinit(void); +PVOID ShimLib_ShimMalloc(SIZE_T); +void ShimLib_ShimFree(PVOID); +PCSTR ShimLib_StringDuplicateA(PCSTR); +PHOOKAPI WINAPI ShimLib_GetHookAPIs(LPCSTR,LPCWSTR,PDWORD); + + +#define SHIM_REASON_ATTACH 1 +#define SHIM_REASON_DETACH 2 +#define SHIM_REASON_DLL_LOAD 3 /* Arg: PLDR_DATA_TABLE_ENTRY */ +#define SHIM_REASON_DLL_UNLOAD 4 /* Arg: Module Handle */ + + +typedef PVOID (__cdecl *_PVSHIM)(PCWSTR); + +#if defined(_MSC_VER) +#define _SHMALLOC(x) __declspec(allocate(x)) +#elif defined(__GNUC__) +#define _SHMALLOC(x) __attribute__ ((section (x) )) +#else +#error Your compiler is not supported. +#endif + Propchange: trunk/reactos/dll/appcompat/shims/shimlib/shimlib.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 71438: [KDCOM]: Properly revert the commits.
by hbelusca＠svn.reactos.org 28 May '16

28 May '16

Author: hbelusca Date: Sat May 28 15:54:44 2016 New Revision: 71438 URL: http://svn.reactos.org/svn/reactos?rev=71438&view=rev Log: [KDCOM]: Properly revert the commits. Modified: trunk/reactos/drivers/base/kdcom/kddll.c Modified: trunk/reactos/drivers/base/kdcom/kddll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kddll.c… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kddll.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kddll.c [iso-8859-1] Sat May 28 15:54:44 2016 @@ -11,7 +11,7 @@ /* GLOBALS ********************************************************************/ ULONG CurrentPacketId = INITIAL_PACKET_ID | SYNC_PACKET_ID; -ULONG RemotePacketId = INITIAL_PACKET_ID; +ULONG RemotePacketId = INITIAL_PACKET_ID; /* PRIVATE FUNCTIONS **********************************************************/ @@ -90,7 +90,7 @@ ULONG Checksum; /* Special handling for breakin packet */ - if(PacketType == PACKET_TYPE_KD_POLL_BREAKIN) + if (PacketType == PACKET_TYPE_KD_POLL_BREAKIN) { return KdpPollBreakIn(); } @@ -175,9 +175,9 @@ case PACKET_TYPE_KD_RESET: KDDBGPRINT("KdReceivePacket - got PACKET_TYPE_KD_RESET\n"); + CurrentPacketId = INITIAL_PACKET_ID; + RemotePacketId = INITIAL_PACKET_ID; KdpSendControlPacket(PACKET_TYPE_KD_RESET, 0); - CurrentPacketId = INITIAL_PACKET_ID; - RemotePacketId = INITIAL_PACKET_ID; /* Fall through */ case PACKET_TYPE_KD_RESEND: @@ -219,7 +219,7 @@ /* Receive the message header data */ KdStatus = KdpReceiveBuffer(MessageHeader->Buffer, - MessageHeader->Length); + MessageHeader->Length); if (KdStatus != KDP_PACKET_RECEIVED) { /* Didn't receive data. Packet needs to be resent. */ @@ -278,7 +278,7 @@ if (Packet.Checksum != Checksum) { KDDBGPRINT("KdReceivePacket - wrong cheksum, got %x, calculated %x\n", - Packet.Checksum, Checksum); + Packet.Checksum, Checksum); KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0); continue; }

1 0

[tkreuzer] 71437: Revert a mistake commit...
by tkreuzer＠svn.reactos.org 28 May '16

28 May '16

Author: tkreuzer Date: Sat May 28 15:51:44 2016 New Revision: 71437 URL: http://svn.reactos.org/svn/reactos?rev=71437&view=rev Log: Revert a mistake commit... Modified: trunk/reactos/drivers/base/kdcom/kddll.c Modified: trunk/reactos/drivers/base/kdcom/kddll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kddll.c… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kddll.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kddll.c [iso-8859-1] Sat May 28 15:51:44 2016 @@ -8,19 +8,11 @@ #include "kddll.h" -#define _FULL_ 1 -#define _WORKS_ 0 -#define _WORKS2_ 0 - /* GLOBALS ********************************************************************/ ULONG CurrentPacketId = INITIAL_PACKET_ID | SYNC_PACKET_ID; -ULONG RemotePacketId = INITIAL_PACKET_ID; - -#if _FULL_ -ULONG KdCompNumberRetries = 5; -ULONG KdCompRetryCount = 5; -#endif +ULONG RemotePacketId = INITIAL_PACKET_ID; + /* PRIVATE FUNCTIONS **********************************************************/ @@ -38,13 +30,13 @@ IN PVOID Buffer, IN ULONG Length) { - ULONG i, Checksum = 0; - - for (i = 0; i < Length; i++) + PUCHAR ByteBuffer = Buffer; + ULONG Checksum = 0; + + while (Length-- > 0) { - Checksum += ((PUCHAR)Buffer)[i]; + Checksum += (ULONG)*ByteBuffer++; } - return Checksum; } @@ -67,36 +59,6 @@ /* PUBLIC FUNCTIONS ***********************************************************/ - -NTSTATUS -NTAPI -KdD0Transition(VOID) -{ - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -KdD3Transition(VOID) -{ - return STATUS_SUCCESS; -} - - -/****************************************************************************** - * \name KdDebuggerInitialize1 - * \brief Phase 1 initialization. - * \param [opt] LoaderBlock Pointer to the Loader parameter block. Can be NULL. - * \return Status - */ -NTSTATUS -NTAPI -KdDebuggerInitialize1( - IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) -{ - return STATUS_SUCCESS; -} - /****************************************************************************** * \name KdReceivePacket @@ -128,36 +90,21 @@ ULONG Checksum; /* Special handling for breakin packet */ - if (PacketType == PACKET_TYPE_KD_POLL_BREAKIN) + if(PacketType == PACKET_TYPE_KD_POLL_BREAKIN) { return KdpPollBreakIn(); } for (;;) { -#if _FULL_ || _WORKS2_ - if (KdContext) - { - KdContext->KdpControlCPending = FALSE; - } -#endif /* Step 1 - Read PacketLeader */ KdStatus = KdpReceivePacketLeader(&Packet.PacketLeader); -#if _FULL_ - if (KdStatus != KDP_PACKET_TIMEOUT) - { -// KdCompNumberRetries = KdCompRetryCount; - } -#endif if (KdStatus != KDP_PACKET_RECEIVED) { /* Check if we got a breakin */ if (KdStatus == KDP_PACKET_RESEND) { -#if _FULL_ || _WORKS2_ || _PATCH_ - if (KdContext) -#endif - KdContext->KdpControlCPending = TRUE; + KdContext->KdpControlCPending = TRUE; } return KdStatus; } @@ -167,37 +114,22 @@ if (KdStatus != KDP_PACKET_RECEIVED) { /* Didn't receive a PacketType. */ - KDDBGPRINT("KdReceivePacket - Didn't receive a PacketType.\n"); -#if _WORKS_ - continue; -#else return KdStatus; -#endif } /* Check if we got a resend packet */ if (Packet.PacketLeader == CONTROL_PACKET_LEADER && Packet.PacketType == PACKET_TYPE_KD_RESEND) { - KDDBGPRINT("KdReceivePacket - PACKET_TYPE_KD_RESEND.\n"); return KDP_PACKET_RESEND; } /* Step 3 - Read ByteCount */ KdStatus = KdpReceiveBuffer(&Packet.ByteCount, sizeof(USHORT)); -#if _WORKS_ - if (KdStatus != KDP_PACKET_RECEIVED || Packet.ByteCount > PACKET_MAX_SIZE) -#else - if (KdStatus != KDP_PACKET_RECEIVED) -#endif - { - /* Didn't receive ByteCount _WORKS_: or it's too big. Start over. */ - KDDBGPRINT("KdReceivePacket - Didn't receive ByteCount.\n"); -#if _WORKS_ - continue; -#else + if (KdStatus != KDP_PACKET_RECEIVED) + { + /* Didn't receive ByteCount. */ return KdStatus; -#endif } /* Step 4 - Read PacketId */ @@ -205,12 +137,7 @@ if (KdStatus != KDP_PACKET_RECEIVED) { /* Didn't receive PacketId. */ - KDDBGPRINT("KdReceivePacket - Didn't receive PacketId.\n"); -#if _WORKS_ - continue; -#else return KdStatus; -#endif } /* @@ -226,12 +153,7 @@ if (KdStatus != KDP_PACKET_RECEIVED) { /* Didn't receive Checksum. */ - KDDBGPRINT("KdReceivePacket - Didn't receive Checksum.\n"); -#if _WORKS_ - continue; -#else return KdStatus; -#endif } /* Step 6 - Handle control packets */ @@ -253,9 +175,9 @@ case PACKET_TYPE_KD_RESET: KDDBGPRINT("KdReceivePacket - got PACKET_TYPE_KD_RESET\n"); + KdpSendControlPacket(PACKET_TYPE_KD_RESET, 0); CurrentPacketId = INITIAL_PACKET_ID; - RemotePacketId = INITIAL_PACKET_ID; - KdpSendControlPacket(PACKET_TYPE_KD_RESET, 0); + RemotePacketId = INITIAL_PACKET_ID; /* Fall through */ case PACKET_TYPE_KD_RESEND: @@ -265,11 +187,8 @@ default: KDDBGPRINT("KdReceivePacket - got unknown control packet\n"); -#if _FULL_ + /* We got an invalid packet, ignore it and start over */ continue; -#else - return KDP_PACKET_RESEND; -#endif } } @@ -277,56 +196,17 @@ if (PacketType == PACKET_TYPE_KD_ACKNOWLEDGE) { /* We received something different */ -#if _FULL_ || _WORKS2_ - if (Packet.PacketId != RemotePacketId) - { - KdpSendControlPacket(PACKET_TYPE_KD_ACKNOWLEDGE, - Packet.PacketId); - continue; - } -#elif _PATCH_ - DBGKD_MANIPULATE_STATE64 State; - KdStatus = KdpReceiveBuffer(&State, sizeof(State)); - KDDBGPRINT("KdReceivePacket - unxpected Packet.PacketType=0x%x, 0x%x, 0x%x\n", - Packet.PacketType, Packet.Checksum, State.ApiNumber); -#endif KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0); CurrentPacketId ^= 1; return KDP_PACKET_RECEIVED; } /* Get size of the message header */ -#if _WORKS_ - switch (Packet.PacketType) - { - case PACKET_TYPE_KD_STATE_CHANGE64: - MessageHeader->Length = sizeof(DBGKD_WAIT_STATE_CHANGE64); - break; - - case PACKET_TYPE_KD_STATE_MANIPULATE: - MessageHeader->Length = sizeof(DBGKD_MANIPULATE_STATE64); - break; - - case PACKET_TYPE_KD_DEBUG_IO: - MessageHeader->Length = sizeof(DBGKD_DEBUG_IO); - break; - - default: - KDDBGPRINT("KdReceivePacket - unknown PacketType\n"); - return KDP_PACKET_RESEND; - } - - //KDDBGPRINT("KdReceivePacket - got normal PacketType\n"); - - /* Packet smaller than expected? */ - if (MessageHeader->Length > Packet.ByteCount) -#else MessageHeader->Length = MessageHeader->MaximumLength; /* Packet smaller than expected or too big? */ if (Packet.ByteCount < MessageHeader->Length || Packet.ByteCount > PACKET_MAX_SIZE) -#endif { KDDBGPRINT("KdReceivePacket - too few data (%d) for type %d\n", Packet.ByteCount, MessageHeader->Length); @@ -338,11 +218,8 @@ //KDDBGPRINT("KdReceivePacket - got normal PacketType, Buffer = %p\n", MessageHeader->Buffer); /* Receive the message header data */ -#if _WORKS2_ - MessageHeader->Length = MessageHeader->MaximumLength; -#endif KdStatus = KdpReceiveBuffer(MessageHeader->Buffer, - MessageHeader->Length); + MessageHeader->Length); if (KdStatus != KDP_PACKET_RECEIVED) { /* Didn't receive data. Packet needs to be resent. */ @@ -369,7 +246,7 @@ /* Do we have data? */ if (MessageData->Length) { - KDDBGPRINT("KdReceivePacket - 0x%lx bytes data\n", *DataLength); + KDDBGPRINT("KdReceivePacket - got data\n"); /* Receive the message data */ KdStatus = KdpReceiveBuffer(MessageData->Buffer, @@ -401,19 +278,10 @@ if (Packet.Checksum != Checksum) { KDDBGPRINT("KdReceivePacket - wrong cheksum, got %x, calculated %x\n", - Packet.Checksum, Checksum); + Packet.Checksum, Checksum); KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0); continue; } - -#if _FULL_ || _WORKS2_ - if (Packet.PacketId != INITIAL_PACKET_ID && - Packet.PacketId != (INITIAL_PACKET_ID ^ 1)) - { - KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0); - continue; - } -#endif /* Acknowledge the received packet */ KdpSendControlPacket(PACKET_TYPE_KD_ACKNOWLEDGE, Packet.PacketId); @@ -422,7 +290,6 @@ if (Packet.PacketId != RemotePacketId) { /* Continue with next packet */ - KDDBGPRINT("KdReceivePacket - Wrong PacketId.\n"); continue; } @@ -440,28 +307,6 @@ } return KDP_PACKET_RECEIVED; -} - -static -BOOLEAN -IsQuickTimeoutAllowed( - IN ULONG PacketType, - IN PSTRING MessageHeader) -{ - PDBGKD_DEBUG_IO DebugIo = (PDBGKD_DEBUG_IO)MessageHeader->Buffer; - ULONG ApiNumber = DebugIo->ApiNumber; - - if ( ((PacketType == PACKET_TYPE_KD_DEBUG_IO) && - ((ApiNumber == DbgKdPrintStringApi))) || - ((PacketType == PACKET_TYPE_KD_FILE_IO) && - ((ApiNumber == DbgKdCreateFileApi))) || - ((PacketType == PACKET_TYPE_KD_STATE_CHANGE64) && - ((ApiNumber == DbgKdLoadSymbolsStateChange))) ) - { - return TRUE; - } - - return FALSE; } VOID @@ -491,11 +336,7 @@ MessageData->Length); } -#if _FULL_ - Retries = KdCompNumberRetries = KdCompRetryCount; -#else Retries = KdContext->KdpDefaultRetries; -#endif for (;;) { @@ -508,7 +349,7 @@ /* Send the message header */ KdpSendBuffer(MessageHeader->Buffer, MessageHeader->Length); - /* If we have message data, also send it */ + /* If we have meesage data, also send it */ if (MessageData) { KdpSendBuffer(MessageData->Buffer, MessageData->Length); @@ -529,37 +370,58 @@ { /* Packet received, we can quit the loop */ CurrentPacketId &= ~SYNC_PACKET_ID; + Retries = KdContext->KdpDefaultRetries; break; } - - if (KdStatus == KDP_PACKET_TIMEOUT) + else if (KdStatus == KDP_PACKET_TIMEOUT) { /* Timeout, decrement the retry count */ - Retries--; + if (Retries > 0) + Retries--; /* * If the retry count reaches zero, bail out * for packet types allowed to timeout. */ - if ((Retries == 0) && - IsQuickTimeoutAllowed(PacketType, MessageHeader)) + if (Retries == 0) { + ULONG MessageId = *(PULONG)MessageHeader->Buffer; + switch (PacketType) + { + case PACKET_TYPE_KD_DEBUG_IO: + { + if (MessageId != DbgKdPrintStringApi) continue; + break; + } + + case PACKET_TYPE_KD_STATE_CHANGE32: + case PACKET_TYPE_KD_STATE_CHANGE64: + { + if (MessageId != DbgKdLoadSymbolsStateChange) continue; + break; + } + + case PACKET_TYPE_KD_FILE_IO: + { + if (MessageId != DbgKdCreateFileApi) continue; + break; + } + } /* Reset debugger state */ KD_DEBUGGER_NOT_PRESENT = TRUE; SharedUserData->KdDebuggerEnabled &= ~0x00000002; CurrentPacketId = INITIAL_PACKET_ID | SYNC_PACKET_ID; - RemotePacketId = INITIAL_PACKET_ID; + RemotePacketId = INITIAL_PACKET_ID; + return; } } + // else (KdStatus == KDP_PACKET_RESEND) /* Resend the packet */ /* Packet timed out, send it again */ KDDBGPRINT("KdSendPacket got KdStatus 0x%x\n", KdStatus); } - -#if _FULL_ - KdCompNumberRetries = Retries; -#endif // _FULL_ } +/* EOF */

1 0

[tkreuzer] 71436: Patch "works": continue vs return stuff
by tkreuzer＠svn.reactos.org 28 May '16

28 May '16

Author: tkreuzer Date: Sat May 28 15:46:49 2016 New Revision: 71436 URL: http://svn.reactos.org/svn/reactos?rev=71436&view=rev Log: Patch "works": continue vs return stuff Modified: trunk/reactos/drivers/base/kdcom/kddll.c Modified: trunk/reactos/drivers/base/kdcom/kddll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kddll.c… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kddll.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kddll.c [iso-8859-1] Sat May 28 15:46:49 2016 @@ -8,11 +8,19 @@ #include "kddll.h" +#define _FULL_ 1 +#define _WORKS_ 0 +#define _WORKS2_ 0 + /* GLOBALS ********************************************************************/ ULONG CurrentPacketId = INITIAL_PACKET_ID | SYNC_PACKET_ID; ULONG RemotePacketId = INITIAL_PACKET_ID; +#if _FULL_ +ULONG KdCompNumberRetries = 5; +ULONG KdCompRetryCount = 5; +#endif /* PRIVATE FUNCTIONS **********************************************************/ @@ -30,13 +38,13 @@ IN PVOID Buffer, IN ULONG Length) { - PUCHAR ByteBuffer = Buffer; - ULONG Checksum = 0; - - while (Length-- > 0) + ULONG i, Checksum = 0; + + for (i = 0; i < Length; i++) { - Checksum += (ULONG)*ByteBuffer++; + Checksum += ((PUCHAR)Buffer)[i]; } + return Checksum; } @@ -59,6 +67,36 @@ /* PUBLIC FUNCTIONS ***********************************************************/ + +NTSTATUS +NTAPI +KdD0Transition(VOID) +{ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +KdD3Transition(VOID) +{ + return STATUS_SUCCESS; +} + + +/****************************************************************************** + * \name KdDebuggerInitialize1 + * \brief Phase 1 initialization. + * \param [opt] LoaderBlock Pointer to the Loader parameter block. Can be NULL. + * \return Status + */ +NTSTATUS +NTAPI +KdDebuggerInitialize1( + IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) +{ + return STATUS_SUCCESS; +} + /****************************************************************************** * \name KdReceivePacket @@ -97,14 +135,29 @@ for (;;) { +#if _FULL_ || _WORKS2_ + if (KdContext) + { + KdContext->KdpControlCPending = FALSE; + } +#endif /* Step 1 - Read PacketLeader */ KdStatus = KdpReceivePacketLeader(&Packet.PacketLeader); +#if _FULL_ + if (KdStatus != KDP_PACKET_TIMEOUT) + { +// KdCompNumberRetries = KdCompRetryCount; + } +#endif if (KdStatus != KDP_PACKET_RECEIVED) { /* Check if we got a breakin */ if (KdStatus == KDP_PACKET_RESEND) { - KdContext->KdpControlCPending = TRUE; +#if _FULL_ || _WORKS2_ || _PATCH_ + if (KdContext) +#endif + KdContext->KdpControlCPending = TRUE; } return KdStatus; } @@ -114,22 +167,37 @@ if (KdStatus != KDP_PACKET_RECEIVED) { /* Didn't receive a PacketType. */ + KDDBGPRINT("KdReceivePacket - Didn't receive a PacketType.\n"); +#if _WORKS_ + continue; +#else return KdStatus; +#endif } /* Check if we got a resend packet */ if (Packet.PacketLeader == CONTROL_PACKET_LEADER && Packet.PacketType == PACKET_TYPE_KD_RESEND) { + KDDBGPRINT("KdReceivePacket - PACKET_TYPE_KD_RESEND.\n"); return KDP_PACKET_RESEND; } /* Step 3 - Read ByteCount */ KdStatus = KdpReceiveBuffer(&Packet.ByteCount, sizeof(USHORT)); +#if _WORKS_ + if (KdStatus != KDP_PACKET_RECEIVED || Packet.ByteCount > PACKET_MAX_SIZE) +#else if (KdStatus != KDP_PACKET_RECEIVED) - { - /* Didn't receive ByteCount. */ +#endif + { + /* Didn't receive ByteCount _WORKS_: or it's too big. Start over. */ + KDDBGPRINT("KdReceivePacket - Didn't receive ByteCount.\n"); +#if _WORKS_ + continue; +#else return KdStatus; +#endif } /* Step 4 - Read PacketId */ @@ -137,7 +205,12 @@ if (KdStatus != KDP_PACKET_RECEIVED) { /* Didn't receive PacketId. */ + KDDBGPRINT("KdReceivePacket - Didn't receive PacketId.\n"); +#if _WORKS_ + continue; +#else return KdStatus; +#endif } /* @@ -153,7 +226,12 @@ if (KdStatus != KDP_PACKET_RECEIVED) { /* Didn't receive Checksum. */ + KDDBGPRINT("KdReceivePacket - Didn't receive Checksum.\n"); +#if _WORKS_ + continue; +#else return KdStatus; +#endif } /* Step 6 - Handle control packets */ @@ -187,8 +265,11 @@ default: KDDBGPRINT("KdReceivePacket - got unknown control packet\n"); - /* We got an invalid packet, ignore it and start over */ +#if _FULL_ continue; +#else + return KDP_PACKET_RESEND; +#endif } } @@ -196,17 +277,56 @@ if (PacketType == PACKET_TYPE_KD_ACKNOWLEDGE) { /* We received something different */ +#if _FULL_ || _WORKS2_ + if (Packet.PacketId != RemotePacketId) + { + KdpSendControlPacket(PACKET_TYPE_KD_ACKNOWLEDGE, + Packet.PacketId); + continue; + } +#elif _PATCH_ + DBGKD_MANIPULATE_STATE64 State; + KdStatus = KdpReceiveBuffer(&State, sizeof(State)); + KDDBGPRINT("KdReceivePacket - unxpected Packet.PacketType=0x%x, 0x%x, 0x%x\n", + Packet.PacketType, Packet.Checksum, State.ApiNumber); +#endif KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0); CurrentPacketId ^= 1; return KDP_PACKET_RECEIVED; } /* Get size of the message header */ +#if _WORKS_ + switch (Packet.PacketType) + { + case PACKET_TYPE_KD_STATE_CHANGE64: + MessageHeader->Length = sizeof(DBGKD_WAIT_STATE_CHANGE64); + break; + + case PACKET_TYPE_KD_STATE_MANIPULATE: + MessageHeader->Length = sizeof(DBGKD_MANIPULATE_STATE64); + break; + + case PACKET_TYPE_KD_DEBUG_IO: + MessageHeader->Length = sizeof(DBGKD_DEBUG_IO); + break; + + default: + KDDBGPRINT("KdReceivePacket - unknown PacketType\n"); + return KDP_PACKET_RESEND; + } + + //KDDBGPRINT("KdReceivePacket - got normal PacketType\n"); + + /* Packet smaller than expected? */ + if (MessageHeader->Length > Packet.ByteCount) +#else MessageHeader->Length = MessageHeader->MaximumLength; /* Packet smaller than expected or too big? */ if (Packet.ByteCount < MessageHeader->Length || Packet.ByteCount > PACKET_MAX_SIZE) +#endif { KDDBGPRINT("KdReceivePacket - too few data (%d) for type %d\n", Packet.ByteCount, MessageHeader->Length); @@ -218,6 +338,9 @@ //KDDBGPRINT("KdReceivePacket - got normal PacketType, Buffer = %p\n", MessageHeader->Buffer); /* Receive the message header data */ +#if _WORKS2_ + MessageHeader->Length = MessageHeader->MaximumLength; +#endif KdStatus = KdpReceiveBuffer(MessageHeader->Buffer, MessageHeader->Length); if (KdStatus != KDP_PACKET_RECEIVED) @@ -246,7 +369,7 @@ /* Do we have data? */ if (MessageData->Length) { - KDDBGPRINT("KdReceivePacket - got data\n"); + KDDBGPRINT("KdReceivePacket - 0x%lx bytes data\n", *DataLength); /* Receive the message data */ KdStatus = KdpReceiveBuffer(MessageData->Buffer, @@ -283,6 +406,15 @@ continue; } +#if _FULL_ || _WORKS2_ + if (Packet.PacketId != INITIAL_PACKET_ID && + Packet.PacketId != (INITIAL_PACKET_ID ^ 1)) + { + KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0); + continue; + } +#endif + /* Acknowledge the received packet */ KdpSendControlPacket(PACKET_TYPE_KD_ACKNOWLEDGE, Packet.PacketId); @@ -290,6 +422,7 @@ if (Packet.PacketId != RemotePacketId) { /* Continue with next packet */ + KDDBGPRINT("KdReceivePacket - Wrong PacketId.\n"); continue; } @@ -307,6 +440,28 @@ } return KDP_PACKET_RECEIVED; +} + +static +BOOLEAN +IsQuickTimeoutAllowed( + IN ULONG PacketType, + IN PSTRING MessageHeader) +{ + PDBGKD_DEBUG_IO DebugIo = (PDBGKD_DEBUG_IO)MessageHeader->Buffer; + ULONG ApiNumber = DebugIo->ApiNumber; + + if ( ((PacketType == PACKET_TYPE_KD_DEBUG_IO) && + ((ApiNumber == DbgKdPrintStringApi))) || + ((PacketType == PACKET_TYPE_KD_FILE_IO) && + ((ApiNumber == DbgKdCreateFileApi))) || + ((PacketType == PACKET_TYPE_KD_STATE_CHANGE64) && + ((ApiNumber == DbgKdLoadSymbolsStateChange))) ) + { + return TRUE; + } + + return FALSE; } VOID @@ -336,7 +491,11 @@ MessageData->Length); } +#if _FULL_ + Retries = KdCompNumberRetries = KdCompRetryCount; +#else Retries = KdContext->KdpDefaultRetries; +#endif for (;;) { @@ -349,7 +508,7 @@ /* Send the message header */ KdpSendBuffer(MessageHeader->Buffer, MessageHeader->Length); - /* If we have meesage data, also send it */ + /* If we have message data, also send it */ if (MessageData) { KdpSendBuffer(MessageData->Buffer, MessageData->Length); @@ -370,58 +529,37 @@ { /* Packet received, we can quit the loop */ CurrentPacketId &= ~SYNC_PACKET_ID; - Retries = KdContext->KdpDefaultRetries; break; } - else if (KdStatus == KDP_PACKET_TIMEOUT) + + if (KdStatus == KDP_PACKET_TIMEOUT) { /* Timeout, decrement the retry count */ - if (Retries > 0) - Retries--; + Retries--; /* * If the retry count reaches zero, bail out * for packet types allowed to timeout. */ - if (Retries == 0) + if ((Retries == 0) && + IsQuickTimeoutAllowed(PacketType, MessageHeader)) { - ULONG MessageId = *(PULONG)MessageHeader->Buffer; - switch (PacketType) - { - case PACKET_TYPE_KD_DEBUG_IO: - { - if (MessageId != DbgKdPrintStringApi) continue; - break; - } - - case PACKET_TYPE_KD_STATE_CHANGE32: - case PACKET_TYPE_KD_STATE_CHANGE64: - { - if (MessageId != DbgKdLoadSymbolsStateChange) continue; - break; - } - - case PACKET_TYPE_KD_FILE_IO: - { - if (MessageId != DbgKdCreateFileApi) continue; - break; - } - } /* Reset debugger state */ KD_DEBUGGER_NOT_PRESENT = TRUE; SharedUserData->KdDebuggerEnabled &= ~0x00000002; CurrentPacketId = INITIAL_PACKET_ID | SYNC_PACKET_ID; - RemotePacketId = INITIAL_PACKET_ID; - + RemotePacketId = INITIAL_PACKET_ID; return; } } - // else (KdStatus == KDP_PACKET_RESEND) /* Resend the packet */ /* Packet timed out, send it again */ KDDBGPRINT("KdSendPacket got KdStatus 0x%x\n", KdStatus); } -} - -/* EOF */ + +#if _FULL_ + KdCompNumberRetries = Retries; +#endif // _FULL_ +} +

1 0

[hbelusca] 71435: [TIMEDATE.CPL]: Do not hardcode some of the buffer lengths. CORE-11284
by hbelusca＠svn.reactos.org 28 May '16

28 May '16

Author: hbelusca Date: Sat May 28 15:23:00 2016 New Revision: 71435 URL: http://svn.reactos.org/svn/reactos?rev=71435&view=rev Log: [TIMEDATE.CPL]: Do not hardcode some of the buffer lengths. CORE-11284 Modified: trunk/reactos/dll/cpl/timedate/timezone.c Modified: trunk/reactos/dll/cpl/timedate/timezone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timezone.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timezone.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/timedate/timezone.c [iso-8859-1] Sat May 28 15:23:00 2016 @@ -73,7 +73,7 @@ DWORD dwValueSize; LONG lError; - dwValueSize = 128 * sizeof(WCHAR); + dwValueSize = sizeof(Entry->Description); lError = RegQueryValueExW(hZoneKey, L"Display", NULL, @@ -83,7 +83,7 @@ if (lError != ERROR_SUCCESS) return lError; - dwValueSize = 33 * sizeof(WCHAR); + dwValueSize = sizeof(Entry->StandardName); lError = RegQueryValueExW(hZoneKey, L"Std", NULL, @@ -93,7 +93,7 @@ if (lError != ERROR_SUCCESS) return lError; - dwValueSize = 33 * sizeof(WCHAR); + dwValueSize = sizeof(Entry->DaylightName); lError = RegQueryValueExW(hZoneKey, L"Dlt", NULL, @@ -103,7 +103,7 @@ if (lError != ERROR_SUCCESS) return lError; - dwValueSize = sizeof(TZ_INFO); + dwValueSize = sizeof(Entry->TimezoneInfo); lError = RegQueryValueExW(hZoneKey, L"TZI", NULL, @@ -371,7 +371,7 @@ 0, REG_DWORD, (LPBYTE)&dwValue, - sizeof(DWORD)); + sizeof(dwValue)); } else { @@ -401,7 +401,7 @@ hBitmap = LoadImageW(hApplet, MAKEINTRESOURCEW(IDC_WORLD), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); if (hBitmap != NULL) { - GetObjectW(hBitmap, sizeof(BITMAP), &bitmap); + GetObjectW(hBitmap, sizeof(bitmap), &bitmap); cxSource = bitmap.bmWidth; cySource = bitmap.bmHeight;

1 0

[ekohl] 71434: [NETSHELL] German translation and fixed layout Patch by reactosfanboy. CORE-11278 #resolve #comment Thanks a lot!
by ekohl＠svn.reactos.org 28 May '16

28 May '16

Author: ekohl Date: Sat May 28 00:18:39 2016 New Revision: 71434 URL: http://svn.reactos.org/svn/reactos?rev=71434&view=rev Log: [NETSHELL] German translation and fixed layout Patch by reactosfanboy. CORE-11278 #resolve #comment Thanks a lot! Modified: trunk/reactos/dll/shellext/netshell/lang/de-DE.rc Modified: trunk/reactos/dll/shellext/netshell/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… ============================================================================== --- trunk/reactos/dll/shellext/netshell/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/lang/de-DE.rc [iso-8859-1] Sat May 28 00:18:39 2016 @@ -36,12 +36,12 @@ LTEXT "Dauer:", -1, 19, 34, 60, 8 LTEXT "Ãbertragungsrate:", -1, 19, 48, 60, 8 GROUPBOX "AktivitÃ¤t", -1, 9, 74, 182, 70, BS_GROUPBOX - RTEXT "Gesendet", -1, 26, 90, 60, 8 - ICON "", IDC_NETSTAT, 110, 85, 32, 32 - LTEXT "Empfangen", -1, 149, 90, 37, 8 + LTEXT "Gesendet", -1, 55, 90, 60, 8 + ICON "", IDC_NETSTAT, 105, 85, 32, 32 + RTEXT "Empfangen", -1, 137, 90, 44, 8 LTEXT "Bytes:", -1, 17, 115, 32, 8 - RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 - RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + LTEXT "000.000.000", IDC_SEND, 55, 115, 44, 8 + RTEXT "000.000.000", IDC_RECEIVED, 137, 115, 44, 8 PUSHBUTTON "E&igenschaften", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Deaktivieren", IDC_ENDISABLE, 66, 150, 50, 14 RTEXT "", IDC_STATUS, 83, 20, 98, 8 @@ -82,11 +82,11 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 - LTEXT "Choose whether to use typical or custom settings:", IDC_STATIC, 53, 7, 240, 20 - AUTORADIOBUTTON "Typical Settings", IDC_NETWORK_TYPICAL, 53, 27, 253, 20, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Custom Settings", IDC_NETWORK_CUSTOM, 53, 72, 253, 20, WS_TABSTOP - LTEXT "Creates network connetions using the Client for ReactOS Networks, File and Print Sharing for ReactOS Networks, and the TCP/IP transport protocol with automatic addressing.", IDC_STATIC, 65, 45, 240, 30 - LTEXT "Allows you to manually configure network components.", IDC_STATIC, 65, 90, 243, 20 + LTEXT "WÃ¤hlen Sie, ob Standard- oder benutzerdefinierte Einstellungen verwendet werden sollen:", IDC_STATIC, 53, 7, 240, 20 + AUTORADIOBUTTON "Standardeinstellungen", IDC_NETWORK_TYPICAL, 53, 27, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Benutzerdefinierte Einstellungen", IDC_NETWORK_CUSTOM, 53, 72, 253, 20, WS_TABSTOP + LTEXT "Erstellt Netzwerkverbindungen unter Verwendung des Clients fÃ¼r ReactOS-Netzwerke, Datei- und Druckerfreigabe fÃ¼r ReactOS-Netzwerke und des TCP/IP-Transportprotokolls mit automatischer Adressierung.", IDC_STATIC, 65, 45, 240, 30 + LTEXT "ErmÃ¶glicht die manuelle Konfiguration von Netzwerkkomponenten.", IDC_STATIC, 65, 90, 243, 20 END IDD_NETWORKCOMPONENTPAGE DIALOGEX 0, 0, 317, 143 @@ -94,14 +94,14 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "For Device:", IDC_STATIC, 33, 2, 100, 20 + LTEXT "FÃ¼r GerÃ¤t:", IDC_STATIC, 33, 2, 100, 20 LTEXT "n/a", IDC_NETWORK_DEVICE, 75, 2, 253, 20 - LTEXT "Components checked are used by this connection:", IDC_STATIC, 33, 12, 253, 20 - CONTROL "", IDC_COMPONENT_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 33, 22, 250, 50 - PUSHBUTTON "&Install...", IDC_NETWORK_INSTALL, 122, 75, 50, 14, WS_DISABLED | WS_TABSTOP - PUSHBUTTON "&Uninstall", IDC_NETWORK_UNINSTALL, 177, 75, 50, 14, WS_DISABLED | WS_TABSTOP - PUSHBUTTON "&Properties", IDC_NETWORK_PROPERTIES, 232, 75, 50, 14, WS_DISABLED | WS_TABSTOP - GROUPBOX "Description", IDC_STATIC, 33, 90, 250, 50, BS_GROUPBOX + LTEXT "Aktivierte Komponenten werden von dieser Verbindung verwendet:", IDC_STATIC, 33, 17, 253, 10 + CONTROL "", IDC_COMPONENT_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 33, 27, 250, 45 + PUSHBUTTON "I&nstallieren...", IDC_NETWORK_INSTALL, 122, 75, 50, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Deinstallieren", IDC_NETWORK_UNINSTALL, 177, 75, 50, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "Ei&genschaften", IDC_NETWORK_PROPERTIES, 232, 75, 50, 14, WS_DISABLED | WS_TABSTOP + GROUPBOX "Beschreibung", IDC_STATIC, 33, 90, 250, 50, BS_GROUPBOX END IDD_NETWORKDOMAINPAGE DIALOGEX 0, 0, 317, 143 @@ -109,13 +109,13 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Do you want this computer to be a member of a domain?\n\ -(You can obtain this information from your network administator.)", IDC_STATIC, 33, 2, 263, 50 - AUTORADIOBUTTON "No, this computer will be part of a workgroup.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Yes, this computer will be part of a domain.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP - LTEXT "Workgroup or Domain Name:", IDC_STATIC, 33, 72, 126, 14 + LTEXT "Soll dieser Computer einer DomÃ¤ne oder Arbeitsgruppe hinzugefÃ¼gt werden?\n\ +(DomÃ¤nen-Anmelde-Informationen mÃ¼ssen eventuell vom Netzwerkadministrator bezogen werden.)", IDC_STATIC, 33, 2, 263, 50 + AUTORADIOBUTTON "Diesen Computer folgender Arbeitsgruppe hinzufÃ¼gen.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Diesen Computer folgender DomÃ¤ne hinzufÃ¼gen.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP + LTEXT "Arbeitsgruppe oder DomÃ¤ne:", IDC_STATIC, 33, 72, 126, 14 EDITTEXT IDC_DOMAIN_NAME, 33, 82, 126, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "NOTE: If this computer isn't going to be part of a network, you don't have sufficient rights to join a domain, or you don't know what to enter, then just choose workgroup for now. These options can be changed at a later time.", IDC_STATIC, 33, 107, 263, 50 + LTEXT "Hinweis: Soll dieser Computer nicht mit einem Netzwerk verbunden werden, ungenÃ¼gend Rechte besitzen, einer DomÃ¤ne beizutreten oder Sie schlicht nicht wissen, was Sie eingeben sollen, wÃ¤hlen Sie vorlÃ¤ufig Arbeitsgruppe.\nDiese Einstellung kann spÃ¤ter jederzeit verÃ¤ndert werden.", IDC_STATIC, 33, 107, 263, 50 END STRINGTABLE @@ -165,12 +165,12 @@ STRINGTABLE BEGIN - IDS_NETWORKSETTINGSTITLE "Network Settings" - IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to other networks, computers, and the Internet." - IDS_NETWORKCOMPONENTTITLE "Network Components" - IDS_NETWORKCOMPONENTSUBTITLE "Determine which networking components are used on your computer. To add new components, click on Install." - IDS_NETWORKDOMAINTITLE "Workgroup or Computer Domain" - IDS_NETWORKDOMAINSUBTITLE "A domain is a group of computers defined by a network administator. A workgroup is a group of computers sharing the same workgroup name." + IDS_NETWORKSETTINGSTITLE "Netzwerkeinstellungen" + IDS_NETWORKSETTINGSSUBTITLE "Die Installation von Netzwerksoftware ermÃ¶glicht das Herstellen von Verbindungen mit anderen Computern, Netzwerken und dem Internet." + IDS_NETWORKCOMPONENTTITLE "Netzwerkkomponenten" + IDS_NETWORKCOMPONENTSUBTITLE "WÃ¤hlen Sie die Netzwerkkomponenten, die aktiviert werden sollen. Klicken Sie auf ""Installieren"", um eine Komponente hinzuzufÃ¼gen." + IDS_NETWORKDOMAINTITLE "Arbeitsgruppe oder ComputerdomÃ¤ne" + IDS_NETWORKDOMAINSUBTITLE "Eine Arbeitsgruppe besteht aus Computern mit gleichem Arbeitsgruppennamen.\nEine DomÃ¤ne ist eine vom Netzwerkadministrator vorgegebene Computergruppe." IDS_REACTOS_SETUP "ReactOS Setup" - IDS_WZD_DOMAIN_NAME "Setup cannot continue until you\nenter the name of your domain\nor workgroup." + IDS_WZD_DOMAIN_NAME "Setup kann nicht fortgesetzt werden bevor Sie den Namen der DomÃ¤ne oder Arbeitsgruppe festgelegt haben." END

1 0

[ekohl] 71433: [TIMEDATE] Fixes and improvements to datetime CPL applet. Patch by Carlo Bramini. Replaced the original RegLocalQuery() by QueryTimezoneData() to simplify the error handling. Modific...
by ekohl＠svn.reactos.org 28 May '16

28 May '16

Author: ekohl Date: Sat May 28 00:12:02 2016 New Revision: 71433 URL: http://svn.reactos.org/svn/reactos?rev=71433&view=rev Log: [TIMEDATE] Fixes and improvements to datetime CPL applet. Patch by Carlo Bramini. Replaced the original RegLocalQuery() by QueryTimezoneData() to simplify the error handling. Modification by Eric Kohl. CORE-11284 #resolve #comment Thanks a lot! Modified: trunk/reactos/dll/cpl/timedate/timezone.c Modified: trunk/reactos/dll/cpl/timedate/timezone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timezone.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timezone.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/timedate/timezone.c [iso-8859-1] Sat May 28 00:12:02 2016 @@ -24,11 +24,10 @@ { struct _TIMEZONE_ENTRY *Prev; struct _TIMEZONE_ENTRY *Next; - WCHAR Description[64]; /* 'Display' */ + WCHAR Description[128]; /* 'Display' */ WCHAR StandardName[33]; /* 'Std' */ WCHAR DaylightName[33]; /* 'Dlt' */ TZ_INFO TimezoneInfo; /* 'TZI' */ - ULONG Index; /* 'Index ' */ } TIMEZONE_ENTRY, *PTIMEZONE_ENTRY; @@ -38,21 +37,80 @@ PTIMEZONE_ENTRY TimeZoneListHead = NULL; PTIMEZONE_ENTRY TimeZoneListTail = NULL; -static PTIMEZONE_ENTRY -GetLargerTimeZoneEntry(DWORD Index) +static +PTIMEZONE_ENTRY +GetLargerTimeZoneEntry( + LONG Bias, + LPWSTR lpDescription) { PTIMEZONE_ENTRY Entry; Entry = TimeZoneListHead; while (Entry != NULL) { - if (Entry->Index >= Index) + if (Entry->TimezoneInfo.Bias > Bias) return Entry; + if (Entry->TimezoneInfo.Bias == Bias) + { + if (_wcsicmp(Entry->Description, lpDescription) > 0) + return Entry; + } + Entry = Entry->Next; } return NULL; +} + + +static +LONG +QueryTimezoneData( + HKEY hZoneKey, + PTIMEZONE_ENTRY Entry) +{ + DWORD dwValueSize; + LONG lError; + + dwValueSize = 128 * sizeof(WCHAR); + lError = RegQueryValueExW(hZoneKey, + L"Display", + NULL, + NULL, + (LPBYTE)&Entry->Description, + &dwValueSize); + if (lError != ERROR_SUCCESS) + return lError; + + dwValueSize = 33 * sizeof(WCHAR); + lError = RegQueryValueExW(hZoneKey, + L"Std", + NULL, + NULL, + (LPBYTE)&Entry->StandardName, + &dwValueSize); + if (lError != ERROR_SUCCESS) + return lError; + + dwValueSize = 33 * sizeof(WCHAR); + lError = RegQueryValueExW(hZoneKey, + L"Dlt", + NULL, + NULL, + (LPBYTE)&Entry->DaylightName, + &dwValueSize); + if (lError != ERROR_SUCCESS) + return lError; + + dwValueSize = sizeof(TZ_INFO); + lError = RegQueryValueExW(hZoneKey, + L"TZI", + NULL, + NULL, + (LPBYTE)&Entry->TimezoneInfo, + &dwValueSize); + return lError; } @@ -62,11 +120,9 @@ WCHAR szKeyName[256]; DWORD dwIndex; DWORD dwNameSize; - DWORD dwValueSize; LONG lError; HKEY hZonesKey; HKEY hZoneKey; - PTIMEZONE_ENTRY Entry; PTIMEZONE_ENTRY Current; @@ -77,10 +133,9 @@ &hZonesKey)) return; - dwIndex = 0; - while (TRUE) - { - dwNameSize = 256 * sizeof(WCHAR); + for (dwIndex = 0; ; dwIndex++) + { + dwNameSize = sizeof(szKeyName); lError = RegEnumKeyExW(hZonesKey, dwIndex, szKeyName, @@ -106,70 +161,16 @@ break; } - dwValueSize = 64 * sizeof(WCHAR); - lError = RegQueryValueExW(hZoneKey, - L"Display", - NULL, - NULL, - (LPBYTE)&Entry->Description, - &dwValueSize); + lError = QueryTimezoneData(hZoneKey, + Entry); + + RegCloseKey(hZoneKey); + if (lError != ERROR_SUCCESS) { - RegCloseKey(hZoneKey); - dwIndex++; HeapFree(GetProcessHeap(), 0, Entry); - continue; - } - - dwValueSize = 33 * sizeof(WCHAR); - if (RegQueryValueExW(hZoneKey, - L"Std", - NULL, - NULL, - (LPBYTE)&Entry->StandardName, - &dwValueSize)) - { - RegCloseKey(hZoneKey); - break; - } - - dwValueSize = 33 * sizeof(WCHAR); - if (RegQueryValueExW(hZoneKey, - L"Dlt", - NULL, - NULL, - (LPBYTE)&Entry->DaylightName, - &dwValueSize)) - { - RegCloseKey(hZoneKey); - break; - } - - dwValueSize = sizeof(DWORD); - if (RegQueryValueExW(hZoneKey, - L"Index", - NULL, - NULL, - (LPBYTE)&Entry->Index, - &dwValueSize)) - { - RegCloseKey(hZoneKey); - break; - } - - dwValueSize = sizeof(TZ_INFO); - if (RegQueryValueExW(hZoneKey, - L"TZI", - NULL, - NULL, - (LPBYTE)&Entry->TimezoneInfo, - &dwValueSize)) - { - RegCloseKey(hZoneKey); - break; - } - - RegCloseKey(hZoneKey); + break; + } if (TimeZoneListHead == NULL && TimeZoneListTail == NULL) @@ -181,7 +182,7 @@ } else { - Current = GetLargerTimeZoneEntry(Entry->Index); + Current = GetLargerTimeZoneEntry(Entry->TimezoneInfo.Bias, Entry->Description); if (Current != NULL) { if (Current == TimeZoneListHead) @@ -210,8 +211,6 @@ TimeZoneListTail = Entry; } } - - dwIndex++; } RegCloseKey(hZonesKey);

1 0

[pschweitzer] 71432: [REISERFS] r71430, repetita
by pschweitzer＠svn.reactos.org 27 May '16

27 May '16

Author: pschweitzer Date: Fri May 27 20:35:44 2016 New Revision: 71432 URL: http://svn.reactos.org/svn/reactos?rev=71432&view=rev Log: [REISERFS] r71430, repetita Removed: trunk/reactos/drivers/filesystems/reiserfs/inc/gplntifs.h [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/drivers/filesystems/reiserfs/inc/gplntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/reiser…

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